--- np2/pccore.c	2003/12/12 01:04:39	1.29
+++ np2/pccore.c	2004/01/09 07:27:15	1.43
@@ -1,4 +1,5 @@
 #include	"compiler.h"
+#include	"strres.h"
 #include	"dosio.h"
 #include	"soundmng.h"
 #include	"sysmng.h"
@@ -22,6 +23,7 @@
 #include	"sound.h"
 #include	"fmboard.h"
 #include	"beep.h"
+#include	"s98.h"
 #include	"font.h"
 #include	"diskdrv.h"
 #include	"fddfile.h"
@@ -29,8 +31,10 @@
 #include	"sxsi.h"
 #include	"calendar.h"
 #include	"timing.h"
-//#include	"hostdrv.h"
 #include	"debugsub.h"
+#if defined(SUPPORT_HOSTDRV)
+#include	"hostdrv.h"
+#endif
 
 
 	const char	np2version[] = NP2VER_CORE;
@@ -49,8 +53,8 @@
 				3, {0x0c, 0x0c, 0x08, 0x06, 0x03, 0x0c}, 64, 64, 64, 64, 64,
 				1, 0x82,
 				0, {0x17, 0x04, 0x1f}, {0x0c, 0x0c, 0x02, 0x10, 0x3f, 0x3f},
