micropack: use the shared devfd

diff --git a/Kernel/platform-micropack/Makefile b/Kernel/platform-micropack/Makefile
index 2b56907..7e90a54 100644 (file)
--- a/Kernel/platform-micropack/Makefile
+++ b/Kernel/platform-micropack/Makefile
@@ -1,5 +1,5 @@
 
-CSRCS = devlpr.c devtty.c devfd.c
+CSRCS = devlpr.c devtty.c ../dev/z80pack/devfd.c
 CSRCS += devices.c main.c
 
 ASRCS = crt0.s z80pack.s
@@ -9,6 +9,8 @@ COBJS = $(CSRCS:.c=.rel)
 AOBJS = $(ASRCS:.s=.rel)
 OBJS  = $(COBJS) $(AOBJS)
 
+CROSS_CCOPTS += -I../dev/z80pack/
+
 JUNK = $(CSRCS:.c=.lst) $(CSRCS:.c=.asm) $(CSRCS:.c=.sym) $(ASRCS:.s=.lst) $(ASRCS:.s=.sym) $(CSRCS:.c=.rst) $(ASRCS:.s=.rst)
 
 all:   $(OBJS)

diff --git a/Kernel/platform-micropack/devfd.c b/Kernel/platform-micropack/devfd.c
deleted file mode 100644 (file)
index ae34af5..0000000
--- a/Kernel/platform-micropack/devfd.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* 
- * z80pack fd driver
- *
- */
-
-#include <kernel.h>
-#include <kdata.h>
-#include <printf.h>
-#include <devfd.h>
-
-__sfr __at 10 fd_drive;
-__sfr __at 11 fd_track;
-__sfr __at 12 fd_sectorl;
-__sfr __at 13 fd_cmd;
-__sfr __at 14 fd_status;
-__sfr __at 15 fd_dmal;
-__sfr __at 16 fd_dmah;
-__sfr __at 17 fd_sectorh;
-
-/* floppies. 26 128 byte sectors, not a nice way to use all of them in 512's */
-static int sectrack[16] = {
-    26, 26, 26, 26,
-    0, 0, 0, 0,
-    128, 128, 0, 0,
-    0, 0, 0, 0
-};
-
-static int fd_transfer(bool is_read, uint8_t minor, uint8_t rawflag);
-
-int fd_read(uint8_t minor, uint8_t rawflag, uint8_t flag)
-{
-    flag;
-    return fd_transfer(true, minor, rawflag);
-}
-
-int fd_write(uint8_t minor, uint8_t rawflag, uint8_t flag)
-{
-    flag;
-    return fd_transfer(false, minor, rawflag);
-}
-
-int hd_read(uint8_t minor, uint8_t rawflag, uint8_t flag)
-{
-    flag;
-    return fd_transfer(true, minor + 8, rawflag);
-}
-
-int hd_write(uint8_t minor, uint8_t rawflag, uint8_t flag)
-{
-    flag;
-    return fd_transfer(false, minor + 8, rawflag);
-}
-
-/* We will wrap on big disks if we ever try and support the Z80Pack P:
-   that wants different logic */
-static void fd_geom(int minor, blkno_t block)
-{
-    /* Turn block int track/sector 
-       and write to the controller.
-       Forced to do real / and % */
-    int track = block / sectrack[minor];
-    int sector = block % sectrack[minor] + 1;
-    fd_sectorl = sector & 0xFF;
-    fd_sectorh = sector >> 8;
-    fd_track = track;
-}
-
-static int fd_transfer(bool is_read, uint8_t minor, uint8_t rawflag)
-{
-    blkno_t block;
-    uint16_t block_xfer;     /* blocks to transfer */
-    uint16_t dptr;
-    uint16_t dlen;
-    uint16_t ct = 0;
-    uint8_t st;
-    int map = 0;
-    uint16_t *page = &udata.u_page;
-
-    if(rawflag == 1) {
-        dlen = udata.u_count;
-        dptr = (uint16_t)udata.u_base;
-        block = udata.u_offset >> BLKSHIFT;
-        block_xfer = dlen >> 7;                /* We want this in 128 byte sectors */
-        map = 1;
-    } else if (rawflag == 2) {         /* Swap device special */
-        dlen = swapcnt;
-        dptr = (uint16_t)swapbase;
-        page = &swapproc->p_page;      /* Acting on this task */
-        block = swapblk;
-        block_xfer = dlen >> 7;                /* We want this in 128 byte sectors */
-        map = 1;
-        /*
-         *     In the z80pack case this is simpler than usual. Be very
-         *     careful how you implement the swap device. On most platforms
-         *     we have user space in part of the "common" which means you
-         *     must be prepared to switch common segment as well during
-         *     a swap, or to perform mapping games using the banks
-         */
-    } else { /* rawflag == 0 */
-        dptr = (uint16_t)udata.u_buf->bf_data;
-        block = udata.u_buf->bf_blk;
-        block_xfer = 4;
-    }
-    block <<= 2;
-    /* Read the disk in four sector chunks. FIXME We ought to cache the geometry
-       and just bump sector checking for a wrap. */
-    while (ct < block_xfer) {
-        fd_drive = minor;
-        fd_geom(minor, block);
-        /* The Z80pack DMA uses the current MMU mappings... beware that
-         * is odd - but most hardware would be PIO (inir/otir etc) anyway */
-        fd_dmal = dptr & 0xFF;
-        fd_dmah = dptr >> 8;
-
-        /* No banking problems in swap only mode */
-        fd_cmd = 1 - is_read;
-
-        st = fd_status;
-        /* Real disks would need retries */
-        if (st) {
-            kprintf("fd%d: block %d, error %d\n", minor, st, block);
-            break;
-        }
-        block++;
-        ct++;
-        dptr += 128;
-    }
-    return ct >> 2;
-}
-
-int fd_open(uint8_t minor, uint16_t flag)
-{
-    flag;
-    if(minor >= 8 || !sectrack[minor]) {
-        udata.u_error = ENODEV;
-        return -1;
-    }
-    return 0;
-}
-
-int hd_open(uint8_t minor, uint16_t flag)
-{
-    flag;
-    if(minor >= 8 || !sectrack[minor + 8]) {
-        udata.u_error = ENODEV;
-        return -1;
-    }
-    return 0;
-}

diff --git a/Kernel/platform-micropack/devfd.h b/Kernel/platform-micropack/devfd.h
deleted file mode 100644 (file)
index dba1f6c..0000000
--- a/Kernel/platform-micropack/devfd.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __DEVFD_DOT_H__
-#define __DEVFD_DOT_H__
-
-/* public interface */
-int fd_read(uint8_t minor, uint8_t rawflag, uint8_t flag);
-int fd_write(uint8_t minor, uint8_t rawflag, uint8_t flag);
-int fd_open(uint8_t minor, uint16_t flag);
-
-int hd_read(uint8_t minor, uint8_t rawflag, uint8_t flag);
-int hd_write(uint8_t minor, uint8_t rawflag, uint8_t flag);
-int hd_open(uint8_t minor, uint16_t flag);
-
-void fd_bankcmd(uint16_t cmd, uint16_t *bank);
-
-#endif /* __DEVRD_DOT_H__ */