--- np2/pccore.c	2004/01/25 07:53:08	1.54
+++ np2/pccore.c	2004/01/31 20:05:23	1.61
@@ -176,6 +176,11 @@ static void pccore_set(void) {
 	pccore.keyboardclock = pccore.realclock / 1920;
 	pccore.midiclock = pccore.realclock / 3125;
 
+	// HDDの接続 (I/Oの使用状態が変わるので..
+	if (np2cfg.dipsw[1] & 0x20) {
+		pccore.hddif |= PCHDD_IDE;
+	}
+
 	// 拡張メモリ
 	extsize = 0;
 	if (!(np2cfg.dipsw[2] & 0x80)) {
@@ -183,14 +188,6 @@ static void pccore_set(void) {
 	}
 	pccore.extmem = extsize;
 
-	// HDDの接続 (I/Oの使用状態が変わるので..
-	if (np2cfg.dipsw[1] & 0x20) {
-		pccore.hddif |= PCHDD_IDE;
-	}
-#if defined(SUPPORT_SCSI)
-	pccore.hddif |= PCHDD_SCSI;
-#endif
-
 	// サウンドボードの接続
 	pccore.sound = np2cfg.SOUND_SW;
 
@@ -265,9 +262,9 @@ void pccore_init(void) {
 
 	sound_init();
 
-	mpu98ii_construct();
 	rs232c_construct();
-	pc9861k_construct();
+	mpu98ii_construct();
+	pc9861k_initialize();
 
 	iocore_create();
 
@@ -291,9 +288,9 @@ void pccore_term(void) {
 
 	iocore_destroy();
 
-	pc9861k_destruct();
-	rs232c_destruct();
+	pc9861k_deinitialize();
 	mpu98ii_destruct();
+	rs232c_destruct();
 
 	sxsi_trash();
 
@@ -353,6 +350,22 @@ void pccore_reset(void) {
 		CPU_RAM_D000 = 0xffff;
 	}
 
+	// HDDセット
+	sxsi_open();
+#if defined(SUPPORT_SASI)
+	if (sxsi_issasi()) {
+		pccore.hddif &= ~PCHDD_IDE;
+		pccore.hddif |= PCHDD_SASI;
+		TRACEOUT(("supported SASI"));
+	}
+#endif
+#if defined(SUPPORT_SCSI)
+	if (sxsi_isscsi()) {
+		pccore.hddif |= PCHDD_SCSI;
+		TRACEOUT(("supported SCSI"));
+	}
+#endif
+
 	sound_changeclock();
 	beep_changeclock();
 	sound_reset();
@@ -380,7 +393,6 @@ void pccore_reset(void) {
 	pal_change(1);
 
 	bios_init();
-	sxsi_open();
 
 	if (np2cfg.ITF_WORK) {
 		CS_BASE = 0xf0000;
@@ -669,11 +681,18 @@ void pccore_exec(BOOL draw) {
 			treip[trpos & (IPTRACE - 1)] = (CPU_CS << 16) + CPU_IP;
 			trpos++;
 #endif
-#if 0
-			if (tr) {
-				if ((CPU_CS == 0xf760) || (CPU_CS == 0xf990)) {
-					TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP));
-				}
+#if 1
+			if ((CPU_CS == 0xf800) && (CPU_IP == 0x0B5B)) {
+				TRACEOUT(("%.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x",
+							mem[0x9000], mem[0x9001],
+							mem[0x9002], mem[0x9003],
+							mem[0x9004], mem[0x9005],
+							mem[0x9006], mem[0x9007],
+							mem[0x9008], mem[0x9009]));
+			}
+			if ((CPU_CS == 0xf800) && (CPU_IP == 0x15FF)) {
+				TRACEOUT(("DX = %.4x / DS:DI = %.4x:%.4x [%.2x]",
+									CPU_DX, CPU_DS, CPU_DI, mem[0xa3fe0]));
 			}
 #endif
 #if 0
@@ -699,6 +718,13 @@ void pccore_exec(BOOL draw) {
 				TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP));
 			}
 #endif
+#if 1		// 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();
 		}