--- np2/pccore.c	2004/02/09 20:39:39	1.64
+++ np2/pccore.c	2004/02/18 21:58:41	1.70
@@ -34,6 +34,7 @@
 #include	"np2ver.h"
 #include	"calendar.h"
 #include	"timing.h"
+#include	"keystat.h"
 #include	"debugsub.h"
 
 
@@ -44,6 +45,7 @@
 				0, 0, 0, 0,
 				{0x3e, 0x73, 0x7b}, 0,
 				0, 0, {1, 1, 6, 1, 8, 1},
+				{{0, {0, }}, {0, {0, }}},
 
 				"VX", PCBASECLOCK25, 4,
 				{0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6e},
@@ -54,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,
@@ -170,9 +176,7 @@ static void sound_init(void) {
 		rate = 0;
 	}
 	sound_create(rate, np2cfg.delayms);
-#if defined(SUPPORT_WAVEMIX)
-	wavemix_initialize(rate);
-#endif
+	fddmtrsnd_initialize(rate);
 	beep_initialize(rate);
 	beep_setvol(np2cfg.BEEP_VOL);
 	tms3631_initialize(rate);
@@ -193,10 +197,8 @@ static void sound_init(void) {
 static void sound_term(void) {
 
 	soundmng_stop();
-#if defined(SUPPORT_WAVEMIX)
-	wavemix_deinitialize();
-#endif
 	rhythm_deinitialize();
+	fddmtrsnd_deinitialize();
 	sound_destroy();
 }
 
@@ -207,15 +209,15 @@ void pccore_init(void) {
 	pal_initlcdtable();
 	pal_makelcdpal();
 	pal_makeskiptable();
-	dispsync_init();
+	dispsync_initialize();
 	sxsi_initialize();
 
-	font_init();
+	font_initialize();
 	font_load(np2cfg.fontfile, TRUE);
-	maketext_init();
-	makegrph_init();
-	gdcsub_init();
-	fddfile_init();
+	maketext_initialize();
+	makegrph_initialize();
+	gdcsub_initialize();
+	fddfile_initialize();
 
 	sound_init();
 
@@ -294,7 +296,7 @@ void pccore_reset(void) {
 	}
 
 	pccore_set();
-	nevent_init();
+	nevent_allreset();
 
 	CPU_RESET();
 	CPU_SETEXTSIZE((UINT32)pccore.extmem);
@@ -326,9 +328,7 @@ void pccore_reset(void) {
 	sound_changeclock();
 	beep_changeclock();
 	sound_reset();
-#if defined(SUPPORT_WAVEMIX)
-	wavemix_bind();
-#endif
+	fddmtrsnd_bind();
 
 	fddfile_reset2dmode();
 	bios0x18_16(0x20, 0xe1);
@@ -343,13 +343,13 @@ void pccore_reset(void) {
 	cbuscore_bind();
 	fmboard_bind();
 
-	fddmtr_init();
-	calendar_init();
-	vram_init();
+	fddmtr_initialize();
+	calendar_initialize();
+	vram_initialize();
 
 	pal_change(1);
 
-	bios_init();
+	bios_initialize();
 
 	if (np2cfg.ITF_WORK) {
 		CS_BASE = 0xf0000;
@@ -588,7 +588,7 @@ UINT	cflg;
 void pccore_exec(BOOL draw) {
 
 	drawframe = draw;
-	keyext_flash();
+	keystat_sync();
 	soundmng_sync();
 	mouseif_sync();
 	pal_eventclear();
@@ -637,7 +637,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],
@@ -674,15 +674,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();