From ebee7a084401f53f8ec92c60fdd5c831112da16c Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bobbi.manners@gmail.com>
Date: Fri, 18 Nov 2022 19:26:20 -0500
Subject: [PATCH] More Mockingboard work.

---
 applecorn.po    | Bin 819200 -> 819200 bytes
 mainmem.audio.s |  38 +++++++++++++++++++++++++++++++-------
 mainmem.ensq.s  |   3 ++-
 mainmem.init.s  |   4 +++-
 mainmem.mock.s  |   6 +++++-
 5 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/applecorn.po b/applecorn.po
index 157011616cc2640f1c31194be453e97909606655..b72f590a118d273e20b4739879510640379c2bd8 100644
GIT binary patch
delta 640
zcmZ9K&ubGw9K|=gn>3x4vRbQK>yJSMDOiYmkP3S!y%<9N0aI|MyDO<kt#}CpN~Z`4
zLZt^`OC{?PnvyN1WKW?7OAdMo2t6ewwptW=5R{lhg%wu6F-<5Q9=y++@4W9EhB1XP
zrI-|@x!c_1vEf0EedTb=JV}YqQeptag9K2EgP;(o2NVYNmQo^mxfR$f^>3r*xeHTT
zMOw`YZx2bN4;$KY2wNIHqgSNwGBwXv(N%s*GbgHOWF(G__(LPUWPJKY8oW&LBW;|*
zy*yqtXRBx|uxP%jqKkKey5A(!4!Y`olQb^dysP5lEY!|U+d?<<e-NuR&bjI++xcm=
z@kP#%=Z{F{2-@#zoh_$o=+eTRUL2)%*j1x;zpJJ(@G!M|T{Z7;0MteuTMSa)Bh>km
zIV2PsmkN5BYbcSyeV^>`<8(!y_sNHXUL0a)|BIG+CKL*K#)tjWnoPN@;4ljjYrx#B
zp&Nl!^Pq-?7Ty>(=UmB(7#rC&JB<G^%L>5O7gCXa(P%vZo1^)y_xD=wdu_nX43Lp`
zaGTNzXQJ((i*=pdb>-tZZ-&+rCwtNg;E5s+&O2RckM831^aFV|XKYZepq3-QX%w%Q
za=YjjA5hKDb);OIOjab1!ZjGLCl0vAz;pS2&&EnD7Q>UtR>yVm9sGlvAJO*HJ+!{p
GxAqt29TJ5A

delta 628
zcmZ9G&1(}u7{>Q2F_{Dj@gv(d=pbG^L}P?fVGqSibMP;ShZ(a|QxGp6nzB&3py)|c
z(XwJp7?vnmp_rUPk(OK=5Im(NZG|WlRFox$3Q^L&F{Ty|&+z=7dFOe@G!v$osAQCo
zJ|*0ZMZ<#mS-^dBFRMJvDk4Y%$)G-aKwi)>kPqaqWfk;nMSN8YuAxpO8exsl3tL{@
zCGh~hkzVxTr8ExcjnH@Xwl&&B=cNd<CYxw1{P8PsC6(e#dV<1u8P8d>O%zMcrB{Ct
z*S{{hBkPiTfpVp)?R1EHg^N`U|4#QhgmTXyJIkeinRk$dx%?-yzQLB0d8W?qk-{GI
zPqX2k(G7HF;g(*3a$i+T@?cdnFz^WF{;F1X1OUp>&{jOO*Co{1FYFTfIL{uH^t#|C
z;wN@`<byOppR4md^1h^3PMN3wixwqQUM}f{9_+u*R4UlAV-^u99=B>6=<>poTuf*?
zEO!x3A$Lh=+ii}p&A8y4vlSd+c8U82Y}zt#@e^r;e$r$s1s_S4SKdwczq`a>W(J6r
z9Xuc-<xCD7beV^aAG$iYDR^ddXJ{*Rw8#KDQq+a(VVBXRo7at->YY4$Lxp9n9{)v?
r_+{<wCb}w#3F}J>CB$(nx`oF4<C(wH*0n9P_B12~A8e!7+kw&nCX)(a

diff --git a/mainmem.audio.s b/mainmem.audio.s
index d52f845..b2592e9 100644
--- a/mainmem.audio.s
+++ b/mainmem.audio.s
@@ -444,7 +444,7 @@ AUDIOISR    INC   SYSCLOCK+0                ; Increment system clock
             PLA                             ; Recover frequency
             STA   CURRPITCH,X               ; Store for pitch envelope
             PLY                             ; Recover amplitude
-            JSR   ENSQNOTE                  ; Start note playing
+            JSR   AUDIONOTE                 ; Start note playing
 :NEXT 	    DEX
             BPL   :L1                       ; Next audio queue
 
@@ -459,7 +459,7 @@ AUDIOISR    INC   SYSCLOCK+0                ; Increment system clock
 :NOENV      DEX
             BPL   :L2                       ; Next audio queue
             CLC
-            RTL
+            RTS
 :HOLDSET    JSR   REMAUDIO                  ; Dequeue amplitude/env (ignored)
             JSR   REMAUDIO                  ; Dequeue frequency (ignored)
             JSR   REMAUDIO                  ; Dequeue duration
@@ -471,7 +471,7 @@ AUDIOISR    INC   SYSCLOCK+0                ; Increment system clock
 :CNT        DB    $05                       ; Used to determine 20Hz cycles
 
 
-* Helper function for ENSQISR - called when no note playing
+* Helper function for AUDIOISR - called when no note playing
 * On entry: X is audio channel #
 NONOTE      LDA   CHANENV,X                 ; See if envelope is in effect
             CMP   #$FF
@@ -479,14 +479,14 @@ NONOTE      LDA   CHANENV,X                 ; See if envelope is in effect
             STZ   CURRAMP,X                 ; Next env will start at zero vol
             LDY   #$00                      ; Zero volume
             LDA   #$00                      ; Zero freq
-            JSR   ENSQNOTE                  ; Silence channel Y
+            JSR   AUDIONOTE                 ; Silence channel Y
             RTS
 :RELEASE    LDA   #3                        ; Phase 3 is release phase
             STA   AMPSECT,X                 ; Force release phase
             RTS
 
 
-* Helper function for ENSQISR
+* Helper function for AUDIOISR
 * On entry: X is audio channel #
 * On return: CS if there are <= 4 bytes in queue, CC otherwise
 * X is preserved
@@ -508,6 +508,30 @@ CHECK4BYTES PHX
             RTS
 
 
+* Configure an oscillator to play a note
+* On entry: X - oscillator number 0-3 , A - frequency, Y - amplitude
+* Preserves all registers
+AUDIONOTE
+            JMP  ENSQNOTE
+*            JMP  MOCKNOTE
+
+
+* Adjust frequency of  oscillator
+* On entry: X - oscillator number 0-3 , Y - frequency to set
+* Preserves X & Y
+AUDIOFREQ
+            JMP  ENSQFREQ
+*            JMP  MOCKFREQ
+
+
+* Adjust amplitude of  oscillator
+* On entry: X - oscillator number 0-3 , Y - amplitude to set
+* Preserves X & Y
+AUDIOAMP
+            JMP  ENSQAMP
+*            JMP  MOCKAMP
+
+
 * Handle envelope tick counter
 * On entry: X is audio channel #
 * On return: CS if this cycle is an envelope tick, CC otherwise.
@@ -618,7 +642,7 @@ UPDPITCH    STX   OSCNUM
             ADC   CURRPITCH,X               ; Add change to current
             STA   CURRPITCH,X               ; Update
             TAY
-            JSR   ENSQFREQ                  ; Update Ensoniq regs
+            JSR   AUDIOFREQ                 ; Update Ensoniq regs
             RTS
 
 
@@ -706,7 +730,7 @@ ADSRPHASE   STX   OSCNUM
 :CLAMP      LDA   :TARGET                   ; Recover target level
 :UPDATE     STA   CURRAMP,X                 ; Store updated amplitude
             TAY                             ; Tell the Ensoniq
-            JSR   ENSQAMP
+            JSR   AUDIOAMP
 :DONE       CLC                             ; CC to indicate phase continues
             RTS
 :TARGET     DB    $00
diff --git a/mainmem.ensq.s b/mainmem.ensq.s
index cb1407f..0ee9fbb 100644
--- a/mainmem.ensq.s
+++ b/mainmem.ensq.s
@@ -156,7 +156,8 @@ ENSQAMP     PHX
 
 * Ensoniq interrupt service routine - just calls generic audio ISR
 ENSQISR     CLD
-            JMP   AUDIOISR
+            JSR   AUDIOISR
+            RTL
 
 
 **
diff --git a/mainmem.init.s b/mainmem.init.s
index 15dfe40..d43ea49 100644
--- a/mainmem.init.s
+++ b/mainmem.init.s
@@ -37,5 +37,7 @@ RESETHW      SEC
              JSR   IDROUTINE         ; See if this is a GS
              BCS   :NOTGS
              JSR   ENSQINIT          ; Initialize Ensoniq
-:NOTGS       RTS
+:NOTGS
+*             JSR   MOCKINIT          ; Initialize Mockingboard (sl4)
+             RTS
 
diff --git a/mainmem.mock.s b/mainmem.mock.s
index dbc10ac..e922366 100644
--- a/mainmem.mock.s
+++ b/mainmem.mock.s
@@ -130,7 +130,11 @@ MOCKAMP     PHX
 
 * Mockingboard interrupt service routine - just calls generic audio ISR
 MOCKISR     CLD
-            JMP   AUDIOISR
+* TODO: Check whether interrupt is from Mockingboard or not
+            BIT    MOCK_6522_T1CL          ; Clear interrupt
+*            JSR   AUDIOISR
+            CLC                            ; CC indicates we serviced irq
+            RTS
 
 
 **