--- np2/pccore.c	2004/02/18 21:58:41	1.70
+++ np2/pccore.c	2004/02/19 11:32:11	1.73
@@ -10,6 +10,7 @@
 #include	"cbuscore.h"
 #include	"pc9861k.h"
 #include	"mpu98ii.h"
+#include	"amd98.h"
 #include	"bios.h"
 #include	"biosmem.h"
 #include	"vram.h"
@@ -120,7 +121,7 @@ static void pccore_set(void) {
 	}
 	else {
 		pccore.baseclock = PCBASECLOCK20;			// 2.0MHz
-		pccore.cpumode = CPUMODE_8MHz;
+		pccore.cpumode = CPUMODE_8MHZ;
 	}
 	multiple = np2cfg.multiple;
 	if (multiple == 0) {
@@ -192,11 +193,13 @@ static void sound_init(void) {
 	pcm86gen_initialize(rate);
 	pcm86gen_setvol(np2cfg.vol_pcm);
 	cs4231_initialize(rate);
+	amd98_initialize(rate);
 }
 
 static void sound_term(void) {
 
 	soundmng_stop();
+	amd98_deinitialize();
 	rhythm_deinitialize();
 	fddmtrsnd_deinitialize();
 	sound_destroy();
@@ -285,7 +288,7 @@ void pccore_reset(void) {
 		sound_init();
 	}
 
-	ZeroMemory(mem, 0x110000);									// ver0.28
+	ZeroMemory(mem, 0x110000);
 	ZeroMemory(mem + VRAM1_B, 0x18000);
 	ZeroMemory(mem + VRAM1_E, 0x08000);
 	ZeroMemory(mem + FONT_ADRS, 0x08000);
@@ -403,7 +406,6 @@ static void drawscreen(void) {
 				gdcs.grphdisp |= GDCSCRN_ALLDRAW2;
 			}
 		}
-																// ver0.28/pr4
 		if (gdcs.textdisp & GDCSCRN_EXT) {
 			gdcs.textdisp &= ~GDCSCRN_EXT;
 			dispsync_renewalhorizontal();
@@ -412,8 +414,7 @@ static void drawscreen(void) {
 				screenupdate |= 2;
 			}
 		}
-																// ver0.28/pr4
-		if (gdcs.palchange) {									// grphを先に
+		if (gdcs.palchange) {
 			gdcs.palchange = 0;
 			pal_change(0);
 			screenupdate |= 1;
@@ -510,7 +511,7 @@ void screendisp(NEVENTITEM item) {
 	gdc_work(GDCWORK_SLAVE);
 	gdc.vsync = 0;
 	screendispflag = 0;
-	if (!np2cfg.DISPSYNC) {											// ver0.29
+	if (!np2cfg.DISPSYNC) {
 		drawscreen();
 	}
 	pi = &pic.pi[0];
@@ -535,7 +536,7 @@ void screenvsync(NEVENTITEM item) {
 	nevent_set(NEVENT_FLAMES, gdc.vsyncclock, screendisp, NEVENT_RELATIVE);
 
 	// drawscreenで pccore.vsyncclockが変更される可能性があります
-	if (np2cfg.DISPSYNC) {											// ver0.29
+	if (np2cfg.DISPSYNC) {
 		drawscreen();
 	}
 	(void)item;
@@ -651,38 +652,8 @@ void pccore_exec(BOOL draw) {
 									CPU_DX, CPU_DS, CPU_DI, mem[0xa3fe0]));
 			}
 #endif
-#if 0
-			if ((tr & 2) && (mem[0x0471e] == '\\')) {
-				TRACEOUT(("DTA BREAK %.4x:%.4x", CPU_CS, CPU_IP));
-				TRACEOUT(("0471:000e %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x",
-	mem[0x0471e+0], mem[0x0471e+1], mem[0x0471e+2], mem[0x0471e+3],
-	mem[0x0471e+4], mem[0x0471e+5], mem[0x0471e+6], mem[0x0471e+7]));
-				tr -= 2;
-			}
-			// DOS6
-			if (CPU_CS == 0xffd0) {
-				if (CPU_IP == 0xc4c2) {
-					TRACEOUT(("DS:DX = %.4x:%.4x / CX = %.4x", CPU_DS, CPU_DX, CPU_CX));
-				}
-				else if (CPU_IP == 0xc21d) {
-					TRACEOUT(("-> DS:BX = %.4x:%.4x", CPU_DS, CPU_BX));
-				}
-			}
-#endif
-#if 0
-			if ((CPU_CS == 0x0620) || (CPU_CS == 0x08a0)) {
-				TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP));
-			}
-#endif
-#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();