From 0b5f2dcf2a5c09af438e01b2542cad543cdb47be Mon Sep 17 00:00:00 2001 From: FeralChild64 Date: Mon, 15 Feb 2021 22:18:37 +0100 Subject: [PATCH] SD card directory display starts working --- src/dos_m65/dev_sdcard/dev_sd_init.s | 2 +- src/dos_m65/dev_sdcard/fs_hvsr_read_dir.s | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/dos_m65/dev_sdcard/dev_sd_init.s b/src/dos_m65/dev_sdcard/dev_sd_init.s index 2eafa48b..865ff955 100644 --- a/src/dos_m65/dev_sdcard/dev_sd_init.s +++ b/src/dos_m65/dev_sdcard/dev_sd_init.s @@ -30,7 +30,7 @@ dev_sd_init: sta HTRAP00 +nop - lda #$36 ; dos_cdrootdir + lda #$3C ; dos_cdrootdir sta HTRAP00 +nop 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 a550d8f2..ba648a57 100644 --- a/src/dos_m65/dev_sdcard/fs_hvsr_read_dir.s +++ b/src/dos_m65/dev_sdcard/fs_hvsr_read_dir.s @@ -53,7 +53,7 @@ fs_hvsr_read_dir: ldx SD_DIR_DESC ; directory descriptor ldy #$10 ; target page number - lda #$13 ; dos_readdir + lda #$14 ; dos_readdir sta HTRAP00 +nop @@ -72,6 +72,7 @@ fs_hvsr_read_dir: ; Validate/fix characters in file name ldx SD_DIRENT+$40 + dex @lp1: @@ -97,8 +98,6 @@ fs_hvsr_read_dir: dex bpl @lp1 - inc $D020 - ; Validate file name length ; XXX check for directory! @@ -131,6 +130,9 @@ fs_hvsr_read_dir: sta SD_DIRENT+$82 sta SD_DIRENT+$83 + ldx SD_DIRENT+$40 ; make sure file name is terminated by 0 + sta SD_DIRENT, x + ldx #$04 ; XXX put correct amount of spaces instead lda #' ' sta SD_DIRENT+$80, x @@ -148,9 +150,7 @@ fs_hvsr_read_dir: iny lda SD_DIRENT, y sta SD_DIRENT+$80,x - bne @lp2 - inx lda #$22 ; closing quote sta SD_DIRENT+$80, x @@ -214,7 +214,7 @@ fs_hvsr_read_dir_blocksfree: ; Close the directory within the hypervisor XXX maybe move it to close routine ldx SD_DIR_DESC - lda #$14 ; dos_closedir + lda #$16 ; dos_closedir sta HTRAP00 +nop