--- np2/pccore.c	2003/10/21 11:22:05	1.7
+++ np2/pccore.c	2003/11/21 06:51:10	1.19
@@ -4,12 +4,14 @@
 #include	"timemng.h"
 #include	"i286.h"
 #include	"memory.h"
+#include	"np2ver.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"cbuscore.h"
 #include	"pc9861k.h"
 #include	"mpu98ii.h"
 #include	"bios.h"
+#include	"biosmem.h"
 #include	"vram.h"
 #include	"scrndraw.h"
 #include	"dispsync.h"
@@ -28,42 +30,43 @@
 #include	"calendar.h"
 #include	"timing.h"
 //#include	"hostdrv.h"
+#include	"debugsub.h"
 
 
-	const char	np2version[] = "ver.0.38";
+	const char	np2version[] = NP2VER_CORE;
 
-	NP2CFG		np2cfg = {
-				PCBASECLOCK25, 4, 0,
-				{0x3e, 0x63, 0x7a},
-				{0x48, 0x05, 0x0c, 0x00, 0x01, 0x00, 0x00, 0x6E},
-				{0x0c, 0x08, 0x0c, 0x06, 0x03, 0x0c},				// ver0.27
-				{1, 1, 6, 1, 8, 1},
-				0, 4, 32, 22050, 800, 0, 1, 1, 0,
-				0, 0,
-//				0, 0, {1, 2, 2, 1},							// ver0.28
-				0, {0, 0, 0}, 0xd1, 0x7f, 0xd1, 0, 0, 1, 0x82,		// ver0.30
-				1, 80, 3, 1, 1, 0, 0x000000, 0xffffff,
-				0, 0, 0, 0x40, 0,
-				64, 64, 64, 64, 64,									// ver0.27
+	NP2CFG	np2cfg = {
+				0, 1, 0, 32, 0, 0, 0x40,
+				0, 0, 0, 0,
+				{0x3e, 0x63, 0x7a}, 0,
+				0, 0, {1, 1, 6, 1, 8, 1},
+
+				"VX", PCBASECLOCK25, 4,
+				{0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6e},
+				1, 1, 2, 1, 0x000000, 0xffffff,
+				22050, 800, 4, 0,
+				{0, 0, 0}, 0xd1, 0x7f, 0xd1, 0, 0, 1,
+				3, {0x0c, 0x0c, 0x08, 0x06, 0x03, 0x0c}, 64, 64, 64, 64, 64,
+				1, 0x82,
 				0, {0x17, 0x04, 0x1f}, {0x0c, 0x0c, 0x02, 0x10, 0x3f, 0x3f},
-				2, 1, 0, 0,
+				1, 80, 0,
 				{"", ""}, ""};
 
 	PCCORE	pc = {	PCBASECLOCK25,
-							4,
-							4 * PCBASECLOCK25,
-							4 * PCBASECLOCK25 * 50 / 3104,
-							4 * PCBASECLOCK25 * 5 / 3104,
-							4 * PCBASECLOCK25 / 120,
-							4 * PCBASECLOCK25 / 1920,
-							4 * PCBASECLOCK25 / 3125,
-							(4 * PCBASECLOCK25 / 56400),
-							100, 20,
-							0};
+					4,
+					4 * PCBASECLOCK25,
+					4 * PCBASECLOCK25 * 50 / 3104,
+					4 * PCBASECLOCK25 * 5 / 3104,
+					4 * PCBASECLOCK25 / 120,
+					4 * PCBASECLOCK25 / 1920,
+					4 * PCBASECLOCK25 / 3125,
+					4 * PCBASECLOCK25 / 56400,
+					100, 20, 0, PCMODEL_VX};
 
 									// on=0, off=1
-	BYTE	dip_default[3] = {0x3e, 0x63, 0x7a};
-	BYTE	msw_default[8] = {0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6E};
+//	BYTE	dip_default[3] = {0x3e, 0x63, 0x7a};
+static const BYTE msw_default[8] =
+							{0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6e};
 
 	BYTE	screenupdate = 3;
 	int		screendispflag = 1;
@@ -71,12 +74,12 @@
 	BOOL	drawframe;
 	UINT	drawcount = 0;
 
