diff --git a/src/dos_m65/dev_floppy/dev_fd_cmd_open.s b/src/dos_m65/dev_floppy/dev_fd_cmd_open.s index 1358ab93..8029650e 100644 --- a/src/dos_m65/dev_floppy/dev_fd_cmd_open.s +++ b/src/dos_m65/dev_floppy/dev_fd_cmd_open.s @@ -14,4 +14,4 @@ dev_fd_cmd_OPEN_EOI: ; XXX provide implementation - jmp dos_EXIT + jmp dos_EXIT_CLC diff --git a/src/dos_m65/dev_ramdisk/dev_rd_cmd_open.s b/src/dos_m65/dev_ramdisk/dev_rd_cmd_open.s index 50d2c5f7..4e2b436e 100644 --- a/src/dos_m65/dev_ramdisk/dev_rd_cmd_open.s +++ b/src/dos_m65/dev_ramdisk/dev_rd_cmd_open.s @@ -14,4 +14,4 @@ dev_rd_cmd_OPEN_EOI: ; XXX provide implementation - jmp dos_EXIT + jmp dos_EXIT_CLC diff --git a/src/dos_m65/dev_sdcard/dev_sd_cmd_close.s b/src/dos_m65/dev_sdcard/dev_sd_cmd_close.s index af8ca747..9d0c23da 100644 --- a/src/dos_m65/dev_sdcard/dev_sd_cmd_close.s +++ b/src/dos_m65/dev_sdcard/dev_sd_cmd_close.s @@ -8,4 +8,4 @@ dev_sd_cmd_CLOSE: ; XXX provide implementation - jmp dos_EXIT + jmp dos_EXIT_CLC diff --git a/src/dos_m65/dev_sdcard/dev_sd_cmd_open.s b/src/dos_m65/dev_sdcard/dev_sd_cmd_open.s index a5680640..0d75c87b 100644 --- a/src/dos_m65/dev_sdcard/dev_sd_cmd_open.s +++ b/src/dos_m65/dev_sdcard/dev_sd_cmd_open.s @@ -9,7 +9,7 @@ dev_sd_cmd_OPEN: lda #$01 ; mode: receive command or file name sta SD_MODE - jmp dos_EXIT + jmp dos_EXIT_CLC dev_sd_cmd_OPEN_EOI: diff --git a/src/dos_m65/dev_sdcard/fs_hvsr_read_dir.s b/src/dos_m65/dev_sdcard/fs_hvsr_read_dir.s index 554e2086..91bb422e 100644 --- a/src/dos_m65/dev_sdcard/fs_hvsr_read_dir.s +++ b/src/dos_m65/dev_sdcard/fs_hvsr_read_dir.s @@ -42,7 +42,7 @@ fs_hvsr_read_dir_open: ; End - jmp dos_EXIT + jmp dos_EXIT_CLC fs_hvsr_read_dir: diff --git a/src/dos_m65/dev_sdcard/fs_hvsr_read_file.s b/src/dos_m65/dev_sdcard/fs_hvsr_read_file.s index 0f8ad418..ae50062c 100644 --- a/src/dos_m65/dev_sdcard/fs_hvsr_read_file.s +++ b/src/dos_m65/dev_sdcard/fs_hvsr_read_file.s @@ -53,7 +53,7 @@ fs_hvsr_read_file_open: - jmp dos_EXIT + jmp dos_EXIT_CLC fs_hvsr_file_not_found: @@ -68,4 +68,5 @@ fs_hvsr_file_not_found: lda #39 ; file not found error jsr util_status_SD - jmp dos_EXIT_SEC + lda #K_ERR_FILE_NOT_FOUND + jmp dos_EXIT_SEC_A diff --git a/src/dos_m65/dos_enter_exit.s b/src/dos_m65/dos_enter_exit.s index f05635e9..a44c681e 100644 --- a/src/dos_m65/dos_enter_exit.s +++ b/src/dos_m65/dos_enter_exit.s @@ -20,32 +20,32 @@ dos_ENTER: ; enter DOS context dos_EXIT_SEC: ; exit DOS context with Carry set sec - bra dos_EXIT_common + bra dos_EXIT -dos_EXIT: ; exit DOS context with Carry clear +dos_EXIT_CLC: ; exit DOS context with Carry clear clc ; FALLTROUGH -dos_EXIT_common: +dos_EXIT: lda REG_A - bra dos_EXIT_A_common + bra dos_EXIT_A -dos_EXIT_A_SEC: ; exit DOS context with Carry set, return .A +dos_EXIT_SEC_A: ; exit DOS context with Carry set, return .A sec - bra dos_EXIT_A_common + bra dos_EXIT_A -dos_EXIT_A: ; exit DOS context with Carry clear, return .A +dos_EXIT_CLC_A: ; exit DOS context with Carry clear, return .A clc ; FALLTROUGH -dos_EXIT_A_common: +dos_EXIT_A: ldz REG_Z ldy REG_Y diff --git a/src/dos_m65/dos_unitchk.s b/src/dos_m65/dos_unitchk.s index 610f617d..b14c09f9 100644 --- a/src/dos_m65/dos_unitchk.s +++ b/src/dos_m65/dos_unitchk.s @@ -47,4 +47,4 @@ dos_UNITCHK_ramdisk: lda #$02 - jmp dos_EXIT_A + jmp dos_EXIT_CLC_A diff --git a/src/dos_m65/dos_unitnum.s b/src/dos_m65/dos_unitnum.s index 3acd1a4e..06857073 100644 --- a/src/dos_m65/dos_unitnum.s +++ b/src/dos_m65/dos_unitnum.s @@ -30,7 +30,7 @@ dos_UNITNUM_fail: lda #$00 - jmp dos_EXIT_A_SEC + jmp dos_EXIT_SEC_A dos_UNITNUM_sdcard: @@ -53,4 +53,4 @@ dos_UNITNUM_common: cmp #$00 beq dos_UNITNUM_fail - jmp dos_EXIT_A + jmp dos_EXIT_CLC_A diff --git a/src/dos_m65/dos_unitset.s b/src/dos_m65/dos_unitset.s index e57c29eb..a82e6316 100644 --- a/src/dos_m65/dos_unitset.s +++ b/src/dos_m65/dos_unitset.s @@ -46,4 +46,4 @@ dos_UNITSET_ramdisk: stx UNIT_RAMDISK - jmp dos_EXIT + jmp dos_EXIT_CLC diff --git a/src/dos_m65/msg_acptr.s b/src/dos_m65/msg_acptr.s index 0d73ae4d..e3bffd87 100644 --- a/src/dos_m65/msg_acptr.s +++ b/src/dos_m65/msg_acptr.s @@ -60,7 +60,7 @@ msg_ACPTR_read_SD: bcc @3 jsr kernalstatus_EOI @3: - jmp dos_EXIT + jmp dos_EXIT_CLC msg_ACPTR_read_FD: @@ -113,7 +113,7 @@ msg_ACPTR_status_got: sta TBTCNT ; byte return beq msg_ACPTR_reset_status - jmp dos_EXIT_A + jmp dos_EXIT_CLC_A msg_ACPTR_fail_no_talker: @@ -134,7 +134,7 @@ msg_ACPTR_reset_status: msg_ACPTR_EOI: jsr kernalstatus_EOI - jmp dos_EXIT + jmp dos_EXIT_CLC ; Vector tables for jumps diff --git a/src/dos_m65/msg_ciout.s b/src/dos_m65/msg_ciout.s index e1539f70..56ec372a 100644 --- a/src/dos_m65/msg_ciout.s +++ b/src/dos_m65/msg_ciout.s @@ -34,7 +34,7 @@ msg_CIOUT_fail: ; XXX should we set status? lda #K_ERR_DEVICE_NOT_FOUND - jmp dos_EXIT_A_SEC + jmp dos_EXIT_SEC_A @@ -53,7 +53,7 @@ msg_CIOUT_cmdfn_SD: ; get next byte of status - SD card sta SD_CMDFN_BUF,x plp +bcs dev_sd_cmd_OPEN_EOI ; if EOI - execute command - jmp dos_EXIT + jmp dos_EXIT_CLC msg_CIOUT_cmdfn_FD: ; get next byte of status - floppy @@ -68,7 +68,7 @@ msg_CIOUT_cmdfn_FD: ; get next byte of status - floppy sta FD_CMDFN_BUF,x plp +bcs dev_fd_cmd_OPEN_EOI ; if EOI - execute command - jmp dos_EXIT + jmp dos_EXIT_CLC msg_CIOUT_cmdfn_RD: ; get next byte of status - ram disk @@ -83,7 +83,7 @@ msg_CIOUT_cmdfn_RD: ; get next byte of status - ram disk sta RD_CMDFN_BUF,x plp +bcs dev_rd_cmd_OPEN_EOI ; if EOI - execute command - jmp dos_EXIT + jmp dos_EXIT_CLC msg_CIOUT_cmdfn_vectab: diff --git a/src/dos_m65/msg_listen.s b/src/dos_m65/msg_listen.s index ee0e2d79..b8c3f3a8 100644 --- a/src/dos_m65/msg_listen.s +++ b/src/dos_m65/msg_listen.s @@ -45,10 +45,10 @@ msg_LISTEN_success: ; XXX should we reset XX_CMDFN_IDX ? - jmp dos_EXIT + jmp dos_EXIT_CLC msg_LISTEN_fail: lda #K_ERR_DEVICE_NOT_FOUND - jmp dos_EXIT_A_SEC + jmp dos_EXIT_SEC_A diff --git a/src/dos_m65/msg_second.s b/src/dos_m65/msg_second.s index febd686e..c0481254 100644 --- a/src/dos_m65/msg_second.s +++ b/src/dos_m65/msg_second.s @@ -34,7 +34,7 @@ msg_SECOND: msg_SECOND_done: - jmp dos_EXIT + jmp dos_EXIT_CLC msg_SECOND_OPEN: diff --git a/src/dos_m65/msg_talk.s b/src/dos_m65/msg_talk.s index 24381ecb..28bb56e2 100644 --- a/src/dos_m65/msg_talk.s +++ b/src/dos_m65/msg_talk.s @@ -43,10 +43,10 @@ msg_TALK_success: asl sta IDX2_TALKER - jmp dos_EXIT + jmp dos_EXIT_CLC msg_TALK_fail: lda #K_ERR_DEVICE_NOT_FOUND - jmp dos_EXIT_A_SEC + jmp dos_EXIT_SEC_A diff --git a/src/dos_m65/msg_tksa.s b/src/dos_m65/msg_tksa.s index 9df0a4ca..018a0f62 100644 --- a/src/dos_m65/msg_tksa.s +++ b/src/dos_m65/msg_tksa.s @@ -19,4 +19,4 @@ msg_TKSA: msg_TKSA_done: - jmp dos_EXIT + jmp dos_EXIT_CLC diff --git a/src/dos_m65/msg_unlsn_untlk.s b/src/dos_m65/msg_unlsn_untlk.s index a61a7993..5bf9030b 100644 --- a/src/dos_m65/msg_unlsn_untlk.s +++ b/src/dos_m65/msg_unlsn_untlk.s @@ -13,7 +13,7 @@ msg_UNLSN: sta IDX1_LISTENER sta IDX2_LISTENER - jmp dos_EXIT + jmp dos_EXIT_CLC msg_UNTLK: @@ -22,4 +22,4 @@ msg_UNTLK: sta IDX1_TALKER sta IDX2_TALKER - jmp dos_EXIT + jmp dos_EXIT_CLC