Fix firmware so menu works called by PR#

This commit is contained in:
Terence Boldt 2021-03-28 10:27:53 -04:00
parent 433356926b
commit ed62dd961e
9 changed files with 144 additions and 136 deletions

View File

@ -46,11 +46,11 @@ DriverEntry:
sta OutputFlags sta OutputFlags
Start: Start:
; Put command firmware here ; Put command firmware here
; ;
; ;
; ;
rts
SendByte: SendByte:

View File

@ -1,4 +1,4 @@
ca65 V2.19 - Git 59c58ac ca65 V2.18 - N/A
Main file : CommandFirmware.asm Main file : CommandFirmware.asm
Current file: CommandFirmware.asm Current file: CommandFirmware.asm
@ -50,55 +50,55 @@ Current file: CommandFirmware.asm
00C516 1 8D D7 C0 sta OutputFlags 00C516 1 8D D7 C0 sta OutputFlags
00C519 1 00C519 1
00C519 1 Start: 00C519 1 Start:
00C519 1
00C519 1 ; Put command firmware here 00C519 1 ; Put command firmware here
00C519 1 ; 00C519 1 ;
00C519 1 ; 00C519 1 ;
00C519 1 ; 00C519 1 ;
00C519 1 00C519 1 60 rts
00C519 1 00C51A 1
00C519 1 SendByte: 00C51A 1
00C519 1 48 pha 00C51A 1 SendByte:
00C51A 1 waitWrite: 00C51A 1 48 pha
00C51A 1 AD DB C0 lda InputFlags 00C51B 1 waitWrite:
00C51D 1 2A rol 00C51B 1 AD DB C0 lda InputFlags
00C51E 1 2A rol 00C51E 1 2A rol
00C51F 1 B0 F9 bcs waitWrite 00C51F 1 2A rol
00C521 1 68 pla 00C520 1 B0 F9 bcs waitWrite
00C522 1 8D DD C0 sta OutputByte 00C522 1 68 pla
00C525 1 A9 0E lda #$0e ; set bit 0 low to indicate write started 00C523 1 8D DD C0 sta OutputByte
00C527 1 8D D7 C0 sta OutputFlags 00C526 1 A9 0E lda #$0e ; set bit 0 low to indicate write started
00C52A 1 finishWrite: 00C528 1 8D D7 C0 sta OutputFlags
00C52A 1 AD DB C0 lda InputFlags 00C52B 1 finishWrite:
00C52D 1 2A rol 00C52B 1 AD DB C0 lda InputFlags
00C52E 1 2A rol 00C52E 1 2A rol
00C52F 1 90 F9 bcc finishWrite 00C52F 1 2A rol
00C531 1 A9 0F lda #$0f 00C530 1 90 F9 bcc finishWrite
00C533 1 8D D7 C0 sta OutputFlags 00C532 1 A9 0F lda #$0f
00C536 1 60 rts 00C534 1 8D D7 C0 sta OutputFlags
00C537 1 00C537 1 60 rts
00C537 1 GetByte: 00C538 1
00C537 1 A9 0D lda #$0d ;set read flag low 00C538 1 GetByte:
00C539 1 8D D7 C0 sta OutputFlags 00C538 1 A9 0D lda #$0d ;set read flag low
00C53C 1 waitRead: 00C53A 1 8D D7 C0 sta OutputFlags
00C53C 1 AD DB C0 lda InputFlags 00C53D 1 waitRead:
00C53F 1 2A rol 00C53D 1 AD DB C0 lda InputFlags
00C540 1 B0 FA bcs waitRead 00C540 1 2A rol
00C542 1 AD DE C0 lda InputByte 00C541 1 B0 FA bcs waitRead
00C545 1 48 pha 00C543 1 AD DE C0 lda InputByte
00C546 1 A9 0F lda #$0f ;set all flags high 00C546 1 48 pha
00C548 1 8D D7 C0 sta OutputFlags 00C547 1 A9 0F lda #$0f ;set all flags high
00C54B 1 finishRead: 00C549 1 8D D7 C0 sta OutputFlags
00C54B 1 AD DB C0 lda InputFlags 00C54C 1 finishRead:
00C54E 1 2A rol 00C54C 1 AD DB C0 lda InputFlags
00C54F 1 90 FA bcc finishRead 00C54F 1 2A rol
00C551 1 68 pla 00C550 1 90 FA bcc finishRead
00C552 1 end: 00C552 1 68 pla
00C552 1 60 rts 00C553 1 end:
00C553 1 00C553 1 60 rts
00C553 1 00 00 00 00 .repeat 251-<end 00C554 1
00C557 1 00 00 00 00 00C554 1 00 00 00 00 .repeat 251-<end
00C55B 1 00 00 00 00 00C558 1 00 00 00 00
00C55C 1 00 00 00 00
00C5FC 1 .byte 0 00C5FC 1 .byte 0
00C5FC 1 .endrepeat 00C5FC 1 .endrepeat
00C5FC 1 00 00 .byte 0,0 ;0000 blocks = check status 00C5FC 1 00 00 .byte 0,0 ;0000 blocks = check status

