From: Alan Cox Date: Tue, 30 Dec 2014 19:06:10 +0000 (+0000) Subject: nc100: add vt/kbd ioctls X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=af615fe3481dc4daaa910ad65e4f154158d46e78;p=FUZIX.git nc100: add vt/kbd ioctls --- diff --git a/Kernel/platform-nc100/devices.c b/Kernel/platform-nc100/devices.c index 3c7ad1c9..bad73e12 100644 --- a/Kernel/platform-nc100/devices.c +++ b/Kernel/platform-nc100/devices.c @@ -5,6 +5,7 @@ #include #include #include +#include #include struct devsw dev_tab[] = /* The device driver switch table */ @@ -14,7 +15,7 @@ struct devsw dev_tab[] = /* The device driver switch table */ /* 1: /dev/hd Hard disc block devices (Really PCMCIA) */ { rd_open, no_close, rd_read, rd_write, no_ioctl }, /* 2: /dev/tty TTY devices */ - { nc100_tty_open, nc100_tty_close, tty_read, tty_write, tty_ioctl }, + { nc100_tty_open, nc100_tty_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-nc100/devtty.c b/Kernel/platform-nc100/devtty.c index 3e030a73..89a85153 100644 --- a/Kernel/platform-nc100/devtty.c +++ b/Kernel/platform-nc100/devtty.c @@ -147,7 +147,7 @@ void nc100_tty_init(void) uarta; } -static uint8_t keymap[10]; +uint8_t keymap[10]; static uint8_t keyin[10]; static uint8_t keybyte, keybit; static uint8_t newkey; diff --git a/Kernel/platform-nc100/devtty.h b/Kernel/platform-nc100/devtty.h index 948cc298..9c94fc90 100644 --- a/Kernel/platform-nc100/devtty.h +++ b/Kernel/platform-nc100/devtty.h @@ -4,4 +4,9 @@ extern int nc100_tty_open(uint8_t minor, uint16_t flag); extern int nc100_tty_close(uint8_t minor); extern void nc100_tty_init(void); + +extern uint8_t keymap[10]; +#define KEY_ROWS 10 +#define KEY_COLS 8 + #endif