X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FCart.c;h=f2683ca8f5c5ac22ca01a08a0aa5b243043937d6;hb=1cb1584b86a5679b8d32ccfc190f6e76c920810f;hp=52f5cf507f630307fc6c77be46c53a628c44922a;hpb=a12b1b29cc7e394128da59614c2efe8f5d182741;p=picodrive.git

diff --git a/Pico/Cart.c b/Pico/Cart.c
index 52f5cf5..f2683ca 100644
--- a/Pico/Cart.c
+++ b/Pico/Cart.c
@@ -20,6 +20,8 @@ void (*PicoCartUnloadHook)(void) = NULL;
 void (*PicoCartLoadProgressCB)(int percent) = NULL;
 void (*PicoCDLoadProgressCB)(int percent) = NULL; // handled in Pico/cd/cd_file.c
 
+static void PicoCartDetect(void);
+
 /* cso struct */
 typedef struct _cso_struct
 {
@@ -135,6 +137,9 @@ zip_failed:
     if (f == NULL)
       goto cso_failed;
 
+    /* we use our own buffering */
+    setvbuf(f, NULL, _IONBF, 0);
+
     cso = malloc(sizeof(*cso));
     if (cso == NULL)
       goto cso_failed;
@@ -201,6 +206,7 @@ cso_failed:
   file->size  = ftell(f);
   file->type  = PMT_UNCOMPRESSED;
   fseek(f, 0, SEEK_SET);
+
   return file;
 }
 
@@ -489,12 +495,17 @@ int PicoCartInsert(unsigned char *rom,unsigned int romsize)
   // notaz: add a 68k "jump one op back" opcode to the end of ROM.
   // This will hang the emu, but will prevent nasty crashes.
   // note: 4 bytes are padded to every ROM
-  if(rom != NULL)
+  if (rom != NULL)
     *(unsigned long *)(rom+romsize) = 0xFFFE4EFA; // 4EFA FFFE byteswapped
 
   Pico.rom=rom;
   Pico.romsize=romsize;
 
+  if (SRam.data) {
+    free(SRam.data);
+    SRam.data = NULL;
+  }
+
   if (PicoCartUnloadHook != NULL) {
     PicoCartUnloadHook();
     PicoCartUnloadHook = NULL;
@@ -504,6 +515,7 @@ int PicoCartInsert(unsigned char *rom,unsigned int romsize)
   PicoDmaHook = NULL;
   PicoResetHook = NULL;
   PicoLineHook = NULL;
+  PicoLoadStateHook = NULL;
   carthw_chunks = NULL;
 
   PicoMemReset();
@@ -518,7 +530,8 @@ int PicoCartInsert(unsigned char *rom,unsigned int romsize)
   else PicoMemSetup();
   PicoMemReset();
 
-  return PicoReset(1);
+  PicoPower();
+  return 0;
 }
 
 int PicoCartUnload(void)
@@ -549,10 +562,9 @@ static int name_cmp(const char *name)
  * various cart-specific things, which can't be handled by generic code
  * (maybe I should start using CRC for this stuff?)
  */
-void PicoCartDetect(void)
+static void PicoCartDetect(void)
 {
   int sram_size = 0, csum;
-  if(SRam.data) free(SRam.data); SRam.data=0;
   Pico.m.sram_reg = 0;
 
   csum = PicoRead32(0x18c) & 0xffff;
@@ -586,10 +598,16 @@ void PicoCartDetect(void)
     sram_size  = 0x004000;
   }
 
+  // this game actually doesn't have SRAM, but some weird protection
+  if (rom_strcmp(0x120, "PUGGSY") == 0)
+  {
+    SRam.start = SRam.end = sram_size = 0;
+  }
+
   if (sram_size)
   {
     SRam.data = (unsigned char *) calloc(sram_size, 1);
-    if(!SRam.data) return;
+    if (SRam.data == NULL) return;
   }
   SRam.changed = 0;
 
@@ -654,17 +672,19 @@ void PicoCartDetect(void)
   }
 
   // Detect 12-in-1 mapper
-  else if ((name_cmp("ROBOCOP 3") && Pico.romsize == 0x200000) ||
-    (rom_strcmp(0x160, "FLICKY") && Pico.romsize >= 0x200000))
+  else if ((name_cmp("ROBOCOP 3") == 0 && Pico.romsize == 0x200000) ||
+    (rom_strcmp(0x160, "FLICKY") == 0 && Pico.romsize >= 0x200000)  ||
+    (name_cmp(" SHOVE IT!") == 0 && Pico.romsize >= 0x200000) ||
+    (name_cmp("MS PACMAN") == 0 && Pico.romsize >= 0x200000)) // bad dump?
   {
     carthw_12in1_startup();
   }
 
   // Realtec mapper
   else if (Pico.romsize == 512*1024 && (
-    rom_strcmp(0x94, "THE EARTH DEFEND") ||
-    rom_strcmp(0xfe, "WISEGAME 11-03-1993") || // Funny World
-    rom_strcmp(0x95, "MALLET LEGEND "))) // Whac-A-Critter
+    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();
   }