int PadRead(int i)\r
{\r
int pad,value,data_reg;\r
- pad=~PicoPad[i]; // Get inverse of pad MXYZ SACB RLDU\r
+ pad=~PicoPadInt[i]; // Get inverse of pad MXYZ SACB RLDU\r
data_reg=Pico.ioports[i+1];\r
\r
// orr the bits, which are set as output\r
if ((a&0xff4000)==0xa00000) { d=z80Read8(a); goto end; } // Z80 Ram\r
\r
if ((a&0xe700e0)==0xc00000) { d=PicoVideoRead8(a); goto end; } // VDP\r
- \r
+\r
d=OtherRead16(a&~1, 8);\r
if ((a&1)==0) d>>=8;\r
\r
\r
static void PicoWrite32(u32 a,u32 d)\r
{\r
- elprintf(EL_IO, "w32: %06x, %08x", a&0xffffff, d);\r
+ elprintf(EL_IO, "w32: %06x, %08x @%06x", a&0xffffff, d, SekPc);\r
#ifdef EMU_CORE_DEBUG\r
lastwrite_cyc_d[lwp_cyc++&15] = d;\r
#endif\r
\r
if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)\r
{\r
- if (PicoOpt&POPT_EN_FM) ret = ym2612_read_local_z80();\r
- return ret;\r
+ return ym2612_read_local_z80();\r
}\r
\r
if (a>=0x8000)\r