From 460440ea4299d5a2145dea092fd77cbab4f628d6 Mon Sep 17 00:00:00 2001
From: Terence Boldt <terence@boldt.ca>
Date: Tue, 1 Jun 2021 00:37:38 +0000
Subject: [PATCH] Change firmware to wait for RPi ready

---
 .gitignore                    |   1 +
 Apple2/27256.bin              | Bin 32768 -> 32768 bytes
 Apple2/AT28C64B.bin           | Bin 8192 -> 8192 bytes
 Apple2/MenuFirmware.asm       |  18 +++-
 Apple2/MenuFirmware.lst       | 149 ++++++++++++++++++----------------
 RaspberryPi/Apple2-IO-RPi.hdv | Bin 33553920 -> 33553920 bytes
 6 files changed, 97 insertions(+), 71 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7ab1c86..ed47576 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.o
 *.DS_Store
 RaspberryPi/apple2driver/apple2driver
+RaspberryPi/Apple2-IO-RPi.log
diff --git a/Apple2/27256.bin b/Apple2/27256.bin
index b0094fb235ce758e1454727f60cdbdfd5e9f69fb..792458c404870a58902340d79640e6f3d1817e67 100644
GIT binary patch
delta 1611
zcmZo@U}|V!+Mq6>8Gqmd2WNxA+rK9+d|umqKx+f<%Kr*0{;XUF6!I}Xu<|^RUU?cw
zOg5HSH~F80re^#>BptKSbsR+2AqmtG3Dj{2Nyln*9fy#0NC9<70d*Wk(y<#|$6;h0
z(m);3KpjVrbeu-laRgb13{Xc6P{&au9k<bS97Wb43)CSC)Nu?+$7^&Q$B=c%0d?2`
ubsR_1@f%&oabz9x>o)(B*Bp%yXi^-F5JWB<%^~3OXEcWlx+05-T?7FBzM`!F

delta 811
zcmZo@U}|V!+Mq7M<8<Hy2WNxA+rK9+e4ZR2v2OA?4%x~7Bs6)P4kAlPLM0-B5{Hl_
zq@WT~K#9Z164Fo!X`sXrWC<ClL=8~lD6)hsR6-UgaST~P4k}>>lsJwoArF?={7+tU
S)FbdX9F38GR7+Y+>>>c*@QU96

