From 43268da7442e742ce04e690e97b783da69cdce20 Mon Sep 17 00:00:00 2001 From: Bobbi Webber-Manners Date: Wed, 7 Dec 2022 20:35:57 -0500 Subject: [PATCH] Checks IRQ is actually from Mockingboard. --- applecorn.po | Bin 819200 -> 819200 bytes auxmem.init.s | 2 +- mainmem.mock.s | 6 +++++- mame_applecorn | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/applecorn.po b/applecorn.po index e91f38981301a16284253366f8d311c9c16a8f43..eb0c744cefc85ea63854ad88db789c3d56eef807 100644 GIT binary patch delta 194 zcmZo@FluNp+K|p7!0gS?uB$A<(D0Z+0mNu7XK62IVFY3(AZ7+)5T6x@*?^cGh&h0m zb9*@p*M~`r=It5NxwdCa=iY53d@@7fS;i@W?<*}9u`8U+SSh0LY`WPgZVM&mEFkyA zPUcJ?^($e9Ci9A&lQTU3OG#w@_ww>u#0FG1;S{&HB1m=-*9@ST7to|%2{+dA9?^98 cz@fu(MBzfBM1sZk{inEJFmK;*jyqr@05}9m-v9sr delta 189 zcmZo@FluNp+K|p7@XL##O;?J8q2V!u0*KLE&eC4a!U)7nK+FupAU-P)vjH(X5OV-A z=k{_It`CzK&Dt}jb8XL<&b`}6_&|oj-HcNL-&a~JVplkju~J0g?sT(L+!ji|GJ)I| zJAY*Wsb2{*G?`cIoSfnLUrHkLzn7QSA~vA938%QlB|x%^xMl#wynrVCO1PoJazx=m XqQv$Sr?_7*PZnU}+`i!)cfdvf)rv`a diff --git a/auxmem.init.s b/auxmem.init.s index 8c031b8..c416ea1 100644 --- a/auxmem.init.s +++ b/auxmem.init.s @@ -290,7 +290,7 @@ BYTE00 BEQ BYTE00A ; OSBYTE 0,0 - generate error RTS ; %000x1xxx host type, 'A'pple BYTE00A BRK DB $F7 -HELLO ASC 'Applecorn MOS 2022-12-06' +HELLO ASC 'Applecorn MOS 2022-12-07' DB $00 ; Unify MOS messages * TO DO: Move into RAM GSSPEED DB $00 ; $80 if GS is fast, $00 for slow diff --git a/mainmem.mock.s b/mainmem.mock.s index e89a1fe..6fe16b4 100644 --- a/mainmem.mock.s +++ b/mainmem.mock.s @@ -194,11 +194,15 @@ MOCKAMP PHX * Mockingboard interrupt service routine - just calls generic audio ISR MOCKISR CLD -* TODO: Check whether interrupt is from Mockingboard or not + LDA MOCK_6522_IFR ; Interrupt flag register + AND #$40 ; Bit 6 + BEQ :NOTMB ; Wasn't Mockingboard IRQ BIT MOCK_6522_T1CL ; Clear interrupt JSR AUDIOISR CLC ; CC indicates we serviced irq RTS +:NOTMB SEC ; We did not handle irq + RTS ** diff --git a/mame_applecorn b/mame_applecorn index a21de9b..05ac8af 100755 --- a/mame_applecorn +++ b/mame_applecorn @@ -1,2 +1,2 @@ -#mame -w apple2ee -debug -sl5 mouse -sl7 cffa2 -harddisk1 ~/Personal/Development/Applecorn/applecorn.po -mame -w apple2gs -debug -sl7 cffa2 -harddisk1 ~/Personal/Development/Applecorn/applecorn.po -harddisk2 tests/JGHMusic2.po +mame -w apple2ee -debug -sl5 mouse -sl7 cffa2 -harddisk1 ~/Personal/Development/Applecorn/applecorn.po +#mame -w apple2gs -debug -sl7 cffa2 -harddisk1 ~/Personal/Development/Applecorn/applecorn.po -harddisk2 tests/JGHMusic2.po