FAMEC idle loops, PSP port sync, minor adjustments

[picodrive.git] / Pico / Memory.c

diff --git a/Pico/Memory.c b/Pico/Memory.c
index 004d3af..a6b4d63 100644 (file)
--- 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\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
@@ -983,8 +983,7 @@ PICO_INTERNAL unsigned char z80_read(unsigned short a)
 \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