for CRT ROM layout, moved tape support to external ROM

src/,,config_generic_crt.s

@@ -109,7 +109,7 @@
 ;; #CONFIG# PANIC_SCREEN               YES
 ;; #CONFIG# DOS_WEDGE                  YES
 ;; #CONFIG# TAPE_WEDGE                 YES
-;; #CONFIG# TAPE_HEAD_ALIGN            NO
+;; #CONFIG# TAPE_HEAD_ALIGN            YES
 ;; #CONFIG# BCD_SAFE_INTERRUPTS        YES
 
 

src/basic/board_m65/4000.interop

@@ -0,0 +1 @@
+This particular address is not for interoperability - we had to choose some fixed location for the extended ROM jumptable, beginning of the mapped memory block is just sane.

src/kernal/board_crt/8000.crt_vectable_kernal_1.s

@@ -0,0 +1,40 @@
+;; #LAYOUT# CRT KERNAL_0 #TAKE-FLOAT
+;; #LAYOUT# CRT KERNAL_1 #TAKE
+;; #LAYOUT# *   *        #IGNORE
+
+;
+; Definitions for communication with cartridge segment KERNAL_1 from KERNAL_0
+;
+
+
+!ifdef SEGMENT_KERNAL_0 {
+
+	; Label definitions
+
+	!addr JK1__load_tape_normal          = $8000 + 3 * 0
+	!addr JK1__load_tape_turbo           = $8000 + 3 * 1
+	!addr JK1__load_tape_auto            = $8000 + 3 * 2
+	!addr JK1__tape_head_align           = $8000 + 3 * 3
+
+} else {
+
+	; Jump table (Open ROMs private!)
+
+!ifdef CONFIG_TAPE_NORMAL { !ifndef CONFIG_TAPE_AUTODETECT {
+	jmp load_tape_normal
+} else { !byte $00, $00, $00 } } else { !byte $00, $00, $00 }
+
+!ifdef CONFIG_TAPE_TURBO { !ifndef CONFIG_TAPE_AUTODETECT {
+	jmp load_tape_turbo
+} else { !byte $00, $00, $00 } } else { !byte $00, $00, $00 }
+
+!ifdef CONFIG_TAPE_AUTODETECT {
+	jmp load_tape_auto
+} else { !byte $00, $00, $00 }
+
+!ifdef CONFIG_TAPE_HEAD_ALIGN {
+	jmp tape_head_align
+} else { !byte $00, $00, $00 }
+
+
+}

src/kernal/board_crt/8000.interop

@@ -0,0 +1 @@
+This particular address is not for interoperability - we had to choose some fixed location for the extended ROM jumptable, beginning of the mapped memory block is just sane.

src/kernal/board_crt/crt_imports.s

@@ -0,0 +1,49 @@
+;; #LAYOUT# CRT KERNAL_1 #TAKE
+;; #LAYOUT# *   *        #IGNORE
+
+;; #IMPORT# KERNAL_0 = KERNAL_0_combined.sym
+
+;
+; Definitions for calling cartridge segment KERNAL_0 routines from KERNAL_1
+;
+
+;; #ALIAS# STOP                            = KERNAL_0.STOP
+;; #ALIAS# IOINIT                          = KERNAL_0.proxy_K1_IOINIT
+;; #ALIAS# xxx                             = KERNAL_0.xxx
+
+;; #ALIAS# map_NORMAL                      = KERNAL_0.map_NORMAL
+;; #ALIAS# map_KERNAL_1                    = KERNAL_0.map_KERNAL_1
+
+;; #ALIAS# screen_on                       = KERNAL_0.screen_on
+;; #ALIAS# screen_off                      = KERNAL_0.screen_off
+
+;; #ALIAS# hw_entry_reset                  = KERNAL_0.hw_entry_reset
+;; #ALIAS# return_from_interrupt           = KERNAL_0.return_from_interrupt
+;; #ALIAS# udtim_keyboard                  = KERNAL_0.udtim_keyboard
+;; #ALIAS# wait_x_bars                     = KERNAL_0.wait_x_bars
+
+;; #ALIAS# tape_motor_on                   = KERNAL_0.tape_motor_on
+;; #ALIAS# tape_motor_off                  = KERNAL_0.tape_motor_off
+
+;; #ALIAS# lvs_display_loading_verifying   = KERNAL_0.proxy_K1_lvs_display_loading_verifying
+;; #ALIAS# lvs_display_done                = KERNAL_0.proxy_K1_lvs_display_done
+;; #ALIAS# lvs_return_last_address         = KERNAL_0.proxy_K1_lvs_return_last_address
+;; #ALIAS# lvs_device_not_found_error      = KERNAL_0.proxy_K1_lvs_device_not_found_error
+;; #ALIAS# lvs_load_verify_error           = KERNAL_0.proxy_K1_lvs_load_verify_error
+;; #ALIAS# lvs_check_EAL                   = KERNAL_0.lvs_check_EAL
+;; #ALIAS# lvs_STAL_to_MEMUSS              = KERNAL_0.lvs_STAL_to_MEMUSS
+;; #ALIAS# lvs_advance_MEMUSS              = KERNAL_0.lvs_advance_MEMUSS
+
+;; #ALIAS# kernalerror_ROUTINE_TERMINATED  = KERNAL_0.proxy_K1_kernalerror_ROUTINE_TERMINATED
+
+;; #ALIAS# print_kernal_message            = KERNAL_0.proxy_K1_print_kernal_message
+;; #ALIAS# print_return                    = KERNAL_0.proxy_K1_print_return
+
+;; #ALIAS# __MSG_KERNAL_PRESS_PLAY         = KERNAL_0.__MSG_KERNAL_PRESS_PLAY
+;; #ALIAS# __MSG_KERNAL_OK                 = KERNAL_0.__MSG_KERNAL_OK
+;; #ALIAS# __MSG_KERNAL_FOUND              = KERNAL_0.__MSG_KERNAL_FOUND
+
+;; #ALIAS# tape_normal_byte_store          = KERNAL_0.tape_normal_byte_store
+
+;; #ALIAS# CLALL                           = KERNAL_0.proxy_K1_CLALL
+;; #ALIAS# nmi_lock                        = KERNAL_0.nmi_lock

