diff --git a/bin/mega65.rom b/bin/mega65.rom index 5366bfa0..b5b722db 100644 Binary files a/bin/mega65.rom and b/bin/mega65.rom differ diff --git a/bin/mega65_pxlfont.rom b/bin/mega65_pxlfont.rom index 4ba0dfa8..9afc3524 100644 Binary files a/bin/mega65_pxlfont.rom and b/bin/mega65_pxlfont.rom differ 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