From 16a7f4db4d1c81e5629ed8528c376ec7fe151d25 Mon Sep 17 00:00:00 2001 From: Byron Lathi Date: Mon, 4 Dec 2023 00:13:16 -0800 Subject: [PATCH] Update cc65 pointer with PVSeek --- sw/cc65 | 2 +- sw/kernel/filesystems/fat32.s | 2 +- sw/test_code/fs_test/Makefile | 4 +++- sw/test_code/fs_test/harness.c | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sw/cc65 b/sw/cc65 index 58518b6..84af5e6 160000 --- a/sw/cc65 +++ b/sw/cc65 @@ -1 +1 @@ -Subproject commit 58518b6ff56a4e3339c6faeb1251d73d1a6a6b99 +Subproject commit 84af5e6887c39dfd7d38b261e2410bf29dcdaa66 diff --git a/sw/kernel/filesystems/fat32.s b/sw/kernel/filesystems/fat32.s index 267d570..878818d 100644 --- a/sw/kernel/filesystems/fat32.s +++ b/sw/kernel/filesystems/fat32.s @@ -53,7 +53,7 @@ sectors_per_fat = sd_buf + $24 ldx bytes_per_sector+1 jsr pushax ldy #$4 - jsr _printf + jsr _cprintf lda #sps_val_str diff --git a/sw/test_code/fs_test/Makefile b/sw/test_code/fs_test/Makefile index 2405c9c..0cb286b 100644 --- a/sw/test_code/fs_test/Makefile +++ b/sw/test_code/fs_test/Makefile @@ -6,6 +6,8 @@ LDFLAGS=-m $(NAME).map NAME=fs_test +SIMARGS= + BIN=$(NAME).bin FS=$(REPO_TOP)/sw/script/fs.fat @@ -20,7 +22,7 @@ OBJS+=$(patsubst %.s,%.o,$(filter %s,$(SRCS))) OBJS+=$(patsubst %.c,%.o,$(filter %c,$(SRCS))) run: all - $(SIM) $(BIN) + $(SIM) $(SIMARGS) $(BIN) all: fs.fat fat32.s $(BIN) diff --git a/sw/test_code/fs_test/harness.c b/sw/test_code/fs_test/harness.c index 5fcb855..93b9f9b 100644 --- a/sw/test_code/fs_test/harness.c +++ b/sw/test_code/fs_test/harness.c @@ -16,6 +16,6 @@ uint16_t imulii(uint16_t a, uint16_t b) { uint8_t SD_readSingleBlock(uint32_t addr, uint8_t *buf, uint8_t *error) { FILE* f = fopen(FILE_PATH, "rb"); - // fseek(f, addr * 512, SEEK_SET); + fseek(f, addr * 512, SEEK_SET); fread(buf, 512, 1, f); }