FAMEC idle loops, PSP port sync, minor adjustments

[picodrive.git] / Pico / Memory.s

diff --git a/Pico/Memory.s b/Pico/Memory.s
index 04d062f..b2359db 100644 (file)
--- a/Pico/Memory.s
+++ b/Pico/Memory.s
@@ -386,10 +386,7 @@ m_read8_misc2:
     cmp     r2, #0x4000\r
     mvnne   r0, #0\r
     bxne    lr                @ invalid\r
-    ldr     r1, =PicoOpt\r
-    ldr     r1, [r1]\r
-    tst     r1, #1\r
-    bne     ym2612_read_local_68k\r
+    b       ym2612_read_local_68k\r
 \r
 m_read8_fake_ym2612:\r
     ldr     r3, =(Pico+0x22200)\r
@@ -415,13 +412,7 @@ m_read8_vdp:
     tst     r0, #0x70000\r
     tsteq   r0, #0x000e0\r
     bxne    lr              @ invalid read\r
-    stmfd   sp!,{r0,lr}\r
-    bic     r0, r0, #1\r
-    bl      PicoVideoRead\r
-    ldmfd   sp!,{r1,lr}\r
-    tst     r1, #1\r
-    moveq   r0, r0, lsr #8\r
-    bx      lr\r
+    b       PicoVideoRead8\r
 \r
 m_read8_ram:\r
     ldr     r1, =Pico\r
@@ -868,7 +859,11 @@ m_write8_misc2:
     bic     r0, r0, #0xff0000\r
     bic     r0, r0, #0x00e000\r
     tst     r2, #1\r
+    ldr     r2, =SekCycleCnt\r
     streqb  r1, [r3, r0]     @ zram\r
+    ldr     r0, [r2]\r
+    add     r0, r0, #2       @ hack?\r
+    str     r0, [r2]\r
     bx      lr\r
 \r
 m_write8_z80_not_ram:\r