From 6576395b3fc99003f91661915cf083ae8b3c0e6b Mon Sep 17 00:00:00 2001
From: Terence Boldt <terence@boldt.ca>
Date: Sun, 28 Mar 2021 11:17:14 -0400
Subject: [PATCH] Fix menu options

---
 Apple2/Firmware_27256_EPROM.bin     | Bin 32768 -> 32768 bytes
 Apple2/Firmware_AT28C64B_EEPROM.bin | Bin 8192 -> 8192 bytes
 Apple2/MenuFirmware.asm             |  10 ++++---
 Apple2/MenuFirmware.lst             |  44 +++++++++++++++-------------
 4 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/Apple2/Firmware_27256_EPROM.bin b/Apple2/Firmware_27256_EPROM.bin
index 27ac1a1f15b3ca2320ff442d66f26fb4d0e29049..08fe231b3781a37b891e59635383a6e0d88708a1 100644
GIT binary patch
delta 1940
zcmZo@U}|V!+F&BV$TQhg!d2HfKQ}iqFGay8GcUE*SWm$%GbdHSF*!N4xL6_D&p$-L
z(>K7!)z{T8#MLEs@>GfN$^RtGKzb#~(i;iZD@B%GDX?B?vh-Gi^~#W?R|c$CmMp!s
yV7+o=>6HWPl_yItyU0c%rO`MhI!%wpF==JMXg(&syd2HPq@}HqRaP^xivR%BF>{{)

delta 1492
zcmZo@U}|V!+F&BVC_UL!!d2QWGbdHSF*!N4xVYC?Pr*4qH#adaMZqUCFLm;AiSWrA
zIE5zvlQ09RmLyVjBv`c+k*cM@s-=lkT@6+(L!@dMuxeQ%Ro8-5%Mqzs4y;<9NY(5j
g8-<ic!yF@JjfOe)95<TIv4_iO*@9j=GqH;R0EA%ukN^Mx

diff --git a/Apple2/Firmware_AT28C64B_EEPROM.bin b/Apple2/Firmware_AT28C64B_EEPROM.bin
index 46040b8d46e625b6686e955a679ae2913431afdf..9c7ac4f9b1cbee52a4bffd7e49852d4e9b574e8a 100644
GIT binary patch
delta 486
zcmZp0XmHqIBEiTr*;K++*Ev5oH!&|o!6!2>wbxir!7Vc<RlzYiIkmW0A==MBM8VTH
zz{l0s)i1==C3f;uiSWt)B+Nj1CCSn&3Dzq`mR>2aUTL!QN`v*vkfm1!tXGySy|Q4v
Ra%Ab11M8J1LoXA%2mq@Jo3sD`

delta 374
zcmZp0XmHqIBEcv<*;K+++AT9DRlzYiIkmXB*H}-%IX^cyF)u~ICo?Z~@^Xpr$s0I?
zCjXN#1F4oIQne&lwG@%6rNFACiBv5ORxLxMY8kL<St3=-f>p~Asag)KTAnD?Oza{6
DcJh8K

diff --git a/Apple2/MenuFirmware.asm b/Apple2/MenuFirmware.asm
index 40115d9..e947e33 100644
--- a/Apple2/MenuFirmware.asm
+++ b/Apple2/MenuFirmware.asm
@@ -62,7 +62,7 @@ PrintString:
  bne PrintString
 
 GetChar: 
- jsr $fd1b
+ jsr $fd0c
  sec	;subtract ascii "1" to get 0 - 3 from "1" to "4"
  sbc #$b1
  asl	;put in top nibble as EPROM page 
@@ -75,10 +75,12 @@ GetChar:
 Text:
 
 .byte	"Apple2-IO-RPi",$8d
-.byte	"(c)2020-2021 Terence J. Boldt",$8d,$8d
+.byte	"(c)2020-2021 Terence J. Boldt",$8d
+.byte   $8d
 .byte	"1. Boot",$8d
-.byte	"2. File Access",$8d
-.byte	"3. Command Line",$8d,$8d
+.byte	"2. Command Line",$8d
+.byte	"3. File Access [NOT IMPLEMENTED]",$8d
+.byte   $8d
 .byte	"May take 45 seconds for RPi to start",$8d
 .byte	"after intial power-on...",$00
 
diff --git a/Apple2/MenuFirmware.lst b/Apple2/MenuFirmware.lst
index 06628b1..221dbd3 100644
--- a/Apple2/MenuFirmware.lst
+++ b/Apple2/MenuFirmware.lst
@@ -66,7 +66,7 @@ Current file: MenuFirmware.asm
 00C531  1  D0 F3         bne PrintString
 00C533  1               
 00C533  1               GetChar:
-00C533  1  20 1B FD      jsr $fd1b
+00C533  1  20 0C FD      jsr $fd0c
 00C536  1  38            sec	;subtract ascii "1" to get 0 - 3 from "1" to "4"
 00C537  1  E9 B1         sbc #$b1
 00C539  1  0A            asl	;put in top nibble as EPROM page
@@ -81,30 +81,32 @@ Current file: MenuFirmware.asm
 00C542  1  41 70 70 6C  .byte	"Apple2-IO-RPi",$8d
 00C546  1  65 32 2D 49  
 00C54A  1  4F 2D 52 50  
-00C550  1  28 63 29 32  .byte	"(c)2020-2021 Terence J. Boldt",$8d,$8d
+00C550  1  28 63 29 32  .byte	"(c)2020-2021 Terence J. Boldt",$8d
 00C554  1  30 32 30 2D  
 00C558  1  32 30 32 31  
+00C56E  1  8D           .byte   $8d
 00C56F  1  31 2E 20 42  .byte	"1. Boot",$8d
 00C573  1  6F 6F 74 8D  
-00C577  1  32 2E 20 46  .byte	"2. File Access",$8d
-00C57B  1  69 6C 65 20  
-00C57F  1  41 63 63 65  
-00C586  1  33 2E 20 43  .byte	"3. Command Line",$8d,$8d
-00C58A  1  6F 6D 6D 61  
-00C58E  1  6E 64 20 4C  
-00C597  1  4D 61 79 20  .byte	"May take 45 seconds for RPi to start",$8d
-00C59B  1  74 61 6B 65  
-00C59F  1  20 34 35 20  
-00C5BC  1  61 66 74 65  .byte	"after intial power-on...",$00
-00C5C0  1  72 20 69 6E  
-00C5C4  1  74 69 61 6C  
-00C5D5  1               
-00C5D5  1               end:
-00C5D5  1  60            rts
-00C5D6  1               
-00C5D6  1  00 00 00 00  .repeat	251-<end
-00C5DA  1  00 00 00 00  
-00C5DE  1  00 00 00 00  
+00C577  1  32 2E 20 43  .byte	"2. Command Line",$8d
+00C57B  1  6F 6D 6D 61  
+00C57F  1  6E 64 20 4C  
+00C587  1  33 2E 20 46  .byte	"3. File Access [NOT IMPLEMENTED]",$8d
+00C58B  1  69 6C 65 20  
+00C58F  1  41 63 63 65  
+00C5A8  1  8D           .byte   $8d
+00C5A9  1  4D 61 79 20  .byte	"May take 45 seconds for RPi to start",$8d
+00C5AD  1  74 61 6B 65  
+00C5B1  1  20 34 35 20  
+00C5CE  1  61 66 74 65  .byte	"after intial power-on...",$00
+00C5D2  1  72 20 69 6E  
+00C5D6  1  74 69 61 6C  
+00C5E7  1               
+00C5E7  1               end:
+00C5E7  1  60            rts
+00C5E8  1               
+00C5E8  1  00 00 00 00  .repeat	251-<end
+00C5EC  1  00 00 00 00  
+00C5F0  1  00 00 00 00  
 00C5FC  1               .byte 0
 00C5FC  1               .endrepeat
 00C5FC  1  00 00        .byte      0,0     ;0000 blocks = check status