migrated to ACME assembler

commit 145d64aa6e78838ed07cefed372f0ad6a4687e97
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 20:16:57 2020 +0200

    ACME adaptation

commit 885209d7822286744ea53232ae7461472a01d5d6
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 19:57:25 2020 +0200

    ACME adaptation

commit 334d84486bc603551887e7cbeb59d329f2224cc7
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 18:29:15 2020 +0200

    ACME adaptation

commit b5966f49bcd8f0ca79cbec93819a31238924707e
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 18:09:31 2020 +0200

    ACME adaptation

commit 786536a93a5eab5e676fca99625b4eb094a554e7
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 17:24:48 2020 +0200

    ACME adaptation

commit 704c70dfb1f5d68775d6f3da220803b8a3990f56
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 15:07:12 2020 +0200

    ACME adaptation

commit 136874964c9083b375f151475310f9636871fc72
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 14:45:14 2020 +0200

    ACME adaptation

commit 8eca0d5700b72d04336e72c5cd3a68e18b85f96d
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 14:06:52 2020 +0200

    ACME adaptation

commit 11d29eb7ee318239d782f85498b6d0524624d5c4
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 13:56:45 2020 +0200

    ACME apaptation

commit c9b5e5e04cceb92c66bc027e6440bc0f7c5a499f
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 13:49:04 2020 +0200

    ACME adaptation

commit f5cc254cbc921f07863807468cb3fe26b410b409
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 13:01:18 2020 +0200

    ACME adaptation

commit e135a27bf9c30cc0965379c954564e06406303b1
Author: FeralChild64 <you@example.com>
Date:   Sat Sep 19 21:55:01 2020 +0200

    ACME adaptation

commit e9dfddf90d9e2795e88b7da40ae050d733faeb56
Author: FeralChild64 <you@example.com>
Date:   Sat Sep 19 21:48:47 2020 +0200

    Makefile fix

commit 07030104c65cf5e5beeacf6d629ccb9245e58657
Author: FeralChild64 <you@example.com>
Date:   Sat Sep 19 21:42:00 2020 +0200

    ACME adaptation

commit f824362ee5bcfbffca86c430b57773b2ffd65655
Author: FeralChild64 <you@example.com>
Date:   Sat Sep 19 20:14:56 2020 +0200

    ACME adaptation

commit 3a3c59007dcd4940d89b8669f34ca56b61c25fdf
Author: FeralChild64 <you@example.com>
Date:   Fri Sep 18 21:51:45 2020 +0200

    ACME adaptation

commit 6790ef7bc88a41de2881c69b7524dd4ab8c74b5d
Author: FeralChild64 <you@example.com>
Date:   Fri Sep 18 20:35:23 2020 +0200

    ACME adaptation

commit 38ad18b90e9ec713aa7ca49576b3388ce1733357
Author: FeralChild64 <you@example.com>
Date:   Fri Sep 18 18:46:20 2020 +0200

    ACME adaptation

commit 541340371122a9702f7b2d9771c298223cffd0e9
Author: FeralChild64 <you@example.com>
Date:   Fri Sep 18 16:49:46 2020 +0200

    ACME adaptation

commit 25cfd5e186459be1a260d3eb8cfff767838de370
Author: FeralChild64 <you@example.com>
Date:   Thu Sep 17 20:13:33 2020 +0200

    ACME adaptation

commit f61599444d5b1d03d8fd8e4a6a7c3b85069bedb3
Author: FeralChild64 <you@example.com>
Date:   Thu Sep 17 19:29:23 2020 +0200

    ACME adaptation

commit b290be31ec7bb2e5723607697da1bbc621c84429
Author: FeralChild64 <you@example.com>
Date:   Thu Sep 17 17:20:14 2020 +0200

    ACME adaptation

commit 877be9e856880d98fd4bcb25b42aaaacda9dc463
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 16 21:47:38 2020 +0200

    ACME adaptation

commit bb20edaf85d386e41d5c2f715b745b68fbd3362e
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 16 21:31:30 2020 +0200

    ACME adaptation

commit c5d31bd8685abce37c8e254d15aac20bd1570d9f
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 16 18:40:49 2020 +0200

    ACME adaptation

commit 29349826b38f8a89649171559dc8cf24c560aff1
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 14 23:35:47 2020 +0200

    ACME adaptation

