From 83b8756231fdcb96c53b32ef16c00fb129f74e41 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 30 Dec 2014 19:04:59 +0000 Subject: [PATCH] dragon: vt/kbd ioctl support --- Kernel/platform-dragon/devices.c | 4 ++-- Kernel/platform-dragon/devtty.c | 2 +- Kernel/platform-dragon/devtty.h | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Kernel/platform-dragon/devices.c b/Kernel/platform-dragon/devices.c index 60723b45..fe99fe2c 100644 --- a/Kernel/platform-dragon/devices.c +++ b/Kernel/platform-dragon/devices.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include struct devsw dev_tab[] = /* The device driver switch table */ { @@ -16,7 +16,7 @@ struct devsw dev_tab[] = /* The device driver switch table */ /* 1: /dev/hd Hard disc block devices (absent) */ { nxio_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 */ { lpr_open, lpr_close, no_rdwr, lpr_write, no_ioctl }, /* 4: /dev/mem etc System devices (one offs) */ diff --git a/Kernel/platform-dragon/devtty.c b/Kernel/platform-dragon/devtty.c index 7d8fdc76..05d326b6 100644 --- a/Kernel/platform-dragon/devtty.c +++ b/Kernel/platform-dragon/devtty.c @@ -76,7 +76,7 @@ void tty_interrupt(void) } } -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-dragon/devtty.h b/Kernel/platform-dragon/devtty.h index c387e904..62655740 100644 --- a/Kernel/platform-dragon/devtty.h +++ b/Kernel/platform-dragon/devtty.h @@ -1,4 +1,8 @@ #ifndef __DEVTTY_DOT_H__ #define __DEVTTY_DOT_H__ +#define KEY_ROWS 8 +#define KEY_COLS 7 +extern uint8_t keymap[8]; + #endif -- 2.34.1