-	BYTE	mem[0x200000];								// ver0.28
+	BYTE	mem[0x200000];
 
 
 // ---------------------------------------------------------------------------
 
-static void setvsyncclock(void) {								// ver0.28
+static void setvsyncclock(void) {
 
 	UINT	vfp;
 	UINT	vbp;
@@ -113,7 +116,9 @@ static void setvsyncclock(void) {							
 	pc.vsyncclock = cnt - pc.dispclock;
 }
 
-static void setpcclock(UINT base, UINT multiple) {			// ver0.28
+static void setpcclock(UINT base, UINT multiple) {
+
+	pc.model = PCMODEL_VX;
 
 	if (base >= ((PCBASECLOCK25 + PCBASECLOCK20) / 2)) {
 		pc.baseclock = PCBASECLOCK25;			// 2.5MHz
@@ -202,12 +207,14 @@ void pccore_init(void) {
 
 void pccore_term(void) {
 
+	sound_term();
+
 	fdd_eject(0);
 	fdd_eject(1);
 	fdd_eject(2);
 	fdd_eject(3);
 
-	extmemmng_clear();												// ver0.28
+	extmemmng_clear();
 
 	iocore_destroy();
 
@@ -215,8 +222,6 @@ void pccore_term(void) {
 	rs232c_destruct();
 	mpu98ii_destruct();
 
-	sound_term();
-
 	sxsi_trash();
 }
 
@@ -228,8 +233,8 @@ void pccore_cfgupdate(void) {
 
 	renewal = FALSE;
 	for (i=0; i<8; i++) {
-		if (np2cfg.memsw[i] != mem[0xa3fe2 + i*4]) {
-			np2cfg.memsw[i] = mem[0xa3fe2 + i*4];
+		if (np2cfg.memsw[i] != mem[MEMB_MSW + i*4]) {
+			np2cfg.memsw[i] = mem[MEMB_MSW + i*4];
 			renewal = TRUE;
 		}
 	}
@@ -286,7 +291,7 @@ void pccore_reset(void) {
 	cbuscore_bind();
 	fmboard_bind();
 
-	timing_init();
+	timing_reset();
 	fddmtr_init();
 	calendar_init();
 	vram_init();
@@ -487,6 +492,7 @@ void screenvsync(NEVENTITEM item) {
 void pccore_exec(BOOL draw) {
 
 	drawframe = draw;
+	keyext_flash();
 	soundmng_sync();
 	mouseif_sync();
 	pal_eventclear();
@@ -513,7 +519,7 @@ void pccore_exec(BOOL draw) {
 			i286_resetprefetch();
 		}
 
-#if 1 // ndef TRACE
+#ifndef TRACE
 		if (I286_REMCLOCK > 0) {
 			if (!(CPUTYPE & CPUTYPE_V30)) {
 				i286();
@@ -523,20 +529,27 @@ void pccore_exec(BOOL draw) {
 			}
 		}
 #else
-		while(nevent.remainclock > 0) {
-{
-static FILEH fh = FILEH_INVALID;
-if (I286_CS == 0x0e14) {
-	if (fh == FILEH_INVALID) {
-		fh = file_create("log.txt");
-	}
-}
-if (fh != FILEH_INVALID) {
-char buf[32];
-wsprintf(buf, "%.4x:%.4x\r\n", I286_CS, I286_IP);
-file_write(fh, buf, strlen(buf));
-}
-}
+		while(I286_REMCLOCK > 0) {
+#if 0
+			TRACEOUT(("%.4x:%.4x", I286_CS, I286_IP));
+#elif 1
+			if ((I286_CS == 0x1c29) && (I286_IP == 0x01E9)) {
+				if (I286_BX) {
+					TRACEOUT(("set %.4x", I286_BX));
+				}
+			}
+			if ((I286_CS == 0x4159) && (I286_IP == 0x02d6)) {
+				if (I286_AX) {
+					TRACEOUT(("get %d", (short)I286_AX));
+				}
+			}
+#else
+			if (I286_CS == 0x4159) {
+				if ((I286_IP >= 0x02d1) && (I286_IP < 0x02e3)) {
+					TRACEOUT(("%s", debugsub_regs()));
+				}
+			}
+#endif
 			i286_step();
 		}
 #endif