izaya/collapseos
1
0
Fork 0
mirror of https://github.com/hsoft/collapseos.git synced 2024-12-01 03:38:05 +11:00
Code Issues Releases Wiki Activity
7c893dada1
collapseos/recipes/rc2014/sdcard/glue.asm

100 lines
1.7 KiB
NASM
Raw Normal View History

recipe/rc2014/sdcard: new recipe
2019-05-08 05:26:52 +10:00
; 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
Use zasm in recipes
2019-05-21 01:00:14 +10:00
.equ RAMSTART 0x8000
.equ RAMEND 0xffff
pgm: new kernel module The pgm module implements a shell hook so that when an unknown command is typed, we look into the mounted filesystem and look for a file with the same name as the command. If we find one, we load it in memory and run it.
2019-06-01 04:50:43 +10:00
.equ PGM_CODEADDR 0x9000
Use zasm in recipes
2019-05-21 01:00:14 +10:00
.equ ACIA_CTL 0x80 ; Control and status. RS off.
.equ ACIA_IO 0x81 ; Transmit. RS on.
recipe/rc2014/sdcard: new recipe
2019-05-08 05:26:52 +10:00
recipes/rc2014/sdcard: mount filesystem!
2019-05-29 03:13:34 +10:00
jp init ; 3 bytes
; *** Jump Table ***
jp printstr
sdc: add sdcPutC Wriiiiiite!
2019-06-02 09:53:42 +10:00
jp sdcWaitResp
jp sdcCmd
jp sdcCmdR1
jp sdcCmdR7
jp sdcSendRecv
recipe/rc2014/sdcard: new recipe
2019-05-08 05:26:52 +10:00
; interrupt hook
.fill 0x38-$
jp aciaInt
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-07 05:32:23 +11:00
.inc "err.h"
Move ASCII consts to ascii.h And made them shorter in name. The new ascii.h file allow reuse in userspace code.
2019-11-14 12:38:06 +11:00
.inc "ascii.h"
Make the shell a userspace app That's my mega-commit you've all been waiting for. The code for the shell share more routines with userspace apps than with kernel units, because, well, its behavior is that of a userspace app, not a device driver. This created a weird situation with libraries and jump tables. Some routine belonging to the `kernel/` directory felt weird there. And then comes `apps/basic`, which will likely share even more code with the shell. I was seeing myself creating huge jump tables to reuse code from the shell. It didn't feel right. Moreover, we'll probably want basic-like apps to optionnally replace the shell. So here I am with this huge change in the project structure. I didn't test all recipes on hardware yet, I will do later. I might have broken some... But now, the structure feels better and the line between what belongs to `kernel` and what belongs to `apps` feels clearer.
2019-11-16 07:37:49 +11:00
.inc "blkdev.h"
.inc "fs.h"
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-07 05:32:23 +11:00
.inc "core.asm"
Extract str.asm from core.asm and make core included by userspace Most of register fiddling routines (which is now the only thing contained in care.asm) are used by almost all userspace apps, often in inner loops. That makes the penalty of using jump tables for those a bit too high. Moreover, it burdens jump tables needlessly. Because this unit is very small (now that string routines are out), it makes sense to always include it in binaries.
2019-11-15 01:55:31 +11:00
.inc "str.asm"
Use zasm in recipes
2019-05-21 01:00:14 +10:00
.equ ACIA_RAMSTART RAMSTART
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-07 05:32:23 +11:00
.inc "acia.asm"
Use zasm in recipes
2019-05-21 01:00:14 +10:00
.equ BLOCKDEV_RAMSTART ACIA_RAMEND
recipes/rc2014/sdcard: add instructions to write to SD card
2019-06-03 01:53:36 +10:00
.equ BLOCKDEV_COUNT 2
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-07 05:32:23 +11:00
.inc "blockdev.asm"
parts/z80/sdc: add sdcInitialize Also, adjust SD card recipe. Straightforward initialization and read!
2019-05-09 06:03:54 +10:00
; List of devices
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-31 07:59:35 +11:00
.dw sdcGetB, sdcPutB
.dw blk2GetB, blk2PutB
parts/z80/sdc: implement blockdev's GetC
2019-05-10 00:47:57 +10:00
parts/z80/sdc: add sdcInitialize Also, adjust SD card recipe. Straightforward initialization and read!
2019-05-09 06:03:54 +10:00
Use zasm in recipes
2019-05-21 01:00:14 +10:00
.equ STDIO_RAMSTART BLOCKDEV_RAMEND
stdio: remove a layer of indirection in GetC/PutC We use zasm's ability to use labels in .equ directive. We didn't do it before because for a while, we were in between scas and zasm (scas was used in automated tests) so we needed to use the lowest common denominator: zasm doesn't have macros and scas can't use labels in .equ directives. This forced us to add this layer of indirection. But now that we are completely cut from scas' dependency, we can use this nice zasm's ability.
2019-11-05 01:55:12 +11:00
.equ STDIO_GETC aciaGetC
.equ STDIO_PUTC aciaPutC
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-07 05:32:23 +11:00
.inc "stdio.asm"
stdio: de-macro-ize
2019-05-17 22:14:19 +10:00
recipes/rc2014/sdcard: mount filesystem!
2019-05-29 03:13:34 +10:00
.equ FS_RAMSTART STDIO_RAMEND
.equ FS_HANDLE_COUNT 1
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-07 05:32:23 +11:00
.inc "fs.asm"
recipes/rc2014/sdcard: mount filesystem!
2019-05-29 03:13:34 +10:00
Make the shell a userspace app That's my mega-commit you've all been waiting for. The code for the shell share more routines with userspace apps than with kernel units, because, well, its behavior is that of a userspace app, not a device driver. This created a weird situation with libraries and jump tables. Some routine belonging to the `kernel/` directory felt weird there. And then comes `apps/basic`, which will likely share even more code with the shell. I was seeing myself creating huge jump tables to reuse code from the shell. It didn't feel right. Moreover, we'll probably want basic-like apps to optionnally replace the shell. So here I am with this huge change in the project structure. I didn't test all recipes on hardware yet, I will do later. I might have broken some... But now, the structure feels better and the line between what belongs to `kernel` and what belongs to `apps` feels clearer.
2019-11-16 07:37:49 +11:00
; *** Shell ***
.inc "lib/util.asm"
.inc "lib/parse.asm"
.inc "lib/args.asm"
.inc "lib/stdio.asm"
recipes/rc2014/sdcard: mount filesystem!
2019-05-29 03:13:34 +10:00
.equ SHELL_RAMSTART FS_RAMEND
recipes/rc2014/sdcard: add instructions to write to SD card
2019-06-03 01:53:36 +10:00
.equ SHELL_EXTRA_CMD_COUNT 11
Make the shell a userspace app That's my mega-commit you've all been waiting for. The code for the shell share more routines with userspace apps than with kernel units, because, well, its behavior is that of a userspace app, not a device driver. This created a weird situation with libraries and jump tables. Some routine belonging to the `kernel/` directory felt weird there. And then comes `apps/basic`, which will likely share even more code with the shell. I was seeing myself creating huge jump tables to reuse code from the shell. It didn't feel right. Moreover, we'll probably want basic-like apps to optionnally replace the shell. So here I am with this huge change in the project structure. I didn't test all recipes on hardware yet, I will do later. I might have broken some... But now, the structure feels better and the line between what belongs to `kernel` and what belongs to `apps` feels clearer.
2019-11-16 07:37:49 +11:00
.inc "shell/main.asm"
recipes/rc2014/sdcard: add instructions to write to SD card
2019-06-03 01:53:36 +10:00
.dw sdcInitializeCmd, sdcFlushCmd
.dw blkBselCmd, blkSeekCmd, blkLoadCmd, blkSaveCmd
recipes/rc2014/sdcard: mount filesystem!
2019-05-29 03:13:34 +10:00
.dw fsOnCmd, flsCmd, fnewCmd, fdelCmd, fopnCmd
recipe/rc2014/sdcard: new recipe
2019-05-08 05:26:52 +10:00
Make the shell a userspace app That's my mega-commit you've all been waiting for. The code for the shell share more routines with userspace apps than with kernel units, because, well, its behavior is that of a userspace app, not a device driver. This created a weird situation with libraries and jump tables. Some routine belonging to the `kernel/` directory felt weird there. And then comes `apps/basic`, which will likely share even more code with the shell. I was seeing myself creating huge jump tables to reuse code from the shell. It didn't feel right. Moreover, we'll probably want basic-like apps to optionnally replace the shell. So here I am with this huge change in the project structure. I didn't test all recipes on hardware yet, I will do later. I might have broken some... But now, the structure feels better and the line between what belongs to `kernel` and what belongs to `apps` feels clearer.
2019-11-16 07:37:49 +11:00
.inc "shell/blkdev.asm"
.inc "shell/fs.asm"
blockdev: make implementors "random access" This huge refactoring remove the Seek and Tell routine from blockdev implementation requirements and change GetC and PutC's API so that they take an address to read and write (through HL/DE) at each call. The "PTR" approach in blockdev implementation was very redundant from device to device and it made more sense to generalize. It's possible that future device aren't "random access", but we'll be able to add more device types later. Another important change in this commit is that the "blockdev handle" is now opaque. Previously, consumers of the API would happily call routines directly from one of the 4 offsets. We can't do that any more. This makes the API more solid for future improvements. This change forced me to change a lot of things in fs, but overall, things are now simpler. No more `FS_PTR`: the "device handle" now holds the active pointer. Lots, lots of changes, but it also feels a lot cleaner and solid.
2019-06-05 01:53:02 +10:00
.equ PGM_RAMSTART SHELL_RAMEND
Make the shell a userspace app That's my mega-commit you've all been waiting for. The code for the shell share more routines with userspace apps than with kernel units, because, well, its behavior is that of a userspace app, not a device driver. This created a weird situation with libraries and jump tables. Some routine belonging to the `kernel/` directory felt weird there. And then comes `apps/basic`, which will likely share even more code with the shell. I was seeing myself creating huge jump tables to reuse code from the shell. It didn't feel right. Moreover, we'll probably want basic-like apps to optionnally replace the shell. So here I am with this huge change in the project structure. I didn't test all recipes on hardware yet, I will do later. I might have broken some... But now, the structure feels better and the line between what belongs to `kernel` and what belongs to `apps` feels clearer.
2019-11-16 07:37:49 +11:00
.inc "shell/pgm.asm"
pgm: new kernel module The pgm module implements a shell hook so that when an unknown command is typed, we look into the mounted filesystem and look for a file with the same name as the command. If we find one, we load it in memory and run it.
2019-06-01 04:50:43 +10:00
blockdev: make implementors "random access" This huge refactoring remove the Seek and Tell routine from blockdev implementation requirements and change GetC and PutC's API so that they take an address to read and write (through HL/DE) at each call. The "PTR" approach in blockdev implementation was very redundant from device to device and it made more sense to generalize. It's possible that future device aren't "random access", but we'll be able to add more device types later. Another important change in this commit is that the "blockdev handle" is now opaque. Previously, consumers of the API would happily call routines directly from one of the 4 offsets. We can't do that any more. This makes the API more solid for future improvements. This change forced me to change a lot of things in fs, but overall, things are now simpler. No more `FS_PTR`: the "device handle" now holds the active pointer. Lots, lots of changes, but it also feels a lot cleaner and solid.
2019-06-05 01:53:02 +10:00
.equ SDC_RAMSTART PGM_RAMEND
pgm: new kernel module The pgm module implements a shell hook so that when an unknown command is typed, we look into the mounted filesystem and look for a file with the same name as the command. If we find one, we load it in memory and run it.
2019-06-01 04:50:43 +10:00
.equ SDC_PORT_CSHIGH 6
.equ SDC_PORT_CSLOW 5
.equ SDC_PORT_SPI 4
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-07 05:32:23 +11:00
.inc "sdc.asm"
zasm: use blkdev IDs as input and output This will soon allow use to seek and tell on input, which is necessary for a second pass which is necessary for forward symbol references. This require making `blkSel` a bit more flexible. Rather than having one global selected blkdev, each app can select its own, in its own memory space.
2019-05-11 08:20:43 +10:00
init:
di
; setup stack
ld hl, RAMEND
ld sp, hl
recipes/rc2014/sdcard: add instructions to write to SD card
2019-06-03 01:53:36 +10:00
im 1
zasm: use blkdev IDs as input and output This will soon allow use to seek and tell on input, which is necessary for a second pass which is necessary for forward symbol references. This require making `blkSel` a bit more flexible. Rather than having one global selected blkdev, each app can select its own, in its own memory space.
2019-05-11 08:20:43 +10:00
call aciaInit
recipes/rc2014: add missing calls to fsInit Also, tighten RAM addresses. They were unecessarily loose.
2019-06-18 03:44:36 +10:00
call fsInit
zasm: use blkdev IDs as input and output This will soon allow use to seek and tell on input, which is necessary for a second pass which is necessary for forward symbol references. This require making `blkSel` a bit more flexible. Rather than having one global selected blkdev, each app can select its own, in its own memory space.
2019-05-11 08:20:43 +10:00
call shellInit
pgm: new kernel module The pgm module implements a shell hook so that when an unknown command is typed, we look into the mounted filesystem and look for a file with the same name as the command. If we find one, we load it in memory and run it.
2019-06-01 04:50:43 +10:00
ld hl, pgmShellHook
ld (SHELL_CMDHOOK), hl
zasm: use blkdev IDs as input and output This will soon allow use to seek and tell on input, which is necessary for a second pass which is necessary for forward symbol references. This require making `blkSel` a bit more flexible. Rather than having one global selected blkdev, each app can select its own, in its own memory space.
2019-05-11 08:20:43 +10:00
recipes/rc2014/sdcard: add instructions to write to SD card
2019-06-03 01:53:36 +10:00
xor a
blockdev: make selection structure opaque I'm about to change that structure and I don't want fs to be messed up by this. I'm proceeding step by step...
2019-06-04 23:56:36 +10:00
ld de, BLOCKDEV_SEL
recipes/rc2014/sdcard: add instructions to write to SD card
2019-06-03 01:53:36 +10:00
call blkSel
zasm: use blkdev IDs as input and output This will soon allow use to seek and tell on input, which is necessary for a second pass which is necessary for forward symbol references. This require making `blkSel` a bit more flexible. Rather than having one global selected blkdev, each app can select its own, in its own memory space.
2019-05-11 08:20:43 +10:00
ei
jp shellLoop
recipes/rc2014/sdcard: mount filesystem!
2019-05-29 03:13:34 +10:00
; *** blkdev 2: file handle 0 ***
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-31 07:59:35 +11:00
blk2GetB:
fs: adjust to DE->IX change in recipe/emul glue code
2019-06-03 00:18:03 +10:00
ld ix, FS_HANDLES
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-31 07:59:35 +11:00
jp fsGetB
recipes/rc2014/sdcard: mount filesystem!
2019-05-29 03:13:34 +10:00
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-31 07:59:35 +11:00
blk2PutB:
fs: adjust to DE->IX change in recipe/emul glue code
2019-06-03 00:18:03 +10:00
ld ix, FS_HANDLES
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-31 07:59:35 +11:00
jp fsPutB
Reference in New Issue Copy Permalink