commit 8bcd6a621c4b11766d0cf34f79858ba90a67248e
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 14 22:52:25 2020 +0200

    ACME adaptation

commit e87a69edc2ce4bfcc460c31e08dcc352a985f88d
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 14 22:43:27 2020 +0200

    ACME adaptation

commit f49a097bd52e96d00b866c02bda7121e4543233c
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 14 19:02:07 2020 +0200

    ACME adaptation

commit fa0e9214a633b8e8f867cc70925b390940dcd426
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 14 17:47:19 2020 +0200

    ACME adaptation

commit 1b763b91e7a03e426227129c7f22f0ce57a4c197
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 14 17:17:10 2020 +0200

    ACME adaptation

commit e92a4b57b232cd85eb1e71090b8a89c7c8461ebc
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 14 17:15:37 2020 +0200

    ACME adaptation

commit de3c693e8a7e73ea5289198946058e3240894e6a
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 14 17:10:05 2020 +0200

    ACME adaptation

commit f9bd7ae0f04e932d613be9ed5cb19af9be5d338e
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 13 14:34:44 2020 +0200

    ACME adaptation

commit 694dee52555dbfc2b1f7f452a9671ff51106c057
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 13 14:16:14 2020 +0200

    ACME adaptation

commit 0af2c55edfcd22942d9f25417eb0d35f55b71604
Author: FeralChild64 <you@example.com>
Date:   Fri Sep 11 17:38:09 2020 +0200

    ACME adaptation

commit 2015e17334bd56a1e8a13a5abc098d9c2e7ea44f
Author: FeralChild64 <you@example.com>
Date:   Fri Sep 11 16:46:05 2020 +0200

    ACME adaptation

commit b1e972162798d60f4483cd6cc261e856c20c2c8c
Author: FeralChild64 <you@example.com>
Date:   Fri Sep 11 16:24:31 2020 +0200

    ACME adaptation

commit 9d027e868466901ba53bf074a79ec8cf16273021
Author: FeralChild64 <you@example.com>
Date:   Fri Sep 11 15:04:31 2020 +0200

    ACME adaptation

commit 957186deddd1aa4f3b4f1aa1f421e4239a584e57
Author: FeralChild64 <you@example.com>
Date:   Thu Sep 10 22:49:07 2020 +0200

    ACME adaptation

commit b8060f67a455cfac109f08d96b62c360d693b931
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 23:07:28 2020 +0200

    ACME adaptation

commit e54d004568f44bbfe5c070ef1d7cf3544112e497
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 22:58:20 2020 +0200

    ACME adaptation

commit f90b77f073c5a605cb31c6ee451f65c8a8aff7d8
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 22:12:09 2020 +0200

    ACME adaptation

commit b211bb4afcd9c58fe1f5c92f3007717d611cd531
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 22:01:40 2020 +0200

    ACME adaptation

commit 8d7ea343b07e9e08e5f77f3c414758a6cffd0440
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 21:38:34 2020 +0200

    ACME adaptation

commit 46413eb0d92d6400aba0ff8dfe556e61e8a44d78
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 21:07:47 2020 +0200

    ACME adaptation

commit 9f98f69ecc21f7b74a5eb89e247f5a2c6fcb655d
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 20:05:03 2020 +0200

    ACME adaptation

commit 7bb9f1cadc682c7e0a4a6796739d860d473ca110
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 19:55:12 2020 +0200

    ACME adaptation

commit 5fc115392b5bdca6b56f67ad866b1884d2d2bdf8
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 19:31:10 2020 +0200

    ACME adaptation

commit b7940fc60e568d859df9e3156f6bacc6d685b2cc
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 19:16:09 2020 +0200

    ACME adaptation

commit 56288cb97197561afa0816b29c134ec1190e8eab
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 18:48:23 2020 +0200

    ACME adaptation

commit 10401a60fc7922a53d782120ef6795d889140218
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 16:34:16 2020 +0200

    ACME adaptation

commit 8ce76e4d2b56837a691ae84b1a412a2ae32a157b
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 16:20:44 2020 +0200

    ACME adaptation

commit 33fade899fa6172ea6b5b5f6683bb61f544429fd
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 15:28:46 2020 +0200

    ACME adaptation

