diff --git a/src/basic/basic_commands/cmd_rem.s b/src/basic/basic_commands/cmd_rem.s index 8b9bc74f..9a4cf91c 100644 --- a/src/basic/basic_commands/cmd_rem.s +++ b/src/basic/basic_commands/cmd_rem.s @@ -7,11 +7,6 @@ cmd_rem: - lda LSTX - jsr print_hex_byte - jmp cmd_rem - - ; XXX do we need these PHA's? pha diff --git a/src/kernal/keyboard_m65/mega65_scnkey.s b/src/kernal/keyboard_m65/mega65_scnkey.s index 0153811e..deae8815 100644 --- a/src/kernal/keyboard_m65/mega65_scnkey.s +++ b/src/kernal/keyboard_m65/mega65_scnkey.s @@ -345,17 +345,20 @@ m65_scnkey_add_if_new_valid: cmp #$FF ; invalid key code beq @1 - ; XXX filter-out SHIFT, VENDOR, etc. - ;cmp $xx ; left SHIFT - ;beq @1 - ;cmp $xx ; right SHIFT - ;beq @1 - ;cmp $xx ; VENDOR - ;beq @1 - ;cmp $xx ; CAPS LOCK - ;beq @1 - ;cmp $xx ; ALT - ;beq @1 + ; Filter-out SHIFT, VENDOR, etc. + + cmp #$0F ; left SHIFT + beq @1 + cmp #$34 ; right SHIFT + beq @1 + cmp #$3A ; CONTROL + beq @1 + cmp #$3D ; VENDOR + beq @1 + cmp #$40 ; NO SCROLL + beq @1 + cmp #$42 ; ALT + beq @1 ; New, valid key index