X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FMemory.s;h=f73f77460c34933642ede87081d6981cb9dedac5;hb=8022f53da61b8e70420a3bac97250119bbe26457;hp=7b19e614e63d0a92c1087023422668cc808192c3;hpb=e5503e2f4fe1c7ccc46c493a1596fb0e416f678e;p=picodrive.git diff --git a/Pico/cd/Memory.s b/Pico/cd/Memory.s index 7b19e61..f73f774 100644 --- a/Pico/cd/Memory.s +++ b/Pico/cd/Memory.s @@ -136,7 +136,7 @@ m_s68k_decode_write_table: .extern gfx_cd_write16 .extern s68k_reg_write8 .extern s68k_poll_adclk -.extern PicoCpuS68k +.extern PicoCpuMS68k .extern s68k_poll_detect .extern SN76496Write .extern m_m68k_read8_misc @@ -381,7 +381,7 @@ PicoWriteS68k32: @ u32 a, u32 d add r2, r2, #0x110000 add r2, r2, #0x002200 .if \is_read - ldrb r0, [r2, #0x18] + ldrb r0, [r2, #0x18] @ Pico_mcd->m.bcram_reg .else strb r1, [r2, #0x18] .endif @@ -1259,7 +1259,7 @@ m_m68k_write16_regs_spec: @ special case and r2, r2, #0xfe cmp r2, #0x0e bxne lr - ldr r0, =PicoCpuS68k + ldr r0, =PicoCpuCS68k str r1, [r0, #0x58] @ push s68k out of stopped state str r1, [r3] bx lr @@ -1450,7 +1450,7 @@ m_m68k_write32_regs_comm: @ Handle the 0x10-0x1f range strneh r1, [r2, #2] cmp r0, #0x10 bxlt lr - ldr r0, =PicoCpuS68k @ remove poll detected state for s68k + ldr r0, =PicoCpuCS68k @ remove poll detected state for s68k mov r1, #0 str r1, [r0, #0x58] str r1, [r3]