X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FCart.c;h=e616622a4488c996ae384c2aadbfc8ca9581539b;hb=12f0f94d1595ac3bf4a33ded6023197b22572163;hp=a19dcc86b91c72d63c16f677cfce3282a191a735;hpb=ca61ee42d9298aeb5a5c97d9addaa1832af41d67;p=picodrive.git

diff --git a/Pico/Cart.c b/Pico/Cart.c
index a19dcc8..e616622 100644
--- a/Pico/Cart.c
+++ b/Pico/Cart.c
@@ -481,7 +481,7 @@ int PicoCartLoad(pm_file *f,unsigned char **prom,unsigned int *psize)
   return 0;
 }
 
-// Insert/remove a cartridge:
+// Insert a cartridge:
 int PicoCartInsert(unsigned char *rom,unsigned int romsize)
 {
   // notaz: add a 68k "jump one op back" opcode to the end of ROM.
@@ -493,15 +493,24 @@ int PicoCartInsert(unsigned char *rom,unsigned int romsize)
   Pico.rom=rom;
   Pico.romsize=romsize;
 
+  PicoMemResetHooks();
+  PicoDmaHook = NULL;
+  PicoResetHook = NULL;
+  PicoLineHook = NULL;
+  carthw_chunks = NULL;
+
+  PicoMemReset();
+
+  if (!(PicoMCD & 1))
+    PicoCartDetect();
+
   // setup correct memory map for loaded ROM
+  // call PicoMemReset again due to possible memmap change
   if (PicoMCD & 1)
        PicoMemSetupCD();
   else PicoMemSetup();
   PicoMemReset();
 
-  if (!(PicoMCD & 1))
-    PicoCartDetect();
-
   return PicoReset(1);
 }
 
@@ -546,10 +555,12 @@ void PicoCartDetect(void)
       Pico.m.sram_reg |= 4;
     } else {
       // normal SRAM
-      SRam.start = PicoRead32(0x1B4) & 0xFFFF00;
+      SRam.start = PicoRead32(0x1B4) & ~0xff;
       SRam.end   = PicoRead32(0x1B8) | 1;
       sram_size  = SRam.end - SRam.start + 1;
     }
+    SRam.start &= ~0xff000000;
+    SRam.end   &= ~0xff000000;
     Pico.m.sram_reg |= 0x10; // SRAM was detected
   }
   if (sram_size <= 0)
@@ -630,5 +641,12 @@ void PicoCartDetect(void)
   // Unusual region 'code'
   if (rom_strcmp(0x1f0, "EUROPE") == 0)
     *(int *) (Pico.rom+0x1f0) = 0x20204520;
+
+  // SVP detection
+  if (name_cmp("Virtua Racing") == 0 ||
+      name_cmp("VIRTUA RACING") == 0)
+  {
+    PicoSVPInit();
+  }
 }