src/kernal/board_crt/crt_proxies.s

@@ -0,0 +1,72 @@
+;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# *   *        #IGNORE
+
+;
+; Proxies for calling cartridge segment KERNAL_0 routines from KERNAL_1
+;
+
+
+
+!ifdef HAS_TAPE {
+
+proxy_K1_kernalerror_ROUTINE_TERMINATED:
+
+	jsr map_NORMAL
+	jmp kernalerror_ROUTINE_TERMINATED
+
+proxy_K1_lvs_display_loading_verifying:
+
+	jsr map_NORMAL
+	jsr lvs_display_loading_verifying
+	jmp map_KERNAL_1
+
+proxy_K1_lvs_display_done:
+
+	jsr map_NORMAL
+	jsr lvs_display_done
+	jmp map_KERNAL_1
+
+proxy_K1_lvs_return_last_address:
+
+	jsr map_NORMAL
+	jmp lvs_return_last_address
+
+proxy_K1_lvs_device_not_found_error:
+
+	jsr map_NORMAL
+	jmp lvs_device_not_found_error
+
+proxy_K1_lvs_load_verify_error:
+
+	jsr map_NORMAL
+	jmp lvs_load_verify_error
+
+proxy_K1_print_kernal_message:
+
+	jsr map_NORMAL
+	jsr print_kernal_message
+	jmp map_KERNAL_1
+
+proxy_K1_print_return:
+
+	jsr map_NORMAL
+	jsr print_return
+	jmp map_KERNAL_1
+}
+
+
+!ifdef CONFIG_TAPE_HEAD_ALIGN {
+
+proxy_K1_CLALL:
+
+	jsr map_NORMAL
+	jsr CLALL
+	jmp map_KERNAL_1
+
+proxy_K1_IOINIT:
+
+	jsr map_NORMAL
+	jsr IOINIT
+	jmp map_KERNAL_1
+
+}

src/kernal/board_crt/crt_redirect_tape.s

@@ -0,0 +1,46 @@
+;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# *   *        #IGNORE
+
+;
+; ROM routine call redirect for tape routines
+;
+
+
+!ifdef CONFIG_TAPE_NORMAL { !ifndef CONFIG_TAPE_AUTODETECT {
+
+load_tape_normal:
+
+	jsr map_KERNAL_1
+	jsr JK1__load_tape_normal
+	jmp map_NORMAL
+} }
+
+
+!ifdef CONFIG_TAPE_TURBO { !ifndef CONFIG_TAPE_AUTODETECT {
+
+load_tape_turbo:
+
+	jsr map_KERNAL_1
+	jsr JK1__load_tape_turbo
+	jmp map_NORMAL
+} }
+
+
+!ifdef CONFIG_TAPE_AUTODETECT {
+
+load_tape_auto:
+
+	jsr map_KERNAL_1
+	jsr JK1__load_tape_auto
+	jmp map_NORMAL
+}
+
+
+!ifdef CONFIG_TAPE_HEAD_ALIGN {
+
+tape_head_align:
+
+	jsr map_KERNAL_1
+	jsr JK1__tape_head_align
+	jmp map_NORMAL
+}

