z80pack: share the lpr driver code

diff --git a/Kernel/dev/README b/Kernel/dev/README
new file mode 100644 (file)
index 0000000..baa193f
--- /dev/null
+++ b/Kernel/dev/README
@@ -0,0 +1,2 @@
+Common blocks that are used by multiple platforms so are best kept
+as shared parts each platform can build and include

diff --git a/Kernel/platform-micropack/Makefile b/Kernel/platform-micropack/Makefile
index c574e2d..a977289 100644 (file)
--- a/Kernel/platform-micropack/Makefile
+++ b/Kernel/platform-micropack/Makefile
@@ -1,5 +1,5 @@
 
-CSRCS = devlpr.c ../dev/z80pack/devtty.c ../dev/z80pack/devfd.c
+CSRCS = ../dev/z80pack/devlpr.c ../dev/z80pack/devtty.c ../dev/z80pack/devfd.c
 CSRCS += devices.c main.c
 
 ASRCS = crt0.s z80pack.s

diff --git a/Kernel/platform-micropack/devlpr.c b/Kernel/platform-micropack/devlpr.c
deleted file mode 100644 (file)
index 65d8c43..0000000
--- a/Kernel/platform-micropack/devlpr.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <kernel.h>
-#include <version.h>
-#include <kdata.h>
-#include <devlpr.h>
-
-__sfr __at 0x02 lpstat;                /* I/O 2 and 3 */
-__sfr __at 0x03 lpdata;
-
-int lpr_open(uint8_t minor, uint16_t flag)
-{
-    minor; flag; // shut up compiler
-    return 0;
-}
-
-int lpr_close(uint8_t minor)
-{
-    minor; // shut up compiler
-    return 0;
-}
-
-int lpr_write(uint8_t minor, uint8_t rawflag, uint8_t flag)
-{
-    int c = udata.u_count;
-    char *p = udata.u_base;
-    minor; rawflag; flag; // shut up compiler
-
-    while(c) {
-        /* Note; on real hardware it might well be necessary to
-           busy wait a bit just to get acceptable performance */
-        while (lpstat != 0xFF) {
-//            if (psleep_flags(&clocktick, flag))
-//                return -1;
-        }
-        /* FIXME: tidy up ugetc and sysio checks globally */
-        lpdata = ugetc(p++);
-    }
-    return (-1);
-}

diff --git a/Kernel/platform-micropack/devlpr.h b/Kernel/platform-micropack/devlpr.h
deleted file mode 100644 (file)
index 7765c18..0000000
--- a/Kernel/platform-micropack/devlpr.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __DEVLPR_DOT_H__
-#define __DEVLPR_DOT_H__
-
-int lpr_open(uint8_t minor, uint16_t flag);
-int lpr_close(uint8_t minor);
-int lpr_write(uint8_t minor, uint8_t rawflag, uint8_t flag);
-
-#endif

diff --git a/Kernel/platform-z80pack-lite/Makefile b/Kernel/platform-z80pack-lite/Makefile
index c574e2d..a977289 100644 (file)
--- a/Kernel/platform-z80pack-lite/Makefile
+++ b/Kernel/platform-z80pack-lite/Makefile
@@ -1,5 +1,5 @@
 
-CSRCS = devlpr.c ../dev/z80pack/devtty.c ../dev/z80pack/devfd.c
+CSRCS = ../dev/z80pack/devlpr.c ../dev/z80pack/devtty.c ../dev/z80pack/devfd.c
 CSRCS += devices.c main.c
 
 ASRCS = crt0.s z80pack.s

