--- np2/pccore.c 2004/02/13 08:33:48 1.66 +++ np2/pccore.c 2004/02/18 03:24:48 1.69 @@ -34,6 +34,7 @@ #include "np2ver.h" #include "calendar.h" #include "timing.h" +#include "keystat.h" #include "debugsub.h" @@ -55,7 +56,11 @@ 1, 0x82, 0, {0x17, 0x04, 0x1f}, {0x0c, 0x0c, 0x02, 0x10, 0x3f, 0x3f}, 3, 1, 80, 0, 0, - {"", ""}, {"", "", "", ""}, "", "", ""}; + {"", ""}, +#if defined(SUPPORT_SCSI) + {"", "", "", ""}, +#endif + "", "", ""}; PCCORE pccore = { PCBASECLOCK25, 4, 0, PCMODEL_VX, 0, 0, {0x3e, 0x73, 0x7b}, 0, @@ -589,7 +594,7 @@ UINT cflg; void pccore_exec(BOOL draw) { drawframe = draw; - keyext_flash(); + keystat_sync(); soundmng_sync(); mouseif_sync(); pal_eventclear(); @@ -638,7 +643,7 @@ void pccore_exec(BOOL draw) { treip[trpos & (IPTRACE - 1)] = (CPU_CS << 16) + CPU_IP; trpos++; #endif -#if 1 +#if 0 if ((CPU_CS == 0xf800) && (CPU_IP == 0x0B5B)) { TRACEOUT(("%.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x", mem[0x9000], mem[0x9001], @@ -675,15 +680,15 @@ void pccore_exec(BOOL draw) { TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP)); } #endif -#if 1 // VX LIO +#if 0 // VX LIO if (CPU_CS == 0xf990) { if (CPU_IP == 0x07BE) { TRACEOUT(("%d,%d - %d,%d", CPU_BP, CPU_DX, CPU_SI, CPU_DI)); } } #endif - i286x_step(); -// i286c_step(); +// i286x_step(); + i286c_step(); } #endif nevent_progress();