trs80: kbd and vt ioctls

diff --git a/Kernel/platform-trs80/devices.c b/Kernel/platform-trs80/devices.c
index bd466cb..bc59ba1 100644 (file)
--- a/Kernel/platform-trs80/devices.c
+++ b/Kernel/platform-trs80/devices.c
@@ -6,6 +6,7 @@
 #include <devhd.h>
 #include <devsys.h>
 #include <devlpr.h>
+#include <vt.h>
 #include <devtty.h>
 
 struct devsw dev_tab[] =  /* The device driver switch table */
@@ -15,7 +16,7 @@ struct devsw dev_tab[] =  /* The device driver switch table */
   /* 1: /dev/hd                Hard disc block devices */
   {  hd_open,     no_close,     hd_read,   hd_write,   no_ioctl  },
   /* 2: /dev/tty       TTY devices */
-  {  tty_open,    trstty_close, tty_read,  tty_write,  tty_ioctl },
+  {  tty_open,    trstty_close, tty_read,  tty_write,  vt_ioctl },
   /* 3: /dev/lpr       Printer devices */
   {  lpr_open,    lpr_close,    no_rdwr,   lpr_write,  no_ioctl  },
   /* 4: /dev/mem etc   System devices (one offs) */

diff --git a/Kernel/platform-trs80/devtty.c b/Kernel/platform-trs80/devtty.c
index 80a6e92..3b5c4d9 100644 (file)
--- a/Kernel/platform-trs80/devtty.c
+++ b/Kernel/platform-trs80/devtty.c
@@ -107,7 +107,7 @@ int tty_carrier(uint8_t minor)
 }
 
 
-static uint8_t keymap[8];
+uint8_t keymap[8];
 static uint8_t keyin[8];
 static uint8_t keybyte, keybit;
 static uint8_t newkey;

diff --git a/Kernel/platform-trs80/devtty.h b/Kernel/platform-trs80/devtty.h
index 300ecd6..5977fd9 100644 (file)
--- a/Kernel/platform-trs80/devtty.h
+++ b/Kernel/platform-trs80/devtty.h
@@ -5,4 +5,8 @@ extern void tty_interrupt(void);
 extern void kbd_interrupt(void);
 extern int trstty_close(uint8_t minor);
 
+#define KEY_ROWS       8
+#define KEY_COLS       8
+extern uint8_t keymap[8];
+
 #endif