View File

@ -1,4 +1,4 @@
ca65 V2.19 - Git 59c58ac ca65 V2.18 - N/A
Main file : DriveFirmware.asm Main file : DriveFirmware.asm
Current file: DriveFirmware.asm Current file: DriveFirmware.asm

View File

@ -51,7 +51,7 @@ Start:
; ;
; ;
; ;
rts
SendByte: SendByte:
pha pha

View File

@ -1,4 +1,4 @@
ca65 V2.19 - Git 59c58ac ca65 V2.18 - N/A
Main file : FileAccessFirmware.asm Main file : FileAccessFirmware.asm
Current file: FileAccessFirmware.asm Current file: FileAccessFirmware.asm
@ -55,50 +55,50 @@ Current file: FileAccessFirmware.asm
00C519 1 ; 00C519 1 ;
00C519 1 ; 00C519 1 ;
00C519 1 ; 00C519 1 ;
00C519 1 00C519 1 60 rts
00C519 1 00C51A 1
00C519 1 SendByte: 00C51A 1 SendByte:
00C519 1 48 pha 00C51A 1 48 pha
00C51A 1 waitWrite: 00C51B 1 waitWrite:
00C51A 1 AD DB C0 lda InputFlags 00C51B 1 AD DB C0 lda InputFlags
00C51D 1 2A rol
00C51E 1 2A rol 00C51E 1 2A rol
00C51F 1 B0 F9 bcs waitWrite 00C51F 1 2A rol
00C521 1 68 pla 00C520 1 B0 F9 bcs waitWrite
00C522 1 8D DD C0 sta OutputByte 00C522 1 68 pla
00C525 1 A9 0E lda #$0e ; set bit 0 low to indicate write started 00C523 1 8D DD C0 sta OutputByte
00C527 1 8D D7 C0 sta OutputFlags 00C526 1 A9 0E lda #$0e ; set bit 0 low to indicate write started
00C52A 1 finishWrite: 00C528 1 8D D7 C0 sta OutputFlags
00C52A 1 AD DB C0 lda InputFlags 00C52B 1 finishWrite:
00C52D 1 2A rol 00C52B 1 AD DB C0 lda InputFlags
00C52E 1 2A rol 00C52E 1 2A rol
00C52F 1 90 F9 bcc finishWrite 00C52F 1 2A rol
00C531 1 A9 0F lda #$0f 00C530 1 90 F9 bcc finishWrite
00C533 1 8D D7 C0 sta OutputFlags 00C532 1 A9 0F lda #$0f
00C536 1 60 rts 00C534 1 8D D7 C0 sta OutputFlags
00C537 1 00C537 1 60 rts
00C537 1 GetByte: 00C538 1
00C537 1 A9 0D lda #$0d ;set read flag low 00C538 1 GetByte:
00C539 1 8D D7 C0 sta OutputFlags 00C538 1 A9 0D lda #$0d ;set read flag low
00C53C 1 waitRead: 00C53A 1 8D D7 C0 sta OutputFlags
00C53C 1 AD DB C0 lda InputFlags 00C53D 1 waitRead:
00C53F 1 2A rol 00C53D 1 AD DB C0 lda InputFlags
00C540 1 B0 FA bcs waitRead 00C540 1 2A rol
00C542 1 AD DE C0 lda InputByte 00C541 1 B0 FA bcs waitRead
00C545 1 48 pha 00C543 1 AD DE C0 lda InputByte
00C546 1 A9 0F lda #$0f ;set all flags high 00C546 1 48 pha
00C548 1 8D D7 C0 sta OutputFlags 00C547 1 A9 0F lda #$0f ;set all flags high
00C54B 1 finishRead: 00C549 1 8D D7 C0 sta OutputFlags
00C54B 1 AD DB C0 lda InputFlags 00C54C 1 finishRead:
00C54E 1 2A rol 00C54C 1 AD DB C0 lda InputFlags
00C54F 1 90 FA bcc finishRead 00C54F 1 2A rol
00C551 1 68 pla 00C550 1 90 FA bcc finishRead
00C552 1 end: 00C552 1 68 pla
00C552 1 60 rts 00C553 1 end:
00C553 1 00C553 1 60 rts
00C553 1 00 00 00 00 .repeat 251-<end 00C554 1
00C557 1 00 00 00 00 00C554 1 00 00 00 00 .repeat 251-<end
00C55B 1 00 00 00 00 00C558 1 00 00 00 00
00C55C 1 00 00 00 00
00C5FC 1 .byte 0 00C5FC 1 .byte 0
00C5FC 1 .endrepeat 00C5FC 1 .endrepeat
00C5FC 1 00 00 .byte 0,0 ;0000 blocks = check status 00C5FC 1 00 00 .byte 0,0 ;0000 blocks = check status

