Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[KERNAL] typematic preference apply fix, build relist fixes #358

Merged
merged 1 commit into from
Sep 2, 2024
Merged

[KERNAL] typematic preference apply fix, build relist fixes #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions kernal/cbm/editor.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ MODIFIER_SHIFT = 1

.export defcb

.import tpmcache, tpmflg

; screen driver
.import screen_mode
.import screen_set_charset
Expand Down Expand Up @@ -249,6 +251,12 @@ cint jsr iokeys
@l2
jsr kbd_config ;set keyboard layout

jsr fetch_typematic_from_nvram
KVARS_START_TRASH_X_NZ
sta tpmcache
stz tpmflg
KVARS_END_TRASH_X_NZ

lda #$c
sta blnct
sta blnsw
Expand Down Expand Up @@ -336,10 +344,10 @@ loop3
:

jsr fetch_typematic_from_nvram ; after toggle, new profile
bmi loop3b
tax
lda #6
jsr extapi
KVARS_START_TRASH_X_NZ
sta tpmcache
stz tpmflg
KVARS_END_TRASH_X_NZ

bra loop3b
scrpnc
Expand Down
4 changes: 3 additions & 1 deletion kernal/drivers/x16/ps2data.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ PS2DATA_NEW_STYLE = $02
LED_NUM_LOCK = 2

.import i2c_read_byte, i2c_read_first_byte, i2c_direct_read, i2c_read_next_byte, i2c_read_stop, i2c_write_byte
.import tpmflg, ledstate
.import tpmflg, tpmcache, ledstate

.export ps2data_init, ps2data_fetch, ps2data_kbd, ps2data_kbd_count, ps2data_mouse, ps2data_mouse_count
.export ps2data_keyboard_and_mouse, ps2data_keyboard_only, ps2data_raw
Expand Down Expand Up @@ -48,6 +48,8 @@ ps2data_init:

; Clear keyboard set typematic rate/delay flag
stz tpmflg
lda #$ab ; default (won't configure kbd because bit 7 is set)
sta tpmcache

; Set internal numlock state to defaults
lda #LED_NUM_LOCK
Expand Down
9 changes: 5 additions & 4 deletions kernal/drivers/x16/ps2kbd.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@

.export kbd_config, kbd_scan, receive_scancode_resume, keymap, ps2kbd_typematic
.export kbd_leds
.export tpmflg, ledstate
.export tpmflg, tpmcache, ledstate

.import extapi, fetch_typematic_from_nvram
.import extapi

I2C_ADDRESS = $42
I2C_KBD_ADDRESS = $43
Expand Down Expand Up @@ -78,6 +78,8 @@ dk_shift:
.res 1
dk_scan:
.res 1
tpmcache:
.res 1


.segment "KEYMAP"
Expand Down Expand Up @@ -285,9 +287,8 @@ _kbd_scan:

pha
phx
jsr fetch_typematic_from_nvram
ldx tpmcache
bmi @2
tax
lda #6
jsr extapi
@2: plx
Expand Down
6 changes: 3 additions & 3 deletions scripts/relist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ def get_segment_offset(self, segment_name):
# TODO: It's probably more efficient for scan map to return a map of all modules, not just the one we're interested during
# this iteration.
def scan_map(map_filename: str, lst_filename:str, segment_map:Dict[str,Segment], module_map:Dict[str,Module]):
segment_matcher = re.compile("^([A-Z][A-Z0-9_]*) *([0-9A-F]{6}) ([0-9A-F]{6}) ([0-9A-F]{6}) ([0-9A-F]{5})$", re.IGNORECASE)
lst_matcher = re.compile("^ ([A-Z][A-Z0-9_]*) *Offs=([0-9A-F]{6}) Size=([0-9A-F]{6}) Align=([0-9A-F]{5}) Fill=([0-9A-F]{4})$", re.IGNORECASE)
segment_matcher = re.compile(r"^([A-Z][A-Z0-9_]*) *([0-9A-F]{6}) ([0-9A-F]{6}) ([0-9A-F]{6}) ([0-9A-F]{5})$", re.IGNORECASE)
lst_matcher = re.compile(r"^ ([A-Z][A-Z0-9_]*) *Offs=([0-9A-F]{6}) Size=([0-9A-F]{6}) Align=([0-9A-F]{5}) Fill=([0-9A-F]{4})$", re.IGNORECASE)
obj_filename = f"{os.path.basename(os.path.splitext(lst_filename)[0])}.o:"

# print(f"Looking for {os.path.basename(os.path.splitext(lst_filename)[0])}.o")
Expand Down Expand Up @@ -86,7 +86,7 @@ def scan_map(map_filename: str, lst_filename:str, segment_map:Dict[str,Segment],
# print(f"Done reading {line_num} lines")
return segment_map, module_map

lst_matcher = re.compile("^([0-9A-F]{6})r \\d (\w\w | )(\w\w | )(\w\w | )(\w\w | )\s*$")
lst_matcher = re.compile(r"^([0-9A-F]{6})r \\d (\w\w | )(\w\w | )(\w\w | )(\w\w | )\s*$")
seg_matcher = re.compile(r'^\s*\.segment "([A-Z_][A-Z0-9_]*)"', re.IGNORECASE)
spc_matcher = re.compile(r'^\s*\.(bss|code|data|rodata|zeropage)(\s|$)', re.IGNORECASE)

Expand Down
18 changes: 9 additions & 9 deletions scripts/trace_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
cur_bank = 0 # Holds the bank of the line that is currently parsed

# Regex
segmentParser = re.compile("^[\s]*.segment[\s]+[\"\'][\w]+[\"\']", re.IGNORECASE)
memoryDefintionParser = re.compile("memory[\s]*\{[^\}]*\}", re.IGNORECASE)
segmentDefinitionParser = re.compile("segments[\s]*\{[^\}]*\}", re.IGNORECASE)
configLineParser = re.compile("[\w]+[\s]*:[^;]*;", re.IGNORECASE)
hexnumParser = re.compile("^\$[0-9a-f]+$", re.IGNORECASE)
hexnumParser2 = re.compile("^0x[0-9a-f]+$", re.IGNORECASE)
decnumParser = re.compile("^[0-9]+$", re.IGNORECASE)
labelParser = re.compile("^[\s]*[a-z]+[a-z0-9]*\:", re.IGNORECASE)
procParser = re.compile("^[\s]*.proc[\s]+", re.IGNORECASE)
segmentParser = re.compile(r"^[\s]*.segment[\s]+[\"\'][\w]+[\"\']", re.IGNORECASE)
memoryDefintionParser = re.compile(r"memory[\s]*\{[^\}]*\}", re.IGNORECASE)
segmentDefinitionParser = re.compile(r"segments[\s]*\{[^\}]*\}", re.IGNORECASE)
configLineParser = re.compile(r"[\w]+[\s]*:[^;]*;", re.IGNORECASE)
hexnumParser = re.compile(r"^\$[0-9a-f]+$", re.IGNORECASE)
hexnumParser2 = re.compile(r"^0x[0-9a-f]+$", re.IGNORECASE)
decnumParser = re.compile(r"^[0-9]+$", re.IGNORECASE)
labelParser = re.compile(r"^[\s]*[a-z]+[a-z0-9]*\:", re.IGNORECASE)
procParser = re.compile(r"^[\s]*.proc[\s]+", re.IGNORECASE)

# Converts string to number
# Accepted formats: decimal numbers, hexadecimal numbers (0xn or $n)
Expand Down
Loading