--- np2/win9x/sysmng.cpp	2003/10/21 11:22:05	1.4
+++ np2/win9x/sysmng.cpp	2004/06/14 13:35:40	1.8
@@ -2,11 +2,10 @@
 #include	"np2.h"
 #include	"dosio.h"
 #include	"sysmng.h"
-#include	"i286.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"fddfile.h"
 
-
 	UINT	sys_updates;
 
 
@@ -26,7 +25,7 @@ static struct {
 void sysmng_workclockreset(void) {
 
 	workclock.tick = GETTICK();
-	workclock.clock = I286_CLOCK;
+	workclock.clock = CPU_CLOCK;
 	workclock.draws = drawcount;
 }
 
@@ -41,8 +40,8 @@ BOOL sysmng_workclockrenewal(void) {
 	workclock.tick += tick;
 	workclock.fps = ((drawcount - workclock.draws) * 10000) / tick;
 	workclock.draws = drawcount;
-	workclock.khz = (I286_CLOCK - workclock.clock) / tick;
-	workclock.clock = I286_CLOCK;
+	workclock.khz = (CPU_CLOCK - workclock.clock) / tick;
+	workclock.clock = CPU_CLOCK;
 	return(TRUE);
 }
 
@@ -81,6 +80,11 @@ void sysmng_updatecaption(BYTE flag) {
 				milstr_ncpy(clock, " -", sizeof(clock));
 			}
 			milstr_ncat(clock, work, sizeof(clock));
+#if 0
+			SPRINTF(work, " (debug: OPN %d / PSG %s)", opngen.playing,
+									(psg1.mixer & 0x3f)?"ON":"OFF");
+			milstr_ncat(clock, work, sizeof(clock));
+#endif
 		}
 	}
 	milstr_ncpy(work, np2oscfg.titles, sizeof(work));