From 7e56516acc958e88d0f38d7df3fc53ba5abd4d26 Mon Sep 17 00:00:00 2001
From: Terence Boldt <terence@boldt.ca>
Date: Thu, 7 Oct 2021 00:57:30 +0100
Subject: [PATCH] Fix firmware and driver to support drive 2

---
 Apple2/AT28C64B.bin                           | Bin 8192 -> 8192 bytes
 Apple2/CommandFirmware.lst                    |   2 +-
 Apple2/DriveFirmware.asm                      |   2 +-
 Apple2/DriveFirmware.lst                      |   4 ++--
 Apple2/FileAccessFirmware.lst                 |   2 +-
 Apple2/MenuFirmware.lst                       |   2 +-
 RaspberryPi/Apple2-IO-RPi.hdv                 | Bin 33553920 -> 33553920 bytes
 .../apple2driver/handlers/readBlock.go        |   3 ++-
 .../apple2driver/handlers/writeBlock.go       |   2 +-
 9 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Apple2/AT28C64B.bin b/Apple2/AT28C64B.bin
index 395270e10f9d2307c2b9444951edd871956be875..00bf3da5df13f9a93b64670b2e5c7ef7b73c5b53 100644
GIT binary patch
delta 54
scmZp0XmFVDk5PQ$|No5Qlm9b<NhUDK3?^B?BrBL?1CpEnvolHn0HmZBs{jB1

delta 54
scmZp0XmFVDkCA=i|No5alm9b<NhUDK3?^B?BrBL?1CpEnvolHn0GBiuD*ylh

diff --git a/Apple2/CommandFirmware.lst b/Apple2/CommandFirmware.lst
index acc44a8..dcf61eb 100644
--- a/Apple2/CommandFirmware.lst
+++ b/Apple2/CommandFirmware.lst
@@ -1,4 +1,4 @@
-ca65 V2.18 - N/A
+ca65 V2.17 - Raspbian 2.17-1
 Main file   : CommandFirmware.asm
 Current file: CommandFirmware.asm
 
diff --git a/Apple2/DriveFirmware.asm b/Apple2/DriveFirmware.asm
index 9e1bbe7..3032c88 100644
--- a/Apple2/DriveFirmware.asm
+++ b/Apple2/DriveFirmware.asm
@@ -195,6 +195,6 @@ end:
 .endrepeat
 
 .byte      0,0     ;0000 blocks = check status
-.byte      7       ;bit set(0=status 1=read 2=write) unset(3=format, 4/5=number of volumes, 6=interruptable, 7=removable)
+.byte      23       ;bit set(0=status 1=read 2=write) unset(3=format, 4/5=number of volumes, 6=interruptable, 7=removable)
 .byte     DriverEntry&$00FF ;low byte of entry
 
diff --git a/Apple2/DriveFirmware.lst b/Apple2/DriveFirmware.lst
index 580ed1a..6991f1f 100644
--- a/Apple2/DriveFirmware.lst
+++ b/Apple2/DriveFirmware.lst
@@ -1,4 +1,4 @@
-ca65 V2.18 - N/A
+ca65 V2.17 - Raspbian 2.17-1
 Main file   : DriveFirmware.asm
 Current file: DriveFirmware.asm
 
@@ -199,7 +199,7 @@ Current file: DriveFirmware.asm
 00C7FC  1               .endrepeat
 00C7FC  1               
 00C7FC  1  00 00        .byte      0,0     ;0000 blocks = check status
-00C7FE  1  07           .byte      7       ;bit set(0=status 1=read 2=write) unset(3=format, 4/5=number of volumes, 6=interruptable, 7=removable)
+00C7FE  1  17           .byte      23       ;bit set(0=status 1=read 2=write) unset(3=format, 4/5=number of volumes, 6=interruptable, 7=removable)
 00C7FF  1  14           .byte     DriverEntry&$00FF ;low byte of entry
 00C800  1               
 00C800  1               
diff --git a/Apple2/FileAccessFirmware.lst b/Apple2/FileAccessFirmware.lst
index 454a42b..9b31632 100644
--- a/Apple2/FileAccessFirmware.lst
+++ b/Apple2/FileAccessFirmware.lst
@@ -1,4 +1,4 @@
-ca65 V2.18 - N/A
+ca65 V2.17 - Raspbian 2.17-1
 Main file   : FileAccessFirmware.asm
 Current file: FileAccessFirmware.asm
 
diff --git a/Apple2/MenuFirmware.lst b/Apple2/MenuFirmware.lst
index a14f558..db8acab 100644
--- a/Apple2/MenuFirmware.lst
+++ b/Apple2/MenuFirmware.lst
@@ -1,4 +1,4 @@
-ca65 V2.18 - N/A
+ca65 V2.17 - Raspbian 2.17-1
 Main file   : MenuFirmware.asm
 Current file: MenuFirmware.asm
 
diff --git a/RaspberryPi/Apple2-IO-RPi.hdv b/RaspberryPi/Apple2-IO-RPi.hdv
index 8bf17c37146f2458288f0144b0129baee1c7cd73..8cbca7887b6b742e398545e3572b63bda76608c5 100755
GIT binary patch
delta 2386
zcmXBURhUp!07YR27`i2-hn5EE?k<t;MvzWvhVJeL3F&U7yQQSNTe=z7avuJ*&(r<R
z%elc{LShDEZRWt}WisXplRC_uFhL#$<qzDFKQLf_ynqDLLJ|dpIEh0iN$4aEon)bt
zJamGbVIe635EkJO9)XB}h=_#9h=QnyhUkcan23egh=cDC7x54ue*1eQL?R?c5+p@3
zBu5ZZASF^EHPRq0(%}cBM+Rg>CS*nyWJNY)$B)Q?oXCaT$b-Ddhx{mjf+&Q-D1xFW
zhT<rJk|>4JD1)*nhw`X^il~IjsDhtR6+fdIs-p&Kq84hS4(g&F>Z1V~q7fRS37VoA
znxh3;;uo|+Yy65fXp44ej}GXFPUws-=!$OWj^EG&J<$uj(Fc9e5B(900T_ru7>pqp
zieVUz5g3V47>zL)i*Xo_37CjUn2afyifNdR8JLM#n2kA@i+Pxj1^68cu?UN?1b<*D
zmSH(oU?o;zHP&D))?qz1U?VnRGqzwWwqZN|#9!Efo!Eul*n_>;hy6H!gE)l4ID(@%
zhT}MalQ@OHaT;fE7Uyst|KI{H;u0?73a;WBuHy!7;udb>4({R}?&AR-;t?L>37+B^
zp5q1n#Y?=xYrMf*yu*8Zz(;(-XMDj|d_%}6-u^h4uqK=dZvssO6VXI6kxdj6)kHJV
zO$-y$#4@o>9P^!tYvP&sCV~0hBs7UkVw1!qHOWkJ6J-9sWJ*t|Olp(Hq&4Zx4<^0I
zU^1FaCbP+6vYKoryZO=NFgZ;wliTDmc}+f(-xM$fO(9d*6fs3jF;m=>FeObXQ`(d<
zWlcF#-c&FZO(j#=R53r9s^(`?%~UrvOifeE)HZcYT~p80Hw{cf)5tV7O-xhM%rrMG
zOiS~NX=PfQUrig+*0eM2O$XD_bTXYy7t_^rGu_Q^ribZidYRs)kLhdrnf@l&3@`)D
zAT!tuF+<HTGu(_YBh4r?+Ke${%{VjOOfVD8Bs1AeF;mSnGu_NEGtDeB+srX@%{(*T
zEHJ;Dg=UdiY?hcm%u=(=EH^96O0&wWHfzjUv(BtH8_Y(t$!s=T%vQ6_Y&U<JzswG^
z)9f<4%^tJY>@)k#0dvqCGKb9(bJQF&$IS_I(ws7Xo73iuIcv_D^X4CO!CW+#%w==M
zTs7Csb#ueqG`GxcbI05@_so6sz&tdM%wzM!JT=eEbMwOdYhIdH=Cyfa-kNvjz4>51
Vnos7l`C`7BZvngb`vnAC{SQ3xbWQ*O

delta 2386
zcmXBURg_Rw07hX47?1|(9=c1qkuK@(5b5q7K)O*{knZm8lu)|6yF13coriD#XRZ5k
zUd|2v5)wTat1|~iEtN51q*UMC{w~PF;QWD`@&^X&j}s7KN=U+h5GPUSBo3V<p_4Rp
zl7&u?Gb|)|0Ky<F!XXgh;kWM*5s?rXQ4kf;5FIfP6F(ppVj~XXA|B!+0TLn+5+ezc
zA{l~^94U|zsgN3JkQV8X9vP4knUEP-kQLdG9X}!mav~RUBM<T-AM&FB3Zf7SqX>%P
zClo_*lt4+8LTQviS(HP0RKU-uh)Sr8DyWKTsE!(_iCU<QI;e|!sE-C{h(>6PCTNOg
z_yx`JD_Wo>TA?-Cpe@>=JvyKxI-xVVpewqeJ9?ledZ9P^pfCENKL#Ke12G7L@f(I<
zD28D;MqngHVKl~IEXH9xCSW3d#~+x4$(Vwvn1<<?fj==5v+x&YV-DtG9_C{K7Ge<=
zV+odG8J1%OR$>)aV-40~9oAz5HewStV+*!o8@6Kyc48NHV-NOXANJz_4&o3F;|Tu7
zQ5?f@oWMW$7bkHFr*Q^naSrEk0T*!zmvIGGaShjT12=ICw{Zt|aS!+L01xp9kMRUg
z@eI%L0x$6juki+N@ec3t0Uz-RpYa7>@eLuPc>CjE!kDlooC!4HO$773iD)93$R>)3
zYNDCwCWeV=elW32Y!k=CHStV*lfWc2iA-XX#3VJzOpy8ik|{i;G^tE#lg6Yq=}dZ)
z!DKX<OlFhCWHs4LcJrgjVRD*WCb!9B@|t`mzbRk}nnI?qDPoG6pG+}R+>|gSO(|2_
zlrd#ZIaA(LFh84$rjn^_s+g*#nyGGTn3|@Rscq_*x~86~ZyK0}rjcoEnwX}hnfb*u
zH@}(|rlo0RTAMbet!Zc4n+~R<>0~;aE~cyLX1bdmrl;v;dYe9`ujyy{n*k=+3^aqx
zVDp<9VuqSwX1Ez)Mw(G(v>9W@nsH{lnP4WG-_0Lpl9_C#n5kx(nQms7Kg~=t%lu_#
zn>l8#nP=vk1!kdHWEPtxW~o_bmYWr3rCDWGn>A*wS!dRp4Q8X+WHy^EW~<p|wwoPh
zr`ct8n>}W)*=P2f1LmMPWDc7n=5KS<95ctw3G<Kn*PJw`%xQDRoHggnd2_*BG?&a}
zbH!XW*UWWu!`w8t%x!bW+%@;iee=LPG>^<<^Ta$g&&+f4!n`!E%xm+;yfyF4d-K73
VG@s08^Tm8M-vV~=_X`NP@*gSFbBF){

diff --git a/RaspberryPi/apple2driver/handlers/readBlock.go b/RaspberryPi/apple2driver/handlers/readBlock.go
index 8d0fa80..c6399a2 100644
--- a/RaspberryPi/apple2driver/handlers/readBlock.go
+++ b/RaspberryPi/apple2driver/handlers/readBlock.go
@@ -17,6 +17,7 @@ func ReadBlockCommand(drive1 *os.File, drive2 *os.File) {
 
 	if !oldFirmware {
 		driveUnit, err = a2io.ReadByte()
+		fmt.Printf("Drive unit: %0X\n", driveUnit)
 
 		if err != nil {
 			fmt.Printf("Drive unit not sent, assuming older firmware")
@@ -26,7 +27,7 @@ func ReadBlockCommand(drive1 *os.File, drive2 *os.File) {
 
 	file := drive1
 
-	if driveUnit >= 8 {
+	if driveUnit >= 128 {
 		file = drive2
 	}
 
diff --git a/RaspberryPi/apple2driver/handlers/writeBlock.go b/RaspberryPi/apple2driver/handlers/writeBlock.go
index 175bb2a..c5b60ba 100644
--- a/RaspberryPi/apple2driver/handlers/writeBlock.go
+++ b/RaspberryPi/apple2driver/handlers/writeBlock.go
@@ -24,7 +24,7 @@ func WriteBlockCommand(drive1 *os.File, drive2 *os.File) {
 
 	file := drive1
 
-	if driveUnit >= 8 {
+	if driveUnit >= 128 {
 		file = drive2
 	}