zx128: vt and kbd ioctls

diff --git a/Kernel/platform-zx128/devices.c b/Kernel/platform-zx128/devices.c
index a27e93d..f95fde5 100644 (file)
--- a/Kernel/platform-zx128/devices.c
+++ b/Kernel/platform-zx128/devices.c
@@ -3,7 +3,7 @@
 #include <kdata.h>
 #include <tty.h>
 #include <devsys.h>
-#include <devtty.h>
+#include <vt.h>
 #include <devmdv.h>
 
 struct devsw dev_tab[] =  /* The device driver switch table */
@@ -13,7 +13,7 @@ struct devsw dev_tab[] =  /* The device driver switch table */
   /* 1: /dev/hd                Hard disc block devices */
   {  no_open,      no_close,    no_rdwr,   no_rdwr,   no_ioctl },
   /* 2: /dev/tty       TTY devices */
-  {  tty_open,     tty_close,   tty_read,  tty_write,  tty_ioctl },
+  {  tty_open,     tty_close,   tty_read,  tty_write,  vt_ioctl },
   /* 3: /dev/lpr       Printer devices */
   {  no_open,     no_close,   no_rdwr,   no_rdwr,  no_ioctl  },
   /* 4: /dev/mem etc   System devices (one offs) */

diff --git a/Kernel/platform-zx128/devtty.c b/Kernel/platform-zx128/devtty.c
index 2ce490a..8331b22 100644 (file)
--- a/Kernel/platform-zx128/devtty.c
+++ b/Kernel/platform-zx128/devtty.c
@@ -11,6 +11,7 @@ char tbuf1[TTYSIZ];
 /* buffer for port scan procedure */
 uint8_t keybuf[8];
 /* keyboard state on previous execution. Initialized with all 0x1F (everything released) */
+/* FIXME: needs inverting */
 uint8_t keymap[8] = { 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F };
 
 static uint8_t keybyte, keybit;

diff --git a/Kernel/platform-zx128/devtty.h b/Kernel/platform-zx128/devtty.h
index f96542f..7e5d3c2 100644 (file)
--- a/Kernel/platform-zx128/devtty.h
+++ b/Kernel/platform-zx128/devtty.h
@@ -4,4 +4,8 @@
 void tty_pollirq(void);
 static void keydecode(void);
 
+#define KEY_ROWS       8
+#define KEY_COLS       8
+extern uint8_t keymap[8];
+
 #endif