From 2769b82858074eb63050ddf514b3e1976884326c Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Fri, 25 Sep 2020 15:29:04 +0200
Subject: [PATCH] attempt to workaround some problems on MEGA65 real hardware

---
 bin/mega65.rom                       | Bin 131072 -> 131072 bytes
 bin/mega65_pxlfont.rom               | Bin 131072 -> 131072 bytes
 src/,,config_mega65.s                |   4 ++--
 src/kernal/interrupts/hw_entry_nmi.s |   6 ++++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/bin/mega65.rom b/bin/mega65.rom
index 5366bfa02483d4b9464fd344aa2a370fc0589c00..b5b722dbb008d2d9b56cb5a874197f9996c035c0 100644
GIT binary patch
delta 3862
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
OpO*DhZ27l;f%<<9QnR)I

delta 3664
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

diff --git a/bin/mega65_pxlfont.rom b/bin/mega65_pxlfont.rom
index 4ba0dfa8ac9cc2d8910e4b4a189fc5d85a0aac69..9afc3524fcd0862946d358e7538d4d63a3be4384 100644
GIT binary patch
delta 3862
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
OpO*DhZ27l;f%<<9QnR)I

delta 3664
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

diff --git a/src/,,config_mega65.s b/src/,,config_mega65.s
index 54431853..95856675 100644
--- a/src/,,config_mega65.s
+++ b/src/,,config_mega65.s
@@ -51,8 +51,8 @@
 ;; #CONFIG# KEY_REPEAT_DEFAULT         NO
 ;; #CONFIG# KEY_REPEAT_ALWAYS          NO
 ;; #CONFIG# KEY_FAST_SCAN              YES
-;; #CONFIG# JOY1_CURSOR                YES
-;; #CONFIG# JOY2_CURSOR                YES
+;; #CONFIG# JOY1_CURSOR                NO
+;; #CONFIG# JOY2_CURSOR                NO
 
 ;; #CONFIG# PROGRAMMABLE_KEYS          YES
 
diff --git a/src/kernal/interrupts/hw_entry_nmi.s b/src/kernal/interrupts/hw_entry_nmi.s
index 68bd744f..006eb69d 100644
--- a/src/kernal/interrupts/hw_entry_nmi.s
+++ b/src/kernal/interrupts/hw_entry_nmi.s
@@ -14,11 +14,17 @@ hw_entry_nmi:
 
 	; Call interrupt routine (only if initialised)
 	pha
+
+!ifndef CONFIG_MB_M65 {      ; XXX temporarily disabled for MEGA65, seems to cause crash during startup - to be investigated
+
 	lda NMINV+1              ; consider zeropage NMI address as uninitialized vector
 	beq @1                   ; this allows safer interrupt vector modifications 
 	pla
 	jmp (NMINV)
 @1:
+
+}
+
 	; Vector not initialized - call default interrupt routine
 	pla
 	jmp default_nmi_handler