Apple-2-HW
/
Apple2-IO-RPi
mirror of https://github.com/tjboldt/Apple2-IO-RPi.git
2
0
Fork 1
Code Issues Projects Releases Wiki Activity

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
parent 869eb25c11 a751737bf1
commit 087f5a299f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 229 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/ISSUE_TEMPLATE/bug_report.yml vendored
View File

@ -49,11 +49,23 @@ body:
label: Driver Version
description: What version of the driver are you running? Check with `RPI a2version`
options:
- 0024 (fix VT100 arrow keys)
- 0023 (replaced periph.io with rpio)
- 0022 (added version info)
- Older (error calling RPI a2version, pre-2022-Feb-07)
validations:
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
id: problem-area
attributes:

22
Apple2/Shell.asm
View File

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

BIN
Apple2/Shell.bin
View File

Binary file not shown.

368
Apple2/Shell.lst
View File

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

BIN
RaspberryPi/Apple2-IO-RPi.hdv
View File

Binary file not shown.

2
RaspberryPi/apple2driver/info/version.go
View File

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

1
SECURITY.md
View File

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