X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FCart.c;h=25bb96106b2559325a7b7330c06bb2428b788c04;hb=7b802576b284e113c637324e583a3a44e0e8e871;hp=6f97a4231f85b9f053396277a47312e903b2414c;hpb=ff6b7429bb03e37e2d44eabcd0d86bd5713d2fc1;p=picodrive.git

diff --git a/Pico/Cart.c b/Pico/Cart.c
index 6f97a42..25bb961 100644
--- a/Pico/Cart.c
+++ b/Pico/Cart.c
@@ -15,6 +15,8 @@
 
 static char *rom_exts[] = { "bin", "gen", "smd", "iso" };
 
+void (*PicoCartUnloadHook)(void) = NULL;
+
 void (*PicoCartLoadProgressCB)(int percent) = NULL;
 void (*PicoCDLoadProgressCB)(int percent) = NULL; // handled in Pico/cd/cd_file.c
 
@@ -400,7 +402,6 @@ static int DecodeSmd(unsigned char *data,int len)
 static unsigned char *cd_realloc(void *old, int filesize)
 {
   unsigned char *rom;
-  dprintf("sizeof(mcd_state): %i", sizeof(mcd_state));
   rom=realloc(old, sizeof(mcd_state));
   if (rom) memset(rom+0x20000, 0, sizeof(mcd_state)-0x20000);
   return rom;
@@ -418,7 +419,6 @@ static unsigned char *PicoCartAlloc(int filesize)
   alloc_size&=~0x7ffff; // use alloc size of multiples of 512K, so that memhandlers could be set up more efficiently
   if((filesize&0x3fff)==0x200) alloc_size+=0x200;
   else if(alloc_size-filesize < 4) alloc_size+=4; // padding for out-of-bound exec protection
-  //dprintf("alloc_size: %x\n",  alloc_size);
 
   // Allocate space for the rom plus padding
   rom=(unsigned char *)malloc(alloc_size);
@@ -483,7 +483,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.
@@ -495,21 +495,39 @@ int PicoCartInsert(unsigned char *rom,unsigned int romsize)
   Pico.rom=rom;
   Pico.romsize=romsize;
 
+  if (PicoCartUnloadHook != NULL) {
+    PicoCartUnloadHook();
+    PicoCartUnloadHook = NULL;
+  }
+
+  PicoMemResetHooks();
+  PicoDmaHook = NULL;
+  PicoResetHook = NULL;
+  PicoLineHook = NULL;
+  PicoLoadStateHook = 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);
 }
 
-int PicoUnloadCart(unsigned char* romdata)
+int PicoCartUnload(void)
 {
-  free(romdata);
+  if (Pico.rom != NULL) {
+    free(Pico.rom);
+    Pico.rom=NULL;
+  }
   return 0;
 }
 
@@ -528,7 +546,10 @@ static int name_cmp(const char *name)
   return rom_strcmp(0x150, name);
 }
 
-/* various cart-specific things, which can't be handled by generic code */
+/*
+ * various cart-specific things, which can't be handled by generic code
+ * (maybe I should start using CRC for this stuff?)
+ */
 void PicoCartDetect(void)
 {
   int sram_size = 0, csum;
@@ -548,10 +569,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)
@@ -624,10 +647,35 @@ void PicoCartDetect(void)
     SRam.eeprom_bit_out= 7;
   }
 
+  // SVP detection
+  else if (name_cmp("Virtua Racing") == 0 ||
+           name_cmp("VIRTUA RACING") == 0)
+  {
+    PicoSVPStartup();
+  }
+
+  // Detect 12-in-1 mapper
+  else if ((name_cmp("ROBOCOP 3") == 0 && Pico.romsize == 0x200000) ||
+    (rom_strcmp(0x160, "FLICKY") == 0 && Pico.romsize >= 0x200000))
+  {
+    carthw_12in1_startup();
+  }
+
+  // Realtec mapper
+  else if (Pico.romsize == 512*1024 && (
+    rom_strcmp(0x94, "THE EARTH DEFEND") == 0 ||
+    rom_strcmp(0xfe, "WISEGAME 11-03-1993") == 0 || // Funny World
+    rom_strcmp(0x95, "MALLET LEGEND ") == 0)) // Whac-A-Critter
+  {
+    carthw_realtec_startup();
+  }
+
   // Some games malfunction if SRAM is not filled with 0xff
   if (name_cmp("DINO DINI'S SOCCER") == 0 ||
       name_cmp("MICRO MACHINES II") == 0)
+  {
     memset(SRam.data, 0xff, sram_size);
+  }
 
   // Unusual region 'code'
   if (rom_strcmp(0x1f0, "EUROPE") == 0)