rearrange globals

[picodrive.git] / pico / memory.c

diff --git a/pico/memory.c b/pico/memory.c
index e747552..b49956e 100644 (file)
--- a/pico/memory.c
+++ b/pico/memory.c
@@ -210,7 +210,7 @@ void cyclone_crashed(u32 pc, struct Cyclone *context)
 \r
 static u32 read_pad_3btn(int i, u32 out_bits)\r
 {\r
-  u32 pad = ~PicoPadInt[i]; // Get inverse of pad MXYZ SACB RLDU\r
+  u32 pad = ~PicoIn.padInt[i]; // Get inverse of pad MXYZ SACB RLDU\r
   u32 value;\r
 \r
   if (out_bits & 0x40) // TH\r
@@ -224,7 +224,7 @@ static u32 read_pad_3btn(int i, u32 out_bits)
 \r
 static u32 read_pad_6btn(int i, u32 out_bits)\r
 {\r
-  u32 pad = ~PicoPadInt[i]; // Get inverse of pad MXYZ SACB RLDU\r
+  u32 pad = ~PicoIn.padInt[i]; // Get inverse of pad MXYZ SACB RLDU\r
   int phase = Pico.m.padTHPhase[i];\r
   u32 value;\r
 \r
@@ -349,7 +349,7 @@ void NOINLINE ctl_write_z80busreq(u32 d)
     }\r
     else\r
     {\r
-      if ((PicoOpt&POPT_EN_Z80) && !Pico.m.z80_reset) {\r
+      if ((PicoIn.opt & POPT_EN_Z80) && !Pico.m.z80_reset) {\r
         pprof_start(m68k);\r
         PicoSyncZ80(SekCyclesDone());\r
         pprof_end_sub(m68k);\r
@@ -367,7 +367,7 @@ void NOINLINE ctl_write_z80reset(u32 d)
   {\r
     if (d)\r
     {\r
-      if ((PicoOpt&POPT_EN_Z80) && Pico.m.z80Run) {\r
+      if ((PicoIn.opt & POPT_EN_Z80) && Pico.m.z80Run) {\r
         pprof_start(m68k);\r
         PicoSyncZ80(SekCyclesDone());\r
         pprof_end_sub(m68k);\r
@@ -542,8 +542,8 @@ static void PicoWrite8_z80(u32 a, u32 d)
     return;\r
   }\r
   if ((a & 0x6000) == 0x4000) { // FM Sound\r
-    if (PicoOpt & POPT_EN_FM)\r
-      emustatus |= ym2612_write_local(a&3, d&0xff, 0)&1;\r
+    if (PicoIn.opt & POPT_EN_FM)\r
+      Pico.m.status |= ym2612_write_local(a & 3, d & 0xff, 0) & 1;\r
     return;\r
   }\r
   // TODO: probably other VDP access too? Maybe more mirrors?\r
@@ -597,12 +597,8 @@ u32 PicoRead8_io(u32 a)
     goto end;\r
   }\r
 \r
-  if (PicoOpt & POPT_EN_32X) {\r
-    d = PicoRead8_32x(a);\r
-    goto end;\r
-  }\r
+  d = PicoRead8_32x(a);\r
 \r
-  d = m68k_unmapped_read8(a);\r
 end:\r
   return d;\r
 }\r
@@ -632,12 +628,8 @@ u32 PicoRead16_io(u32 a)
     goto end;\r
   }\r
 \r
-  if (PicoOpt & POPT_EN_32X) {\r
-    d = PicoRead16_32x(a);\r
-    goto end;\r
-  }\r
+  d = PicoRead16_32x(a);\r
 \r
-  d = m68k_unmapped_read16(a);\r
 end:\r
   return d;\r
 }\r
@@ -662,12 +654,7 @@ void PicoWrite8_io(u32 a, u32 d)
     Pico.m.sram_reg |= (u8)(d & 3);\r
     return;\r
   }\r
-  if (PicoOpt & POPT_EN_32X) {\r
-    PicoWrite8_32x(a, d);\r
-    return;\r
-  }\r
-\r
-  m68k_unmapped_write8(a, d);\r
+  PicoWrite8_32x(a, d);\r
 }\r
 \r
 void PicoWrite16_io(u32 a, u32 d)\r
@@ -690,11 +677,7 @@ void PicoWrite16_io(u32 a, u32 d)
     Pico.m.sram_reg |= (u8)(d & 3);\r
     return;\r
   }\r
