timers implemented for new z80 mode

[picodrive.git] / Pico / Memory.s

diff --git a/Pico/Memory.s b/Pico/Memory.s
index 368b640..04d062f 100644 (file)
--- a/Pico/Memory.s
+++ b/Pico/Memory.s
@@ -389,11 +389,7 @@ m_read8_misc2:
     ldr     r1, =PicoOpt\r
     ldr     r1, [r1]\r
     tst     r1, #1\r
-\r
-    ldrne   r1, =ym2612_st\r
-    ldrne   r1, [r1]\r
-    ldrneb  r0, [r1, #0x11]   @ ym2612_st->status\r
-    bxne    lr\r
+    bne     ym2612_read_local_68k\r
 \r
 m_read8_fake_ym2612:\r
     ldr     r3, =(Pico+0x22200)\r
@@ -879,27 +875,21 @@ m_write8_z80_not_ram:
     and     r2, r0, #0x6000\r
     cmp     r2,     #0x4000\r
     bne     m_write8_z80_not_ym2612\r
-    ldr     r2, =PicoOpt\r
+    ldr     r3, =PicoOpt\r
     and     r0, r0, #3\r
-    ldr     r2, [r2]\r
-    tst     r2, #1\r
+    ldr     r3, [r3]\r
+    mov     r2, #0           @ is_from_z80 = 0\r
+    tst     r3, #1\r
     bxeq    lr\r
     stmfd   sp!,{lr}\r
-.if EXTERNAL_YM2612\r
-    tst     r2, #0x200\r
-    ldreq   r2, =YM2612Write_\r
-    ldrne   r2, =YM2612Write_940\r
-    mov     lr, pc\r
-    bx      r2\r
-.else\r
-    bl      YM2612Write_\r
-.endif\r
+    and     r1, r1, #0xff\r
+    bl      ym2612_write_local\r
     ldr     r2, =emustatus\r
     ldmfd   sp!,{lr}\r
     ldr     r1, [r2]\r
     and     r0, r0, #1\r
     orr     r1, r0, r1\r
-    str     r1, [r2]         @ emustatus|=YM2612Write(a&3, d);\r
+    str     r1, [r2]         @ emustatus|=ym2612_write_local(a&3, d);\r
     bx      lr\r
 \r
 m_write8_z80_not_ym2612:     @ not too likely\r
@@ -916,7 +906,7 @@ m_write8_z80_not_ym2612:     @ not too likely
 m_write8_z80_bank_reg:\r
     ldr     r3, =(Pico+0x22208) @ Pico.m\r
     ldrh    r2, [r3, #0x0a]\r
-    mov     r1, r1, lsr #8\r
+    mov     r1, r1, lsl #8\r
     orr     r2, r1, r2, lsr #1\r
     bic     r2, r2, #0xfe00\r
     strh    r2, [r3, #0x0a]\r
@@ -932,7 +922,7 @@ m_write8_not_z80:
     bne     OtherWrite8\r
 m_write8_psg:\r
     ldr     r2, =PicoOpt\r
-    mov     r0, r1\r
+    and     r0, r1, #0xff\r
     ldr     r2, [r2]\r
     tst     r2, #2\r
     bxeq    lr\r