From cda4c7b0d3e4842096a6c9e3bd5c9cfce67563c9 Mon Sep 17 00:00:00 2001 From: FeralChild64 Date: Fri, 28 Aug 2020 20:09:53 +0200 Subject: [PATCH] fix for programmable keys in MEGA65 native mode --- src/kernal/board_m65/mega65_proxies.s | 2 +- src/kernal/screen_m65/mega65_chrin_keyboard.s | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/kernal/board_m65/mega65_proxies.s b/src/kernal/board_m65/mega65_proxies.s index 3120e933..1c64dfb5 100644 --- a/src/kernal/board_m65/mega65_proxies.s +++ b/src/kernal/board_m65/mega65_proxies.s @@ -9,7 +9,7 @@ proxy_K1_chrin_programmable_keys: jsr map_NORMAL - jsr CHROUT + jsr chrin_programmable_keys jmp_8 !+ proxy_K1_CHROUT: diff --git a/src/kernal/screen_m65/mega65_chrin_keyboard.s b/src/kernal/screen_m65/mega65_chrin_keyboard.s index 61894679..14ade3dc 100644 --- a/src/kernal/screen_m65/mega65_chrin_keyboard.s +++ b/src/kernal/screen_m65/mega65_chrin_keyboard.s @@ -159,9 +159,8 @@ m65_chrin_keyboard_not_enter: #if CONFIG_PROGRAMMABLE_KEYS - // XXX do not work yet - //jsr chrin_programmable_keys - //bcc m65_chrin_keyboard_enter + jsr chrin_programmable_keys + bcc m65_chrin_keyboard_enter #endif // CONFIG_PROGRAMMABLE_KEYS @@ -169,4 +168,3 @@ m65_chrin_keyboard_not_enter: jsr CHROUT jsr pop_keyboard_buffer jmp m65_chrin_keyboard_repeat -