chris/open-roms
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some tweaks to C128 keyboard support

Browse Source
This commit is contained in:
FeralChild64 committed 2019-10-18 18:20:36 +02:00
1 parent 1db03b5921
commit e9565c9724
4 files changed
+42 -48
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CONFIG.md
+1 -1
View File
@@ -117,7 +117,7 @@ Needs 70-250 more space in KERNAL segment (depending on the features enabled for
### `CONFIG_KEYBOARD_C128` ### `CONFIG_KEYBOARD_C128`
Allows to use additional keys found on the C128 keyboard. Allows to use additional keys found on the C128 keyboard. NOTE: might be buggy, on VICE emulator I can't get all the keys working.
Needs about 125 bytes more space in KERNAL segment. If unsure - disable. Needs about 125 bytes more space in KERNAL segment. If unsure - disable.
c64/kernal/keyboard/kb_matrix_128.s
+1 -1
View File
@@ -23,7 +23,7 @@ kb_matrix_128_bucky_filter:
.byte %00000000 .byte %00000000
.byte %00000000 .byte %00000000
.byte %10000001 // XXX ALT, NO_SCRL - probably here .byte %10000001 // ALT, NO_SCRL
c64/kernal/keyboard/scnkey.s
+39 -45
View File
@@ -42,11 +42,11 @@ SCNKEY:
#if !CONFIG_JOY2_CURSOR && CONFIG_KEY_FAST_SCAN #if !CONFIG_JOY2_CURSOR && CONFIG_KEY_FAST_SCAN
ldx #$00 ldx #$00
stx CIA1_PRA // connect all the rows stx CIA1_PRA // connect all the rows
#if CONFIG_KEYBOARD_C128 #if CONFIG_KEYBOARD_C128
stx VIC_XSCAN stx VIC_XSCAN
#endif #endif
dex // puts $FF dex // puts $FF
cpx CIA1_PRB cpx CIA1_PRB
beq scnkey_no_keys beq scnkey_no_keys
@@ -64,7 +64,7 @@ scnkey_bucky_loop:
#endif #endif
lda kb_matrix_bucky_testmask, y lda kb_matrix_bucky_testmask, y
and CIA1_PRB and CIA1_PRB
bne !+ // not pressed bne !+ // not pressed
lda SHFLAG lda SHFLAG
ora kb_matrix_bucky_shflag, y ora kb_matrix_bucky_shflag, y
sta SHFLAG sta SHFLAG
@@ -81,26 +81,26 @@ scnkey_bucky_loop:
// Check for control port 2 activity // Check for control port 2 activity
ldx #$00 ldx #$00
stx CIA1_DDRA // set port to input to read joystick stx CIA1_DDRA // set port to input to read joystick
lda CIA1_PRA // read the joystick 2 status lda CIA1_PRA // read the joystick 2 status
dex // puts $FF dex // puts $FF
stx CIA1_DDRA // set port back to output stx CIA1_DDRA // set port back to output
and #%00001111 // filter out anything but joystick movement and #%00001111 // filter out anything but joystick movement
cmp #%00001111 cmp #%00001111
bne scnkey_joystick_filtered bne scnkey_joystick_filtered
#if CONFIG_KEY_FAST_SCAN #if CONFIG_KEY_FAST_SCAN
inx // puts $00 inx // puts $00
stx CIA1_PRA // connect all the rows stx CIA1_PRA // connect all the rows
#if CONFIG_KEYBOARD_C128 #if CONFIG_KEYBOARD_C128
stx VIC_XSCAN stx VIC_XSCAN
#endif #endif
dex // puts $FF dex // puts $FF
cpx CIA1_PRB cpx CIA1_PRB
beq scnkey_no_keys beq scnkey_no_keys
@@ -110,12 +110,12 @@ scnkey_bucky_loop:
// Check for control port 1 activity (can interfere with keyboard) // Check for control port 1 activity (can interfere with keyboard)
jsr keyboard_disconnect // disconnect all the rows, .X will be $FF jsr keyboard_disconnect // disconnect all the rows, .X will be $FF
cpx CIA1_PRB // only control port activity will be reported cpx CIA1_PRB // only control port activity will be reported
#if CONFIG_JOY1_CURSOR #if CONFIG_JOY1_CURSOR
bne scnkey_joystick_1 // use joystick for cursor keys bne scnkey_joystick_1 // use joystick for cursor keys
#else #else
bne scnkey_no_keys // if activity detected do not scan the keyboard bne scnkey_no_keys // if activity detected do not scan the keyboard
#endif #endif
// Check if KEYTAB is not 0 (happens if more than one bucky key is pressed) // Check if KEYTAB is not 0 (happens if more than one bucky key is pressed)
@@ -126,7 +126,7 @@ scnkey_bucky_loop:
// Scan the keyboard matrix // Scan the keyboard matrix
ldy #$FF // offset in key matrix table, $FF for not found yet ldy #$FF // offset in key matrix table, $FF for not found yet
#if CONFIG_KEYBOARD_C128 #if CONFIG_KEYBOARD_C128
jsr scnkey_128 jsr scnkey_128
#endif #endif
@@ -134,26 +134,26 @@ scnkey_bucky_loop:
scnkey_matrix_loop: scnkey_matrix_loop:
lda kb_matrix_row_keys, x lda kb_matrix_row_keys, x
sta CIA1_PRA sta CIA1_PRA
lda kb_matrix_bucky_filter, x // filter out bucky keys lda kb_matrix_bucky_filter, x // filter out bucky keys
ora CIA1_PRB ora CIA1_PRB
cmp #$FF cmp #$FF
beq scnkey_matrix_loop_next // skip if no key pressed from this row beq scnkey_matrix_loop_next // skip if no key pressed from this row
cpy #$FF cpy #$FF
bne scnkey_no_keys // clash, more than one key pressed bne scnkey_no_keys // clash, more than one key pressed
// We have at least one key pressed in this row, we need to find which one exactly // We have at least one key pressed in this row, we need to find which one exactly
ldy #$07 ldy #$07
scnkey_matrix_loop_inner: scnkey_matrix_loop_inner:
cmp kb_matrix_row_keys, y cmp kb_matrix_row_keys, y
bne !+ // not this particular key bne !+ // not this particular key
tya // now .A contains key offset within a row tya // now .A contains key offset within a row
clc clc
adc kb_matrix_row_offsets, x // now .A contains key offset from the matrix start adc kb_matrix_row_offsets, x // now .A contains key offset from the matrix start
tay tay
jmp scnkey_matrix_loop_next jmp scnkey_matrix_loop_next
!: !:
dey dey
bpl scnkey_matrix_loop_inner bpl scnkey_matrix_loop_inner
bmi scnkey_no_keys // branch always, multiple keys must have been pressed bmi scnkey_no_keys // branch always, multiple keys must have been pressed
scnkey_matrix_loop_next: scnkey_matrix_loop_next:
dex dex
bpl scnkey_matrix_loop bpl scnkey_matrix_loop
@@ -165,9 +165,9 @@ scnkey_matrix_loop_next:
// To be extra sure, check for possible control port 1 interference once again // To be extra sure, check for possible control port 1 interference once again
jsr keyboard_disconnect // disconnect all the rows, .X will be $FF jsr keyboard_disconnect // disconnect all the rows, .X will be $FF
cpx CIA1_PRB // only control port activity will be reported cpx CIA1_PRB // only control port activity will be reported
beq scnkey_got_key // branch if joystick activity NOT detected beq scnkey_got_key // branch if joystick activity NOT detected
// FALLTROUGH // FALLTROUGH
@@ -175,12 +175,7 @@ scnkey_no_keys:
// Mark no key press // Mark no key press
#if CONFIG_KEYBOARD_C128
lda #$FF // non-standard, but for C128 keyboard $40 is a valid position
#else
lda #$40 lda #$40
#endif
sta LSTX sta LSTX
rts rts
@@ -191,7 +186,7 @@ scnkey_joystick_1:
// Prepare joystick 1 status // Prepare joystick 1 status
lda CIA1_PRB lda CIA1_PRB
and #%00001111 // filter out anything but movement and #%00001111 // filter out anything but movement
// FALLTROUGH // FALLTROUGH
@@ -230,7 +225,7 @@ scnkey_joystick_filtered:
scnkey_got_key: // .Y should now contain the key offset in matrix pointed by KEYTAB scnkey_got_key: // .Y should now contain the key offset in matrix pointed by KEYTAB
cpy LSTX cpy LSTX
beq scnkey_try_repeat // branch if the same key as previously beq scnkey_try_repeat // branch if the same key as previously
sty LSTX sty LSTX
// Reset key repeat counters - see [CM64] page 58 // Reset key repeat counters - see [CM64] page 58
@@ -252,7 +247,7 @@ scnkey_output_key:
lda NDX lda NDX
cmp XMAX cmp XMAX
bcs scnkey_early_repeat // no space in buffer bcs scnkey_early_repeat // no space in buffer
// Reinitialize secondary counter // Reinitialize secondary counter
@@ -264,23 +259,22 @@ scnkey_output_key:
#if CONFIG_KEYBOARD_C128 #if CONFIG_KEYBOARD_C128
cpy #$40 cpy #$40
bcs !+ bcc !+
lda (KEYTAB), y // retrieve key code from standard matrix lda kb_matrix_128 - $41, y // retrieve key code from C128 extended matrix
jmp scnkey_got_petscii jmp scnkey_got_petscii
!: !:
lda (KEYTAB), y // retrieve key code from standard matrix
lda kb_matrix_128 - $40, y // retrieve key code from C128 extended matrix
// XXX this will be needed for extended screen editor // XXX this will be needed for extended screen editor
// cmp KEY_TAB_FW // special handling for SHIFT+TAB
// cmp KEY_TAB_FW // special handling for SHIFT+TAB
// bne scnkey_got_petscii // bne scnkey_got_petscii
// lda SHFLAG // special handling for SHIFT+TAB // lda SHFLAG // special handling for SHIFT+TAB
// and #KEY_FLAG_SHIFT // and #KEY_FLAG_SHIFT
// bne !+ // bne !+
// lda KEY_TAB_FW // lda KEY_TAB_FW
// bne scnkey_got_petscii // branch alWAYS // bne scnkey_got_petscii // branch alWAYS
// !: // !:
// lda KEY_TAB_BW // lda KEY_TAB_BW
@@ -294,7 +288,7 @@ scnkey_output_key:
scnkey_got_petscii: scnkey_got_petscii:
beq scnkey_no_keys // branch if we have no PETSCII code for this key beq scnkey_no_keys // branch if we have no PETSCII code for this key
ldy NDX ldy NDX
sta KEYD, y sta KEYD, y
inc NDX inc NDX
@@ -312,7 +306,7 @@ scnkey_try_repeat:
// Check whether we should repeat keys - first the flag, afterwards hardcoded list // Check whether we should repeat keys - first the flag, afterwards hardcoded list
lda RPTFLG lda RPTFLG
bmi scnkey_handle_repeat // branch if we should repeat always bmi scnkey_handle_repeat // branch if we should repeat always
tya tya
ldx #(__kb_matrix_alwaysrepeat_end - kb_matrix_alwaysrepeat - 1) ldx #(__kb_matrix_alwaysrepeat_end - kb_matrix_alwaysrepeat - 1)
@@ -338,7 +332,7 @@ scnkey_handle_repeat:
// Countdown before subsequent repeats // Countdown before subsequent repeats
lda KOUNT lda KOUNT
beq scnkey_output_key // if second counter is also 0, we can repeat the key beq scnkey_output_key // if second counter is also 0, we can repeat the key
dec KOUNT dec KOUNT
rts rts
c64/kernal/keyboard/scnkey_128.s
+1 -1
View File
@@ -37,7 +37,7 @@ scnkey_matrix_128_loop_inner:
tya // now .A contains key offset within a row tya // now .A contains key offset within a row
clc clc
adc kb_matrix_row_offsets, x // now .A contains key offset from the matrix start adc kb_matrix_row_offsets, x // now .A contains key offset from the matrix start
adc #$40 // now .A contains fully normalized offset adc #$41 // now .A contains offset after the standard matrix
tay tay
jmp scnkey_matrix_128_loop_next jmp scnkey_matrix_128_loop_next
!: !: