rearrange globals

[picodrive.git] / pico / cart.c

diff --git a/pico/cart.c b/pico/cart.c
index f17ce5e..3148f36 100644 (file)
--- a/pico/cart.c
+++ b/pico/cart.c
@@ -576,9 +576,9 @@ int PicoCartLoad(pm_file *f,unsigned char **prom,unsigned int *psize,int is_sms)
   if (!is_sms)\r
   {\r
     // maybe we are loading MegaCD BIOS?\r
-    if (!(PicoAHW & PAHW_MCD) && size == 0x20000 && (!strncmp((char *)rom+0x124, "BOOT", 4) ||\r
+    if (!(PicoIn.AHW & PAHW_MCD) && size == 0x20000 && (!strncmp((char *)rom+0x124, "BOOT", 4) ||\r
          !strncmp((char *)rom+0x128, "BOOT", 4))) {\r
-      PicoAHW |= PAHW_MCD;\r
+      PicoIn.AHW |= PAHW_MCD;\r
     }\r
 \r
     // Check for SMD:\r
@@ -628,7 +628,7 @@ int PicoCartInsert(unsigned char *rom, unsigned int romsize, const char *carthw_
   }\r
   pdb_cleanup();\r
 \r
-  PicoAHW &= PAHW_MCD|PAHW_SMS;\r
+  PicoIn.AHW &= PAHW_MCD|PAHW_SMS;\r
 \r
   PicoCartMemSetup = NULL;\r
   PicoDmaHook = NULL;\r
@@ -637,13 +637,13 @@ int PicoCartInsert(unsigned char *rom, unsigned int romsize, const char *carthw_
   PicoLoadStateHook = NULL;\r
   carthw_chunks = NULL;\r
 \r
-  if (!(PicoAHW & (PAHW_MCD|PAHW_SMS)))\r
+  if (!(PicoIn.AHW & (PAHW_MCD|PAHW_SMS)))\r
     PicoCartDetect(carthw_cfg);\r
 \r
   // setup correct memory map for loaded ROM\r
-  switch (PicoAHW) {\r
+  switch (PicoIn.AHW) {\r
     default:\r
-      elprintf(EL_STATUS|EL_ANOMALY, "starting in unknown hw configuration: %x", PicoAHW);\r
+      elprintf(EL_STATUS|EL_ANOMALY, "starting in unknown hw configuration: %x", PicoIn.AHW);\r
     case 0:\r
     case PAHW_SVP:  PicoMemSetup(); break;\r
     case PAHW_MCD:  PicoMemSetupCD(); break;\r
@@ -654,7 +654,7 @@ int PicoCartInsert(unsigned char *rom, unsigned int romsize, const char *carthw_
   if (PicoCartMemSetup != NULL)\r
     PicoCartMemSetup();\r
 \r
-  if (PicoAHW & PAHW_SMS)\r
+  if (PicoIn.AHW & PAHW_SMS)\r
     PicoPowerMS();\r
   else\r
     PicoPower();\r
@@ -681,7 +681,7 @@ void PicoCartUnload(void)
     PicoCartUnloadHook = NULL;\r
   }\r
 \r
-  if (PicoAHW & PAHW_32X)\r
+  if (PicoIn.AHW & PAHW_32X)\r
     PicoUnload32x();\r
 \r
   if (Pico.rom != NULL) {\r
@@ -965,7 +965,7 @@ static void parse_carthw(const char *carthw_cfg, int *fill_sram)
       else if (strcmp(p, "filled_sram") == 0)\r
         *fill_sram = 1;\r
       else if (strcmp(p, "force_6btn") == 0)\r
-        PicoQuirks |= PQUIRK_FORCE_6BTN;\r
+        PicoIn.quirks |= PQUIRK_FORCE_6BTN;\r
       else {\r
         elprintf(EL_STATUS, "carthw:%d: unsupported prop: %s", line, p);\r
         goto bad_nomsg;\r