X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FCart.c;h=a0d38a0bd91ae2a6a569ea1a7e1c9619856b81c6;hb=0b35350da642c6de77de35a226e3692f1841d6e4;hp=4b94b47816030e5adc69fea353391512fbb5c108;hpb=fad248933b6676d30ccf419858b4ee10cc123fc5;p=picodrive.git

diff --git a/Pico/Cart.c b/Pico/Cart.c
index 4b94b47..a0d38a0 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;
 }
 
@@ -412,7 +418,7 @@ static unsigned char *PicoCartAlloc(int filesize)
   int alloc_size;
   unsigned char *rom;
 
-  if (PicoMCD & 1) return cd_realloc(NULL, filesize);
+  if (PicoAHW & PAHW_MCD) return cd_realloc(NULL, filesize);
 
   alloc_size=filesize+0x7ffff;
   if((filesize&0x3fff)==0x200) alloc_size-=0x200;
@@ -468,13 +474,17 @@ int PicoCartLoad(pm_file *f,unsigned char **prom,unsigned int *psize)
   }
 
   // maybe we are loading MegaCD BIOS?
-  if (!(PicoMCD&1) && size == 0x20000 && (!strncmp((char *)rom+0x124, "BOOT", 4) || !strncmp((char *)rom+0x128, "BOOT", 4))) {
-    PicoMCD |= 1;
+  if (!(PicoAHW & PAHW_MCD) && size == 0x20000 && (!strncmp((char *)rom+0x124, "BOOT", 4) ||
+       !strncmp((char *)rom+0x128, "BOOT", 4))) {
+    PicoAHW |= PAHW_MCD;
     rom = cd_realloc(rom, size);
   }
 
   // Check for SMD:
-  if ((size&0x3fff)==0x200) { DecodeSmd(rom,size); size-=0x200; } // Decode and byteswap SMD
+  if (size >= 0x4200 && (size&0x3fff)==0x200 &&
+      ((rom[0x2280] == 'S' && rom[0x280] == 'E') || (rom[0x280] == 'S' && rom[0x2281] == 'E'))) {
+    DecodeSmd(rom,size); size-=0x200; // Decode and byteswap SMD
+  }
   else Byteswap(rom,size); // Just byteswap
 
   if (prom)  *prom=rom;
@@ -489,17 +499,24 @@ 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;
   }
 
+  PicoAHW &= PAHW_MCD;
+
   PicoMemResetHooks();
   PicoDmaHook = NULL;
   PicoResetHook = NULL;
@@ -509,17 +526,23 @@ int PicoCartInsert(unsigned char *rom,unsigned int romsize)
 
   PicoMemReset();
 
-  if (!(PicoMCD & 1))
+  if (!(PicoAHW & PAHW_MCD))
     PicoCartDetect();
 
   // setup correct memory map for loaded ROM
   // call PicoMemReset again due to possible memmap change
-  if (PicoMCD & 1)
-       PicoMemSetupCD();
-  else PicoMemSetup();
+  switch (PicoAHW) {
+    default:
+      elprintf(EL_STATUS|EL_ANOMALY, "starting in unknown hw configuration: %x", PicoAHW);
+    case 0:
+    case PAHW_SVP:  PicoMemSetup(); break;
+    case PAHW_MCD:  PicoMemSetupCD(); break;
+    case PAHW_PICO: PicoMemSetupPico(); break;
+  }
   PicoMemReset();
 
-  return PicoReset(1);
+  PicoPower();
+  return 0;
 }
 
 int PicoCartUnload(void)
@@ -550,10 +573,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;
@@ -587,10 +609,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,22 +682,37 @@ void PicoCartDetect(void)
     PicoSVPStartup();
   }
 
+  // Pico
+  else if (rom_strcmp(0x100, "SEGA PICO") == 0 ||
+           rom_strcmp(0x100, "IMA IKUNOUJYUKU") == 0) // what is that supposed to mean?
+  {
+    PicoInitPico();
+  }
+
   // 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();
   }
 
+  // Radica mapper
+  else if (name_cmp("KID CHAMELEON") == 0 && Pico.romsize > 0x100000)
+  {
+    carthw_radica_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)
@@ -678,7 +721,7 @@ void PicoCartDetect(void)
   }
 
   // Unusual region 'code'
-  if (rom_strcmp(0x1f0, "EUROPE") == 0)
+  if (rom_strcmp(0x1f0, "EUROPE") == 0 || rom_strcmp(0x1f0, "Europe") == 0)
     *(int *) (Pico.rom+0x1f0) = 0x20204520;
 }