diff --git a/Apple2/AT28C64B.bin b/Apple2/AT28C64B.bin
index 82e4577861834032e3bf97f5faf6ed09bae6b9ad..873b927397d05814e100baab23da46cae0e0bc35 100644
GIT binary patch
delta 406
zcmZ9@I|{;36og^0Q42eZo2Tg{w%I@y;2yG-^p+{zfEV$S-X`w|DYSP9A_$f~ryNc*
zKMZ_noW}W5g-P+4Ow-{0IbEKIO|i;n`WNip+TdD8g+8Ntz+{m!*;j>OQj*w8QL?Zg
zEQpH4UW$r^4PisnB#u(lEF1_2q9HLz(XenKT!@y$Rf?8{2jM|<ByLi4EPMzbq9^f^
LqGz!%qw)L?iGJuD

delta 206
zcmZp0XmHq|F2Un;-~$I|gTmXtCoX)R93Zi7@;MIK$^RrYd7KU+OGrW`B!Lo#kR_y`
z5>h~k!^jfSPzh<E#1Ui(8K{H|P~s@Ege+7-7ASEHSwapfAqSK=jw~S$mSAER0RYh!
BVlV&z

diff --git a/Apple2/MenuFirmware.asm b/Apple2/MenuFirmware.asm
index ea9de01..d46b284 100644
--- a/Apple2/MenuFirmware.asm
+++ b/Apple2/MenuFirmware.asm
@@ -55,12 +55,28 @@ Start:
  ldy #$00
 PrintString:
  lda Text,y
- beq GetChar
+ beq WaitForRPi
  ora #$80
  jsr $fded
  iny
  bne PrintString
 
+WaitForRPi:
+ lda InputFlags
+ rol
+ bcs OK
+ lda #$ff
+ jsr $fca8
+ lda #$ae
+ jsr $fded
+ jmp WaitForRPi
+
+OK:
+ lda #$cf
+ jsr $fded
+ lda #$cb
+ jsr $fded
+
 GetChar: 
  jsr $fd0c
  sec	;subtract ascii "1" to get 0 - 3 from "1" to "4"
diff --git a/Apple2/MenuFirmware.lst b/Apple2/MenuFirmware.lst
index 5656c24..51a6883 100644
--- a/Apple2/MenuFirmware.lst
+++ b/Apple2/MenuFirmware.lst
@@ -58,81 +58,90 @@ Current file: MenuFirmware.asm
 00C721  1  20 58 FC      jsr $fc58	;clear screen and show menu options
 00C724  1  A0 00         ldy #$00
 00C726  1               PrintString:
-00C726  1  B9 42 C7      lda Text,y
-00C729  1  F0 08         beq GetChar
+00C726  1  B9 5F C7      lda Text,y
+00C729  1  F0 08         beq WaitForRPi
 00C72B  1  09 80         ora #$80
 00C72D  1  20 ED FD      jsr $fded
 00C730  1  C8            iny
 00C731  1  D0 F3         bne PrintString
 00C733  1               
-00C733  1               GetChar:
-00C733  1  20 0C FD      jsr $fd0c
-00C736  1  38            sec	;subtract ascii "1" to get 0 - 3 from "1" to "4"
-00C737  1  E9 B1         sbc #$b1
-00C739  1  0A            asl	;put in top nibble as EPROM page
-00C73A  1  0A            asl
-00C73B  1  0A            asl
-00C73C  1  0A            asl
-00C73D  1  09 0F         ora #$0f ;set all flags high
-00C73F  1  4C 0E C7      jmp PageJump
-00C742  1               
-00C742  1               Text:
-00C742  1               
-00C742  1  41 70 70 6C  .byte	"Apple2-IO-RPi",$8d
-00C746  1  65 32 2D 49  
-00C74A  1  4F 2D 52 50  
-00C74E  1  69 8D        
-00C750  1  28 63 29 32  .byte	"(c)2020-2021 Terence J. Boldt",$8d
-00C754  1  30 32 30 2D  
-00C758  1  32 30 32 31  
-00C75C  1  20 54 65 72  
-00C760  1  65 6E 63 65  
-00C764  1  20 4A 2E 20  
-00C768  1  42 6F 6C 64  
-00C76C  1  74 8D        
-00C76E  1  8D           .byte   $8d
-00C76F  1  31 2E 20 42  .byte	"1. Boot",$8d
-00C773  1  6F 6F 74 8D  
-00C777  1  32 2E 20 43  .byte	"2. Command Line",$8d
-00C77B  1  6F 6D 6D 61  
-00C77F  1  6E 64 20 4C  
-00C783  1  69 6E 65 8D  
-00C787  1  33 2E 20 4C  .byte	"3. Load File",$8d
-00C78B  1  6F 61 64 20  
-00C78F  1  46 69 6C 65  
-00C793  1  8D           
-00C794  1  8D           .byte   $8d
-00C795  1  4D 61 79 20  .byte	"May take 45 seconds for RPi to start",$8d
-00C799  1  74 61 6B 65  
-00C79D  1  20 34 35 20  
-00C7A1  1  73 65 63 6F  
-00C7A5  1  6E 64 73 20  
-00C7A9  1  66 6F 72 20  
-00C7AD  1  52 50 69 20  
-00C7B1  1  74 6F 20 73  
-00C7B5  1  74 61 72 74  
-00C7B9  1  8D           
-00C7BA  1  61 66 74 65  .byte	"after intial power-on...",$00
-00C7BE  1  72 20 69 6E  
-00C7C2  1  74 69 61 6C  
-00C7C6  1  20 70 6F 77  
-00C7CA  1  65 72 2D 6F  
-00C7CE  1  6E 2E 2E 2E  
-00C7D2  1  00           
-00C7D3  1               
-00C7D3  1               end:
-00C7D3  1  60            rts
-00C7D4  1               
-00C7D4  1  00 00 00 00  .repeat	251-<end
-00C7D8  1  00 00 00 00  
-00C7DC  1  00 00 00 00  
-00C7E0  1  00 00 00 00  
-00C7E4  1  00 00 00 00  
-00C7E8  1  00 00 00 00  
-00C7EC  1  00 00 00 00  
-00C7F0  1  00 00 00 00  
-00C7F4  1  00 00 00 00  
-00C7F8  1  00 00 00 00  
+00C733  1               WaitForRPi:
+00C733  1  AD FB C0      lda InputFlags
+00C736  1  2A            rol
+00C737  1  B0 0D         bcs OK
+00C739  1  A9 FF         lda #$ff
+00C73B  1  20 A8 FC      jsr $fca8
+00C73E  1  A9 AE         lda #$ae
+00C740  1  20 ED FD      jsr $fded
+00C743  1  4C 33 C7      jmp WaitForRPi
+00C746  1               
+00C746  1               OK:
+00C746  1  A9 CF         lda #$cf
+00C748  1  20 ED FD      jsr $fded
+00C74B  1  A9 CB         lda #$cb
+00C74D  1  20 ED FD      jsr $fded
+00C750  1               
+00C750  1               GetChar:
+00C750  1  20 0C FD      jsr $fd0c
+00C753  1  38            sec	;subtract ascii "1" to get 0 - 3 from "1" to "4"
+00C754  1  E9 B1         sbc #$b1
+00C756  1  0A            asl	;put in top nibble as EPROM page
+00C757  1  0A            asl
+00C758  1  0A            asl
+00C759  1  0A            asl
+00C75A  1  09 0F         ora #$0f ;set all flags high
+00C75C  1  4C 0E C7      jmp PageJump
+00C75F  1               
+00C75F  1               Text:
+00C75F  1               
+00C75F  1  41 70 70 6C  .byte	"Apple2-IO-RPi",$8d
+00C763  1  65 32 2D 49  
+00C767  1  4F 2D 52 50  
+00C76B  1  69 8D        
+00C76D  1  28 63 29 32  .byte	"(c)2020-2021 Terence J. Boldt",$8d
+00C771  1  30 32 30 2D  
+00C775  1  32 30 32 31  
+00C779  1  20 54 65 72  
+00C77D  1  65 6E 63 65  
+00C781  1  20 4A 2E 20  
+00C785  1  42 6F 6C 64  
+00C789  1  74 8D        
+00C78B  1  8D           .byte   $8d
+00C78C  1  31 2E 20 42  .byte	"1. Boot",$8d
+00C790  1  6F 6F 74 8D  
+00C794  1  32 2E 20 43  .byte	"2. Command Line",$8d
+00C798  1  6F 6D 6D 61  
+00C79C  1  6E 64 20 4C  
+00C7A0  1  69 6E 65 8D  
+00C7A4  1  33 2E 20 4C  .byte	"3. Load File",$8d
+00C7A8  1  6F 61 64 20  
+00C7AC  1  46 69 6C 65  
+00C7B0  1  8D           
+00C7B1  1  8D           .byte   $8d
+00C7B2  1  4D 61 79 20  .byte	"May take 45 seconds for RPi to start",$8d
+00C7B6  1  74 61 6B 65  
+00C7BA  1  20 34 35 20  
+00C7BE  1  73 65 63 6F  
+00C7C2  1  6E 64 73 20  
+00C7C6  1  66 6F 72 20  
+00C7CA  1  52 50 69 20  
+00C7CE  1  74 6F 20 73  
+00C7D2  1  74 61 72 74  
+00C7D6  1  8D           
+00C7D7  1  61 66 74 65  .byte	"after intial power-on...",$00
+00C7DB  1  72 20 69 6E  
+00C7DF  1  74 69 61 6C  
+00C7E3  1  20 70 6F 77  
+00C7E7  1  65 72 2D 6F  
+00C7EB  1  6E 2E 2E 2E  
+00C7EF  1  00           
+00C7F0  1               
+00C7F0  1               end:
+00C7F0  1  60            rts
+00C7F1  1               
+00C7F1  1  00 00 00 00  .repeat	251-<end
+00C7F5  1  00 00 00 00  
+00C7F9  1  00 00 00     
 00C7FC  1               .byte 0
 00C7FC  1               .endrepeat
 00C7FC  1  00 00        .byte      0,0     ;0000 blocks = check status
diff --git a/RaspberryPi/Apple2-IO-RPi.hdv b/RaspberryPi/Apple2-IO-RPi.hdv
index 889f2bfcf0cec95960f932ffee6e086091aa1d57..4c2144b2e92b9c8588a5d759df419fa92bf51e85 100755
GIT binary patch
delta 2737
zcmZA1X_QZO0Eh8LCM3IxY?G~KvSe0!BwHv7sqB@gNXQl%`@WMsl5N766ta{Vv#AlX
zq>?3-eWGk(jGm`g|1&Q>&%NiK^L_I>=XYbX?iPwgLUeHMq_7J2jIJHLrFL*oW|hz`
ziI?-{iw()VvwQ!Q^^+6B5(>oK4Ox>F7tg1b5s7j8c*bRrc@g13@$<67gF-{QBn501
z<=i9%ZX(=7xY-r3S(|gSD{vF(CelrEz-D{SO>*ES%1xA;lz>e}&P__-CfZH3o78~K
z(VUyqz)g&s7&mDFn+rKNX@Q%XZfd$o57^w!xk(S))C!6ppIs{mxo|IXBN+D~5Aq@(
z?niz+fC4CpLMV(PD2iezjtB7&9!3e2#3Lw$(kO$nD2EU{it?y{il~Ijcnpst6k&J*
zRZtbxP#sUA2Eq}6NJJqTF{p`JsEs<Pi+ZS!r_cZm@iZFY88k){G(|Hs$FpdGmS~0N
z@H|?h4PL;DXp44ekC)H^FXI)wijL@n&gg=!=!Wii4X@)3^uU|wiC%aMZ{r>GMjyP3
zzIYG)&>sWvJ_ceC24e_@;sXrBaE!o*h{Z^Z!f1@aSd7DXOu$4;!emUrR7}Hk%)m^{
z!fedJTzrIin2!Zmh(%b8CHNRiu?(MJIX=Y-ti&p;#u~)oGpxlrtVcXHAOW9aBfh|w
z*o4j4g0HX@+prxw@HM`{P9!1;yO4|&q#_OJ*o|-T9Wt;7-(xTKVLyJr0UX339LA40
zf}ij+e!)@vieosA6F7<Aa0<WU5B!PKID@k|hx53Ai^#-ZxP;628~@-6uHqW5;|Bi4
zP29q5WZ@37ad$Fze>zMqbFay5g3Wy<kI8HDnfpzC^MEN}3YtQuuqk4SnqsE7dC)v$
z9yTRRN%M#)WlEbermQJvLd>J4ys2O+no6d!dCWX+LQR-?!c;L;O*K>9JZWl}a1&u7
zO_Yf?F{Y;Z|8Q#iR>#ye^-O*9lxbiZnx{=8^NeY1nwX}hnQ3mGH7!g_)5<(&o;R&c
z8}ovB(X=(~OndW^>0n+qub5X&N7Ko4HeF0t)6H}@ubJ1)8>WYO)ATgG%v<Jd^N#6l
z`j~f3U-O>nXZo7~=6y5J3^Iew5Hr+#V1}9DW`z0B#F~+2lo@Ttn6YM@8E+<-iDr_S
zY^Ip0W}2C9W|)~~mYHqln7QU7GtbO73(P{Z$SgKX%*SS_S!O;l%gv`|g;{A<nbl^E
zi8G&>wPu}JZ{p1clVCnK8_gHyOS8#rHe1YBW~<p|wwoR1Yx9lSX%bD6*=3SVib*wT
zCf)2d-<t1ChS_7jH+#)Kv)}w+4w!@HkU4CAG)K%&=4bPZIck12$INka!kjd}nN#L>
z^N0D<oHl37S#!>uHy6xBlWG1km&|4JxB16hF;~qsbKTr9|C*cTmbq=R%pH>*w3EMI
IP_C5!09Igh!vFvP

delta 2470
zcmZY9W7H5<0EhAOR&Tb=#bw*JZQCs`+qHVLtz~T4ZP~V4HdcF{eeC`4d(J)okN2E=
z2Y&q?Wgyn&3=Fj@UFc9l@&<0r8yN5`eNgI}0nLJzWeun`rBQ=uQ|1Ro4Ek0xVC)Y|
ztzb*-U`w4~OWj~gy<kiIAC?i{@&q6RLLw9b5gK6-7U2*c5fBlP5E)Sr710nKF%T26
z5F2q27x54u36KzpkQhmj6v>brDex0gA{A024bmbVenxs^Kt^OjW@JHDWJ7l3Ku+XB
zZsb8;<U@WGKtU8jVH8186hm>8KuMHBX_P@(ltXz`Kt)tSWmG{`R6}*tKuy#_ZPY<s
z)I)tVKtnV_V>CfiG(&T=KufejYqUXIv_pGzKu2^!XLLbVbVGOaz%S^DUg(WJ=!<^n
zk6$qW12G7LF$6;~48t)3BQXl2F$QBX4&yNa6EO*sF$KS2DyAU_(=h`xF$=RX2XiqG
z^RWO6u?UN?1WU0D%drA0u?nlP25a#<)?qz1U?VnRGqzwWwqZN|z@ONGo!Eul*n_>;
zhy6H!gE)l4ID(`23xDGnj^hMQ;uKEf49?;l&f@|u;u0?73a;WBuHy!7;udb>4({R}
z?&AR-;t?L>37+B~Ji~Lmz)QTsYrMf*yu*8Zz(;(-XMDj|{EKh+K8CkH0VaeAX+oJm
z6WW9^VNEy_-b64FO(YZ9L@`lKG!xy#FfmOm6WhcwaZNlE-y|>zO(K)nBr!=%GLzh-
zFh7};CY4ET(wMX+o%z|MHyKPulgVT@Sxi=w&15$@Oiq)_<Tn3bPF_#>Ony_q6f}iQ
zVN=8uHN{MEQ^J%qrA%p4#*{VXOnFnmR5X=LWmCmeHPuXYQ^V9WwM=bO$J90TOnuY9
zG&GG&W7EVmHO)+O)55egtxRjv#<Vr<OncM8bTpkzXVb-WHQh{i)5H8?dYWFQx9Ma0
zntrCg`PB?C1I-{a*bFg4%`h|Ej4&h3C^OoOF=Nd*Gu})v6U`(u*-SCNnW<))2{O~o
z3^UWrGPBJbGuO;B^UVUY&@3{G%@VWJEHlf^3bWFzGONuRv)24>)|vHYgV|^{nayU4
z*=n|#?dA{jr`ch4nq6kM*<<#aeP+KoU=Er?=CC<pj+(#B-{zP(Zcdn!=9D>Y&X}|2
zoH=hUn2Y9;xoobOtLB=yZf=;H=9al_?wGsgp1E%xn1|+(d2F7Tr{*8?%se+Q%uDmi
jyf$ylTl3DmHy_ML^T~WRU(8qYulW|Ro8K=W#DV_+Q$E95