-  if (PicoOpt & POPT_EN_32X) {\r
-    PicoWrite16_32x(a, d);\r
-    return;\r
-  }\r
-  m68k_unmapped_write16(a, d);\r
+  PicoWrite16_32x(a, d);\r
 }\r
 \r
 #endif // _ASM_MEMORY_C\r
@@ -971,7 +954,7 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
       ym2612.OPN.ST.address = d;\r
       ym2612.addr_A1 = 0;\r
 #ifdef __GP2X__\r
-      if (PicoOpt & POPT_EXT_FM) YM2612Write_940(a, d, -1);\r
+      if (PicoIn.opt & POPT_EXT_FM) YM2612Write_940(a, d, -1);\r
 #endif\r
       return 0;\r
 \r
@@ -1036,7 +1019,7 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
 \r
           if ((d ^ old_mode) & 0xc0) {\r
 #ifdef __GP2X__\r
-            if (PicoOpt & POPT_EXT_FM) return YM2612Write_940(a, d, get_scanline(is_from_z80));\r
+            if (PicoIn.opt & POPT_EXT_FM) return YM2612Write_940(a, d, get_scanline(is_from_z80));\r
 #endif\r
             return 1;\r
           }\r
@@ -1049,7 +1032,7 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
             PsndDacLine = scanline;\r
           }\r
 #ifdef __GP2X__\r
-          if (PicoOpt & POPT_EXT_FM) YM2612Write_940(a, d, scanline);\r
+          if (PicoIn.opt & POPT_EXT_FM) YM2612Write_940(a, d, scanline);\r
 #endif\r
           return 0;\r
         }\r
@@ -1060,7 +1043,7 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
       ym2612.OPN.ST.address = d;\r
       ym2612.addr_A1 = 1;\r
 #ifdef __GP2X__\r
-      if (PicoOpt & POPT_EXT_FM) YM2612Write_940(a, d, -1);\r
+      if (PicoIn.opt & POPT_EXT_FM) YM2612Write_940(a, d, -1);\r
 #endif\r
       return 0;\r
 \r
@@ -1074,7 +1057,7 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
   }\r
 \r
 #ifdef __GP2X__\r
-  if (PicoOpt & POPT_EXT_FM)\r
+  if (PicoIn.opt & POPT_EXT_FM)\r
     return YM2612Write_940(a, d, get_scanline(is_from_z80));\r
 #endif\r
   return YM2612Write_(a, d);\r
@@ -1123,7 +1106,7 @@ void ym2612_pack_state(void)
   elprintf(EL_YMTIMER, "save: timer b %i/%i", tbt >> 16, tbc);\r
 \r
 #ifdef __GP2X__\r
-  if (PicoOpt & POPT_EXT_FM)\r
+  if (PicoIn.opt & POPT_EXT_FM)\r
     YM2612PicoStateSave2_940(tat, tbt);\r
   else\r
 #endif\r
@@ -1158,7 +1141,7 @@ void ym2612_unpack_state(void)
   }\r
 \r
 #ifdef __GP2X__\r
-  if (PicoOpt & POPT_EXT_FM)\r
+  if (PicoIn.opt & POPT_EXT_FM)\r
     ret = YM2612PicoStateLoad2_940(&tat, &tbt);\r
   else\r
 #endif\r
@@ -1233,8 +1216,8 @@ static unsigned char z80_md_bank_read(unsigned short a)
 \r
 static void z80_md_ym2612_write(unsigned int a, unsigned char data)\r
 {\r
-  if (PicoOpt & POPT_EN_FM)\r
-    emustatus |= ym2612_write_local(a, data, 1) & 1;\r
+  if (PicoIn.opt & POPT_EN_FM)\r
+    Pico.m.status |= ym2612_write_local(a, data, 1) & 1;\r
 }\r
 \r
 static void z80_md_vdp_br_write(unsigned int a, unsigned char data)\r