diff --git a/Kernel/platform-z80pack-lite/devlpr.c b/Kernel/platform-z80pack-lite/devlpr.c
deleted file mode 100644 (file)
index 65d8c43..0000000
--- a/Kernel/platform-z80pack-lite/devlpr.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <kernel.h>
-#include <version.h>
-#include <kdata.h>
-#include <devlpr.h>
-
-__sfr __at 0x02 lpstat;                /* I/O 2 and 3 */
-__sfr __at 0x03 lpdata;
-
-int lpr_open(uint8_t minor, uint16_t flag)
-{
-    minor; flag; // shut up compiler
-    return 0;
-}
-
-int lpr_close(uint8_t minor)
-{
-    minor; // shut up compiler
-    return 0;
-}
-
-int lpr_write(uint8_t minor, uint8_t rawflag, uint8_t flag)
-{
-    int c = udata.u_count;
-    char *p = udata.u_base;
-    minor; rawflag; flag; // shut up compiler
-
-    while(c) {
-        /* Note; on real hardware it might well be necessary to
-           busy wait a bit just to get acceptable performance */
-        while (lpstat != 0xFF) {
-//            if (psleep_flags(&clocktick, flag))
-//                return -1;
-        }
-        /* FIXME: tidy up ugetc and sysio checks globally */
-        lpdata = ugetc(p++);
-    }
-    return (-1);
-}

diff --git a/Kernel/platform-z80pack-lite/devlpr.h b/Kernel/platform-z80pack-lite/devlpr.h
deleted file mode 100644 (file)
index 7765c18..0000000
--- a/Kernel/platform-z80pack-lite/devlpr.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __DEVLPR_DOT_H__
-#define __DEVLPR_DOT_H__
-
-int lpr_open(uint8_t minor, uint16_t flag);
-int lpr_close(uint8_t minor);
-int lpr_write(uint8_t minor, uint8_t rawflag, uint8_t flag);
-
-#endif

diff --git a/Kernel/platform-z80pack/Makefile b/Kernel/platform-z80pack/Makefile
index 9b86732..933b09d 100644 (file)
--- a/Kernel/platform-z80pack/Makefile
+++ b/Kernel/platform-z80pack/Makefile
@@ -1,5 +1,5 @@
 
-CSRCS = devlpr.c ../dev/z80pack/devtty.c ../dev/z80pack/devfd.c
+CSRCS = ../dev/z80pack/devlpr.c ../dev/z80pack/devtty.c ../dev/z80pack/devfd.c
 CSRCS += devices.c main.c
 
 ASRCS = crt0.s z80pack.s

diff --git a/Kernel/platform-z80pack/devlpr.c b/Kernel/platform-z80pack/devlpr.c
deleted file mode 100644 (file)
index 65d8c43..0000000
--- a/Kernel/platform-z80pack/devlpr.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <kernel.h>
-#include <version.h>
-#include <kdata.h>
-#include <devlpr.h>
-
-__sfr __at 0x02 lpstat;                /* I/O 2 and 3 */
-__sfr __at 0x03 lpdata;
-
-int lpr_open(uint8_t minor, uint16_t flag)
-{
-    minor; flag; // shut up compiler
-    return 0;
-}
-
-int lpr_close(uint8_t minor)
-{
-    minor; // shut up compiler
-    return 0;
-}
-
-int lpr_write(uint8_t minor, uint8_t rawflag, uint8_t flag)
-{
-    int c = udata.u_count;
-    char *p = udata.u_base;
-    minor; rawflag; flag; // shut up compiler
-
-    while(c) {
-        /* Note; on real hardware it might well be necessary to
-           busy wait a bit just to get acceptable performance */
-        while (lpstat != 0xFF) {
-//            if (psleep_flags(&clocktick, flag))
-//                return -1;
-        }
-        /* FIXME: tidy up ugetc and sysio checks globally */
-        lpdata = ugetc(p++);
-    }
-    return (-1);
-}

diff --git a/Kernel/platform-z80pack/devlpr.h b/Kernel/platform-z80pack/devlpr.h
deleted file mode 100644 (file)
index 7765c18..0000000
--- a/Kernel/platform-z80pack/devlpr.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __DEVLPR_DOT_H__
-#define __DEVLPR_DOT_H__
-
-int lpr_open(uint8_t minor, uint16_t flag);
-int lpr_close(uint8_t minor);
-int lpr_write(uint8_t minor, uint8_t rawflag, uint8_t flag);
-
-#endif