z80: start bringing platforms into line with core updates

diff --git a/Kernel/platform-msx2/devfd.c b/Kernel/platform-msx2/devfd.c
index afd21d2..f96ee7e 100644 (file)
--- 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 7b0d0c6..66eddc6 100644 (file)
--- 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 f0a556a..cd4444a 100644 (file)
--- 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 86af82f..4810f86 100644 (file)
--- 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