FAMEC idle loops, PSP port sync, minor adjustments

[picodrive.git] / Pico / Memory_amips.s

diff --git a/Pico/Memory_amips.s b/Pico/Memory_amips.s
index 4ad7cd3..34d3673 100644 (file)
--- a/Pico/Memory_amips.s
+++ b/Pico/Memory_amips.s
@@ -417,16 +417,9 @@ m_read8_misc3:
 m_read8_z80_misc:
     addiu   $t0, 0xc000       # expecting 0x4000 to get 0
     bnez    $t0, m_read_neg1  # invalid
-
-    lui     $t0, %hi(PicoOpt)
-    lw      $t0, %lo(PicoOpt)($t0)
-    andi    $t0, 1
-    beqz    $t0, m_read8_fake_ym2612
-    lui     $t0, %hi(Pico+0x22208)
-    lui     $t0, %hi(ym2612_st)
-    lw      $t0, %lo(ym2612_st)($t0)
-    jr      $ra
-    lb      $v0, 0x11($t0)
+    nop
+    j       ym2612_read_local_68k
+    nop
 
 m_read8_fake_ym2612:
     lb      $v0, %lo(Pico+0x22208)($t0) # Pico.m.rotate
@@ -473,7 +466,9 @@ m_read8_vdp:
     andi    $t1, $a0, 0xe0
     or      $t0, $t1
     bnez    $t0, m_read_null # invalid address
-    m_read8_call16 PicoVideoRead
+    nop
+    j       PicoVideoRead8
+    nop
 
 m_read8_ram:
     lui     $t0, %hi(Pico)