From 17fbf220db0ea7b3564f68a2d9b806a8861d0e47 Mon Sep 17 00:00:00 2001 From: FeralChild64 Date: Thu, 4 Jun 2020 22:41:47 +0200 Subject: [PATCH] initial head align tool adaptations for Mega65 ROM layout --- c64/kernal/board_m65/mega65_imports.s | 11 +++++++++++ c64/kernal/tape/tape_head_align.s | 12 ------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/c64/kernal/board_m65/mega65_imports.s b/c64/kernal/board_m65/mega65_imports.s index e09cabb0..25399d18 100644 --- a/c64/kernal/board_m65/mega65_imports.s +++ b/c64/kernal/board_m65/mega65_imports.s @@ -8,7 +8,11 @@ #import "KERNAL_0_combined.sym" +.label CLALL = KERNAL_0.CLALL .label STOP = KERNAL_0.STOP + +.label hw_entry_reset = KERNAL_0.hw_entry_reset +.label return_from_interrupt = KERNAL_0.return_from_interrupt .label clrchn_reset = KERNAL_0.clrchn_reset .label udtim_keyboard = KERNAL_0.udtim_keyboard @@ -55,3 +59,10 @@ .label tape_normal_byte_store = KERNAL_0.tape_normal_byte_store #endif + + +#if CONFIG_TAPE_HEAD_ALIGN + +.label nmi_lock = KERNAL_0.nmi_lock + +#endif diff --git a/c64/kernal/tape/tape_head_align.s b/c64/kernal/tape/tape_head_align.s index 756d9ec0..a5f05d70 100644 --- a/c64/kernal/tape/tape_head_align.s +++ b/c64/kernal/tape/tape_head_align.s @@ -1,5 +1,4 @@ // #LAYOUT# STD * #TAKE -// #LAYOUT# M65 KERNAL_0 #TAKE // #LAYOUT# M65 KERNAL_1 #TAKE // #LAYOUT# * * #IGNORE @@ -40,14 +39,6 @@ tape_head_align: -#if (ROM_LAYOUT_M65 && SEGMENT_KERNAL_0) - - jsr map_KERNAL_1 - jsr_ind VK1__tape_head_align - jmp map_NORMAL - -#else - // Make sure user really wants to launch the tool jsr tape_ask_play @@ -274,7 +265,4 @@ tape_head_align_quit: jmp hw_entry_reset -#endif // ROM layout - - #endif // CONFIG_TAPE_HEAD_ALIGN