Binary file not shown.

Binary file not shown.

View File

@ -47,7 +47,11 @@ DriverEntry:
;since the firmware page changes to 0, this falls through to the driver ;since the firmware page changes to 0, this falls through to the driver
Start: Start:
jsr $fc58 lda #$f0 ;restore COUT after PR# called
sta $36
lda #$fd
sta $37
jsr $fc58 ;clear screen and show menu options
ldy #$00 ldy #$00
PrintString: PrintString:
lda Text,y lda Text,y

View File

@ -1,4 +1,4 @@
ca65 V2.19 - Git 59c58ac ca65 V2.18 - N/A
Main file : MenuFirmware.asm Main file : MenuFirmware.asm
Current file: MenuFirmware.asm Current file: MenuFirmware.asm
@ -51,50 +51,54 @@ Current file: MenuFirmware.asm
00C519 1 ;since the firmware page changes to 0, this falls through to the driver 00C519 1 ;since the firmware page changes to 0, this falls through to the driver
00C519 1 00C519 1
00C519 1 Start: 00C519 1 Start:
00C519 1 20 58 FC jsr $fc58 00C519 1 A9 F0 lda #$f0 ;restore COUT after PR# called
00C51C 1 A0 00 ldy #$00 00C51B 1 85 36 sta $36
00C51E 1 PrintString: 00C51D 1 A9 FD lda #$fd
00C51E 1 B9 3A C5 lda Text,y 00C51F 1 85 37 sta $37
00C521 1 F0 08 beq GetChar 00C521 1 20 58 FC jsr $fc58 ;clear screen and show menu options
00C523 1 09 80 ora #$80 00C524 1 A0 00 ldy #$00
00C525 1 20 ED FD jsr $fded 00C526 1 PrintString:
00C528 1 C8 iny 00C526 1 B9 42 C5 lda Text,y
00C529 1 D0 F3 bne PrintString 00C529 1 F0 08 beq GetChar
00C52B 1 00C52B 1 09 80 ora #$80
00C52B 1 GetChar: 00C52D 1 20 ED FD jsr $fded
00C52B 1 20 1B FD jsr $fd1b 00C530 1 C8 iny
00C52E 1 38 sec ;subtract ascii "1" to get 0 - 3 from "1" to "4" 00C531 1 D0 F3 bne PrintString
00C52F 1 E9 B1 sbc #$b1 00C533 1
00C531 1 0A asl ;put in top nibble as EPROM page 00C533 1 GetChar:
00C532 1 0A asl 00C533 1 20 1B FD jsr $fd1b
00C533 1 0A asl 00C536 1 38 sec ;subtract ascii "1" to get 0 - 3 from "1" to "4"
00C534 1 0A asl 00C537 1 E9 B1 sbc #$b1
00C535 1 09 0F ora #$0f ;set all flags high 00C539 1 0A asl ;put in top nibble as EPROM page
00C537 1 4C 0E C5 jmp PageJump 00C53A 1 0A asl
00C53A 1 00C53B 1 0A asl
00C53A 1 Text: 00C53C 1 0A asl
00C53A 1 00C53D 1 09 0F ora #$0f ;set all flags high
00C53A 1 41 70 70 6C .byte "Apple2-IO-RPi",$8d 00C53F 1 4C 0E C5 jmp PageJump
00C53E 1 65 32 2D 49 00C542 1
00C542 1 4F 2D 52 50 00C542 1 Text:
00C548 1 28 63 29 32 .byte "(c)2020-2021 Terence J. Boldt",$8d,$8d 00C542 1
00C54C 1 30 32 30 2D 00C542 1 41 70 70 6C .byte "Apple2-IO-RPi",$8d
00C550 1 32 30 32 31 00C546 1 65 32 2D 49
00C567 1 31 2E 20 42 .byte "1. Boot",$8d 00C54A 1 4F 2D 52 50
00C56B 1 6F 6F 74 8D 00C550 1 28 63 29 32 .byte "(c)2020-2021 Terence J. Boldt",$8d,$8d
00C56F 1 32 2E 20 46 .byte "2. File Access",$8d 00C554 1 30 32 30 2D
00C573 1 69 6C 65 20 00C558 1 32 30 32 31
00C577 1 41 63 63 65 00C56F 1 31 2E 20 42 .byte "1. Boot",$8d
00C57E 1 33 2E 20 43 .byte "3. Command Line",$8d,$00 00C573 1 6F 6F 74 8D
00C582 1 6F 6D 6D 61 00C577 1 32 2E 20 46 .byte "2. File Access",$8d
00C586 1 6E 64 20 4C 00C57B 1 69 6C 65 20
00C58F 1 00C57F 1 41 63 63 65
00C58F 1 end: 00C586 1 33 2E 20 43 .byte "3. Command Line",$8d,$00
00C58F 1 60 rts 00C58A 1 6F 6D 6D 61
00C590 1 00C58E 1 6E 64 20 4C
00C590 1 00 00 00 00 .repeat 251-<end 00C597 1
00C594 1 00 00 00 00 00C597 1 end:
00C598 1 00 00 00 00 00C597 1 60 rts
00C598 1
00C598 1 00 00 00 00 .repeat 251-<end
00C59C 1 00 00 00 00
00C5A0 1 00 00 00 00
00C5FC 1 .byte 0 00C5FC 1 .byte 0
00C5FC 1 .endrepeat 00C5FC 1 .endrepeat
00C5FC 1 00 00 .byte 0,0 ;0000 blocks = check status 00C5FC 1 00 00 .byte 0,0 ;0000 blocks = check status