imported winuaesrc1450b13.zip

a2091.c

@@ -176,6 +176,8 @@ static int isirq(void)
 
 void rethink_a2091(void)
 {
+    if (currprefs.cs_cdtvscsi)
+	return;
     if (isirq()) {
 	uae_int_requested |= 2;
 #if A2091_DEBUG > 2 || A3000_DEBUG > 2
@@ -190,6 +192,8 @@ static void INT2(void)
 {
     int irq = 0;
 
+    if (currprefs.cs_cdtvscsi)
+	return;
     if (!(auxstatus & 0x80))
 	return;
     dmac_istr |= ISTR_INTS;
@@ -243,6 +247,10 @@ static void doscsistatus(void)
 #if WD33C93_DEBUG > 0
     write_log ("%s STATUS=%02X\n", WD33C93, scsidelay_status);
 #endif
+    if (currprefs.cs_cdtvscsi) {
+	cdtv_scsi_int ();
+	return;
+    }
     if (!currprefs.cs_a2091 && currprefs.cs_mbdmac != 1)
 	return;
     INT2();
@@ -610,6 +618,7 @@ uae_u8 wdscsi_get(void)
     } else if (sasr == WD_SCSI_STATUS) {
 	uae_int_requested &= ~2;
 	auxstatus &= ~0x80;
+	cdtv_scsi_clear_int ();
 	dmac_istr &= ~ISTR_INTS;
 	if (wdregs[WD_COMMAND_PHASE] == 0x10) {
 	    wdregs[WD_COMMAND_PHASE] = 0x11;

autoconf.c

@@ -28,6 +28,7 @@ uaecptr EXPANSION_bootcode, EXPANSION_nullfunc;
 /* ROM tag area memory access */
 
 uae_u8 *rtarea;
+uaecptr rtarea_base = 0xf00000;
 
 static uae_u32 REGPARAM3 rtarea_lget (uaecptr) REGPARAM;
 static uae_u32 REGPARAM3 rtarea_wget (uaecptr) REGPARAM;
@@ -114,7 +115,7 @@ static int rt_straddr;
 
 uae_u32 addr (int ptr)
 {
-    return (uae_u32)ptr + RTAREA_BASE;
+    return (uae_u32)ptr + rtarea_base;
 }
 
 void db (uae_u8 data)
@@ -157,7 +158,9 @@ void calltrap (uae_u32 n)
 
 void org (uae_u32 a)
 {
-    rt_addr = a - RTAREA_BASE;
+    if ( ((a & 0xffff0000) != 0x00f00000) && ((a & 0xffff0000) != rtarea_base) )
+	write_log ("ORG: corrupt address! %08X", a);
+    rt_addr = a & 0xffff;
 }
 
 uae_u32 here (void)
@@ -224,13 +227,13 @@ void rtarea_init (void)
 
     a = here();
     /* Dummy trap - removing this breaks the filesys emulation. */
-    org (RTAREA_BASE + 0xFF00);
+    org (rtarea_base + 0xFF00);
     calltrap (deftrap2 (nullfunc, TRAPFLAG_NO_RETVAL, ""));
 
-    org (RTAREA_BASE + 0xFF80);
+    org (rtarea_base + 0xFF80);
     calltrap (deftrap2 (getchipmemsize, TRAPFLAG_DORET, ""));
 
-    org (RTAREA_BASE + 0xFF10);
+    org (rtarea_base + 0xFF10);
     calltrap (deftrap2 (uae_puts, TRAPFLAG_NO_RETVAL, ""));
     dw (RTS);
 
@@ -240,7 +243,7 @@ void rtarea_init (void)
     filesys_install_code ();
 #endif
 
-    uae_boot_rom_size = here() - RTAREA_BASE;
+    uae_boot_rom_size = here() - rtarea_base;
     init_extended_traps ();
 }
 
@@ -253,4 +256,9 @@ void set_uae_int_flag (void)
 
 void rtarea_setup (void)
 {
+    uaecptr base = need_uae_boot_rom ();
+    if (base) {
+	write_log ("RTAREA located at %08X\n", base);
+	rtarea_base = base;
+    }
 }

cdtv.c

@@ -53,7 +53,8 @@
 #define AUDIO_STATUS_PLAY_ERROR     0x14
 #define AUDIO_STATUS_NO_STATUS      0x15
 
-#define MODEL_NAME "MATSHITA0.97" /* also MATSHITA0.96 exists */
+#define MODEL_NAME "MATSHITA0.96"
+/* also MATSHITA0.97 exists but is apparently rare */
 
 static smp_comm_pipe requests;
 static volatile int thread_alive;
@@ -866,6 +867,15 @@ static void checkint(void)
 	INT2();
 }
 
+void cdtv_scsi_int (void)
+{
+    checkint ();
+}
+void cdtv_scsi_clear_int (void)
+{
+    dmac_istr &= ~ISTR_INTS;
+}
+
 void rethink_cdtv (void)
 {
     checkint ();

cfgfile.c

@@ -2858,6 +2858,7 @@ void default_prefs (struct uae_prefs *p, int type)
     p->filesys_custom_uaefsdb = 1;
     p->picasso96_nocustom = 1;
     p->cart_internal = 1;
+    p->sana2[0] = 0;
 
     p->cs_compatible = 1;
     p->cs_rtc = 2;