--- np2/x11/sysmng.c	2003/11/16 16:43:45	1.1
+++ np2/x11/sysmng.c	2011/01/15 14:05:47	1.6
@@ -2,9 +2,12 @@
 
 #include "np2.h"
 #include "dosio.h"
-#include "fddfile.h"
-#include "i286.h"
+#include "cpucore.h"
 #include "pccore.h"
+#include "iocore.h"
+#include "fddfile.h"
+#include "ideio.h"
+#include "sxsi.h"
 #include "sysmng.h"
 #include "toolkit.h"
 
@@ -26,7 +29,7 @@ sysmng_workclockreset(void)
 {
 
 	workclock.tick = GETTICK();
-	workclock.clock = I286_CLOCK;
+	workclock.clock = CPU_CLOCK;
 	workclock.draws = drawcount;
 	workclock.fps = 0;
 	workclock.khz = 0;
@@ -41,8 +44,8 @@ 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;
 	}
 	return FALSE;
@@ -63,19 +66,25 @@ sysmng_updatecaption(BYTE flag)
 			milstr_ncat(titlestr, "  FDD2:", sizeof(titlestr));
 			milstr_ncat(titlestr, file_getname((char *)fdd_diskname(1)), sizeof(titlestr));
 		}
+#if defined(SUPPORT_IDEIO)
+		if (sxsi_getfilename(0x02)) {
+			milstr_ncat(titlestr, "  CD-ROM:", sizeof(titlestr));
+			milstr_ncat(titlestr, file_getname((OEMCHAR *)sxsi_getfilename(0x02)), sizeof(titlestr));
+		}
+#endif
 	}
 	if (flag & 2) {
 		clockstr[0] = '\0';
 		if (np2oscfg.DISPCLK & 2) {
 			if (workclock.fps) {
-				SPRINTF(clockstr, " - %u.%1uFPS", workclock.fps / 10, workclock.fps % 10);
+				g_snprintf(clockstr, sizeof(clockstr), " - %u.%1uFPS", workclock.fps / 10, workclock.fps % 10);
 			}
 			else {
 				milstr_ncpy(clockstr, " - 0FPS", sizeof(clockstr));
 			}
 		}
 		if (np2oscfg.DISPCLK & 1) {
-			SPRINTF(work, " %2u.%03uMHz", workclock.khz / 1000, workclock.khz % 1000);
+			g_snprintf(work, sizeof(work), " %2u.%03uMHz", workclock.khz / 1000, workclock.khz % 1000);
 			if (clockstr[0] == '\0') {
 				milstr_ncpy(clockstr, " -", sizeof(clockstr));
 			}