From 3e437747c2b846a2f471f3a052ae592cfba8f54c Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Mon, 17 Jun 2019 13:44:36 -0400 Subject: [PATCH] recipes/rc2014: add missing calls to fsInit Also, tighten RAM addresses. They were unecessarily loose. --- recipes/rc2014/sdcard/glue.asm | 1 + recipes/rc2014/zasm/glue.asm | 9 +++++---- recipes/rc2014/zasm/user.h | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/recipes/rc2014/sdcard/glue.asm b/recipes/rc2014/sdcard/glue.asm index f290829..4e0cad3 100644 --- a/recipes/rc2014/sdcard/glue.asm +++ b/recipes/rc2014/sdcard/glue.asm @@ -69,6 +69,7 @@ init: ld hl, aciaGetC ld de, aciaPutC call stdioInit + call fsInit call shellInit ld hl, pgmShellHook ld (SHELL_CMDHOOK), hl diff --git a/recipes/rc2014/zasm/glue.asm b/recipes/rc2014/zasm/glue.asm index daa0b21..cb630d4 100644 --- a/recipes/rc2014/zasm/glue.asm +++ b/recipes/rc2014/zasm/glue.asm @@ -1,10 +1,10 @@ ; classic RC2014 setup (8K ROM + 32K RAM) and a stock Serial I/O module ; The RAM module is selected on A15, so it has the range 0x8000-0xffff .equ RAMSTART 0x8000 -; kernel RAM usage, because of SDC, is a bit high and bring us almost to 0x9e00 -; We allocate at least 0x100 bytes for RAM, which is why we have this threshold. -; for the stack. -.equ RAMEND 0xa000 +; kernel RAM usage, because of SDC, is a bit high and bring us almost to 0x8500 +; We allocate at least 0x200 bytes for the stack, which is why we have this +; threshold. +.equ RAMEND 0x8700 .equ PGM_CODEADDR RAMEND .equ ACIA_CTL 0x80 ; Control and status. RS off. .equ ACIA_IO 0x81 ; Transmit. RS on. @@ -102,6 +102,7 @@ init: ld hl, aciaGetC ld de, aciaPutC call stdioInit + call fsInit call shellInit ld hl, pgmShellHook ld (SHELL_CMDHOOK), hl diff --git a/recipes/rc2014/zasm/user.h b/recipes/rc2014/zasm/user.h index e2a4079..a8f0050 100644 --- a/recipes/rc2014/zasm/user.h +++ b/recipes/rc2014/zasm/user.h @@ -1,5 +1,5 @@ -.equ USER_CODE 0xa000 -.equ USER_RAMSTART USER_CODE+0x1800 +.equ USER_CODE 0x8700 +.equ USER_RAMSTART USER_CODE+0x1900 .equ FS_HANDLE_SIZE 6 .equ BLOCKDEV_SIZE 8