From 8fdeda81dee50a9a8359058cc5e99cd73fdaedd1 Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Sun, 14 Feb 2021 13:51:20 +0100
Subject: [PATCH] CBDOS fixes

---
 src/dos_m65/dev_sdcard/dev_sd_cmd_open.s |  6 +++---
 src/dos_m65/dos_imports.s                |  2 ++
 src/dos_m65/msg_ciout.s                  | 16 ++++++++++------
 3 files changed, 15 insertions(+), 9 deletions(-)

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 25a0575a..5a043e60 100644
--- a/src/dos_m65/dev_sdcard/dev_sd_cmd_open.s
+++ b/src/dos_m65/dev_sdcard/dev_sd_cmd_open.s
@@ -18,7 +18,7 @@ dev_sd_cmd_OPEN_EOI:
 	; XXX add support for second card
 
 	lda SD_CMDFN_BUF
-	cmp '$'
+	cmp #'$'
 	beq dev_sd_cmd_OPEN_dir
 
 	; XXX implement for file names
@@ -38,9 +38,9 @@ dev_sd_cmd_OPEN_dir:
 	; Provide pointer and length of the header
 
 	lda #$20
-	sta SD_ACPTR_PTR+0
+	sta SD_ACPTR_LEN+0
 	lda #$00
-	sta SD_ACPTR_PTR+1
+	sta SD_ACPTR_LEN+1
 
 	lda #<dir_hdr_sd
 	sta SD_ACPTR_PTR+0
diff --git a/src/dos_m65/dos_imports.s b/src/dos_m65/dos_imports.s
index 6c427057..00e611ae 100644
--- a/src/dos_m65/dos_imports.s
+++ b/src/dos_m65/dos_imports.s
@@ -5,6 +5,8 @@
 ; Definitions for calling MEGA65 segment KERNAL_0 routines from DOS_1
 ;
 
+;; #ALIAS# MONITOR                         = KERNAL_0.MONITOR
+
 ;; #ALIAS# kernalstatus_EOI                = KERNAL_0.kernalstatus_EOI
 ;; #ALIAS# kernalstatus_DEVICE_NOT_FOUND   = KERNAL_0.kernalstatus_DEVICE_NOT_FOUND
 
diff --git a/src/dos_m65/msg_ciout.s b/src/dos_m65/msg_ciout.s
index 3885020c..525213e5 100644
--- a/src/dos_m65/msg_ciout.s
+++ b/src/dos_m65/msg_ciout.s
@@ -21,6 +21,7 @@ msg_CIOUT:
 	; Receiving command or file name
 
 	ldx IDX2_LISTENER
+	lda REG_A
 	jmp (msg_CIOUT_cmdfn_vectab, X)
 @1:
 	; XXX handle cases of transferring data
@@ -42,13 +43,14 @@ msg_CIOUT_fail:
 msg_CIOUT_cmdfn_SD:                    ; get next byte of status - SD card
 
 	ldx SD_CMDFN_IDX
-	sta SD_CMDFN_IDX,x
+	sta SD_CMDFN_BUF,x
 	inx
 	bpl @1
 	ldx #$7F
 @1:
+	sta SD_CMDFN_IDX
 	lda #$00
-	sta SD_CMDFN_IDX,x
+	sta SD_CMDFN_BUF,x
 	plp
 	+bcs dev_sd_cmd_OPEN_EOI           ; if EOI - execute command
 	jmp dos_EXIT
@@ -56,13 +58,14 @@ msg_CIOUT_cmdfn_SD:                    ; get next byte of status - SD card
 msg_CIOUT_cmdfn_FD:                    ; get next byte of status - floppy
 
 	ldx FD_CMDFN_IDX
-	sta FD_CMDFN_IDX,x
+	sta FD_CMDFN_BUF,x
 	inx
 	bpl @1
 	ldx #$7F
 @1:
+	sta FD_CMDFN_IDX
 	lda #$00
-	sta FD_CMDFN_IDX,x
+	sta FD_CMDFN_BUF,x
 	plp
 	+bcs dev_fd_cmd_OPEN_EOI           ; if EOI - execute command
 	jmp dos_EXIT
@@ -70,13 +73,14 @@ msg_CIOUT_cmdfn_FD:                    ; get next byte of status - floppy
 msg_CIOUT_cmdfn_RD:                    ; get next byte of status - ram disk
 
 	ldx RD_CMDFN_IDX
-	sta RD_CMDFN_IDX,x
+	sta RD_CMDFN_BUF,x
 	inx
 	bpl @1
 	ldx #$7F
 @1:
+	sta RD_CMDFN_IDX
 	lda #$00
-	sta RD_CMDFN_IDX,x
+	sta RD_CMDFN_BUF,x
 	plp
 	+bcs dev_rd_cmd_OPEN_EOI           ; if EOI - execute command
 	jmp dos_EXIT