--- np2/pccore.c	2003/12/25 19:26:54	1.37
+++ np2/pccore.c	2004/01/08 16:29:56	1.41
@@ -31,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;
@@ -185,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);
@@ -199,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();
 }
@@ -310,11 +319,19 @@ void pccore_reset(void) {
 	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();