--- xmil/pccore.c	2004/08/12 20:09:42	1.26
+++ xmil/pccore.c	2004/08/14 12:16:17	1.32
@@ -36,8 +36,8 @@ const OEMCHAR xmilversion[] = OEMTEXT(XM
 #if defined(SUPPORT_BANKMEM)
 	UINT8		mBANK[16][0x8000];
 #endif
-	BYTE		*RAM0r;
-	BYTE		*RAM0w;
+	UINT8		*RAM0r;
+	UINT8		*RAM0w;
 
 
 // ----
@@ -173,28 +173,10 @@ void iptrace_out(void) {
 }
 #endif
 
-#if 0
-UINT pccore_getraster(UINT *h) {
-
-	SINT32	work;
-	UINT	vl;
-
-	work = nevent_getwork(NEVENT_FRAMES);
-	vl = work / 250;
-	if (h) {
-		*h = work - (vl * 250);
-	}
-	if (corestat.vsync) {
-		vl += corestat.vl;
-	}
-	return(vl);
-}
-#endif
 
 void neitem_disp(UINT id) {
 
 	corestat.vsync = 1;
-	pcg.r.vsync = 1;
 	if (xmilcfg.DISPSYNC & 1) {
 		scrnupdate();
 	}
@@ -208,7 +190,9 @@ void neitem_vsync(UINT id) {
 }
 
 
-// #define	SINGLESTEPONLY
+// ----
+
+#define	SINGLESTEPONLY
 
 void pccore_exec(BRESULT draw) {
 
@@ -218,7 +202,8 @@ void pccore_exec(BRESULT draw) {
 	corestat.drawframe = draw;
 	soundmng_sync();
 
-	frameclock = 266 * RASTER_CLOCK * pccore.multiple / 2;
+	timing_setrate(crtc.e.frameclock);
+	frameclock = crtc.e.frameclock * pccore.multiple / 2;
 	dispclock = min(frameclock, crtc.e.dispclock);
 	corestat.dispclock = dispclock;
 	corestat.syncclock = frameclock - dispclock;
@@ -231,7 +216,7 @@ void pccore_exec(BRESULT draw) {
 		}
 #else
 		while(CPU_REMCLOCK > 0) {
-			TRACEOUT(("%.4x", Z80_PC));
+		//	TRACEOUT(("%.4x", Z80_PC));
 #if defined(TRACE) && IPTRACE
 			treip[trpos & (IPTRACE - 1)] = Z80_PC;
 			trpos++;
@@ -245,5 +230,6 @@ void pccore_exec(BRESULT draw) {
 
 	scrnupdate();
 	sound_sync();
+	fdc_callback();
 }