X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMemory.c;h=a6b4d639eabb257882c5cc34e7117efed0deadd0;hb=c060a9ab9c428e1ed9c4159b56529a2a36031e44;hp=004d3af078eac2257f3090e29e7c288d0ec3c34d;hpb=b06778874d140bd5187cb74444ddc40931b9bd1d;p=picodrive.git diff --git a/Pico/Memory.c b/Pico/Memory.c index 004d3af..a6b4d63 100644 --- a/Pico/Memory.c +++ b/Pico/Memory.c @@ -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; @@ -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)