X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMemory.c;h=bdcfaabdf925c4dd45a6cd942cb004f361a96b5a;hb=b2305d080dcd60b0da0065c29f6a3c3b6762e8f5;hp=004d3af078eac2257f3090e29e7c288d0ec3c34d;hpb=48dc74f20a90629b55c1ab676639c05a125ea383;p=picodrive.git

diff --git a/Pico/Memory.c b/Pico/Memory.c
index 004d3af..bdcfaab 100644
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -105,7 +105,7 @@ PICO_INTERNAL_ASM void PicoMemReset(void)
 int PadRead(int i)
 {
   int pad,value,data_reg;
-  pad=~PicoPad[i]; // Get inverse of pad MXYZ SACB RLDU
+  pad=~PicoPadInt[i]; // Get inverse of pad MXYZ SACB RLDU
   data_reg=Pico.ioports[i+1];
 
   // orr the bits, which are set as output
@@ -345,7 +345,7 @@ PICO_INTERNAL_ASM u32 PicoRead8(u32 a)
   if ((a&0xff4000)==0xa00000) { d=z80Read8(a); goto end; } // Z80 Ram
 
   if ((a&0xe700e0)==0xc00000) { d=PicoVideoRead8(a); goto end; } // VDP
-  
+
   d=OtherRead16(a&~1, 8);
   if ((a&1)==0) d>>=8;
 
@@ -465,7 +465,7 @@ void PicoWrite16(u32 a,u16 d)
 
 static void PicoWrite32(u32 a,u32 d)
 {
-  elprintf(EL_IO, "w32: %06x, %08x", a&0xffffff, d);
+  elprintf(EL_IO, "w32: %06x, %08x @%06x", a&0xffffff, d, SekPc);
 #ifdef EMU_CORE_DEBUG
   lastwrite_cyc_d[lwp_cyc++&15] = d;
 #endif
@@ -983,8 +983,7 @@ PICO_INTERNAL unsigned char z80_read(unsigned short a)
 
   if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)
   {
-    if (PicoOpt&POPT_EN_FM) ret = ym2612_read_local_z80();
-    return ret;
+    return ym2612_read_local_z80();
   }
 
   if (a>=0x8000)