1999-02-27 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>

	* i386/i386at/i386at_ds_routines.c: Include
	<i386/linux/device-drivers.h> instead of <linux/device-drivers.h>.
	* device/ds_routines.c [LINUX_DEV]: Likewise.
	* i386/linux/Makefile.in (linux-gen-flags): Fix an extra slash.
	(distclean): Remove asm links.
	* linux/src/COPYING: Copied from linux-2.0.36.

1999-02-02  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>

	* i386/i386at/kd_event.c (kbdgetstat): Fix a typo
	DEV_GET_SIZES -> DEV_GET_SIZE.
	* i386/i386at/kd_mouse.c (mousegetstat): Likewise.
	* device/kmsg.c (kmsggetstat): Likewise.

1999-02-01  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>

	* linux/dev/glue/block.c (dev_getstat): Fix a missing `struct'.
	* device/cons.c (cninit): Don't call kmsginit.
	* kmsg.c (kmsg_buffer): Defined as static.
	(kmsg_write_offset): Likewise.
	(kmsg_read_offset): Likewise.
	(kmsg_read_queue): Likewise.
	(kmsg_in_use): Likewise.
	(kmsg_lock): Likewise.
	(kmsginit): Likewise, and call queue_init instead of setting
	PREV and NEXT manually.
	(kmsg_done_init): New variable.
	(kmsg_putchar): Call kmsginit if not initialized yet.
	(kmsggetstat): New function.
	* kmsg.h (kmsggetstat): Add the prototype.
	* i386/i386at/kd_event.c (kbdgetstat): Handle DEV_GET_SIZE.
	(kbdread): Check if the amount a user specify is a multiple
	of sizeof(kd_event).
	* i386/i386at/kd_mouse.c (mousegetstat): New function.
	(mouseread): Check if the amount a user specify is a multiple
	of sizeof(kd_event).
	* i386/i386at/conf.c (dev_name_list): Set the mouse getstat entry
	to mousegetstat and the kmsg getstat entry to kmsggetstat.
	Use MACH_COM instead of NCOM to determine if com is used.
	Use MACH_LPR instead of NLPR to determine if lpr is used.
	* configure.in (--enable-com): New option.
	(--enable-lpr): Likewise.
	* Makefile.in (enable_com): New variable.
	(enable_lpr): Likewise.
	* i386/Makefrag (i386at-files): Remove com.c.
	(objfiles): Add com.o if enable_com is yes, and lpr.o if enable_lpr
	is yes.

1999-01-10  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>

	* i386/i386at/kd.c: Applied a keymap patch. Reported by
	Marcus Brinkmann <Marcus.Brikmann@ruhr-uni-bochum.de>.
	* i386/i386at/kd.h: Likewise.

1998-12-06  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>

	Add kmsg device.

	* Makefile.in (device-files): Add kmsg.c and kmsg.h.
	* configure.in (--enable-kmsg): New option.
	* device/cons.c: Include kmsg.h.
	(cninit): Call kmsginit if MACH_KMSG is defined.
	(cnputc): Call kmsg_putchar if MACH_KMSG is defined.
	* device/kmsg.c: New file.
	* device/kmsg.h: Likewise.
	* i386/i386at/conf.c (dev_name_list): Add kmsg entry.

1998-12-01  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>

	* i386/i386at/i386at_ds_routines.c: Include <linux/device-drivers.h>
	only if LINUX_DEV is defined. Reported by UCHIYAMA Yasushi
	<uch@nop.or.jp>.
	* device/ds_routines.c: Likewise.
	* configure.in: AC_CONFIG_SUBDIRS(linux) instead of linuxdev.
	(--disable-linuxdev): New option.
	* linux/Makefile.in (CPPFLAGS): Remove -DLINUX_DEV, and add @DEFS@.
	(objfiles): Add linux.o only if LINUX_DEV is defined.
	* linux/Drivers.in (--disable-linuxdev): New option.
	* i386/Makefrag (DEFINES): Remove -DLINUX_DEV.

6 files changed, 183 insertions, 103 deletions

diff --git a/i386/i386at/conf.c b/i386/i386at/conf.c
index 2bd2d2a..7bca47b 100644
--- a/i386/i386at/conf.c
+++ b/i386/i386at/conf.c
@@ -175,13 +175,16 @@ extern int	kbdopen(), kbdclose(), kbdread();
 extern int	kbdgetstat(), kbdsetstat();
 #define	kbdname			"kbd"
 
-extern int	mouseopen(), mouseclose(), mouseread();
+extern int	mouseopen(), mouseclose(), mouseread(), mousegetstat();
 #define	mousename		"mouse"
 
 extern int	ioplopen(), ioplclose();
 extern vm_offset_t ioplmmap();
 #define	ioplname		"iopl"
 
+extern int	kmsgopen(), kmsgclose(), kmsgread(), kmsggetstat();
+#define kmsgname		"kmsg"
+
 /*
  * List of devices - console must be at slot 0
  */
@@ -328,21 +331,19 @@ struct dev_ops	dev_name_list[] =
 #endif
 #endif /* ! LINUX_DEV */
 
-#if	NCOM > 0
+#ifdef MACH_COM
 	{ comname,	comopen,	comclose,	comread,
 	  comwrite,	comgetstat,	comsetstat,	nomap,
 	  nodev,	nulldev,	comportdeath,	0,
 	  nodev },
 #endif
 
-#ifndef LINUX_DEV
-#if	NLPR > 0
+#ifdef MACH_LPR
 	{ lprname,	lpropen,	lprclose,	lprread,
 	  lprwrite,	lprgetstat,	lprsetstat,	nomap,
 	  nodev,	nulldev,	lprportdeath,	0,
 	  nodev },
 #endif
-#endif /* ! LINUX_DEV */
 
 #if	NBLIT > 0
 	{ blitname,	blitopen,	blitclose,	nodev,
@@ -352,7 +353,7 @@ struct dev_ops	dev_name_list[] =
 #endif
 
 	{ mousename,	mouseopen,	mouseclose,	mouseread,
-	  nodev,	nulldev,	nulldev,	nomap,
+	  nodev,	mousegetstat,	nulldev,	nomap,
 	  nodev,	nulldev,	nulldev,	0,
 	  nodev },
 
@@ -384,6 +385,13 @@ struct dev_ops	dev_name_list[] =
 #endif  NHD > 0
 #endif 0 /* Kevin doesn't know why this was here. */
 
+#ifdef	MACH_KMSG
+        { kmsgname,     kmsgopen,       kmsgclose,       kmsgread,
+          nodev,        kmsggetstat,    nodev,           nomap,
+          nodev,        nulldev,        nulldev,         0,
+          nodev },
+#endif
+
 };
 int	dev_name_count = sizeof(dev_name_list)/sizeof(dev_name_list[0]);
 
diff --git a/i386/i386at/i386at_ds_routines.c b/i386/i386at/i386at_ds_routines.c
index b67aa9e..be1f58d 100644
--- a/i386/i386at/i386at_ds_routines.c
+++ b/i386/i386at/i386at_ds_routines.c
@@ -35,7 +35,10 @@
 
 #include <i386at/dev_hdr.h>
 #include <i386at/device_emul.h>
-#include <i386/device-drivers.h>
+
+#ifdef LINUX_DEV
+#include <i386/linux/device-drivers.h>
+#endif
 
 extern struct device_emulation_ops mach_device_emulation_ops;
 #ifdef LINUX_DEV
diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
index 906fdd5..7c87729 100644
--- a/i386/i386at/kd.c
+++ b/i386/i386at/kd.c
@@ -219,102 +219,120 @@ u_char	*esc_spt	= (u_char *)0;
  * state.  The states are ordered: Normal, SHIFT, CTRL, ALT,
  * SHIFT/ALT.
  */
+
+/* This new keymap from Tudor Hulubei (tudor@cs.unh.edu) makes the
+   following changes to the keyboard driver:
+
+   - Alt + key (m-key) returns `ESC key' instead of `ESC N key'.
+   - Backspace returns 0x7f instead of 0x08.
+   - Delete returns `ESC [ 9' instead of 0x7f.
+   - Alt + function keys return key sequences that are different
+     from the key sequences returned by the function keys alone.
+     This is done with the idea of alowing a terminal server to
+     implement multiple virtual consoles mapped on Alt+F1, Alt+F2,
+     etc, as in Linux.
+
+   -- Derek Upham 1997/06/25 */
+
 unsigned char	key_map[NUMKEYS][WIDTH_KMAP] = {
-{NC,NC,NC,NC,NC,NC,NC,NC,NC,NC,NC,NC,NC,NC,NC},
-{K_ESC,NC,NC, K_ESC,NC,NC, K_ESC,NC,NC, K_ESC,NC,NC, K_ESC,NC,NC},
-{K_ONE,NC,NC, K_BANG,NC,NC, K_ONE,NC,NC, 0x1b,0x4e,0x31, 0x1b,0x4e,0x21},
-{K_TWO,NC,NC, K_ATSN,NC,NC, K_NUL,NC,NC, 0x1b,0x4e,0x32, 0x1b,0x4e,0x40},
-{K_THREE,NC,NC, K_POUND,NC,NC, K_THREE,NC,NC, 0x1b,0x4e,0x33, 0x1b,0x4e,0x23},
-{K_FOUR,NC,NC, K_DOLLAR,NC,NC, K_FOUR,NC,NC, 0x1b,0x4e,0x34, 0x1b,0x4e,0x24},
-{K_FIVE,NC,NC, K_PERC,NC,NC, K_FIVE,NC,NC, 0x1b,0x4e,0x35, 0x1b,0x4e,0x25},
-{K_SIX,NC,NC, K_CARET,NC,NC, K_RS,NC,NC, 0x1b,0x4e,0x36, 0x1b,0x4e,0x5e},
-{K_SEVEN,NC,NC, K_AMPER,NC,NC, K_SEVEN,NC,NC, 0x1b,0x4e,0x37, 0x1b,0x4e,0x26},
-{K_EIGHT,NC,NC, K_ASTER,NC,NC, K_EIGHT,NC,NC, 0x1b,0x4e,0x38, 0x1b,0x4e,0x2a},
-{K_NINE,NC,NC, K_LPAREN,NC,NC, K_NINE,NC,NC, 0x1b,0x4e,0x39,0x1b,0x4e,0x28},
-{K_ZERO,NC,NC, K_RPAREN,NC,NC, K_ZERO,NC,NC, 0x1b,0x4e,0x30,0x1b,0x4e,0x29},
-{K_MINUS,NC,NC, K_UNDSC,NC,NC, K_US,NC,NC, 0x1b,0x4e,0x2d, 0x1b,0x4e,0x5f},
-{K_EQL,NC,NC, K_PLUS,NC,NC, K_EQL,NC,NC, 0x1b,0x4e,0x3d, 0x1b,0x4e,0x2b},
-{K_BS,NC,NC, K_BS,NC,NC, K_BS,NC,NC, K_BS,NC,NC, K_BS,NC,NC},
-{K_HT,NC,NC, K_GS,NC,NC, K_HT,NC,NC, K_HT,NC,NC, K_GS,NC,NC},
-{K_q,NC,NC, K_Q,NC,NC, K_DC1,NC,NC, 0x1b,0x4e,0x71, 0x1b,0x4e,0x51},
-{K_w,NC,NC, K_W,NC,NC, K_ETB,NC,NC, 0x1b,0x4e,0x77, 0x1b,0x4e,0x57},
-{K_e,NC,NC, K_E,NC,NC, K_ENQ,NC,NC, 0x1b,0x4e,0x65, 0x1b,0x4e,0x45},
-{K_r,NC,NC, K_R,NC,NC, K_DC2,NC,NC, 0x1b,0x4e,0x72, 0x1b,0x4e,0x52},
-{K_t,NC,NC, K_T,NC,NC, K_DC4,NC,NC, 0x1b,0x4e,0x74, 0x1b,0x4e,0x54},
-{K_y,NC,NC, K_Y,NC,NC, K_EM,NC,NC, 0x1b,0x4e,0x79, 0x1b,0x4e,0x59},
-{K_u,NC,NC, K_U,NC,NC, K_NAK,NC,NC, 0x1b,0x4e,0x75, 0x1b,0x4e,0x55},
-{K_i,NC,NC, K_I,NC,NC, K_HT,NC,NC, 0x1b,0x4e,0x69, 0x1b,0x4e,0x49},
-{K_o,NC,NC, K_O,NC,NC, K_SI,NC,NC, 0x1b,0x4e,0x6f, 0x1b,0x4e,0x4f},
-{K_p,NC,NC, K_P,NC,NC, K_DLE,NC,NC, 0x1b,0x4e,0x70, 0x1b,0x4e,0x50},
-{K_LBRKT,NC,NC, K_LBRACE,NC,NC, K_ESC,NC,NC, 0x1b,0x4e,0x5b, 0x1b,0x4e,0x7b},
-{K_RBRKT,NC,NC, K_RBRACE,NC,NC, K_GS,NC,NC, 0x1b,0x4e,0x5d, 0x1b,0x4e,0x7d},
-{K_CR,NC,NC, K_CR,NC,NC, K_CR,NC,NC, K_CR,NC,NC, K_CR,NC,NC},
-{K_SCAN,K_CTLSC,NC, K_SCAN,K_CTLSC,NC, K_SCAN,K_CTLSC,NC, K_SCAN,K_CTLSC,NC, 
-	 K_SCAN,K_CTLSC,NC},
-{K_a,NC,NC, K_A,NC,NC, K_SOH,NC,NC, 0x1b,0x4e,0x61, 0x1b,0x4e,0x41},
-{K_s,NC,NC, K_S,NC,NC, K_DC3,NC,NC, 0x1b,0x4e,0x73, 0x1b,0x4e,0x53},
-{K_d,NC,NC, K_D,NC,NC, K_EOT,NC,NC, 0x1b,0x4e,0x65, 0x1b,0x4e,0x45},
-{K_f,NC,NC, K_F,NC,NC, K_ACK,NC,NC, 0x1b,0x4e,0x66, 0x1b,0x4e,0x46},
-{K_g,NC,NC, K_G,NC,NC, K_BEL,NC,NC, 0x1b,0x4e,0x67, 0x1b,0x4e,0x47},
-{K_h,NC,NC, K_H,NC,NC, K_BS,NC,NC, 0x1b,0x4e,0x68, 0x1b,0x4e,0x48},
-{K_j,NC,NC, K_J,NC,NC, K_LF,NC,NC, 0x1b,0x4e,0x6a, 0x1b,0x4e,0x4a},
-{K_k,NC,NC, K_K,NC,NC, K_VT,NC,NC, 0x1b,0x4e,0x6b, 0x1b,0x4e,0x4b},
-{K_l,NC,NC, K_L,NC,NC, K_FF,NC,NC, 0x1b,0x4e,0x6c, 0x1b,0x4e,0x4c},
-{K_SEMI,NC,NC, K_COLON,NC,NC, K_SEMI,NC,NC, 0x1b,0x4e,0x3b, 0x1b,0x4e,0x3a},
-{K_SQUOTE,NC,NC,K_DQUOTE,NC,NC,K_SQUOTE,NC,NC,0x1b,0x4e,0x27,0x1b,0x4e,0x22},
-{K_GRAV,NC,NC, K_TILDE,NC,NC, K_RS,NC,NC, 0x1b,0x4e,0x60, 0x1b,0x4e,0x7e},
+{NC,NC,NC,      NC,NC,NC,       NC,NC,NC,      NC,NC,NC,      NC,NC,NC},
+{K_ESC,NC,NC,   K_ESC,NC,NC,    K_ESC,NC,NC,   0x1b,K_ESC,NC, K_ESC,NC,NC},
+{K_ONE,NC,NC,   K_BANG,NC,NC,   K_ONE,NC,NC,   0x1b,0x31,NC,  0x1b,0x4e,0x21},
+{K_TWO,NC,NC,   K_ATSN,NC,NC,   K_NUL,NC,NC,   0x1b,0x32,NC,  0x1b,0x4e,0x40},
+{K_THREE,NC,NC, K_POUND,NC,NC,  K_THREE,NC,NC, 0x1b,0x33,NC,  0x1b,0x4e,0x23},
+{K_FOUR,NC,NC,  K_DOLLAR,NC,NC, K_FOUR,NC,NC,  0x1b,0x34,NC,  0x1b,0x4e,0x24},
+{K_FIVE,NC,NC,  K_PERC,NC,NC,   K_FIVE,NC,NC,  0x1b,0x35,NC,  0x1b,0x4e,0x25},
+{K_SIX,NC,NC,   K_CARET,NC,NC,  K_RS,NC,NC,    0x1b,0x36,NC,  0x1b,0x4e,0x5e},
+{K_SEVEN,NC,NC, K_AMPER,NC,NC,  K_SEVEN,NC,NC, 0x1b,0x37,NC,  0x1b,0x4e,0x26},
+{K_EIGHT,NC,NC, K_ASTER,NC,NC,  K_EIGHT,NC,NC, 0x1b,0x38,NC,  0x1b,0x4e,0x2a},
+{K_NINE,NC,NC,  K_LPAREN,NC,NC, K_NINE,NC,NC,  0x1b,0x39,NC,  0x1b,0x4e,0x28},
+{K_ZERO,NC,NC,  K_RPAREN,NC,NC, K_ZERO,NC,NC,  0x1b,0x30,NC,  0x1b,0x4e,0x29},
+{K_MINUS,NC,NC, K_UNDSC,NC,NC,  K_US,NC,NC,    0x1b,0x2d,NC,  0x1b,0x4e,0x5f},
+{K_EQL,NC,NC,   K_PLUS,NC,NC,   K_EQL,NC,NC,   0x1b,0x3d,NC,  0x1b,0x4e,0x2b},
+{K_DEL,NC,NC,   K_DEL,NC,NC,    K_DEL,NC,NC,   0x1b,K_DEL,NC, K_DEL,NC,NC},
+{K_HT,NC,NC,    K_GS,NC,NC,     K_HT,NC,NC,    0x1b,K_HT,NC,  K_GS,NC,NC},
+{K_q,NC,NC,     K_Q,NC,NC,      K_DC1,NC,NC,   0x1b,0x71,NC,  0x1b,0x4e,0x51},
+{K_w,NC,NC,     K_W,NC,NC,      K_ETB,NC,NC,   0x1b,0x77,NC,  0x1b,0x4e,0x57},
+{K_e,NC,NC,     K_E,NC,NC,      K_ENQ,NC,NC,   0x1b,0x65,NC,  0x1b,0x4e,0x45},
+{K_r,NC,NC,     K_R,NC,NC,      K_DC2,NC,NC,   0x1b,0x72,NC,  0x1b,0x4e,0x52},
+{K_t,NC,NC,     K_T,NC,NC,      K_DC4,NC,NC,   0x1b,0x74,NC,  0x1b,0x4e,0x54},
+{K_y,NC,NC,     K_Y,NC,NC,      K_EM,NC,NC,    0x1b,0x79,NC,  0x1b,0x4e,0x59},
+{K_u,NC,NC,     K_U,NC,NC,      K_NAK,NC,NC,   0x1b,0x75,NC,  0x1b,0x4e,0x55},
+{K_i,NC,NC,     K_I,NC,NC,      K_HT,NC,NC,    0x1b,0x69,NC,  0x1b,0x4e,0x49},
+{K_o,NC,NC,     K_O,NC,NC,      K_SI,NC,NC,    0x1b,0x6f,NC,  0x1b,0x4e,0x4f},
+{K_p,NC,NC,     K_P,NC,NC,      K_DLE,NC,NC,   0x1b,0x70,NC,  0x1b,0x4e,0x50},
+{K_LBRKT,NC,NC, K_LBRACE,NC,NC, K_ESC,NC,NC,   0x1b,0x5b,NC,  0x1b,0x4e,0x7b},
+{K_RBRKT,NC,NC, K_RBRACE,NC,NC, K_GS,NC,NC,    0x1b,0x5d,NC,  0x1b,0x4e,0x7d},
+{K_CR,NC,NC,    K_CR,NC,NC,     K_CR,NC,NC,    0x1b,K_CR,NC,  K_CR,NC,NC},
+{K_SCAN,K_CTLSC,NC, K_SCAN,K_CTLSC,NC, K_SCAN,K_CTLSC,NC, K_SCAN,K_CTLSC,NC,
+     K_SCAN,K_CTLSC,NC},
+{K_a,NC,NC,     K_A,NC,NC,      K_SOH,NC,NC,   0x1b,0x61,NC,  0x1b,0x4e,0x41},
+{K_s,NC,NC,     K_S,NC,NC,      K_DC3,NC,NC,   0x1b,0x73,NC,  0x1b,0x4e,0x53},
+{K_d,NC,NC,     K_D,NC,NC,      K_EOT,NC,NC,   0x1b,0x64,NC,  0x1b,0x4e,0x45},
+{K_f,NC,NC,     K_F,NC,NC,      K_ACK,NC,NC,   0x1b,0x66,NC,  0x1b,0x4e,0x46},
+{K_g,NC,NC,     K_G,NC,NC,      K_BEL,NC,NC,   0x1b,0x67,NC,  0x1b,0x4e,0x47},
+{K_h,NC,NC,     K_H,NC,NC,      K_BS,NC,NC,    0x1b,0x68,NC,  0x1b,0x4e,0x48},
+{K_j,NC,NC,     K_J,NC,NC,      K_LF,NC,NC,    0x1b,0x6a,NC,  0x1b,0x4e,0x4a},
+{K_k,NC,NC,     K_K,NC,NC,      K_VT,NC,NC,    0x1b,0x6b,NC,  0x1b,0x4e,0x4b},
+{K_l,NC,NC,     K_L,NC,NC,      K_FF,NC,NC,    0x1b,0x6c,NC,  0x1b,0x4e,0x4c},
+{K_SEMI,NC,NC,  K_COLON,NC,NC,  K_SEMI,NC,NC,  0x1b,0x3b,NC,  0x1b,0x4e,0x3a},
+{K_SQUOTE,NC,NC,K_DQUOTE,NC,NC, K_SQUOTE,NC,NC,0x1b,0x27,NC,  0x1b,0x4e,0x22},
+{K_GRAV,NC,NC,  K_TILDE,NC,NC,  K_RS,NC,NC,    0x1b,0x60,NC,  0x1b,0x4e,0x7e},
 {K_SCAN,K_LSHSC,NC, K_SCAN,K_LSHSC,NC, K_SCAN,K_LSHSC,NC, K_SCAN,K_LSHSC,NC,
-	 K_SCAN,K_LSHSC,NC},
-{K_BSLSH,NC,NC, K_PIPE,NC,NC, K_FS,NC,NC, 0x1b,0x4e,0x5c, 0x1b,0x4e,0x7c},
-{K_z,NC,NC, K_Z,NC,NC, K_SUB,NC,NC, 0x1b,0x4e,0x7a, 0x1b,0x4e,0x5a},
-{K_x,NC,NC, K_X,NC,NC, K_CAN,NC,NC, 0x1b,0x4e,0x78, 0x1b,0x4e,0x58},
-{K_c,NC,NC, K_C,NC,NC, K_ETX,NC,NC, 0x1b,0x4e,0x63, 0x1b,0x4e,0x43},
-{K_v,NC,NC, K_V,NC,NC, K_SYN,NC,NC, 0x1b,0x4e,0x76, 0x1b,0x4e,0x56},
-{K_b,NC,NC, K_B,NC,NC, K_STX,NC,NC, 0x1b,0x4e,0x62, 0x1b,0x4e,0x42},
-{K_n,NC,NC, K_N,NC,NC, K_SO,NC,NC, 0x1b,0x4e,0x6e, 0x1b,0x4e,0x4e},
-{K_m,NC,NC, K_M,NC,NC, K_CR,NC,NC, 0x1b,0x4e,0x6d, 0x1b,0x4e,0x4d},
-{K_COMMA,NC,NC, K_LTHN,NC,NC, K_COMMA,NC,NC, 0x1b,0x4e,0x2c, 0x1b,0x4e,0x3c},
-{K_PERIOD,NC,NC, K_GTHN,NC,NC, K_PERIOD,NC,NC,0x1b,0x4e,0x2e,0x1b,0x4e,0x3e},
-{K_SLASH,NC,NC, K_QUES,NC,NC, K_SLASH,NC,NC, 0x1b,0x4e,0x2f, 0x1b,0x4e,0x3f},
-{K_SCAN,K_RSHSC,NC, K_SCAN,K_RSHSC,NC, K_SCAN,K_RSHSC,NC, K_SCAN,K_RSHSC,NC, 
-	 K_SCAN,K_RSHSC,NC},
-{K_ASTER,NC,NC, K_ASTER,NC,NC, K_ASTER,NC,NC, 0x1b,0x4e,0x2a,0x1b,0x4e,0x2a},
-{K_SCAN,K_ALTSC,NC, K_SCAN,K_ALTSC,NC, K_SCAN,K_ALTSC,NC, K_SCAN,K_ALTSC,NC, 
-	 K_SCAN,K_ALTSC,NC},
-{K_SPACE,NC,NC, K_SPACE,NC,NC, K_NUL,NC,NC, K_SPACE,NC,NC, K_SPACE,NC,NC},
-{K_SCAN,K_CLCKSC,NC, K_SCAN,K_CLCKSC,NC, K_SCAN,K_CLCKSC,NC, 
-	 K_SCAN,K_CLCKSC,NC, K_SCAN,K_CLCKSC,NC},
-{K_F1, K_F1S, K_F1, K_F1, K_F1S},
-{K_F2, K_F2S, K_F2, K_F2, K_F2S},
-{K_F3, K_F3S, K_F3, K_F3, K_F3S},
-{K_F4, K_F4S, K_F4, K_F4, K_F4S},
-{K_F5, K_F5S, K_F5, K_F5, K_F5S},
-{K_F6, K_F6S, K_F6, K_F6, K_F6S},
-{K_F7, K_F7S, K_F7, K_F7, K_F7S},
-{K_F8, K_F8S, K_F8, K_F8, K_F8S},
-{K_F9, K_F9S, K_F9, K_F9, K_F9S},
-{K_F10, K_F10S, K_F10, K_F10, K_F10S},
-{K_SCAN,K_NLCKSC,NC, K_SCAN,K_NLCKSC,NC, K_SCAN,K_NLCKSC,NC, 
-	 K_SCAN,K_NLCKSC,NC, K_SCAN,K_NLCKSC,NC},
-{K_SCRL, K_NUL,NC,NC, K_SCRL, K_SCRL, K_NUL,NC,NC},
-{K_HOME, K_SEVEN,NC,NC, K_HOME, K_HOME, 0x1b,0x4e,0x37},
-{K_UA, K_EIGHT,NC,NC, K_UA, K_UA, 0x1b,0x4e,0x38},
-{K_PUP, K_NINE,NC,NC, K_PUP, K_PUP, 0x1b,0x4e,0x39},
-{0x1b,0x5b,0x53, K_MINUS,NC,NC, 0x1b,0x5b,0x53,0x1b,0x5b,0x53,0x1b,0x4e,0x2d},
-{K_LA, K_FOUR,NC,NC, K_LA, K_LA, 0x1b,0x4e,0x34},
-{0x1b,0x5b,0x47,K_FIVE,NC,NC,0x1b,0x5b,0x47, 0x1b,0x5b,0x47, 0x1b,0x4e,0x35},
-{K_RA, K_SIX,NC,NC, K_RA, K_RA, 0x1b,0x4e,0x36},
-{0x1b,0x5b,0x54,K_PLUS,NC,NC, 0x1b,0x5b,0x54, 0x1b,0x5b,0x54, 0x1b,0x4e,0x2b},
-{K_END, K_ONE,NC,NC, K_END, K_END, 0x1b,0x4e,0x31},
-{K_DA, K_TWO,NC,NC, K_DA, K_DA, 0x1b,0x4e,0x32},
-{K_PDN, K_THREE,NC,NC, K_PDN, K_PDN, 0x1b,0x4e,0x33},
-{K_INS, K_ZERO,NC,NC, K_INS, K_INS, 0x1b,0x4e,0x30},
-{K_DEL,NC,NC, K_PERIOD,NC,NC, K_DEL,NC,NC, K_DEL,NC,NC, 0x1b,0x4e,0x2e},
-{NC,NC,NC,NC,NC,NC,NC,NC,NC,NC,NC,NC,NC,NC,NC},
-{NC,NC,NC,NC,NC,NC,NC,NC,NC,NC,NC,NC,NC,NC,NC},
-{NC,NC,NC,NC,NC,NC,NC,NC,NC,NC,NC,NC,NC,NC,NC},
-{K_F11, K_F11S, K_F11, K_F11, K_F11S},
-{K_F12, K_F12S, K_F12, K_F12, K_F12S}
+ K_SCAN,K_LSHSC,NC},
+{K_BSLSH,NC,NC, K_PIPE,NC,NC,   K_FS,NC,NC,    0x1b,0x5c,NC,  0x1b,0x4e,0x7c},
+{K_z,NC,NC,     K_Z,NC,NC,      K_SUB,NC,NC,   0x1b,0x7a,NC,  0x1b,0x4e,0x5a},
+{K_x,NC,NC,     K_X,NC,NC,      K_CAN,NC,NC,   0x1b,0x78,NC,  0x1b,0x4e,0x58},
+{K_c,NC,NC,     K_C,NC,NC,      K_ETX,NC,NC,   0x1b,0x63,NC,  0x1b,0x4e,0x43},
+{K_v,NC,NC,     K_V,NC,NC,      K_SYN,NC,NC,   0x1b,0x76,NC,  0x1b,0x4e,0x56},
+{K_b,NC,NC,     K_B,NC,NC,      K_STX,NC,NC,   0x1b,0x62,NC,  0x1b,0x4e,0x42},
+{K_n,NC,NC,     K_N,NC,NC,      K_SO,NC,NC,    0x1b,0x6e,NC,  0x1b,0x4e,0x4e},
+{K_m,NC,NC,     K_M,NC,NC,      K_CR,NC,NC,    0x1b,0x6d,NC,  0x1b,0x4e,0x4d},
+{K_COMMA,NC,NC, K_LTHN,NC,NC,   K_COMMA,NC,NC, 0x1b,0x2c,NC,  0x1b,0x4e,0x3c},
+{K_PERIOD,NC,NC,K_GTHN,NC,NC,   K_PERIOD,NC,NC,0x1b,0x2e,NC,  0x1b,0x4e,0x3e},
+{K_SLASH,NC,NC, K_QUES,NC,NC,   K_SLASH,NC,NC, 0x1b,0x2f,NC,  0x1b,0x4e,0x3f},
+{K_SCAN,K_RSHSC,NC, K_SCAN,K_RSHSC,NC, K_SCAN,K_RSHSC,NC, K_SCAN,K_RSHSC,NC,
+     K_SCAN,K_RSHSC,NC},
+{K_ASTER,NC,NC, K_ASTER,NC,NC,  K_ASTER,NC,NC, 0x1b,0x4e,0x2a,0x1b,0x4e,0x2a},
+{K_SCAN,K_ALTSC,NC, K_SCAN,K_ALTSC,NC, K_SCAN,K_ALTSC,NC, K_SCAN,K_ALTSC,NC,
+     K_SCAN,K_ALTSC,NC},
+{K_SPACE,NC,NC, K_SPACE,NC,NC,  K_NUL,NC,NC,   0x1b,K_SPACE,NC, K_SPACE,NC,NC},
+{K_SCAN,K_CLCKSC,NC, K_SCAN,K_CLCKSC,NC, K_SCAN,K_CLCKSC,NC,
+     K_SCAN,K_CLCKSC,NC, K_SCAN,K_CLCKSC,NC},
+{K_F1,  K_F1S,  K_F1,  K_F1A,  K_F1S},
+{K_F2,  K_F2S,  K_F2,  K_F2A,  K_F2S},
+{K_F3,  K_F3S,  K_F3,  K_F3A,  K_F3S},
+{K_F4,  K_F4S,  K_F4,  K_F4A,  K_F4S},
+{K_F5,  K_F5S,  K_F5,  K_F5A,  K_F5S},
+{K_F6,  K_F6S,  K_F6,  K_F6A,  K_F6S},
+{K_F7,  K_F7S,  K_F7,  K_F7A,  K_F7S},
+{K_F8,  K_F8S,  K_F8,  K_F8A,  K_F8S},
+{K_F9,  K_F9S,  K_F9,  K_F9A,  K_F9S},
+{K_F10, K_F10S, K_F10, K_F10A, K_F10S},
+{K_SCAN,K_NLCKSC,NC, K_SCAN,K_NLCKSC,NC, K_SCAN,K_NLCKSC,NC,
+     K_SCAN,K_NLCKSC,NC, K_SCAN,K_NLCKSC,NC},
+{K_SCRL,         K_NUL,NC,NC,    K_SCRL,        K_SCRL,      K_NUL,NC,NC},
+{K_HOME,         K_SEVEN,NC,NC,  K_HOME,        K_HOME,      0x1b,0x4e,0x37},
+{K_UA,           K_EIGHT,NC,NC,  K_UA,          K_UA,        0x1b,0x4e,0x38},
+{K_PUP,          K_NINE,NC,NC,   K_PUP,         K_PUP,       0x1b,0x4e,0x39},
+{0x1b,0x5b,0x53, K_MINUS,NC,NC,  0x1b,0x5b,0x53, 0x1b,0x5b,0x53,
+     0x1b,0x4e,0x2d},
+{K_LA,           K_FOUR,NC,NC,   K_LA,          K_LA,        0x1b,0x4e,0x34},
+{0x1b,0x5b,0x47, K_FIVE,NC,NC,   0x1b,0x5b,0x47, 0x1b,0x5b,0x47,
+     0x1b,0x4e,0x35},
+{K_RA,           K_SIX,NC,NC,    K_RA,          K_RA,        0x1b,0x4e,0x36},
+{0x1b,0x5b,0x54, K_PLUS,NC,NC,   0x1b,0x5b,0x54, 0x1b,0x5b,0x54,
+     0x1b,0x4e,0x2b},
+{K_END,          K_ONE,NC,NC,    K_END,         K_END,       0x1b,0x4e,0x31},
+{K_DA,           K_TWO,NC,NC,    K_DA,          K_DA,        0x1b,0x4e,0x32},
+{K_PDN,          K_THREE,NC,NC,  K_PDN,         K_PDN,       0x1b,0x4e,0x33},
+{K_INS,          K_ZERO,NC,NC,   K_INS,         K_INS,       0x1b,0x4e,0x30},
+{0x1b,0x5b,0x39, K_PERIOD,NC,NC, K_DEL,NC,NC,   K_DEL,NC,NC, 0x1b,0x4e,0x2e},
+{NC,NC,NC,       NC,NC,NC,       NC,NC,NC,      NC,NC,NC,    NC,NC,NC},
+{NC,NC,NC,       NC,NC,NC,       NC,NC,NC,      NC,NC,NC,    NC,NC,NC},
+{NC,NC,NC,       NC,NC,NC,       NC,NC,NC,      NC,NC,NC,    NC,NC,NC},
+{K_F11,          K_F11S,         K_F11,         K_F11A,      K_F11S},
+{K_F12,          K_F12S,         K_F12,         K_F12A,      K_F12S}
 };
 
 
@@ -1065,12 +1083,15 @@ boolean_t	extended;
 	if ((!extended) && state != KS_NORMAL) {
 		if ((state&(KS_SHIFTED|KS_ALTED)) == (KS_SHIFTED|KS_ALTED))
 			state_idx = SHIFT_ALT;
+                /* CTRL should have higher priority than SHIFT.  That
+                   way, CTRL-SHIFT-2 and CTRL-2 produce the same keycode.
+                   --Derek Upham 1997/06/25 */
+		else if (state&KS_CTLED)
+			state_idx = CTRL_STATE;
 		else if (state&KS_SHIFTED)
 			state_idx = SHIFT_STATE;
 		else if (state&KS_ALTED)
 			state_idx = ALT_STATE;
-		else if (state&KS_CTLED)
-			state_idx = CTRL_STATE;
 	}
 
 	return (CHARIDX(state_idx));
diff --git a/i386/i386at/kd.h b/i386/i386at/kd.h
index f2d3f5e..3b1ace3 100644
--- a/i386/i386at/kd.h
+++ b/i386/i386at/kd.h
@@ -509,6 +509,21 @@ typedef u_char Scancode;
 #define K_F12		0x1b,0x4f,0x41
 #define K_F12S		0x1b,0x4f,0x61
 
+/* These are the Alt-FxxA #defines.  They work with the new keymap
+   -- Derek Upham 1997/06/25  */
+#define K_F1A		0x1b,0x4f,0x30
+#define K_F2A		0x1b,0x4f,0x31
+#define K_F3A		0x1b,0x4f,0x32
+#define K_F4A		0x1b,0x4f,0x33
+#define K_F5A		0x1b,0x4f,0x34
+#define K_F6A		0x1b,0x4f,0x35
+#define K_F7A		0x1b,0x4f,0x36
+#define K_F8A		0x1b,0x4f,0x37
+#define K_F9A		0x1b,0x4f,0x38
+#define K_F10A		0x1b,0x4f,0x39
+#define K_F11A		0x1b,0x4f,0x3a
+#define K_F12A		0x1b,0x4f,0x3b
+
 #define K_SCRL		0x1b,0x5b,0x4d
 #define K_HOME		0x1b,0x5b,0x48
 #define K_UA		0x1b,0x5b,0x41
diff --git a/i386/i386at/kd_event.c b/i386/i386at/kd_event.c
index 9ee4374..304bd7f 100644
--- a/i386/i386at/kd_event.c
+++ b/i386/i386at/kd_event.c
@@ -185,6 +185,11 @@ io_return_t kbdgetstat(dev, flavor, data, count)
 		*data = KB_VANILLAKB;
 		*count = 1;
 		break;
+	    case DEV_GET_SIZE:
+		data[DEV_GET_SIZE_DEVICE_SIZE] = 0;
+		data[DEV_GET_SIZE_RECORD_SIZE] = sizeof(kd_event);
+		*count = DEV_GET_SIZE_COUNT;
+		break;
 	    default:
 		return (D_INVALID_OPERATION);
 	}
@@ -307,6 +312,10 @@ kbdread(dev, ior)
 	register int	err, count;
 	register spl_t	s;
 
+	/* Check if IO_COUNT is a multiple of the record size. */
+	if (ior->io_count % sizeof(kd_event) != 0)
+	    return D_INVALID_SIZE;
+
 	err = device_read_alloc(ior, (vm_size_t)ior->io_count);
 	if (err != KERN_SUCCESS)
 	    return (err);
diff --git a/i386/i386at/kd_mouse.c b/i386/i386at/kd_mouse.c
index 8f4e09a..28114d4 100644
--- a/i386/i386at/kd_mouse.c
+++ b/i386/i386at/kd_mouse.c
@@ -314,6 +314,26 @@ kd_mouse_close(dev, mouse_pic)
 }
 
 #ifdef	MACH_KERNEL
+io_return_t mousegetstat(dev, flavor, data, count)
+	dev_t		  dev;
+	int		  flavor;
+	int *		  data;		/* pointer to OUT array */
+	unsigned int	  *count;	/* OUT */
+{
+	io_return_t	result;
+
+	switch (flavor) {
+	    case DEV_GET_SIZE:
+		data[DEV_GET_SIZE_DEVICE_SIZE] = 0;
+		data[DEV_GET_SIZE_RECORD_SIZE] = sizeof(kd_event);
+		*count = DEV_GET_SIZE_COUNT;
+		break;
+	    default:
+		return D_INVALID_OPERATION;
+	}
+	return D_SUCCESS;
+}
+
 #else	MACH_KERNEL
 /*
  * mouseioctl - handling for asynch & non-blocking I/O.
@@ -390,6 +410,10 @@ mouseread(dev, ior)
 	register int	err, count;
 	register spl_t	s;
 
+	/* Check if IO_COUNT is a multiple of the record size. */
+	if (ior->io_count % sizeof(kd_event) != 0)
+	    return D_INVALID_SIZE;
+
 	err = device_read_alloc(ior, (vm_size_t)ior->io_count);
 	if (err != KERN_SUCCESS)
 	    return (err);