cue support wip

[picodrive.git] / Pico / Memory.c

diff --git a/Pico/Memory.c b/Pico/Memory.c
index 8632c7a..b4e473b 100644 (file)
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -112,7 +112,8 @@ int PadRead(int i)
   // orr the bits, which are set as output\r
   value = data_reg&(Pico.ioports[i+4]|0x80);\r
 \r
-  if(PicoOpt & 0x20) { // 6 button gamepad enabled\r
+  if (PicoOpt & POPT_6BTN_PAD)\r
+  {\r
     int phase = Pico.m.padTHPhase[i];\r
 \r
     if(phase == 2 && !(data_reg&0x40)) { // TH\r
@@ -556,7 +557,7 @@ static unsigned int  m68k_read_8 (unsigned int a, int do_fake)
 #ifdef EMU_CORE_DEBUG\r
   if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];\r
 #endif\r
-  if(PicoMCD&1) return m68k_read_pcrelative_CD8(a);\r
+  if(PicoAHW&1) return m68k_read_pcrelative_CD8(a);\r
   if((a&0xe00000)==0xe00000) return *(u8 *)(Pico.ram+((a^1)&0xffff)); // Ram\r
   return 0;\r
 }\r
@@ -567,7 +568,7 @@ static unsigned int  m68k_read_16(unsigned int a, int do_fake)
 #ifdef EMU_CORE_DEBUG\r
   if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];\r
 #endif\r
-  if(PicoMCD&1) return m68k_read_pcrelative_CD16(a);\r
+  if(PicoAHW&1) return m68k_read_pcrelative_CD16(a);\r
   if((a&0xe00000)==0xe00000) return *(u16 *)(Pico.ram+(a&0xfffe)); // Ram\r
   return 0;\r
 }\r
@@ -578,7 +579,7 @@ static unsigned int  m68k_read_32(unsigned int a, int do_fake)
 #ifdef EMU_CORE_DEBUG\r
   if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];\r
 #endif\r
-  if(PicoMCD&1) return m68k_read_pcrelative_CD32(a);\r
+  if(PicoAHW&1) return m68k_read_pcrelative_CD32(a);\r
   if((a&0xe00000)==0xe00000) { u16 *pm=(u16 *)(Pico.ram+(a&0xfffe)); return (pm[0]<<16)|pm[1]; } // Ram\r
   return 0;\r
 }\r
@@ -638,34 +639,34 @@ void PicoWriteCD32w(unsigned int a, unsigned int d);
 /* it appears that Musashi doesn't always mask the unused bits */\r
 unsigned int  m68k_read_memory_8(unsigned int address)\r
 {\r
-    unsigned int d = (PicoMCD&1) ? PicoReadCD8w(address) : PicoRead8(address);\r
+    unsigned int d = (PicoAHW&1) ? PicoReadCD8w(address) : PicoRead8(address);\r
     return d&0xff;\r
 }\r
 \r
 unsigned int  m68k_read_memory_16(unsigned int address)\r
 {\r
-    unsigned int d = (PicoMCD&1) ? PicoReadCD16w(address) : PicoRead16(address);\r
+    unsigned int d = (PicoAHW&1) ? PicoReadCD16w(address) : PicoRead16(address);\r
     return d&0xffff;\r
 }\r
 \r
 unsigned int  m68k_read_memory_32(unsigned int address)\r
 {\r
-    return (PicoMCD&1) ? PicoReadCD32w(address) : PicoRead32(address);\r
+    return (PicoAHW&1) ? PicoReadCD32w(address) : PicoRead32(address);\r
 }\r
 \r
 void m68k_write_memory_8(unsigned int address, unsigned int value)\r
 {\r
-    if (PicoMCD&1) PicoWriteCD8w(address, (u8)value); else PicoWrite8(address, (u8)value);\r
+    if (PicoAHW&1) PicoWriteCD8w(address, (u8)value); else PicoWrite8(address, (u8)value);\r
 }\r
 \r
 void m68k_write_memory_16(unsigned int address, unsigned int value)\r
 {\r
-    if (PicoMCD&1) PicoWriteCD16w(address,(u16)value); else PicoWrite16(address,(u16)value);\r
+    if (PicoAHW&1) PicoWriteCD16w(address,(u16)value); else PicoWrite16(address,(u16)value);\r
 }\r
 \r
 void m68k_write_memory_32(unsigned int address, unsigned int value)\r
 {\r
-    if (PicoMCD&1) PicoWriteCD32w(address, value); else PicoWrite32(address, value);\r
+    if (PicoAHW&1) PicoWriteCD32w(address, value); else PicoWrite32(address, value);\r
 }\r
 #endif\r
 #endif // EMU_M68K\r
@@ -680,7 +681,7 @@ PICO_INTERNAL unsigned char z80_read(unsigned short a)
 \r
   if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)\r
   {\r
-    if (PicoOpt&1) ret = (u8) YM2612Read();\r
+    if (PicoOpt&POPT_EN_FM) ret = (u8) YM2612Read();\r
     return ret;\r
   }\r
 \r
@@ -691,7 +692,7 @@ PICO_INTERNAL unsigned char z80_read(unsigned short a)
     addr68k=Pico.m.z80_bank68k<<15;\r
     addr68k+=a&0x7fff;\r
 \r
-    if (PicoMCD & 1)\r
+    if (PicoAHW & PAHW_MCD)\r
          ret = PicoReadM68k8(addr68k);\r
     else ret = PicoRead8(addr68k);\r
     elprintf(EL_Z80BNK, "z80->68k r8 [%06x] %02x", addr68k, ret);\r
@@ -713,13 +714,13 @@ PICO_INTERNAL_ASM void z80_write(unsigned int a, unsigned char data)
 {\r
   if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)\r
   {\r
-    if(PicoOpt&1) emustatus|=YM2612Write(a, data) & 1;\r
+    if(PicoOpt&POPT_EN_FM) emustatus|=YM2612Write(a, data) & 1;\r
     return;\r
   }\r
 \r
   if ((a&0xfff9)==0x7f11) // 7f11 7f13 7f15 7f17\r
   {\r
-    if(PicoOpt&2) SN76496Write(data);\r
+    if(PicoOpt&POPT_EN_PSG) SN76496Write(data);\r
     return;\r
   }\r
 \r
@@ -738,7 +739,7 @@ PICO_INTERNAL_ASM void z80_write(unsigned int a, unsigned char data)
     addr68k=Pico.m.z80_bank68k<<15;\r
     addr68k+=a&0x7fff;\r
     elprintf(EL_Z80BNK, "z80->68k w8 [%06x] %02x", addr68k, data);\r
-    if (PicoMCD & 1)\r
+    if (PicoAHW & PAHW_MCD)\r
          PicoWriteM68k8(addr68k, data);\r
     else PicoWrite8(addr68k, data);\r
     return;\r