various tape related fixes

c64/,,config_mega65.s

@@ -45,7 +45,7 @@
 #define CONFIG_IEC
 // #define CONFIG_IEC_JIFFYDOS    // please keep disabled for now
 // #define CONFIG_TAPE_NORMAL     // please keep disabled for now
-#define CONFIG_TAPE_TURBO
+// #define CONFIG_TAPE_TURBO
 // #define CONFIG_RS232_UP2400    // please keep disabled for now
 // #define CONFIG_RS232_UP9600    // please keep disabled for now
 
@@ -77,7 +77,7 @@
 
 #define CONFIG_PROGRAMMABLE_KEYS
 
-.const CONFIG_KEYCMD_RUN  = @"\$5FL"
+.const CONFIG_KEYCMD_RUN  = @"LOAD\"*\""
 
 .const CONFIG_KEYCMD_F1   = @"@"
 .const CONFIG_KEYCMD_F2   = @""
@@ -108,7 +108,7 @@
 
 #define CONFIG_PANIC_SCREEN
 #define CONFIG_DOS_WEDGE
-#define CONFIG_TAPE_WEDGE
+// #define CONFIG_TAPE_WEDGE
 #define CONFIG_BCD_SAFE_INTERRUPTS
 
 

c64/basic/commands/cmd_load.s

@@ -69,13 +69,13 @@ got_devicenumber:
 	lda #$00
 	sta SA
 	jsr injest_comma
-	bcs got_secondaryaddress
+	bcs cmd_load_got_secondaryaddress
 	jsr basic_parse_line_number
 	lda LINNUM+1
 	bne !+
 	lda LINNUM+0
 	sta SA
-	jmp got_secondaryaddress
+	jmp cmd_load_got_secondaryaddress
 !:
 	// Second parameter is above 255, this can't be a secondary address
 	// Use it as load address instead
@@ -85,7 +85,7 @@ got_devicenumber:
 	ldy LINNUM+1
 	bne got_loadaddress
 
-got_secondaryaddress:
+cmd_load_got_secondaryaddress: // input for tape wedge
 	ldy TXTTAB+1
 	ldx TXTTAB+0
 

c64/basic/wedge_tape.s

@@ -28,9 +28,7 @@ wedge_tape:
 	ldy TXTTAB+1
 	ldx TXTTAB+0
 
-	jsr JLOAD
-
-	jmp basic_main_loop
+	jmp cmd_load_got_secondaryaddress
 
 
 #endif // CONFIG_TAPE_WEDGE

c64/kernal/tape/load_tape_turbo.s

@@ -73,10 +73,7 @@ load_tape_turbo_payload:
 load_tape_turbo_loop:
 
 	jsr tape_turbo_get_byte
-
-	dec CPU_R6510                      // to load below I/O area
 	sta (STAL),y
-	inc CPU_R6510
 
 	eor PRTY                           // handle checksum
 	sta PRTY
@@ -126,7 +123,11 @@ tape_turbo_get_bit:
 	asl
 	sta SID_SIGVOL
 	beq !+
+#if CONFIG_COLORS_BRAND && CONFIG_BRAND_ULTIMATE_64
+	lda #$0B
+#else
 	lda #$06
+#endif
 !:
 	sta VIC_EXTCOL
 	pla

c64/kernal/tape/tape_common.s

@@ -300,7 +300,7 @@ tape_load_success:
 
 	jsr tape_screen_show_motor_off
 	jsr lvs_display_done
-!:
+
 	cli
 	jmp lvs_return_last_address