Merge pull request #97 from tjboldt/shell-version

Update version numbers
This commit is contained in:
Terence Boldt 2022-03-02 08:35:43 -05:00 committed by GitHub
commit 087f5a299f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 229 additions and 176 deletions

View File

@ -49,11 +49,23 @@ body:
label: Driver Version label: Driver Version
description: What version of the driver are you running? Check with `RPI a2version` description: What version of the driver are you running? Check with `RPI a2version`
options: options:
- 0024 (fix VT100 arrow keys)
- 0023 (replaced periph.io with rpio) - 0023 (replaced periph.io with rpio)
- 0022 (added version info) - 0022 (added version info)
- Older (error calling RPI a2version, pre-2022-Feb-07) - Older (error calling RPI a2version, pre-2022-Feb-07)
validations: validations:
required: true required: true
- type: dropdown
id: shell-version
attributes:
label: Shell Version
description: What version of the shell are you running?`
options:
- 000D (added version info)
- Older (pre-2022-Mar-01)
- Not Applicable (bug not Shell related)
validations:
required: true
- type: dropdown - type: dropdown
id: problem-area id: problem-area
attributes: attributes:

View File

@ -87,14 +87,26 @@ DetectSlot:
asl asl
tax tax
clc clc
bcc Start bcc Init
nextSlot: nextSlot:
dex dex
bne DetectSlot bne DetectSlot
rts rts
Start:
Init:
lda #$8d lda #$8d
jsr $c300 ; force 80 columns jsr $c300 ; force 80 columns
ldy #$00
PrintString:
lda Text,y
beq Start
ora #$80
jsr PrintChar
iny
bne PrintString
Start:
lda LastChar lda LastChar
pha pha
bit ClearKeyboard bit ClearKeyboard
@ -266,3 +278,9 @@ restoreChar:
sta (BasL),y sta (BasL),y
lda TextPage1 lda TextPage1
rts rts
Text:
.byte "Apple2-IO-RPi Shell Version 000D",$8d
.byte "(c)2020-2022 Terence J. Boldt",$8d
.byte $8d
.byte $00

Binary file not shown.

View File

@ -1,4 +1,4 @@
ca65 V2.18 - Raspbian 2.19-1 ca65 V2.18 - N/A
Main file : Shell.asm Main file : Shell.asm
Current file: Shell.asm Current file: Shell.asm
@ -91,183 +91,205 @@ Current file: Shell.asm
002028 1 0A asl 002028 1 0A asl
002029 1 AA tax 002029 1 AA tax
00202A 1 18 clc 00202A 1 18 clc
00202B 1 90 04 bcc Start 00202B 1 90 04 bcc Init
00202D 1 nextSlot: 00202D 1 nextSlot:
00202D 1 CA dex 00202D 1 CA dex
00202E 1 D0 D2 bne DetectSlot 00202E 1 D0 D2 bne DetectSlot
002030 1 60 rts 002030 1 60 rts
002031 1 Start: 002031 1
002031 1 Init:
002031 1 A9 8D lda #$8d 002031 1 A9 8D lda #$8d
002033 1 20 00 C3 jsr $c300 ; force 80 columns 002033 1 20 00 C3 jsr $c300 ; force 80 columns
002036 1 A5 06 lda LastChar 002036 1
002038 1 48 pha 002036 1 A0 00 ldy #$00
002039 1 2C 10 C0 bit ClearKeyboard 002038 1 PrintString:
00203C 1 A9 00 lda #ResetCommand 002038 1 B9 76 21 lda Text,y
00203E 1 20 C2 20 jsr SendByte 00203B 1 F0 08 beq Start
002041 1 A9 09 lda #ShellCommand 00203D 1 09 80 ora #$80
002043 1 20 C2 20 jsr SendByte 00203F 1 20 ED FD jsr PrintChar
002046 1 20 52 20 jsr DumpOutput 002042 1 C8 iny
002049 1 A9 00 lda #ResetCommand 002043 1 D0 F3 bne PrintString
00204B 1 20 C2 20 jsr SendByte 002045 1
00204E 1 68 pla 002045 1 Start:
00204F 1 85 06 sta LastChar 002045 1 A5 06 lda LastChar
002051 1 60 rts 002047 1 48 pha
002052 1 002048 1 2C 10 C0 bit ClearKeyboard
002052 1 DumpOutput: 00204B 1 A9 00 lda #ResetCommand
002052 1 20 E0 20 jsr GetByte 00204D 1 20 D1 20 jsr SendByte
002055 1 C9 00 cmp #$00 002050 1 A9 09 lda #ShellCommand
002057 1 F0 26 beq endOutput 002052 1 20 D1 20 jsr SendByte
002059 1 48 pha 002055 1 20 61 20 jsr DumpOutput
00205A 1 20 52 21 jsr ClearCursor 002058 1 A9 00 lda #ResetCommand
00205A 1 20 D1 20 jsr SendByte
00205D 1 68 pla 00205D 1 68 pla
00205E 1 C9 48 cmp #'H' 00205E 1 85 06 sta LastChar
002060 1 F0 27 beq setColumn 002060 1 60 rts
002062 1 C9 56 cmp #'V' 002061 1
002064 1 F0 31 beq setRow 002061 1 DumpOutput:
002066 1 C9 43 cmp #'C' 002061 1 20 EF 20 jsr GetByte
002068 1 F0 16 beq clearScreen 002064 1 C9 00 cmp #$00
00206A 1 C9 54 cmp #'T' 002066 1 F0 26 beq endOutput
00206C 1 F0 37 beq setTop 002068 1 48 pha
00206E 1 C9 42 cmp #'B' 002069 1 20 61 21 jsr ClearCursor
002070 1 F0 3B beq setBottom 00206C 1 68 pla
002072 1 C9 55 cmp #'U' 00206D 1 C9 48 cmp #'H'
002074 1 F0 3F beq moveUp 00206F 1 F0 27 beq setColumn
002076 1 20 ED FD jsr PrintChar 002071 1 C9 56 cmp #'V'
002079 1 20 21 21 jsr SetCursor 002073 1 F0 31 beq setRow
00207C 1 4C 52 20 jmp DumpOutput 002075 1 C9 43 cmp #'C'
00207F 1 endOutput: 002077 1 F0 16 beq clearScreen
00207F 1 60 rts 002079 1 C9 54 cmp #'T'
002080 1 clearScreen: 00207B 1 F0 37 beq setTop
002080 1 20 58 FC jsr Home 00207D 1 C9 42 cmp #'B'
002083 1 20 21 21 jsr SetCursor 00207F 1 F0 3B beq setBottom
002086 1 4C 52 20 jmp DumpOutput 002081 1 C9 55 cmp #'U'
002089 1 setColumn: 002083 1 F0 3F beq moveUp
002089 1 20 E0 20 jsr GetByte 002085 1 20 ED FD jsr PrintChar
00208C 1 85 24 sta htab 002088 1 20 30 21 jsr SetCursor
00208E 1 8D 7B 05 sta htab80 00208B 1 4C 61 20 jmp DumpOutput
002091 1 20 21 21 jsr SetCursor 00208E 1 endOutput:
002094 1 4C 52 20 jmp DumpOutput 00208E 1 60 rts
002097 1 setRow: 00208F 1 clearScreen:
002097 1 20 E0 20 jsr GetByte 00208F 1 20 58 FC jsr Home
00209A 1 85 25 sta vtab 002092 1 20 30 21 jsr SetCursor
00209C 1 20 C1 FB jsr BasCalc 002095 1 4C 61 20 jmp DumpOutput
00209F 1 20 21 21 jsr SetCursor 002098 1 setColumn:
0020A2 1 4C 52 20 jmp DumpOutput 002098 1 20 EF 20 jsr GetByte
0020A5 1 setTop: 00209B 1 85 24 sta htab
0020A5 1 20 E0 20 jsr GetByte 00209D 1 8D 7B 05 sta htab80
0020A8 1 85 22 sta $22 0020A0 1 20 30 21 jsr SetCursor
0020AA 1 4C 52 20 jmp DumpOutput 0020A3 1 4C 61 20 jmp DumpOutput
0020AD 1 setBottom: 0020A6 1 setRow:
0020AD 1 20 E0 20 jsr GetByte 0020A6 1 20 EF 20 jsr GetByte
0020B0 1 85 23 sta $23 0020A9 1 85 25 sta vtab
0020B2 1 4C 52 20 jmp DumpOutput 0020AB 1 20 C1 FB jsr BasCalc
0020B5 1 moveUp: 0020AE 1 20 30 21 jsr SetCursor
0020B5 1 C6 25 dec vtab 0020B1 1 4C 61 20 jmp DumpOutput
0020B7 1 A5 25 lda vtab 0020B4 1 setTop:
0020B9 1 20 C1 FB jsr BasCalc 0020B4 1 20 EF 20 jsr GetByte
0020BC 1 20 21 21 jsr SetCursor 0020B7 1 85 22 sta $22
0020BF 1 4C 52 20 jmp DumpOutput 0020B9 1 4C 61 20 jmp DumpOutput
0020C2 1 0020BC 1 setBottom:
0020C2 1 SendByte: 0020BC 1 20 EF 20 jsr GetByte
0020C2 1 48 pha 0020BF 1 85 23 sta $23
0020C3 1 waitWrite: 0020C1 1 4C 61 20 jmp DumpOutput
0020C3 1 BD 8B C0 lda InputFlags,x 0020C4 1 moveUp:
0020C6 1 2A rol 0020C4 1 C6 25 dec vtab
0020C7 1 2A rol 0020C6 1 A5 25 lda vtab
0020C8 1 B0 F9 bcs waitWrite 0020C8 1 20 C1 FB jsr BasCalc
0020CA 1 68 pla 0020CB 1 20 30 21 jsr SetCursor
0020CB 1 9D 8D C0 sta OutputByte,x 0020CE 1 4C 61 20 jmp DumpOutput
0020CE 1 A9 1E lda #$1e ; set bit 0 low to indicate write started 0020D1 1
0020D0 1 9D 87 C0 sta OutputFlags,x 0020D1 1 SendByte:
0020D3 1 finishWrite: 0020D1 1 48 pha
0020D3 1 BD 8B C0 lda InputFlags,x 0020D2 1 waitWrite:
0020D2 1 BD 8B C0 lda InputFlags,x
0020D5 1 2A rol
0020D6 1 2A rol 0020D6 1 2A rol
0020D7 1 2A rol 0020D7 1 B0 F9 bcs waitWrite
0020D8 1 90 F9 bcc finishWrite 0020D9 1 68 pla
0020DA 1 A9 1F lda #$1f 0020DA 1 9D 8D C0 sta OutputByte,x
0020DC 1 9D 87 C0 sta OutputFlags,x 0020DD 1 A9 1E lda #$1e ; set bit 0 low to indicate write started
0020DF 1 60 rts 0020DF 1 9D 87 C0 sta OutputFlags,x
0020E0 1 0020E2 1 finishWrite:
0020E0 1 GetByte: 0020E2 1 BD 8B C0 lda InputFlags,x
0020E0 1 A9 1D lda #$1d ;set read flag low 0020E5 1 2A rol
0020E2 1 9D 87 C0 sta OutputFlags,x 0020E6 1 2A rol
0020E5 1 waitRead: 0020E7 1 90 F9 bcc finishWrite
0020E5 1 BD 8B C0 lda InputFlags,x 0020E9 1 A9 1F lda #$1f
0020E8 1 2A rol 0020EB 1 9D 87 C0 sta OutputFlags,x
0020E9 1 90 24 bcc readByte 0020EE 1 60 rts
0020EB 1 2C 00 C0 bit Keyboard ;keypress will abort waiting to read 0020EF 1
0020EE 1 10 F5 bpl waitRead 0020EF 1 GetByte:
0020F0 1 keyPressed: 0020EF 1 A9 1D lda #$1d ;set read flag low
0020F0 1 AD 00 C0 lda Keyboard ;send keypress to RPi 0020F1 1 9D 87 C0 sta OutputFlags,x
0020F3 1 29 7F and #$7f 0020F4 1 waitRead:
0020F5 1 9D 8D C0 sta OutputByte,x 0020F4 1 BD 8B C0 lda InputFlags,x
0020F8 1 2C 10 C0 bit ClearKeyboard 0020F7 1 2A rol
0020FB 1 A9 1C lda #$1c ;set write flag low too 0020F8 1 90 24 bcc readByte
0020FD 1 9D 87 C0 sta OutputFlags,x 0020FA 1 2C 00 C0 bit Keyboard ;keypress will abort waiting to read
002100 1 finishKeyPress: 0020FD 1 10 F5 bpl waitRead
002100 1 BD 8B C0 lda InputFlags,x 0020FF 1 keyPressed:
002103 1 2A rol 0020FF 1 AD 00 C0 lda Keyboard ;send keypress to RPi
002104 1 2A rol 002102 1 29 7F and #$7f
002105 1 90 F9 bcc finishKeyPress 002104 1 9D 8D C0 sta OutputByte,x
002107 1 A9 1D lda #$1d ;set flags back for reading 002107 1 2C 10 C0 bit ClearKeyboard
002109 1 9D 87 C0 sta OutputFlags,x 00210A 1 A9 1C lda #$1c ;set write flag low too
00210C 1 4C E5 20 jmp waitRead 00210C 1 9D 87 C0 sta OutputFlags,x
00210F 1 readByte: 00210F 1 finishKeyPress:
00210F 1 BD 8E C0 lda InputByte,x 00210F 1 BD 8B C0 lda InputFlags,x
002112 1 48 pha 002112 1 2A rol
002113 1 A9 1F lda #$1f ;set all flags high 002113 1 2A rol
002115 1 9D 87 C0 sta OutputFlags,x 002114 1 90 F9 bcc finishKeyPress
002118 1 finishRead: 002116 1 A9 1D lda #$1d ;set flags back for reading
002118 1 BD 8B C0 lda InputFlags,x 002118 1 9D 87 C0 sta OutputFlags,x
00211B 1 2A rol 00211B 1 4C F4 20 jmp waitRead
00211C 1 90 FA bcc finishRead 00211E 1 readByte:
00211E 1 68 pla 00211E 1 BD 8E C0 lda InputByte,x
00211F 1 18 clc ;success 002121 1 48 pha
002120 1 end: 002122 1 A9 1F lda #$1f ;set all flags high
002120 1 60 rts 002124 1 9D 87 C0 sta OutputFlags,x
002121 1 002127 1 finishRead:
002121 1 SetCursor: 002127 1 BD 8B C0 lda InputFlags,x
002121 1 AD 7B 05 lda htab80 ;get horizontal location / 2 00212A 1 2A rol
002124 1 4A lsr 00212B 1 90 FA bcc finishRead
002125 1 A8 tay 00212D 1 68 pla
002126 1 AD 55 C0 lda TextPage2 00212E 1 18 clc ;success
002129 1 90 03 bcc setChar 00212F 1 end:
00212B 1 AD 54 C0 lda TextPage1 00212F 1 60 rts
00212E 1 setChar: 002130 1
00212E 1 B1 28 lda (BasL),y 002130 1 SetCursor:
002130 1 85 06 sta LastChar ; save so ClearCursor will pick it up 002130 1 AD 7B 05 lda htab80 ;get horizontal location / 2
002132 1 C9 E0 cmp #$e0 002133 1 4A lsr
002134 1 10 0C bpl lowerCase 002134 1 A8 tay
002136 1 C9 C0 cmp #$c0 002135 1 AD 55 C0 lda TextPage2
002138 1 10 0D bpl upperCase 002138 1 90 03 bcc setChar
00213A 1 C9 A0 cmp #$a0 00213A 1 AD 54 C0 lda TextPage1
00213C 1 10 04 bpl symbol 00213D 1 setChar:
00213E 1 C9 80 cmp #$80 00213D 1 B1 28 lda (BasL),y
002140 1 10 0A bpl noop 00213F 1 85 06 sta LastChar ; save so ClearCursor will pick it up
002142 1 symbol: 002141 1 C9 E0 cmp #$e0
002142 1 lowerCase: 002143 1 10 0C bpl lowerCase
002142 1 invert: 002145 1 C9 C0 cmp #$c0
002142 1 49 80 eor #$80 002147 1 10 0D bpl upperCase
002144 1 4C 4C 21 jmp storeChar 002149 1 C9 A0 cmp #$a0
002147 1 upperCase: 00214B 1 10 04 bpl symbol
002147 1 29 1F and #$1f 00214D 1 C9 80 cmp #$80
002149 1 4C 4C 21 jmp storeChar 00214F 1 10 0A bpl noop
00214C 1 noop: 002151 1 symbol:
00214C 1 storeChar: 002151 1 lowerCase:
00214C 1 91 28 sta (BasL),y 002151 1 invert:
00214E 1 AD 54 C0 lda TextPage1 002151 1 49 80 eor #$80
002151 1 60 rts 002153 1 4C 5B 21 jmp storeChar
002152 1 002156 1 upperCase:
002152 1 ClearCursor: 002156 1 29 1F and #$1f
002152 1 AD 7B 05 lda htab80 ;get horizontal location / 2 002158 1 4C 5B 21 jmp storeChar
002155 1 4A lsr 00215B 1 noop:
002156 1 A8 tay 00215B 1 storeChar:
002157 1 AD 55 C0 lda TextPage2 00215B 1 91 28 sta (BasL),y
00215A 1 90 03 bcc restoreChar 00215D 1 AD 54 C0 lda TextPage1
00215C 1 AD 54 C0 lda TextPage1 002160 1 60 rts
00215F 1 restoreChar: 002161 1
00215F 1 A5 06 lda LastChar 002161 1 ClearCursor:
002161 1 91 28 sta (BasL),y 002161 1 AD 7B 05 lda htab80 ;get horizontal location / 2
002163 1 AD 54 C0 lda TextPage1 002164 1 4A lsr
002166 1 60 rts 002165 1 A8 tay
002166 1 002166 1 AD 55 C0 lda TextPage2
002169 1 90 03 bcc restoreChar
00216B 1 AD 54 C0 lda TextPage1
00216E 1 restoreChar:
00216E 1 A5 06 lda LastChar
002170 1 91 28 sta (BasL),y
002172 1 AD 54 C0 lda TextPage1
002175 1 60 rts
002176 1
002176 1 Text:
002176 1 41 70 70 6C .byte "Apple2-IO-RPi Shell Version 000D",$8d
00217A 1 65 32 2D 49
00217E 1 4F 2D 52 50
002197 1 28 63 29 32 .byte "(c)2020-2022 Terence J. Boldt",$8d
00219B 1 30 32 30 2D
00219F 1 32 30 32 32
0021B5 1 8D .byte $8d
0021B6 1 00 .byte $00
0021B6 1

Binary file not shown.

View File

@ -8,4 +8,4 @@ package info
// Version is the hexadecimal version number that // Version is the hexadecimal version number that
// should be incremented with each driver update // should be incremented with each driver update
const Version = "0023" const Version = "0024"

View File

@ -4,6 +4,7 @@
| Hardware Version | Supported | | Hardware Version | Supported |
| ---------------- | ------------------ | | ---------------- | ------------------ |
| Prototype 6 | :white_check_mark: |
| Prototype 5 | :white_check_mark: | | Prototype 5 | :white_check_mark: |
| Prototype 4 | :white_check_mark: | | Prototype 4 | :white_check_mark: |
| Older prototypes | :x: | | Older prototypes | :x: |