From cf8b8f3f887feb5b10912534c9f229bd47cac9a6 Mon Sep 17 00:00:00 2001 From: FeralChild64 Date: Wed, 27 Nov 2019 20:28:35 +0100 Subject: [PATCH] small IEC fixes --- c64/kernal/iec/iec_jiffydos.s | 8 ++++---- c64/kernal/iec/iec_send_file_name.s | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/c64/kernal/iec/iec_jiffydos.s b/c64/kernal/iec/iec_jiffydos.s index ac2ca272..296357a7 100644 --- a/c64/kernal/iec/iec_jiffydos.s +++ b/c64/kernal/iec/iec_jiffydos.s @@ -66,8 +66,8 @@ __jd_check1: pla // retrieve high nibble from stack ora C3PO // restore VIC-II and RS-232 bits sta CIA2_PRA // bits 4 and 5 on CLK/DATA - ror // move bits 6 and 7 to positions 4 and 5 - ror + lsr // move bits 6 and 7 to positions 4 and 5 + lsr and #%00110000 // clear everything but CLK/DATA ora C3PO sta CIA2_PRA // bits 6 and 7 on CLK/DATA @@ -112,7 +112,7 @@ iec_tx_byte_jiffydos_finalize: iec_tx_byte_jiffydos_wait_eoi: - jsr iec_wait60us + jsr iec_wait20us // XXX is it enough? wait60us damages .Y, so it cannot be used here lda C3PO jmp iec_tx_byte_jiffydos_finalize @@ -196,7 +196,7 @@ jiffydos_wait_line: cmp #$2E bcc jiffydos_wait_line_done // we are safe, border - lot of time till badline !: - lda VIC_RASTER // carry is definitely set here! + lda VIC_RASTER // carry+ is definitely set here! sbc VIC_SCROLY and #$07 // we want 8 lowest bits cmp #$06 diff --git a/c64/kernal/iec/iec_send_file_name.s b/c64/kernal/iec/iec_send_file_name.s index de266cfc..7530f7a0 100644 --- a/c64/kernal/iec/iec_send_file_name.s +++ b/c64/kernal/iec/iec_send_file_name.s @@ -38,8 +38,7 @@ iec_send_file_name_loop: jmp iec_send_file_name_loop iec_send_file_name_done: - jsr UNLSN - rts + jmp UNLSN #endif // CONFIG_IEC