--- np2/x11/sysmng.c	2003/11/16 16:43:45	1.1
+++ np2/x11/sysmng.c	2005/03/12 13:34:30	1.5
@@ -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,6 +66,12 @@ 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';