attempt to workaround some problems on MEGA65 real hardware

ssuukk · Sep 26, 2020 · 2769b82 · 2769b82
1 parent 4f8ec2f
commit 2769b82
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/bin/mega65.rom b/bin/mega65.rom
diff --git a/bin/mega65_pxlfont.rom b/bin/mega65_pxlfont.rom
diff --git 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
@@ -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