From 12afbf665f28d35fdf8661b53571482caf3893a0 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 8 Nov 2017 15:28:51 +0000 Subject: [PATCH] z80: start bringing platforms into line with core updates --- Kernel/platform-msx2/devfd.c | 16 +--------------- Kernel/platform-msx2/devhd.c | 16 +--------------- Kernel/platform-msx2/kernel.def | 2 ++ Kernel/platform-mtx/kernel.def | 2 +- 4 files changed, 5 insertions(+), 31 deletions(-) diff --git a/Kernel/platform-msx2/devfd.c b/Kernel/platform-msx2/devfd.c index afd21d21..f96ee7e7 100644 --- a/Kernel/platform-msx2/devfd.c +++ b/Kernel/platform-msx2/devfd.c @@ -19,25 +19,11 @@ static int fd_transfer(bool is_read, uint8_t rawflag) is_read; - /* FIXME: raw is broken unless nicely aligned */ if(rawflag) { - dlen = udata.u_count; - dptr = (uint16_t)udata.u_base; - if (((uint16_t)dptr|dlen) & BLKMASK) { - udata.u_error = EIO; + if (d_blkoff(9)) return -1; - } - block = udata.u_offset >> 9; - block_xfer = dlen >> 9; map = 1; - } else { /* rawflag == 0 */ - dlen = 512; - dptr = (uint16_t)udata.u_buf->bf_data; - block = udata.u_buf->bf_blk; - block_xfer = 1; - map = 0; } - while (ct < block_xfer) { /* FIXME: Do stuff */ block++; diff --git a/Kernel/platform-msx2/devhd.c b/Kernel/platform-msx2/devhd.c index 7b0d0c6a..66eddc67 100644 --- a/Kernel/platform-msx2/devhd.c +++ b/Kernel/platform-msx2/devhd.c @@ -19,25 +19,11 @@ static int hd_transfer(bool is_read, uint8_t rawflag) is_read; - /* FIXME: raw is broken unless nicely aligned */ if(rawflag) { - dlen = udata.u_count; - dptr = (uint16_t)udata.u_base; - if (((uint16_t)dptr | dlen) & BLKMASK) { - udata.u_error = EIO; + if (d_blkoff(9)) return -1; - } - block = udata.u_offset >> 9; - block_xfer = dlen >> 9; map = 1; - } else { /* rawflag == 0 */ - dlen = 512; - dptr = (uint16_t)udata.u_buf->bf_data; - block = udata.u_buf->bf_blk; - block_xfer = 1; - map = 0; } - while (ct < block_xfer) { /* FIXME: Do stuff */ block++; diff --git a/Kernel/platform-msx2/kernel.def b/Kernel/platform-msx2/kernel.def index f0a556af..cd4444a0 100644 --- a/Kernel/platform-msx2/kernel.def +++ b/Kernel/platform-msx2/kernel.def @@ -10,3 +10,5 @@ Z80_TYPE .equ 1 PROGBASE .equ 0x0000 PROGLOAD .equ 0x0100 NBUFS .equ 6 + +Z80_MMU_HOOKS .equ 0 diff --git a/Kernel/platform-mtx/kernel.def b/Kernel/platform-mtx/kernel.def index 86af82fc..4810f868 100644 --- a/Kernel/platform-mtx/kernel.def +++ b/Kernel/platform-mtx/kernel.def @@ -12,4 +12,4 @@ Z80_TYPE .equ 0 VRAM_CH .equ 3 ; font data 0x1800-1BFF ? - +Z80_MMU_HOOKS .equ 0 -- 2.34.1