diff --git a/apps/ed/glue.asm b/apps/ed/glue.asm index 942a384..d854d02 100644 --- a/apps/ed/glue.asm +++ b/apps/ed/glue.asm @@ -1,6 +1,4 @@ ; *** Requirements *** -; BLOCKDEV_SIZE -; FS_HANDLE_SIZE ; _blkGetB ; _blkPutB ; _blkSeek diff --git a/apps/zasm/glue.asm b/apps/zasm/glue.asm index c86cb6e..5b0dd28 100644 --- a/apps/zasm/glue.asm +++ b/apps/zasm/glue.asm @@ -31,6 +31,7 @@ ; _blkSeek ; _blkTell ; printstr +; printcrlf .inc "user.h" diff --git a/apps/zasm/io.asm b/apps/zasm/io.asm index 7e55bc6..6bd9991 100644 --- a/apps/zasm/io.asm +++ b/apps/zasm/io.asm @@ -287,11 +287,5 @@ _ioIncBlk: ; call printstr followed by newline ioPrintLN: - push hl call printstr - ld hl, .sCRLF - call printstr - pop hl - ret -.sCRLF: - .db 0x0a, 0x0d, 0 + jp printcrlf diff --git a/emul/zasm/glue.asm b/emul/zasm/glue.asm index d7eeb0c..d937398 100644 --- a/emul/zasm/glue.asm +++ b/emul/zasm/glue.asm @@ -26,6 +26,7 @@ jp _blkPutB jp _blkSeek jp _blkTell jp printstr +jp printcrlf .inc "core.asm" .inc "str.asm" diff --git a/emul/zasm/kernel.bin b/emul/zasm/kernel.bin index a53790d..79bdf49 100644 Binary files a/emul/zasm/kernel.bin and b/emul/zasm/kernel.bin differ diff --git a/emul/zasm/user.h b/emul/zasm/user.h index 8c80238..493f010 100644 --- a/emul/zasm/user.h +++ b/emul/zasm/user.h @@ -1,7 +1,5 @@ .org 0x4800 ; in sync with USER_CODE in glue.asm .equ USER_RAMSTART 0x6000 -.equ FS_HANDLE_SIZE 8 -.equ BLOCKDEV_SIZE 8 ; *** JUMP TABLE *** .equ strncmp 0x03 @@ -17,3 +15,4 @@ .equ _blkSeek @+3 .equ _blkTell @+3 .equ printstr @+3 +.equ printcrlf @+3 diff --git a/emul/zasm/zasm.bin b/emul/zasm/zasm.bin index 1001f6e..0bca4fc 100644 Binary files a/emul/zasm/zasm.bin and b/emul/zasm/zasm.bin differ