From de1e3af061dd3b343694a6e5dd01589d6e003209 Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Sat, 28 Nov 2020 18:04:20 +0100
Subject: [PATCH] started rework to fix MEGA65 extra keys

---
 Makefile                                | 1 +
 src/,,config_mega65.s                   | 2 ++
 src/kernal/keyboard/scnkey.s            | 6 ++++++
 src/kernal/keyboard_m65/mega65_scnkey.s | 7 +++++++
 4 files changed, 16 insertions(+)
 create mode 100644 src/kernal/keyboard_m65/mega65_scnkey.s

diff --git a/Makefile b/Makefile
index 523b5a52..fc5883ec 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,7 @@ SRCDIR_KERNAL  = $(SRCDIR_COMMON) \
                  src/kernal/iostack \
                  src/kernal/jumptable \
                  src/kernal/keyboard \
+                 src/kernal/keyboard_m65 \
                  src/kernal/memory \
                  src/kernal/print \
                  src/kernal/rom_revision \
diff --git a/src/,,config_mega65.s b/src/,,config_mega65.s
index 1796acfd..500ac99e 100644
--- a/src/,,config_mega65.s
+++ b/src/,,config_mega65.s
@@ -54,6 +54,8 @@
 ;; #CONFIG# JOY1_CURSOR                NO
 ;; #CONFIG# JOY2_CURSOR                NO
 
+;; #CONFIG# CONFIG_M65_KB_DEV          NO        ; for development, keep disabled
+
 ;; #CONFIG# PROGRAMMABLE_KEYS          YES
 
 ;; #CONFIG# KEYCMD_RUN                 "RUN"
diff --git a/src/kernal/keyboard/scnkey.s b/src/kernal/keyboard/scnkey.s
index 5560f22d..6c81c0ca 100644
--- a/src/kernal/keyboard/scnkey.s
+++ b/src/kernal/keyboard/scnkey.s
@@ -34,6 +34,12 @@
 
 SCNKEY:
 
+!ifdef CONFIG_MB_M65 { !ifdef CONFIG_M65_KB_DEV {
+
+	jsr M65_MODEGET
+	+bcc m65_scnkey
+} }
+
 	; Prepare for SHFLAG update
 
 	lda SHFLAG
diff --git a/src/kernal/keyboard_m65/mega65_scnkey.s b/src/kernal/keyboard_m65/mega65_scnkey.s
new file mode 100644
index 00000000..b8f32e75
--- /dev/null
+++ b/src/kernal/keyboard_m65/mega65_scnkey.s
@@ -0,0 +1,7 @@
+;; #LAYOUT# M65 KERNAL_0 #TAKE
+;; #LAYOUT# *   *        #IGNORE
+
+
+m65_scnkey:
+
+	rts