cleanup in tape support code

c64/kernal/tape/tape_normal_get_data_2.s

@@ -7,21 +7,7 @@
 //
 
 
-#if CONFIG_TAPE_NORMAL
-
-#if CONFIG_TAPE_NO_ERROR_CORRECTION
-
-
-tape_normal_get_data_2: // XXX implement under separate name
-
-	// Just validate the checksum
-
-	lda RIPRTY
-	cmp #$01
-	rts
-
-
-#else
+#if CONFIG_TAPE_NORMAL && !CONFIG_TAPE_NO_ERROR_CORRECTION
 
 
 tape_normal_get_data_2:
@@ -42,6 +28,11 @@ tape_normal_get_data_2:
 
 tape_normal_get_data_2_loop:
 
+	// Check if there are missing bytes to read
+	lda PTR1
+	cmp PTR2
+	beq tape_normal_get_data_2_log_checksum      // branch if no more errors to correct
+
 	// Read missing bytes
 
 	jsr tape_normal_get_byte
@@ -106,16 +97,8 @@ tape_normal_get_data_2_done:
 	rts
 
 
-
 load_cmp_log_MEMUSS:
 
-	lda PTR1 // XXX this comparison can be probably moved somewhere else
-	cmp PTR2
-	bne !+
-
-	lda #$01                                     // to clear Zero flag
-	rts
-!:
 	ldx PTR2
 	lda STACK+0, x
 	cmp MEMUSS+0
@@ -135,6 +118,3 @@ load_cmp_log_MEMUSS:
 
 
 #endif
-
-
-#endif