commit a416f04734402fcfbc57a933731376df2e0180a1
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 12:40:03 2020 +0200

    ACME adaptation

commit f8daee005b1d29f6912723be2ac94bc5fbeb0508
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 7 23:29:54 2020 +0200

    ACME adaptation

commit 83fe6bdd0b08a44fdbfc6eefe323a4b194ccaf5b
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 7 22:23:16 2020 +0200

    ACME adaptation

commit cb1f75620b9c83000a15c9c7f7acefdfee79a979
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 7 19:23:12 2020 +0200

    ACME adaptation

commit e524d517c933ae1f0aeb49764d307fadb4845025
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 6 08:24:25 2020 +0200

    ACME adaptation - replaced comments

commit 2ab572c3a21f4a78a7312d0e684bc11d91d1717a
Author: FeralChild64 <you@example.com>
Date:   Sat Sep 5 17:59:10 2020 +0200

    ACME adaptation - replaced the assembler
This commit is contained in:
FeralChild64 committed 2020-09-20 20:22:36 +02:00
1 parent bfc8291e41
commit c8d255130c
685 files changed
+15835 -16296

No files matched your search

+201 -205
View File
@@ -1,282 +1,276 @@
// #LAYOUT# STD * #TAKE
// #LAYOUT# X16 * #IGNORE
// #LAYOUT# * KERNAL_0 #TAKE
// #LAYOUT# * * #IGNORE
;; #LAYOUT# STD * #TAKE
;; #LAYOUT# X16 * #IGNORE
;; #LAYOUT# * KERNAL_0 #TAKE
;; #LAYOUT# * * #IGNORE
//
// Official Kernal routine, described in:
//
// - [RG64] C64 Programmers Reference Guide - page 295
// - [CM64] Computes Mapping the Commodore 64 - page 220
//
// CPU registers that has to be preserved (see [RG64]): none
//
;
; Official Kernal routine, described in:
;
; - [RG64] C64 Programmers Reference Guide - page 295
; - [CM64] Computes Mapping the Commodore 64 - page 220
;
; CPU registers that has to be preserved (see [RG64]): none
;
// Variables used:
// - KEYTAB - keyboard matrix pointer
// - DELAY - counter for first delay between key repeats
// - KOUNT - counter for next delays between key repeats
// - SHFLAG - SHIFT / CTRL / VENDOR keypress status
// - NDX - number of characters in keyboard buffer
// - XMAX - maximum size of keyboard buffer
// - LSTX - matrix coordinate of last pressed key
// - LSTSHF - previous status of SHFLAG
// - MODE - flag, whether charset toggle (SHIFT+VENDOR) is allowed
// - RPTFLG - whether key repeat is allowed
; Variables used:
; - KEYTAB - keyboard matrix pointer
; - DELAY - counter for first delay between key repeats
; - KOUNT - counter for next delays between key repeats
; - SHFLAG - SHIFT / CTRL / VENDOR keypress status
; - NDX - number of characters in keyboard buffer
; - XMAX - maximum size of keyboard buffer
; - LSTX - matrix coordinate of last pressed key
; - LSTSHF - previous status of SHFLAG
; - MODE - flag, whether charset toggle (SHIFT+VENDOR) is allowed
; - RPTFLG - whether key repeat is allowed
#if !CONFIG_LEGACY_SCNKEY
!ifndef CONFIG_LEGACY_SCNKEY {
// Routine takes some ideas from TWW/CTR proposal, see here:
// - http://codebase64.org/doku.php?id=base:scanning_the_keyboard_the_correct_and_non_kernal_way
; Routine takes some ideas from TWW/CTR proposal, see here:
; - http://codebase64.org/doku.php?id=base:scanning_the_keyboard_the_correct_and_non_kernal_way
SCNKEY:
// Prepare for SHFLAG update
; Prepare for SHFLAG update
lda SHFLAG
sta LSTSHF
lda #$00
sta SHFLAG
#if !CONFIG_JOY2_CURSOR && CONFIG_KEY_FAST_SCAN
!ifndef CONFIG_JOY2_CURSOR { !ifdef CONFIG_KEY_FAST_SCAN {
// Check for any activity - speed optimization, but cannot be done
// that early if we are to scan the joystick #2
; Check for any activity - speed optimization, but cannot be done
; that early if we are to scan the joystick #2
ldx #$00
stx CIA1_PRA // connect all the rows
#if CONFIG_KEYBOARD_C128
stx CIA1_PRA ; connect all the rows
!ifdef CONFIG_KEYBOARD_C128 {
stx VIC_XSCAN
#endif
dex // puts $FF
}
dex ; puts $FF
cpx CIA1_PRB
beq scnkey_no_keys
#endif
} }
// Retrieve SHIFT / VENDOR / CTRL / ALT / CAPS LOCK status
; Retrieve SHIFT / VENDOR / CTRL / ALT / CAPS LOCK status
#if CONFIG_KEYBOARD_C128_CAPS_LOCK
!ifdef CONFIG_KEYBOARD_C128_CAPS_LOCK {
// First check if this is really a C128 - to avoid false positive
; First check if this is really a C128 - to avoid false positive
ldx #$00
stx VIC_XSCAN
dex // puts $FF
dex ; puts $FF
cpx VIC_XSCAN
beq !+ // branch if C64, C128 will keep some bits cleared
beq @1 ; branch if C64, C128 will keep some bits cleared
lda CPU_R6510
and #$40
bne !+ // branch if no CAPS LOCK
bne @1 ; branch if no CAPS LOCK
lda #KEY_CAPS_LOCK
sta SHFLAG
!:
@1:
#if !CONFIG_KEYBOARD_C128
stx VIC_XSCAN // disconnect C128 keys if no C128 keyboard is supported
#endif
!ifndef !CONFIG_KEYBOARD_C128 {
stx VIC_XSCAN ; disconnect C128 keys if no C128 keyboard is supported
} }
#endif
#if CONFIG_KEYBOARD_C65_CAPS_LOCK
!ifdef CONFIG_KEYBOARD_C65_CAPS_LOCK {
lda C65_EXTKEYS_PR
and #$01
bne !+ // branch if no CAPS LOCK
bne @2 ; branch if no CAPS LOCK
lda #KEY_CAPS_LOCK
sta SHFLAG
!:
@2:
#if !CONFIG_KEYBOARD_C65
!ifndef CONFIG_KEYBOARD_C65 {
ldx #$FF
stx C65_EXTKEYS_PR // disconnect C128 keys if no C128 keyboard is supported
#endif
#endif
stx C65_EXTKEYS_PR ; disconnect C65 keys if no C65 keyboard is supported
} }
ldy #(__kb_matrix_bucky_confmask_end - kb_matrix_bucky_confmask - 1)
scnkey_bucky_loop:
lda kb_matrix_bucky_confmask, y
sta CIA1_PRA
#if CONFIG_KEYBOARD_C128
!ifdef CONFIG_KEYBOARD_C128 {
lda kb_matrix_bucky_confmask_c128, y
sta VIC_XSCAN
#endif
#if CONFIG_KEYBOARD_C65
}
!ifdef CONFIG_KEYBOARD_C65 {
lda kb_matrix_bucky_confmask_c65, y
sta C65_EXTKEYS_PR
#endif
}
lda kb_matrix_bucky_testmask, y
and CIA1_PRB
bne !+ // branch if not pressed
bne @3 ; branch if not pressed
lda SHFLAG
ora kb_matrix_bucky_shflag, y
sta SHFLAG
!:
@3:
dey
bpl scnkey_bucky_loop
// Set KEYTAB vector
; Set KEYTAB vector
lda KEYLOG+1
bne !+
jsr scnkey_set_keytab // KEYLOG routine on zeropage? most likely vector not set
jmp_8 scnkey_keytab_set_done
bne @11
jsr scnkey_set_keytab ; KEYLOG routine on zeropage? most likely vector not set
+bra scnkey_keytab_set_done
!:
#if HAS_OPCODES_65CE02
jsr_ind KEYLOG
#else
@11:
!ifdef HAS_OPCODES_65CE02 {
jsr (KEYLOG)
} else {
jsr scnkey_via_keylog
#endif
}
scnkey_keytab_set_done:
#if CONFIG_JOY2_CURSOR
!ifdef CONFIG_JOY2_CURSOR {
// Check for control port 2 activity
; Check for control port 2 activity
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
stx CIA1_DDRA // set port back to output
dex ; puts $FF
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
bne scnkey_joystick_filtered
#if CONFIG_KEY_FAST_SCAN
!ifdef CONFIG_KEY_FAST_SCAN {
inx // puts $00
stx CIA1_PRA // connect all the rows
#if CONFIG_KEYBOARD_C128
inx ; puts $00
stx CIA1_PRA ; connect all the rows
!ifdef CONFIG_KEYBOARD_C128 {
stx VIC_XSCAN
#endif
#if CONFIG_KEYBOARD_C65
}
!ifdef CONFIG_KEYBOARD_C65 {
stx C65_EXTKEYS_PR
#endif
dex // puts $FF
}
dex ; puts $FF
cpx CIA1_PRB
beq scnkey_no_keys
#endif // CONFIG_KEY_FAST_SCAN
} ; CONFIG_KEY_FAST_SCAN
} ; CONFIG_JOY2_CURSOR
#endif // CONFIG_JOY2_CURSOR
; 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
cpx CIA1_PRB ; only control port activity will be reported
!ifdef CONFIG_JOY1_CURSOR {
bne scnkey_joystick_1 ; use joystick for cursor keys
} else {
bne scnkey_no_keys ; if activity detected do not scan the keyboard
}
jsr keyboard_disconnect // disconnect all the rows, .X will be $FF
cpx CIA1_PRB // only control port activity will be reported
#if CONFIG_JOY1_CURSOR
bne scnkey_joystick_1 // use joystick for cursor keys
#else
bne scnkey_no_keys // if activity detected do not scan the keyboard
#endif
// Check if KEYTAB is not 0 (happens if more than one bucky key is pressed)
// High byte equal to 0 = table considered invalid
; Check if KEYTAB is not 0 (happens if more than one bucky key is pressed)
; High byte equal to 0 = table considered invalid
lda KEYTAB+1
beq scnkey_no_keys
// Scan the keyboard matrix
; Scan the keyboard matrix
ldy #$FF // offset in key matrix table, $FF for not found yet
#if CONFIG_KEYBOARD_C128
ldy #$FF ; offset in key matrix table, $FF for not found yet
!ifdef CONFIG_KEYBOARD_C128 {
jsr scnkey_128
#endif
#if CONFIG_KEYBOARD_C65
}
!ifdef CONFIG_KEYBOARD_C65 {
jsr scnkey_65
#endif
}
ldx #$07
scnkey_matrix_loop:
lda kb_matrix_row_keys, x
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
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
bne scnkey_no_keys // jam, more than one key pressed
// We have at least one key pressed in this row, we need to find which one exactly
bne scnkey_no_keys ; jam, more than one key pressed
; We have at least one key pressed in this row, we need to find which one exactly
ldy #$07
scnkey_matrix_loop_inner:
cmp kb_matrix_row_keys, y
bne !+ // not this particular key
tya // now .A contains key offset within a row
bne @4 ; not this particular key
tya ; now .A contains key offset within a row
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
jmp scnkey_matrix_loop_next
!:
@4:
dey
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:
dex
bpl scnkey_matrix_loop
// Scanning complete - check if we got a key
; Scanning complete - check if we got a key
cpy #$FF
beq scnkey_no_keys
// 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
cpx CIA1_PRB // only control port activity will be reported
beq scnkey_got_key // branch if joystick activity NOT detected
jsr keyboard_disconnect ; disconnect all the rows, .X will be $FF
cpx CIA1_PRB ; only control port activity will be reported
beq scnkey_got_key ; branch if joystick activity NOT detected
// FALLTROUGH
; FALLTROUGH
scnkey_no_keys:
// Mark no key press
; Mark no key press
lda #$40
sta LSTX
rts
#if CONFIG_JOY1_CURSOR
!ifdef CONFIG_JOY1_CURSOR {
scnkey_joystick_1:
// Prepare joystick 1 status
; Prepare joystick 1 status
lda CIA1_PRB
and #%00001111 // filter out anything but movement
and #%00001111 ; filter out anything but movement
// FALLTROUGH
; FALLTROUGH
}
#endif
#if CONFIG_JOY1_CURSOR || CONFIG_JOY2_CURSOR
!ifdef CONFIG_JOY1_OR_JOY2_CURSOR {
scnkey_joystick_filtered:
// Set appropriate keyboard matrix and key code for joystick event
; Set appropriate keyboard matrix and key code for joystick event
ldy #$03
!:
@5:
cmp kb_matrix_joy_status, y
beq !+
beq @6
dey
bpl !-
bpl @5
// Not found
; Not found
rts
!:
// Found
@6:
; Found
lda kb_matrix_joy_keytab_lo, y
sta KEYTAB+0
@@ -285,65 +279,64 @@ scnkey_joystick_filtered:
lda kb_matrix_joy_keytab_idx, y
tay
// FALLTROUGH
; FALLTROUGH
}
#endif
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
beq scnkey_try_repeat // branch if the same key as previously
beq scnkey_try_repeat ; branch if the same key as previously
sty LSTX
// Reset key repeat counters - see [CM64] page 58
; Reset key repeat counters - see [CM64] page 58
// Note: according to [CM64] it should be $10 for initializing DELAY, $06 for
// initializing KOUNT for the first time and $04 for subsequent ones - but replicating
// this would make our implementation longer, probably without improving the compatibility.
//
// Besides - since I am the one who writes the code, I will make the values exactly how I like them :D
; Note: according to [CM64] it should be $10 for initializing DELAY, $06 for
; initializing KOUNT for the first time and $04 for subsequent ones - but replicating
; this would make our implementation longer, probably without improving the compatibility.
;
; Besides - since I am the one who writes the code, I will make the values exactly how I like them :D
#if !CONFIG_RS232_UP9600
!ifndef CONFIG_RS232_UP9600 {
lda #$16
#else
} else {
lda #$18
#endif
}
sta DELAY
// FALLTROUGH
; FALLTROUGH
scnkey_output_key:
// Check if we have free space in the keyboard buffer
; Check if we have free space in the keyboard buffer
lda NDX
cmp XMAX
bcs scnkey_early_repeat // no space in buffer
bcs scnkey_early_repeat ; no space in buffer
// Reinitialize secondary counter
; Reinitialize secondary counter
lda #$03
sta KOUNT
// Retrieve the PETSCII code
; Retrieve the PETSCII code
#if CONFIG_KEYBOARD_C128 || CONFIG_KEYBOARD_C65
!ifdef CONFIG_KEYBOARD_C128_OR_C65 {
cpy #$40
bcc !+
bcc scnkey_output_get_keycode
#if CONFIG_KEYBOARD_C128
lda kb_matrix_128 - $41, y // retrieve key code from C128 extended matrix
#elif CONFIG_KEYBOARD_C65
!ifdef CONFIG_KEYBOARD_C128 {
lda kb_matrix_128 - $41, y ; retrieve key code from C128 extended matrix
} else ifdef CONFIG_KEYBOARD_C65 {
// Select key matrix (normal or shifted) for extended C65 keys
; Select key matrix (normal or shifted) for extended C65 keys
lda SHFLAG
and #%00000111 // KEY_FLAG_SHIFT + KEY_FLAG_VENDOR + KEY_FLAG_CTRL
and #%00000111 ; KEY_FLAG_SHIFT + KEY_FLAG_VENDOR + KEY_FLAG_CTRL
beq scnkey_output_65_no_shift
cmp #KEY_FLAG_SHIFT
// XXX how to behave on VENDOR/CTRL key? Harmonize this with claasic keys behavior
bne scnkey_no_keys // no scanning for this bucky key combination
; XXX how to behave on VENDOR/CTRL key? Harmonize this with clasic keys behavior
bne scnkey_no_keys ; no scanning for this bucky key combination
lda kb_matrix_65_shifted - $41, y
jmp scnkey_got_petscii
@@ -351,76 +344,79 @@ scnkey_output_key:
scnkey_output_65_no_shift:
lda kb_matrix_65 - $41, y
}
#endif
jmp scnkey_got_petscii
!:
lda (KEYTAB), y // retrieve key code from standard matrix
#endif // CONFIG_KEYBOARD_C128 or CONFIG_KEYBOARD_C65
; FALLTROUGH
#if CONFIG_KEYBOARD_C128_CAPS_LOCK || CONFIG_KEYBOARD_C65_CAPS_LOCK
scnkey_output_get_keycode:
// Check if we need special handling for a CAPS LOCK key
// This is shorter than a separate set of tables
lda (KEYTAB), y ; retrieve key code from standard matrix
} ; CONFIG_KEYBOARD_C128 or CONFIG_KEYBOARD_C65
!ifdef CONFIG_KEYBOARD_CAPS_LOCK {
; Check if we need special handling for a CAPS LOCK key
; This is shorter than a separate set of tables
scnkey_handle_caps_lock:
#if !CONFIG_KEYBOARD_C128 && !CONFIG_KEYBOARD_C65
!ifndef CONFIG_KEYBOARD_C128_OR_C65 {
lda (KEYTAB), y
#endif
}
tax
lda SHFLAG
and #(%00000111 + KEY_CAPS_LOCK)
cmp #KEY_CAPS_LOCK
bne !+ // branch if no special CAPS LOCK handling needed
bne @7 ; branch if no special CAPS LOCK handling needed
cpx #$41 // 'A'
bcc !+
cpx #$5B // 'Z' + 1
bcs !+
cpx #$41 ; 'A'
bcc @7
cpx #$5B ; 'Z' + 1
bcs @7
txa
clc
adc #$20 // turn lowercase into uppercase
adc #$20 ; turn lowercase into uppercase
tax
!:
@7:
txa
#endif // CONFIG_KEYBOARD_C128_CAPS_LOCK or CONFIG_KEYBOARD_C65_CAPS_LOCK
} ; CONFIG_KEYBOARD_C128_CAPS_LOCK or CONFIG_KEYBOARD_C65_CAPS_LOCK
#if !CONFIG_KEYBOARD_C128 && !CONFIG_KEYBOARD_C128_CAPS_LOCK && !CONFIG_KEYBOARD_C65 && !CONFIG_KEYBOARD_C65_CAPS_LOCK
!ifndef CONFIG_KEYBOARD_C128_OR_C65 { !ifndef CONFIG_KEYBOARD_CAPS_LOCK {
lda (KEYTAB), y
} }
#endif
// Output PETSCII code to the keyboard buffer
; Output PETSCII code to the keyboard buffer
scnkey_got_petscii:
#if CONFIG_KEYBOARD_C128 && CONFIG_EDIT_TABULATORS
!ifdef CONFIG_KEYBOARD_C128 { !ifdef CONFIG_EDIT_TABULATORS {
// Special handling for SHIFT+TAB; it is easier than creating new matrix
; Special handling for SHIFT+TAB; it is easier than creating new matrix
tax
cmp #KEY_C64_TAB_FW
bne !+
bne @8
lda SHFLAG
and #KEY_FLAG_SHIFT
beq !+
beq @8
ldx #KEY_C64_TAB_BW
!:
@8:
txa
#endif // CONFIG_KEYBOARD_C128 and CONFIG_EDIT_TABULATORS
} } ; CONFIG_KEYBOARD_C128 and CONFIG_EDIT_TABULATORS
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
sta KEYD, y
inc NDX
// FALLTROUGH
; FALLTROUGH
scnkey_done:
@@ -428,46 +424,46 @@ scnkey_done:
scnkey_try_repeat:
#if !CONFIG_KEY_REPEAT_ALWAYS
!ifndef CONFIG_KEY_REPEAT_ALWAYS {
// 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
bmi scnkey_handle_repeat // branch if we should repeat always
bmi scnkey_handle_repeat ; branch if we should repeat always
tya
ldx #(__kb_matrix_alwaysrepeat_end - kb_matrix_alwaysrepeat - 1)
!:
@9:
cmp kb_matrix_alwaysrepeat, x
beq scnkey_handle_repeat
dex
bpl !-
bpl @9
bmi scnkey_done
scnkey_handle_repeat:
#endif // no CONFIG_KEY_REPEAT_ALWAYS
} ; no CONFIG_KEY_REPEAT_ALWAYS
// Countdown before first repeat
; Countdown before first repeat
lda DELAY
beq !+
beq @10
dec DELAY
rts
!:
// Countdown before subsequent repeats
@10:
; Countdown before subsequent repeats
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
rts
scnkey_early_repeat:
// Keyboard buffer was full - at least make sure the key
// will be repeated as soon as possible
; Keyboard buffer was full - at least make sure the key
; will be repeated as soon as possible
lda #$00
sta DELAY
@@ -475,4 +471,4 @@ scnkey_early_repeat:
rts
#endif // no CONFIG_LEGACY_SCNKEY
} ; no CONFIG_LEGACY_SCNKEY