From 823c5a36aa8a5ce57c63f1ead9424342a67fd677 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 30 Dec 2014 19:06:45 +0000 Subject: [PATCH] trs80: kbd and vt ioctls --- Kernel/platform-trs80/devices.c | 3 ++- Kernel/platform-trs80/devtty.c | 2 +- Kernel/platform-trs80/devtty.h | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Kernel/platform-trs80/devices.c b/Kernel/platform-trs80/devices.c index bd466cb3..bc59ba16 100644 --- a/Kernel/platform-trs80/devices.c +++ b/Kernel/platform-trs80/devices.c @@ -6,6 +6,7 @@ #include #include #include +#include #include 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 80a6e927..3b5c4d99 100644 --- 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 300ecd62..5977fd9c 100644 --- 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 -- 2.34.1