work on new keyboard scanning routine
This commit is contained in:
1 parent
31d181aac3
commit
5b69467dc1
10 files changed
+319
-59
No files matched your search
@@ -74,6 +74,8 @@ cint_brk: // entry for BRK and STOP+RESTORE - XXX, where should it start?
|
||||
|
||||
// Set keyboard decode vector (Compute's Mapping the 64 p215)
|
||||
|
||||
#if CONFIG_SCNKEY_TWW_CTR
|
||||
|
||||
// Set initial variables for our improved keyboard scan routine
|
||||
lda #$FF
|
||||
ldx #6
|
||||
@@ -82,6 +84,8 @@ cint_brk: // entry for BRK and STOP+RESTORE - XXX, where should it start?
|
||||
bpl !-
|
||||
sta BufferQuantity
|
||||
|
||||
#endif
|
||||
|
||||
// Set key repeat delay (Compute's Mapping the 64 p215)
|
||||
// Making some numbers up here: Repeat every ~1/10th sec
|
||||
// But require key to be held for ~1/3sec before
|
||||
|
||||
@@ -14,9 +14,9 @@
|
||||
|
||||
|
||||
|
||||
keyboard_matrix:
|
||||
kb_matrix:
|
||||
|
||||
// Normal
|
||||
__kb_matrix_normal:
|
||||
.byte $14,$0D,$1D,$88,$85,$86,$87,$11
|
||||
.byte $33,$57,$41,$34,$5A,$53,$45,$00
|
||||
.byte $35,$52,$44,$36,$43,$46,$54,$58
|
||||
@@ -26,7 +26,7 @@ keyboard_matrix:
|
||||
.byte $5C,$2A,$3B,$13,$00,$3D,$5E,$2F
|
||||
.byte $31,$5F,$00,$32,$20,$00,$51,$03
|
||||
|
||||
// With SHIFT
|
||||
__kb_matrix_shift:
|
||||
.byte $94,$8D,$9D,$8C,$89,$8A,$8B,$91
|
||||
.byte $23,$77,$61,$24,$7A,$73,$65,$00
|
||||
.byte $25,$72,$64,$26,$63,$66,$74,$78
|
||||
@@ -36,7 +36,7 @@ keyboard_matrix:
|
||||
.byte $A9,$C0,$5D,$93,$00,$3D,$DE,$3F
|
||||
.byte $21,$5F,$00,$22,$A0,$00,$71,$83
|
||||
|
||||
// With VENDOR key
|
||||
__kb_matrix_vendor:
|
||||
.byte $94,$8D,$9D,$8C,$89,$8A,$8B,$91
|
||||
.byte $96,$B3,$B0,$97,$AD,$AE,$B1,$00
|
||||
.byte $98,$B2,$AC,$99,$BC,$BB,$A3,$BD
|
||||
@@ -46,7 +46,7 @@ keyboard_matrix:
|
||||
.byte $A8,$DF,$5D,$93,$00,$3D,$DE,$3F
|
||||
.byte $81,$5F,$00,$95,$a0,$00,$AB,$83
|
||||
|
||||
// With CTRL
|
||||
__kb_matrix_ctrl:
|
||||
.byte $00,$00,$00,$00,$00,$00,$00,$00
|
||||
.byte $1C,$17,$01,$9F,$1A,$13,$05,$00
|
||||
.byte $9C,$12,$04,$1E,$03,$06,$14,$18
|
||||
@@ -56,41 +56,19 @@ keyboard_matrix:
|
||||
.byte $1C,$00,$1D,$00,$00,$1F,$1E,$00
|
||||
.byte $90,$06,$00,$05,$00,$00,$11,$00
|
||||
|
||||
keyboard_matrix_lookup:
|
||||
// Work out if normal, shifted, control or Vendor modified keyboard.
|
||||
// Table contains the offsets into keyboard_matrixes that should be used
|
||||
// for different values of the bottom 3 bits of key_bucky_state XXX
|
||||
// Interaction is simple to work out when playing with a C64:
|
||||
// CTRL trumps SHIFT or VENDOR
|
||||
// VENDOR + SHIFT = DOES NOTHING
|
||||
// All 3 does CONTROL
|
||||
.byte $00 // Normal
|
||||
.byte $40 // SHIFT
|
||||
.byte $80 // CTRL
|
||||
.byte $80 // CTRL + SHIFT
|
||||
.byte $C0 // VENDOR
|
||||
.byte $C0 // VENDOR + SHIFT
|
||||
.byte $80 // VENDOR + CTRL
|
||||
.byte $80 // VENDOR + CTRL + SHIFT
|
||||
|
||||
|
||||
// keyboard_matrix_ext128: $D02F
|
||||
|
||||
// kb_matrix_ext128: $D02F
|
||||
|
||||
// .byte (HELP),$38,$35,(TAB),$32,$34,$37,$31 // $FE
|
||||
// .byte $1B, $2B, $2D,$0A,$0D,$36,$39,$33 // $FD
|
||||
// .byte $00,$30,$2E,$91,$11,$9D,$1D,(NO_SCRL) // $FB
|
||||
|
||||
// keyboard_matrix_ext65:
|
||||
// kb_matrix_ext65:
|
||||
|
||||
// Last column - normal
|
||||
// .byte (NO_SCRL),(TAB),$00,(HELP),(F9),(F11),(F13),$1B
|
||||
|
||||
// Last column - shifted
|
||||
// .byte (NO_SCRL),(TAB),$00,(HELP),(F10),(F12),(F14),$1B
|
||||
|
||||
|
||||
// XXX ESC : $1B (alias: CTRL [ )
|
||||
// XXX HELP : (to be determined, ?)
|
||||
// XXX TAB : (to be determined, $18 ?)
|
||||
// XXX NO_SCRL : (to be determined, ?)
|
||||
// XXX ALT : bucky, 128: row 3, 1st, 65: 3rd
|
||||
@@ -0,0 +1,36 @@
|
||||
|
||||
//
|
||||
// Matrix for retrieving bucky key status on the C64 keyboard
|
||||
//
|
||||
// Values based on:
|
||||
// - [CM64] Compute's Mapping the Commodore 64 - pags 58 (SHFLAG), 173 (matrix)
|
||||
//
|
||||
|
||||
|
||||
#if !CONFIG_SCNKEY_TWW_CTR
|
||||
|
||||
|
||||
kb_matrix_bucky_confmask: // values to be written to CIA1_PRA
|
||||
|
||||
.byte %11111101 // SHIFT (left)
|
||||
.byte %10111111 // SHIFT (right)
|
||||
.byte %01111111 // VENDOR
|
||||
.byte %01111111 // CTRL
|
||||
|
||||
|
||||
kb_matrix_bucky_testmask: // for AND with CIA1_PRB value
|
||||
|
||||
.byte %10000000 // SHIFT (left)
|
||||
.byte %00010000 // SHIFT (right)
|
||||
.byte %00100000 // VENDOR
|
||||
.byte %00000100 // CTRL
|
||||
|
||||
|
||||
kb_matrix_bucky_shflag: // mask to be ORed to SHFLAG to mark key status
|
||||
.byte KEY_FLAG_SHIFT
|
||||
.byte KEY_FLAG_SHIFT
|
||||
.byte KEY_FLAG_VENDOR
|
||||
.byte KEY_FLAG_CTRL
|
||||
|
||||
|
||||
#endif // no CONFIG_SCNKEY_TWW_CTR
|
||||
@@ -0,0 +1,27 @@
|
||||
|
||||
//
|
||||
// Matrix for filtering out bucky keys while scanning the C64 keyboard
|
||||
//
|
||||
// Values based on:
|
||||
// - [CM64] Compute's Mapping the Commodore 64 - pags 58 (SHFLAG), 173 (matrix)
|
||||
//
|
||||
|
||||
|
||||
#if !CONFIG_SCNKEY_TWW_CTR
|
||||
|
||||
|
||||
kb_matrix_bucky_filter:
|
||||
|
||||
// values for OR with CIA1_PRB content to filter out bucky keys
|
||||
|
||||
.byte %00100100 // VENDOR + CONTROL
|
||||
.byte %00010000 // SHIFT (right)
|
||||
.byte %00000000
|
||||
.byte %00000000
|
||||
.byte %00000000
|
||||
.byte %00000000
|
||||
.byte %10000000 // SHIFT (left)
|
||||
.byte %00000000
|
||||
|
||||
|
||||
#endif // no CONFIG_SCNKEY_TWW_CTR
|
||||
@@ -0,0 +1,21 @@
|
||||
|
||||
//
|
||||
// Work out if normal, shifted, control or Vendor modified keyboard.
|
||||
// Table contains the offsets into keyboard_matrixes that should be used
|
||||
// for different values of the bottom 3 bits of key_bucky_state XXX
|
||||
// Interaction is simple to work out when playing with a C64:
|
||||
// CTRL trumps SHIFT or VENDOR
|
||||
// VENDOR + SHIFT = DOES NOTHING
|
||||
// All 3 does CONTROL
|
||||
//
|
||||
|
||||
kb_matrix_lookup:
|
||||
|
||||
.byte (__kb_matrix_normal - kb_matrix) // Normal
|
||||
.byte (__kb_matrix_shift - kb_matrix) // SHIFT
|
||||
.byte (__kb_matrix_ctrl - kb_matrix) // CTRL
|
||||
.byte (__kb_matrix_ctrl - kb_matrix) // CTRL + SHIFT
|
||||
.byte (__kb_matrix_vendor - kb_matrix) // VENDOR
|
||||
.byte (__kb_matrix_vendor - kb_matrix) // VENDOR + SHIFT
|
||||
.byte (__kb_matrix_ctrl - kb_matrix) // VENDOR + CTRL
|
||||
.byte (__kb_matrix_ctrl - kb_matrix) // VENDOR + CTRL + SHIFT
|
||||
@@ -0,0 +1,27 @@
|
||||
|
||||
//
|
||||
// Single row key codes for scanning the C64 keyboard
|
||||
//
|
||||
// Values based on:
|
||||
// - [CM64] Compute's Mapping the Commodore 64 - pags 58 (SHFLAG), 173 (matrix)
|
||||
//
|
||||
|
||||
|
||||
#if !CONFIG_SCNKEY_TWW_CTR
|
||||
|
||||
|
||||
kb_matrix_row_keys:
|
||||
|
||||
// values for CIA1_PRA to connect only the given row
|
||||
|
||||
.byte %01111111
|
||||
.byte %10111111
|
||||
.byte %11011111
|
||||
.byte %11101111
|
||||
.byte %11110111
|
||||
.byte %11111011
|
||||
.byte %11111101
|
||||
.byte %11111110
|
||||
|
||||
|
||||
#endif // no CONFIG_SCNKEY_TWW_CTR
|
||||
@@ -30,43 +30,60 @@ SCNKEY:
|
||||
|
||||
// Handle repeat timer
|
||||
|
||||
ldx KOUNT
|
||||
beq sk_start
|
||||
lda KOUNT
|
||||
beq !+
|
||||
dec KOUNT
|
||||
|
||||
// Setup the CIA registers XXX check whether the C64 does it every time
|
||||
|
||||
ldx #$FF
|
||||
stx CIA1_DDRA // output
|
||||
ldy #$00
|
||||
sty CIA1_DDRB // input
|
||||
|
||||
!:
|
||||
// Prepare for SHFLAG update
|
||||
|
||||
lda SHFLAG
|
||||
sta LSTSHF
|
||||
ldy #$00
|
||||
sty SHFLAG
|
||||
lda #$00
|
||||
sta SHFLAG
|
||||
|
||||
// XXX retrieve ALT and NO_SCRL status for C128/C65 keyboards
|
||||
|
||||
// Check for any activity
|
||||
|
||||
sty CIA1_PRA // connect all the lines
|
||||
ldx #$FF
|
||||
cpx CIA1_PRB
|
||||
lda #$00
|
||||
sta CIA1_PRA // connect all the rows
|
||||
lda #$FF
|
||||
cmp CIA1_PRB
|
||||
beq scnkey_no_keys
|
||||
|
||||
// XXX retrieve SHIFT / CTRL / VENDOR status
|
||||
// Retrieve SHIFT / VENDOR / CTRL status
|
||||
ldy #$03
|
||||
scnkey_bucky_loop:
|
||||
lda kb_matrix_bucky_confmask, y
|
||||
sta CIA1_PRA
|
||||
lda kb_matrix_bucky_testmask, y
|
||||
and CIA1_PRB
|
||||
bne !+ // not pressed
|
||||
lda SHFLAG
|
||||
ora kb_matrix_bucky_shflag, y
|
||||
sta SHFLAG
|
||||
!:
|
||||
dey
|
||||
bpl scnkey_bucky_loop
|
||||
|
||||
// Set pointer in KEYTAB
|
||||
jsr scnkey_via_keytab
|
||||
// Set KEYTAB vector
|
||||
|
||||
jsr scnkey_via_keylog // XXX for some CPUs we have indirect jsr
|
||||
|
||||
// XXX check for joystick activity
|
||||
|
||||
// Scan the keyboard matrix
|
||||
|
||||
ldy #$07
|
||||
scnkey_matrix_loop:
|
||||
lda kb_matrix_row_keys, y
|
||||
sta CIA1_PRA
|
||||
lda kb_matrix_bucky_filter, y
|
||||
ora CIA1_PRB
|
||||
|
||||
// XXX
|
||||
dey
|
||||
bpl scnkey_matrix_loop
|
||||
|
||||
|
||||
|
||||
@@ -76,12 +93,12 @@ SCNKEY:
|
||||
|
||||
scnkey_no_keys:
|
||||
|
||||
// ldx #$FF
|
||||
stx LSTX
|
||||
lda #$FF
|
||||
sta LSTX
|
||||
|
||||
rts
|
||||
|
||||
scnkey_via_keytab:
|
||||
jmp (KEYTAB)
|
||||
scnkey_via_keylog:
|
||||
jmp (KEYLOG)
|
||||
|
||||
#endif // No CONFIG_SCNKEY_TWW_CTR
|
||||
#endif // no CONFIG_SCNKEY_TWW_CTR
|
||||
@@ -9,9 +9,9 @@ scnkey_set_keytab:
|
||||
|
||||
// Set initial KEYTAB value
|
||||
|
||||
lda #<keyboard_matrix
|
||||
lda #<kb_matrix
|
||||
sta KEYTAB+0
|
||||
lda #>keyboard_matrix
|
||||
lda #>kb_matrix
|
||||
sta KEYTAB+1
|
||||
|
||||
// Calculate table index
|
||||
@@ -21,7 +21,7 @@ scnkey_set_keytab:
|
||||
tax
|
||||
|
||||
// Retrieve table offset
|
||||
lda keyboard_matrix_lookup, x
|
||||
lda kb_matrix_lookup, x
|
||||
|
||||
// Add offset to the vector
|
||||
sec
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
.label KeyQuantity = $A8 // 1 byte
|
||||
.label BufferNew = $A9 // 3 bytes
|
||||
.label TempZP = $B6 // 1 byte
|
||||
// These should be initialized in CINIT to $FF
|
||||
// These should be initialized in CINT to $FF
|
||||
.label BufferQuantity = $B4 // 1 byte
|
||||
.label BufferOld = $293 // 3 bytes
|
||||
.label Buffer = $297 // 4 bytes
|
||||
@@ -116,9 +116,9 @@ accept_key:
|
||||
tax
|
||||
pla
|
||||
and #$3f
|
||||
ora keyboard_matrix_lookup,x
|
||||
ora kb_matrix_lookup,x
|
||||
tax
|
||||
lda keyboard_matrix,x
|
||||
lda kb_matrix,x
|
||||
// But don't insert $00 characters
|
||||
beq sk_nokey
|
||||
|
||||
|
||||
Reference in new issue
Block a user