rearrange globals

[picodrive.git] / pico / state.c

diff --git a/pico/state.c b/pico/state.c
index 69e8be0..100f423 100644 (file)
--- a/pico/state.c
+++ b/pico/state.c
@@ -226,7 +226,7 @@ static int state_save(void *file)
   areaWrite("PicoSEXT", 1, 8, file);\r
   areaWrite(&ver, 1, 4, file);\r
 \r
-  if (!(PicoAHW & PAHW_SMS)) {\r
+  if (!(PicoIn.AHW & PAHW_SMS)) {\r
     memset(buff, 0, sizeof(buff));\r
     SekPackCpu(buff, 0);\r
     CHECKED_WRITE_BUFF(CHUNK_M68K,  buff);\r
@@ -250,7 +250,7 @@ static int state_save(void *file)
   CHECKED_WRITE_BUFF(CHUNK_Z80, buff_z80);\r
   CHECKED_WRITE(CHUNK_PSG, 28*4, sn76496_regs);\r
 \r
-  if (PicoAHW & PAHW_MCD)\r
+  if (PicoIn.AHW & PAHW_MCD)\r
   {\r
     buf2 = malloc(CHUNK_LIMIT_W);\r
     if (buf2 == NULL)\r
@@ -287,7 +287,7 @@ static int state_save(void *file)
   }\r
 \r
 #ifndef NO_32X\r
-  if (PicoAHW & PAHW_32X)\r
+  if (PicoIn.AHW & PAHW_32X)\r
   {\r
     unsigned char cpubuff[SH2_STATE_SIZE];\r
 \r
@@ -406,9 +406,9 @@ static int state_load(void *file)
     CHECKED_READ(1, &chunk);\r
     CHECKED_READ(4, &len);\r
     if (len < 0 || len > 1024*512) R_ERROR_RETURN("bad length");\r
-    if (CHUNK_S68K <= chunk && chunk <= CHUNK_MISC_CD && !(PicoAHW & PAHW_MCD))\r
+    if (CHUNK_S68K <= chunk && chunk <= CHUNK_MISC_CD && !(PicoIn.AHW & PAHW_MCD))\r
       R_ERROR_RETURN("cd chunk in non CD state?");\r
-    if (CHUNK_32X_FIRST <= chunk && chunk <= CHUNK_32X_LAST && !(PicoAHW & PAHW_32X))\r
+    if (CHUNK_32X_FIRST <= chunk && chunk <= CHUNK_32X_LAST && !(PicoIn.AHW & PAHW_32X))\r
       Pico32xStartup();\r
 \r
     switch (chunk)\r
@@ -535,28 +535,28 @@ breakswitch:
   }\r
 \r
 readend:\r
-  if (PicoAHW & PAHW_SMS)\r
+  if (PicoIn.AHW & PAHW_SMS)\r
     PicoStateLoadedMS();\r
 \r
-  if (PicoAHW & PAHW_32X)\r
+  if (PicoIn.AHW & PAHW_32X)\r
     Pico32xStateLoaded(1);\r
 \r
   if (PicoLoadStateHook != NULL)\r
     PicoLoadStateHook();\r
 \r
   // must unpack 68k and z80 after banks are set up\r
-  if (!(PicoAHW & PAHW_SMS))\r
+  if (!(PicoIn.AHW & PAHW_SMS))\r
     SekUnpackCpu(buff_m68k, 0);\r
-  if (PicoAHW & PAHW_MCD)\r
+  if (PicoIn.AHW & PAHW_MCD)\r
     SekUnpackCpu(buff_s68k, 1);\r
 \r
   z80_unpack(buff_z80);\r
 \r
   // due to dep from 68k cycles..\r
   Pico.t.m68c_aim = Pico.t.m68c_cnt;\r
-  if (PicoAHW & PAHW_32X)\r
+  if (PicoIn.AHW & PAHW_32X)\r
     Pico32xStateLoaded(0);\r
-  if (PicoAHW & PAHW_MCD)\r
+  if (PicoIn.AHW & PAHW_MCD)\r
   {\r
     SekCycleAimS68k = SekCycleCntS68k;\r
     pcd_state_loaded();\r
@@ -579,7 +579,7 @@ static int state_load_gfx(void *file)
   int ver, len, found = 0, to_find = 4;\r
   char buff[8];\r
 \r
-  if (PicoAHW & PAHW_32X)\r
+  if (PicoIn.AHW & PAHW_32X)\r
     to_find += 2;\r
 \r
   g_read_offs = 0;\r
@@ -593,7 +593,7 @@ static int state_load_gfx(void *file)
     CHECKED_READ(1, buff);\r
     CHECKED_READ(4, &len);\r
     if (len < 0 || len > 1024*512) R_ERROR_RETURN("bad length");\r
-    if (buff[0] > CHUNK_FM && buff[0] <= CHUNK_MISC_CD && !(PicoAHW & PAHW_MCD))\r
+    if (buff[0] > CHUNK_FM && buff[0] <= CHUNK_MISC_CD && !(PicoIn.AHW & PAHW_MCD))\r
       R_ERROR_RETURN("cd chunk in non CD state?");\r
 \r
     switch (buff[0])\r
@@ -723,7 +723,7 @@ void *PicoTmpStateSave(void)
   memcpy(&t->video, &Pico.video, sizeof(Pico.video));\r
 \r
 #ifndef NO_32X\r
-  if (PicoAHW & PAHW_32X) {\r
+  if (PicoIn.AHW & PAHW_32X) {\r
     memcpy(&t->t32x.p32x, &Pico32x, sizeof(Pico32x));\r
     memcpy(t->t32x.dram, Pico32xMem->dram, sizeof(Pico32xMem->dram));\r
     memcpy(t->t32x.pal, Pico32xMem->pal, sizeof(Pico32xMem->pal));\r
@@ -746,7 +746,7 @@ void PicoTmpStateRestore(void *data)
   Pico.m.dirtyPal = 1;\r
 \r
 #ifndef NO_32X\r
-  if (PicoAHW & PAHW_32X) {\r
+  if (PicoIn.AHW & PAHW_32X) {\r
     memcpy(&Pico32x, &t->t32x.p32x, sizeof(Pico32x));\r
     memcpy(Pico32xMem->dram, t->t32x.dram, sizeof(Pico32xMem->dram));\r
     memcpy(Pico32xMem->pal, t->t32x.pal, sizeof(Pico32xMem->pal));\r