src/kernal/board_crt/crt_tape_normal_byte_store.s

@@ -0,0 +1,17 @@
+;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# *   *        #IGNORE
+
+;
+; Tape (normal) helper routine - byte storage when banking change is needed
+;
+
+
+!ifdef CONFIG_TAPE_NORMAL {
+
+
+tape_normal_byte_store:
+
+	jsr map_NORMAL
+	sta (MEMUSS), y
+	jmp map_KERNAL_1
+}

src/kernal/board_crt/dummy.s

@@ -1,4 +0,0 @@
-;; #LAYOUT# CRT KERNAL_1 #TAKE
-;; #LAYOUT# *   *        #IGNORE
-
-	+nop

src/kernal/board_m65/4000.interop

@@ -1 +1 @@
-This particular address is not for interoperability - we had to choose some fixed location foor the extended ROM jumptable, beginning of the mapped memory block is just sane.
+This particular address is not for interoperability - we had to choose some fixed location for the extended ROM jumptable, beginning of the mapped memory block is just sane.

src/kernal/board_m65/4000.mega65_vectable_kernal_1.s

@@ -43,7 +43,6 @@
 	!word load_tape_turbo
 } else { !word $0000 } } else { !word $0000 }
 
-
 !ifdef CONFIG_TAPE_AUTODETECT {
 	!word load_tape_auto
 } else { !word $0000 }

src/kernal/tape/load_tape_normal.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/load_tape_turbo.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_common.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_common_autodetect.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_common_clean_sid.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_common_ditch_verify.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_common_get_pulse.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_common_prepare_cia.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_common_screen.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_head_align.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_head_align_gen_code.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_head_align_get_pulse.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_head_align_help.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_head_align_irq.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_normal_calibrate.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_normal_get_bit.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_normal_get_byte.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_normal_get_data_1.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_normal_get_data_2.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_normal_get_marker.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_normal_get_pilot.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_normal_sync.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_normal_update_checksum.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_turbo_bytestore.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 
@@ -21,6 +21,8 @@
 
 !ifdef CONFIG_MB_M65 {
 !addr __tape_turbo_bytestore_defmap  = __tape_turbo_bytestore + 10
+} else ifdef ROM_LAYOUT_CRT {
+!addr __tape_turbo_bytestore_defmap  = __tape_turbo_bytestore + 12
 } else {
 !addr __tape_turbo_bytestore_defmap  = __tape_turbo_bytestore + 7
 }
@@ -31,8 +33,11 @@ tape_turbo_bytestore_source:
 
 !ifdef CONFIG_MB_M65 {
 	jsr map_NORMAL
+} else ifdef ROM_LAYOUT_CRT {
+	; 'jsr map_NORMAL' would take too much time
+	ldx #%00000010
+	stx $DE00
 }
-
 	; Set all memory as RAM, tape motor ON
 	ldx #$00
 	stx CPU_R6510
@@ -41,12 +46,17 @@ tape_turbo_bytestore_source:
 	sta (MEMUSS), y
 
 	; Restore default memory layout
-	ldx #$00                           ; value will be determined later, offset from start: 7 bytes
+	ldx #$00                           ; value will be determined later, offset from start: 7/10/12 bytes
 	stx CPU_R6510
 
 !ifdef CONFIG_MB_M65 {
 	; Restore default map and quit
 	jmp map_KERNAL_1
+} else ifdef ROM_LAYOUT_CRT {
+	; Restore default map and quit; 'jsr map_KERNAL_1' would take too much time
+	ldx #%00010000
+	stx $DE00
+	rts
 } else {
 	; Go back
 	rts

src/kernal/tape/tape_turbo_get_bit.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_turbo_get_byte.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_turbo_sync.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE
 

src/kernal/tape/tape_turbo_sync_first.s

@@ -1,5 +1,5 @@
 ;; #LAYOUT# STD *        #TAKE
-;; #LAYOUT# CRT KERNAL_0 #TAKE
+;; #LAYOUT# CRT KERNAL_1 #TAKE
 ;; #LAYOUT# M65 KERNAL_1 #TAKE
 ;; #LAYOUT# *   *        #IGNORE