X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FCart.c;h=dacd793afaa725daaaa8df14181139e4ca6f86fa;hb=4609d0cdb87fcdd5f419153d7a76e2b06242b294;hp=1e0ce2b170627e03e1c7e02f8797f3367ae07ca7;hpb=602133e1c66666f9152b1edb3014e137a9768cad;p=picodrive.git

diff --git a/Pico/Cart.c b/Pico/Cart.c
index 1e0ce2b..dacd793 100644
--- a/Pico/Cart.c
+++ b/Pico/Cart.c
@@ -512,7 +512,7 @@ int PicoCartInsert(unsigned char *rom,unsigned int romsize)
     PicoCartUnloadHook = NULL;
   }
 
-  PicoAHW &= ~PAHW_SVP;
+  PicoAHW &= PAHW_MCD;
 
   PicoMemResetHooks();
   PicoDmaHook = NULL;
@@ -528,9 +528,14 @@ int PicoCartInsert(unsigned char *rom,unsigned int romsize)
 
   // setup correct memory map for loaded ROM
   // call PicoMemReset again due to possible memmap change
-  if (PicoAHW & PAHW_MCD)
-       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();
 
   PicoPower();
@@ -674,6 +679,13 @@ static 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") == 0 && Pico.romsize == 0x200000) ||
     (rom_strcmp(0x160, "FLICKY") == 0 && Pico.romsize >= 0x200000)  ||