-				1, 80, 0,
-				{"", ""}, "", ""};
+				1, 80, 0, 0,
+				{"", ""}, "", "", ""};
 
 	PCCORE	pc = {	PCBASECLOCK25,
 					4,
@@ -82,8 +86,6 @@ void getbiospath(char *path, const char 
 const char	*p;
 
 	p = np2cfg.biospath;
-
-	p = np2cfg.biospath;
 	if (p[0]) {
 		file_cpyname(path, p, maxlen);
 		file_setseparator(path, maxlen);
@@ -134,9 +136,18 @@ static void setvsyncclock(void) {
 	pc.vsyncclock = cnt - pc.dispclock;
 }
 
-static void setpcclock(UINT base, UINT multiple) {
+static void setpcclock(const char *modelstr, UINT base, UINT multiple) {
 
-	pc.model = PCMODEL_VX;
+	UINT8	model;
+
+	model = PCMODEL_VX;
+	if (!milstr_cmp(modelstr, str_VM)) {
+		model = PCMODEL_VM;
+	}
+	else if (!milstr_cmp(modelstr, str_EPSON)) {
+		model = PCMODEL_EPSON | PCMODEL_VM;
+	}
+	pc.model = model;
 
 	if (base >= ((PCBASECLOCK25 + PCBASECLOCK20) / 2)) {
 		pc.baseclock = PCBASECLOCK25;			// 2.5MHz
@@ -176,6 +187,9 @@ static void sound_init(void) {
 		rate = 0;
 	}
 	sound_create(rate, np2cfg.delayms);
+#if defined(SUPPORT_WAVEMIX)
+	wavemix_initialize(rate);
+#endif
 	beep_initialize(rate);
 	beep_setvol(np2cfg.BEEP_VOL);
 	tms3631_initialize(rate);
@@ -190,11 +204,15 @@ static void sound_init(void) {
 	adpcm_setvol(np2cfg.vol_adpcm);
 	pcm86gen_initialize(rate);
 	pcm86gen_setvol(np2cfg.vol_pcm);
+	cs4231_initialize(rate);
 }
 
 static void sound_term(void) {
 
 	soundmng_stop();
+#if defined(SUPPORT_WAVEMIX)
+	wavemix_deinitialize();
+#endif
 	rhythm_deinitialize();
 	sound_destroy();
 }
@@ -223,10 +241,18 @@ void pccore_init(void) {
 	pc9861k_construct();
 
 	iocore_create();
+
+#if defined(SUPPORT_HOSTDRV)
+	hostdrv_initialize();
+#endif
 }
 
 void pccore_term(void) {
 
+#if defined(SUPPORT_HOSTDRV)
+	hostdrv_deinitialize();
+#endif
+
 	sound_term();
 
 	fdd_eject(0);
@@ -267,8 +293,6 @@ void pccore_reset(void) {
 
 	int		i;
 
-//	reset_hostdrv();
-
 	ZeroMemory(mem, 0x10fff0);									// ver0.28
 	ZeroMemory(mem + VRAM1_B, 0x18000);
 	ZeroMemory(mem + VRAM1_E, 0x08000);
@@ -295,17 +319,25 @@ void pccore_reset(void) {
 		sound_init();
 	}
 
-	setpcclock(np2cfg.baseclock, np2cfg.multiple);
+	setpcclock(np2cfg.model, np2cfg.baseclock, np2cfg.multiple);
 	sound_changeclock();
 	beep_changeclock();
 	nevent_init();
 
 	sound_reset();
+#if defined(SUPPORT_WAVEMIX)
+	wavemix_bind();
+#endif
+
+	if (pc.model & PCMODEL_EPSON) {				// RAM ctrl
+		CPU_RAM_D000 = 0xffff;
+	}
 
 	iocore_reset();								// サウンドでpicを呼ぶので…
 	cbuscore_reset();
 	fmboard_reset(np2cfg.SOUND_SW);
 
+	i286_memorymap((pc.model & PCMODEL_EPSON)?1:0);
 	iocore_build();
 	iocore_bind();
 	cbuscore_bind();
@@ -338,6 +370,10 @@ void pccore_reset(void) {
 	sysmng_cpureset();
 
 	soundmng_play();
+
+#if defined(SUPPORT_HOSTDRV)
+	hostdrv_reset();
+#endif
 }
 
 static void drawscreen(void) {
@@ -489,9 +525,9 @@ void screendisp(NEVENTITEM item) {
 
 void screenvsync(NEVENTITEM item) {
 
-	vramop.tramwait = np2cfg.wait[1];
-	vramop.vramwait = np2cfg.wait[3];
-	vramop.grcgwait = np2cfg.wait[5];
+	MEMWAIT_TRAM = np2cfg.wait[1];
+	MEMWAIT_VRAM = np2cfg.wait[3];
+	MEMWAIT_GRCG = np2cfg.wait[5];
 	gdc_work(GDCWORK_MASTER);
 	gdc.vsync = 0x20;
 	if (gdc.vsyncint) {
@@ -526,9 +562,9 @@ void pccore_exec(BOOL draw) {
 
 	gdc.vsync = 0;
 	screendispflag = 1;
-	vramop.tramwait = np2cfg.wait[0];
-	vramop.vramwait = np2cfg.wait[2];
-	vramop.grcgwait = np2cfg.wait[4];
+	MEMWAIT_TRAM = np2cfg.wait[0];
+	MEMWAIT_VRAM = np2cfg.wait[2];
+	MEMWAIT_GRCG = np2cfg.wait[4];
 	nevent_set(NEVENT_FLAMES, pc.dispclock, screenvsync, NEVENT_RELATIVE);
 
 //	nevent_get1stevent();
@@ -540,6 +576,9 @@ void pccore_exec(BOOL draw) {
 		pic_irq();
 		if (CPU_RESETREQ) {
 			CPU_RESETREQ = 0;
+#if 1
+			CPU_SHUT();
+#else
 			CPU_CS = 0xf000;
 			CS_BASE = 0xf0000;
 			CPU_IP = 0xfff0;
@@ -547,6 +586,7 @@ void pccore_exec(BOOL draw) {
 			CPU_DX = 0x0300;
 #endif
 			CPU_CLEARPREFETCH();
+#endif
 		}
 
 #if 1 // ndef TRACE
@@ -561,7 +601,7 @@ void pccore_exec(BOOL draw) {
 #else
 		while(CPU_REMCLOCK > 0) {
 			TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP));
-			i286_step();
+			i286x_step();
 		}
 #endif
 		nevent_progress();
@@ -570,12 +610,13 @@ void pccore_exec(BOOL draw) {
 	mpu98ii_callback();
 	diskdrv_callback();
 	calendar_inc();
+	S98_sync();
 	sound_sync();													// happy!
 
 #if defined(TRACE)
 	execcnt++;
 	if (execcnt >= 60) {
-		TRACEOUT(("resetcnt = %d / pic %d", resetcnt, piccnt));
+//		TRACEOUT(("resetcnt = %d / pic %d", resetcnt, piccnt));
 		execcnt = 0;
 		resetcnt = 0;
 		piccnt = 0;