--- np2/pccore.c	2004/01/25 06:01:31	1.53
+++ np2/pccore.c	2004/01/28 23:36:12	1.56
@@ -140,6 +140,7 @@ static void pccore_set(void) {
 
 	UINT8	model;
 	UINT32	multiple;
+	UINT8	extsize;
 
 	ZeroMemory(&pccore, sizeof(pccore));
 	model = PCMODEL_VX;
@@ -176,17 +177,16 @@ static void pccore_set(void) {
 	pccore.midiclock = pccore.realclock / 3125;
 
 	// 拡張メモリ
+	extsize = 0;
 	if (!(np2cfg.dipsw[2] & 0x80)) {
-		pccore.extmem = np2cfg.EXTMEM;
+		extsize = min(np2cfg.EXTMEM, 13);
 	}
+	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;
@@ -350,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();
@@ -377,7 +393,6 @@ void pccore_reset(void) {
 	pal_change(1);
 
 	bios_init();
-	sxsi_open();
 
 	if (np2cfg.ITF_WORK) {
 		CS_BASE = 0xf0000;
@@ -651,7 +666,7 @@ void pccore_exec(BOOL draw) {
 #endif
 		}
 
-#if 1 // ndef TRACE
+#if 0 // ndef TRACE
 		if (CPU_REMCLOCK > 0) {
 			if (!(CPU_TYPE & CPUTYPE_V30)) {
 				CPU_EXEC();
@@ -666,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