Sync with NetBSD 961207

1 files changed, 213 insertions, 205 deletions

diff --git a/sys/arch/alpha/isa/pckbd.c b/sys/arch/alpha/isa/pckbd.c
index f255e2b82e1..b23ee96cb32 100644
--- a/sys/arch/alpha/isa/pckbd.c
+++ b/sys/arch/alpha/isa/pckbd.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: pckbd.c,v 1.8 1996/12/08 00:20:28 niklas Exp $	*/
-/*	$NetBSD: pckbd.c,v 1.10 1996/10/23 04:12:20 cgd Exp $	*/
+/*	$OpenBSD: pckbd.c,v 1.9 1997/01/24 19:57:26 niklas Exp $	*/
+/*	$NetBSD: pckbd.c,v 1.14 1996/12/05 01:39:30 cgd Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995 Charles Hannum.  All rights reserved.
@@ -62,11 +62,23 @@
 #include <alpha/isa/spkrreg.h>
 #include <alpha/isa/timerreg.h>
 #include <machine/wsconsio.h>
+#include <alpha/isa/pcppivar.h>
 
 #include <alpha/wscons/wsconsvar.h>
 #include <alpha/wscons/kbd.h>
 #include "wscons.h"
 
+#undef KBDATAP
+#undef KBOUTP
+#undef KBSTATP
+#undef KBCMDP
+#undef PITAUX_PORT
+#define	KBDATAP		0x0	/* kbd data port (I) */
+#define	KBOUTP		0x0	/* kbd data port (O) */
+#define	KBSTATP		0x4	/* kbd controller status port (I) */
+#define	KBCMDP		0x4	/* kbd controller port (O) */
+#define	PITAUX_PORT	0x1	/* port B of PPI */
+
 static volatile u_char ack, nak;	/* Don't ask. */
 static u_char async, kernel, polling;	/* Really, you don't want to know. */
 static u_char lock_state = 0x00,	/* all off */
@@ -77,12 +89,8 @@ static u_char lock_state = 0x00,	/* all off */
 bus_space_tag_t pckbd_iot;
 isa_chipset_tag_t pckbd_ic;
 
-bus_space_handle_t pckbd_data_ioh;
-#define	pckbd_out_ioh	pckbd_data_ioh
-bus_space_handle_t pckbd_status_ioh;
-#define	pckbd_cmd_ioh	pckbd_status_ioh
+bus_space_handle_t pckbd_ioh;
 bus_space_handle_t pckbd_timer_ioh;
-bus_space_handle_t pckbd_pitaux_ioh;
 bus_space_handle_t pckbd_delay_ioh;
 
 struct pckbd_softc {
@@ -93,7 +101,11 @@ struct pckbd_softc {
 	int	sc_bellpitch;		/* last pitch programmed */
 };
 
+#ifdef __BROKEN_INDIRECT_CONFIG
 int pckbdprobe __P((struct device *, void *, void *));
+#else
+int pckbdprobe __P((struct device *, struct cfdata *, void *));
+#endif
 void pckbdattach __P((struct device *, struct device *, void *));
 int pckbdintr __P((void *));
 
@@ -108,9 +120,8 @@ struct cfdriver pckbd_cd = {
 int	pckbd_cngetc __P((struct device *));
 void	pckbd_cnpollc __P((struct device *, int));
 void	pckbd_bell __P((struct device *, struct wsconsio_bell_data *));
-int	pckbd_ioctl __P((struct device *, u_long, caddr_t, int,
+int	pckbd_ioctl __P((void *, u_long, caddr_t, int,
 	    struct proc *));
-
 char	*pckbd_translate __P((struct device *dev, int c));
 
 #if NWSCONS
@@ -126,12 +137,15 @@ struct wscons_idev_spec pckbd_wscons_idev = {
 #endif
 
 void	pckbd_bell_stop __P((void *));
-
 static __inline int kbd_wait_output __P((void));
 static __inline int kbd_wait_input __P((void));
 static __inline void kbd_flush_input __P((void));
-u_char kbc_get8042cmd __P((void));
-int kbc_put8042cmd __P((u_char));
+u_char	kbc_get8042cmd __P((void));
+int	kbc_put8042cmd __P((u_char));
+int	kbd_cmd __P((u_char, u_char));
+void	do_async_update __P((void *));
+void	async_update __P((void));
+
 int kbd_cmd __P((u_char, u_char));
 void do_async_update __P((void *));
 void async_update __P((void));
@@ -165,7 +179,7 @@ kbd_wait_output()
 	u_int i;
 
 	for (i = 100000; i; i--)
-		if ((bus_space_read_1(pckbd_iot, pckbd_status_ioh, 0) & KBS_IBF)
+		if ((bus_space_read_1(pckbd_iot, pckbd_ioh, KBSTATP) & KBS_IBF)
 		    == 0) {
 			KBD_DELAY;
 			return 1;
@@ -179,7 +193,7 @@ kbd_wait_input()
 	u_int i;
 
 	for (i = 100000; i; i--)
-		if ((bus_space_read_1(pckbd_iot, pckbd_status_ioh, 0) & KBS_DIB)
+		if ((bus_space_read_1(pckbd_iot, pckbd_ioh, KBSTATP) & KBS_DIB)
 		    != 0) {
 			KBD_DELAY;
 			return 1;
@@ -193,11 +207,11 @@ kbd_flush_input()
 	u_int i;
 
 	for (i = 10; i; i--) {
-		if ((bus_space_read_1(pckbd_iot, pckbd_status_ioh, 0) & KBS_DIB)
+		if ((bus_space_read_1(pckbd_iot, pckbd_ioh, KBSTATP) & KBS_DIB)
 		    == 0)
 			return;
 		KBD_DELAY;
-		(void) bus_space_read_1(pckbd_iot, pckbd_data_ioh, 0);
+		(void) bus_space_read_1(pckbd_iot, pckbd_ioh, KBDATAP);
 	}
 }
 
@@ -211,10 +225,10 @@ kbc_get8042cmd()
 
 	if (!kbd_wait_output())
 		return -1;
-	bus_space_write_1(pckbd_iot, pckbd_cmd_ioh, 0, K_RDCMDBYTE);
+	bus_space_write_1(pckbd_iot, pckbd_ioh, KBCMDP, K_RDCMDBYTE);
 	if (!kbd_wait_input())
 		return -1;
-	return bus_space_read_1(pckbd_iot, pckbd_data_ioh, 0);
+	return bus_space_read_1(pckbd_iot, pckbd_ioh, KBDATAP);
 }
 #endif
 
@@ -228,10 +242,10 @@ kbc_put8042cmd(val)
 
 	if (!kbd_wait_output())
 		return 0;
-	bus_space_write_1(pckbd_iot, pckbd_cmd_ioh, 0, K_LDCMDBYTE);
+	bus_space_write_1(pckbd_iot, pckbd_ioh, KBCMDP, K_LDCMDBYTE);
 	if (!kbd_wait_output())
 		return 0;
-	bus_space_write_1(pckbd_iot, pckbd_out_ioh, 0, val);
+	bus_space_write_1(pckbd_iot, pckbd_ioh, KBOUTP, val);
 	return 1;
 }
 
@@ -250,16 +264,16 @@ kbd_cmd(val, polling)
 		if (!kbd_wait_output())
 			return 0;
 		ack = nak = 0;
-		bus_space_write_1(pckbd_iot, pckbd_out_ioh, 0, val);
+		bus_space_write_1(pckbd_iot, pckbd_ioh, KBOUTP, val);
 		if (polling)
 			for (i = 100000; i; i--) {
 				if (bus_space_read_1(pckbd_iot,
-				    pckbd_status_ioh, 0) & KBS_DIB) {
+				    pckbd_ioh, KBSTATP) & KBS_DIB) {
 					register u_char c;
 
 					KBD_DELAY;
 					c = bus_space_read_1(pckbd_iot,
-					    pckbd_data_ioh, 0);
+					    pckbd_ioh, KBDATAP);
 					if (c == KBR_ACK || c == KBR_ECHO) {
 						ack = 1;
 						return 1;
@@ -277,7 +291,7 @@ kbd_cmd(val, polling)
 		else
 			for (i = 100000; i; i--) {
 				(void) bus_space_read_1(pckbd_iot,
-				    pckbd_status_ioh, 0);
+				    pckbd_ioh, KBSTATP);
 				if (ack)
 					return 1;
 				if (nak)
@@ -295,28 +309,34 @@ kbd_cmd(val, polling)
 int
 pckbdprobe(parent, match, aux)
 	struct device *parent;
-	void *match, *aux;
+#ifdef __BROKEN_INDIRECT_CONFIG
+	void *match;
+#else
+	struct cfdata *match;
+#endif
+	void *aux;
 {
-	struct isa_attach_args *ia = aux;
-	u_int i;
-
-	pckbd_iot = ia->ia_iot;
-	pckbd_ic = ia->ia_ic;
+	struct pcppi_attach_args *pa = aux;
+	u_int i, rv;
 
-	if (bus_space_map(pckbd_iot, KBDATAP, 1, 0, &pckbd_data_ioh) ||
-	    bus_space_map(pckbd_iot, KBSTATP, 1, 0, &pckbd_status_ioh) ||
-	    bus_space_map(pckbd_iot, IO_TIMER1, 4, 0, &pckbd_timer_ioh) ||
-	    bus_space_map(pckbd_iot, PITAUX_PORT, 1, 0, &pckbd_pitaux_ioh))
+	if (pa->pa_slot != PCPPI_KBD_SLOT)
 		return 0;
 
-	pckbd_delay_ioh = ia->ia_delaybah;
+	rv = 0;
+
+	pckbd_iot = pa->pa_iot;
+	pckbd_ic = pa->pa_ic;
+	pckbd_ioh = pa->pa_ioh;
+	pckbd_timer_ioh = pa->pa_pit_ioh;
+	pckbd_delay_ioh = pa->pa_delaybah;
 
 	/* Enable interrupts and keyboard, etc. */
 	if (!kbc_put8042cmd(CMDBYTE)) {
 		printf("pcprobe: command error\n");
-		return 0;
+		goto lose;
 	}
 
+	rv = 1;			/* from here one out, we let it succeed */
 #if 1
 	/* Flush any garbage. */
 	kbd_flush_input();
@@ -326,12 +346,12 @@ pckbdprobe(parent, match, aux)
 		goto lose;
 	}
 	for (i = 600000; i; i--)
-		if ((bus_space_read_1(pckbd_iot, pckbd_status_ioh, 0) & KBS_DIB)
+		if ((bus_space_read_1(pckbd_iot, pckbd_ioh, KBSTATP) & KBS_DIB)
 		    != 0) {
 			KBD_DELAY;
 			break;
 		}
-	if (i == 0 || bus_space_read_1(pckbd_iot, pckbd_data_ioh, 0)
+	if (i == 0 || bus_space_read_1(pckbd_iot, pckbd_ioh, KBDATAP)
 	    != KBR_RSTDONE) {
 		printf("pcprobe: reset error %d\n", 2);
 		goto lose;
@@ -382,9 +402,7 @@ lose:
 	 */
 #endif
 
-	ia->ia_iobase = 16;
-	ia->ia_iosize = 0;
-	return 1;
+	return rv;
 }
 
 void
@@ -393,21 +411,16 @@ pckbdattach(parent, self, aux)
 	void *aux;
 {
 	struct pckbd_softc *sc = (void *)self;
-	struct isa_attach_args *ia = aux;
-
-	pckbd_iot = ia->ia_iot;
-	pckbd_ic = ia->ia_ic;
+	struct pcppi_attach_args *pa = aux;
 
-	if (bus_space_map(pckbd_iot, KBDATAP, 1, 0, &pckbd_data_ioh) ||
-	    bus_space_map(pckbd_iot, KBSTATP, 1, 0, &pckbd_status_ioh) ||
-	    bus_space_map(pckbd_iot, IO_TIMER1, 4, 0, &pckbd_timer_ioh) ||
-	    bus_space_map(pckbd_iot, PITAUX_PORT, 1, 0, &pckbd_pitaux_ioh))
-                panic("pckbdattach couldn't map");
+	pckbd_iot = pa->pa_iot;
+	pckbd_ic = pa->pa_ic;
+	pckbd_ioh = pa->pa_ioh;
+	pckbd_timer_ioh = pa->pa_pit_ioh;
+	pckbd_delay_ioh = pa->pa_delaybah;
 
-	pckbd_delay_ioh = ia->ia_delaybah;
-
-	sc->sc_ih = isa_intr_establish(pckbd_ic, ia->ia_irq, IST_EDGE,
-	    IPL_TTY, pckbdintr, sc, sc->sc_dev.dv_xname);
+	sc->sc_ih = isa_intr_establish(pckbd_ic, 1, IST_EDGE, IPL_TTY,
+	    pckbdintr, sc, sc->sc_dev.dv_xname);
 
 	sc->sc_bellactive = sc->sc_bellpitch = 0;
 
@@ -431,13 +444,13 @@ pckbdintr(arg)
 	u_char data;
 	static u_char last;
 
-	if ((bus_space_read_1(pckbd_iot, pckbd_status_ioh, 0) & KBS_DIB) == 0)
+	if ((bus_space_read_1(pckbd_iot, pckbd_ioh, KBSTATP) & KBS_DIB) == 0)
 		return 0;
 	if (polling)
 		return 1;
 	do {
 		KBD_DELAY;
-		data = bus_space_read_1(pckbd_iot, pckbd_data_ioh, 0);
+		data = bus_space_read_1(pckbd_iot, pckbd_ioh, KBDATAP);
 
 		switch (data) {
 		case KBR_ACK:
@@ -456,15 +469,15 @@ pckbdintr(arg)
 #endif
 			break;
 		}
-	} while (bus_space_read_1(pckbd_iot, pckbd_status_ioh, 0) & KBS_DIB);
+	} while (bus_space_read_1(pckbd_iot, pckbd_ioh, KBSTATP) & KBS_DIB);
 	return 1;
 }
 
 void
-do_async_update(vp)
-	void *vp;
+do_async_update(v)
+	void *v;
 {
-	int poll = *(int *)vp;
+	u_long poll = (u_long)v;
 
 	async = 0;
 
@@ -489,24 +502,21 @@ do_async_update(vp)
 void
 async_update()
 {
-	static int nopoll = 0;
-	static int poll = 1;
-
 	if (kernel || polling) {
 		if (async)
-			untimeout(do_async_update, &nopoll);
-		do_async_update(&poll);
+			untimeout(do_async_update, NULL);
+		do_async_update((void *)1);
 	} else {
 		if (async)
 			return;
 		async = 1;
-		timeout(do_async_update, &nopoll, 1);
+		timeout(do_async_update, NULL, 1);
 	}
 }
 
 int
-pckbd_ioctl(dev, cmd, data, flag, p)
-	struct device *dev;
+pckbd_ioctl(v, cmd, data, flag, p)
+	void *v;
 	u_long cmd;
 	caddr_t data;
 	int flag;
@@ -592,138 +602,136 @@ typedef struct {
 	char shift[CODE_SIZE];
 	char ctl[CODE_SIZE];
 } Scan_def;
-
 static Scan_def	scan_codes[] = {
-	{ NONE,		"",		"",		"" },		/* 0 unused */
-	{ ASCII,	"\033",		"\033",		"\033" },	/* 1 ESCape */
-	{ ASCII,	"1",		"!",		"!" },		/* 2 1 */
-	{ ASCII,	"2",		"@",		"\000" },	/* 3 2 */
-	{ ASCII,	"3",		"#",		"#" },		/* 4 3 */
-	{ ASCII,	"4",		"$",		"$" },		/* 5 4 */
-	{ ASCII,	"5",		"%",		"%" },		/* 6 5 */
-	{ ASCII,	"6",		"^",		"\036" },	/* 7 6 */
-	{ ASCII,	"7",		"&",		"&" },		/* 8 7 */
-	{ ASCII,	"8",		"*",		"\010" },	/* 9 8 */
-	{ ASCII,	"9",		"(",		"(" },		/* 10 9 */
-	{ ASCII,	"0",		")",		")" },		/* 11 0 */
-	{ ASCII,	"-",		"_",		"\037" },	/* 12 - */
-	{ ASCII,	"=",		"+",		"+" },		/* 13 = */
-	{ ASCII,	"\177",		"\177",		"\010" },	/* 14 backspace */
-	{ ASCII,	"\t",		"\177\t",	"\t" },		/* 15 tab */
-	{ ASCII,	"q",		"Q",		"\021" },	/* 16 q */
-	{ ASCII,	"w",		"W",		"\027" },	/* 17 w */
-	{ ASCII,	"e",		"E",		"\005" },	/* 18 e */
-	{ ASCII,	"r",		"R",		"\022" },	/* 19 r */
-	{ ASCII,	"t",		"T",		"\024" },	/* 20 t */
-	{ ASCII,	"y",		"Y",		"\031" },	/* 21 y */
-	{ ASCII,	"u",		"U",		"\025" },	/* 22 u */
-	{ ASCII,	"i",		"I",		"\011" },	/* 23 i */
-	{ ASCII,	"o",		"O",		"\017" },	/* 24 o */
-	{ ASCII,	"p",		"P",		"\020" },	/* 25 p */
-	{ ASCII,	"[",		"{",		"\033" },	/* 26 [ */
-	{ ASCII,	"]",		"}",		"\035" },	/* 27 ] */
-	{ ASCII,	"\r",		"\r",		"\n" },		/* 28 return */
-	{ CTL,		"",		"",		"" },		/* 29 control */
-	{ ASCII,	"a",		"A",		"\001" },	/* 30 a */
-	{ ASCII,	"s",		"S",		"\023" },	/* 31 s */
-	{ ASCII,	"d",		"D",		"\004" },	/* 32 d */
-	{ ASCII,	"f",		"F",		"\006" },	/* 33 f */
-	{ ASCII,	"g",		"G",		"\007" },	/* 34 g */
-	{ ASCII,	"h",		"H",		"\010" },	/* 35 h */
-	{ ASCII,	"j",		"J",		"\n" },		/* 36 j */
-	{ ASCII,	"k",		"K",		"\013" },	/* 37 k */
-	{ ASCII,	"l",		"L",		"\014" },	/* 38 l */
-	{ ASCII,	";",		":",		";" },		/* 39 ; */
-	{ ASCII,	"'",		"\"",		"'" },		/* 40 ' */
-	{ ASCII,	"`",		"~",		"`" },		/* 41 ` */
-	{ SHIFT,	"",		"",		"" },		/* 42 shift */
-	{ ASCII,	"\\",		"|",		"\034" },	/* 43 \ */
-	{ ASCII,	"z",		"Z",		"\032" },	/* 44 z */
-	{ ASCII,	"x",		"X",		"\030" },	/* 45 x */
-	{ ASCII,	"c",		"C",		"\003" },	/* 46 c */
-	{ ASCII,	"v",		"V",		"\026" },	/* 47 v */
-	{ ASCII,	"b",		"B",		"\002" },	/* 48 b */
-	{ ASCII,	"n",		"N",		"\016" },	/* 49 n */
-	{ ASCII,	"m",		"M",		"\r" },		/* 50 m */
-	{ ASCII,	",",		"<",		"<" },		/* 51 , */
-	{ ASCII,	".",		">",		">" },		/* 52 . */
-	{ ASCII,	"/",		"?",		"\037" },	/* 53 / */
-	{ SHIFT,	"",		"",		"" },		/* 54 shift */
-	{ KP,		"*",		"*",		"*" },		/* 55 kp * */
-	{ ALT,		"",		"",		"" },		/* 56 alt */
-	{ ASCII,	" ",		" ",		"\000" },	/* 57 space */
-	{ CAPS,		"",		"",		"" },		/* 58 caps */
-	{ FUNC,		"\033[M",	"\033[Y",	"\033[k" },	/* 59 f1 */
-	{ FUNC,		"\033[N",	"\033[Z",	"\033[l" },	/* 60 f2 */
-	{ FUNC,		"\033[O",	"\033[a",	"\033[m" },	/* 61 f3 */
-	{ FUNC,		"\033[P",	"\033[b",	"\033[n" },	/* 62 f4 */
-	{ FUNC,		"\033[Q",	"\033[c",	"\033[o" },	/* 63 f5 */
-	{ FUNC,		"\033[R",	"\033[d",	"\033[p" },	/* 64 f6 */
-	{ FUNC,		"\033[S",	"\033[e",	"\033[q" },	/* 65 f7 */
-	{ FUNC,		"\033[T",	"\033[f",	"\033[r" },	/* 66 f8 */
-	{ FUNC,		"\033[U",	"\033[g",	"\033[s" },	/* 67 f9 */
-	{ FUNC,		"\033[V",	"\033[h",	"\033[t" },	/* 68 f10 */
-	{ NUM,		"",		"",		"" },		/* 69 num lock */
-	{ SCROLL,	"",		"",		"" },		/* 70 scroll lock */
-	{ KP,		"7",		"\033[H",	"7" },		/* 71 kp 7 */
-	{ KP,		"8",		"\033[A",	"8" },		/* 72 kp 8 */
-	{ KP,		"9",		"\033[I",	"9" },		/* 73 kp 9 */
-	{ KP,		"-",		"-",		"-" },		/* 74 kp - */
-	{ KP,		"4",		"\033[D",	"4" },		/* 75 kp 4 */
-	{ KP,		"5",		"\033[E",	"5" },		/* 76 kp 5 */
-	{ KP,		"6",		"\033[C",	"6" },		/* 77 kp 6 */
-	{ KP,		"+",		"+",		"+" },		/* 78 kp + */
-	{ KP,		"1",		"\033[F",	"1" },		/* 79 kp 1 */
-	{ KP,		"2",		"\033[B",	"2" },		/* 80 kp 2 */
-	{ KP,		"3",		"\033[G",	"3" },		/* 81 kp 3 */
-	{ KP,		"0",		"\033[L",	"0" },		/* 82 kp 0 */
-	{ KP,		".",		"\177",		"." },		/* 83 kp . */
-	{ NONE,		"",		"",		"" },		/* 84 0 */
-	{ NONE,		"100",		"",		"" },		/* 85 0 */
-	{ NONE,		"101",		"",		"" },		/* 86 0 */
-	{ FUNC,		"\033[W",	"\033[i",	"\033[u" },	/* 87 f11 */
-	{ FUNC,		"\033[X",	"\033[j",	"\033[v" },	/* 88 f12 */
-	{ NONE,		"102",		"",		"" },		/* 89 0 */
-	{ NONE,		"103",		"",		"" },		/* 90 0 */
-	{ NONE,		"",		"",		"" },		/* 91 0 */
-	{ NONE,		"",		"",		"" },		/* 92 0 */
-	{ NONE,		"",		"",		"" },		/* 93 0 */
-	{ NONE,		"",		"",		"" },		/* 94 0 */
-	{ NONE,		"",		"",		"" },		/* 95 0 */
-	{ NONE,		"",		"",		"" },		/* 96 0 */
-	{ NONE,		"",		"",		"" },		/* 97 0 */
-	{ NONE,		"",		"",		"" },		/* 98 0 */
-	{ NONE,		"",		"",		"" },		/* 99 0 */
-	{ NONE,		"",		"",		"" },		/* 100 */
-	{ NONE,		"",		"",		"" },		/* 101 */
-	{ NONE,		"",		"",		"" },		/* 102 */
-	{ NONE,		"",		"",		"" },		/* 103 */
-	{ NONE,		"",		"",		"" },		/* 104 */
-	{ NONE,		"",		"",		"" },		/* 105 */
-	{ NONE,		"",		"",		"" },		/* 106 */
-	{ NONE,		"",		"",		"" },		/* 107 */
-	{ NONE,		"",		"",		"" },		/* 108 */
-	{ NONE,		"",		"",		"" },		/* 109 */
-	{ NONE,		"",		"",		"" },		/* 110 */
-	{ NONE,		"",		"",		"" },		/* 111 */
-	{ NONE,		"",		"",		"" },		/* 112 */
-	{ NONE,		"",		"",		"" },		/* 113 */
-	{ NONE,		"",		"",		"" },		/* 114 */
-	{ NONE,		"",		"",		"" },		/* 115 */
-	{ NONE,		"",		"",		"" },		/* 116 */
-	{ NONE,		"",		"",		"" },		/* 117 */
-	{ NONE,		"",		"",		"" },		/* 118 */
-	{ NONE,		"",		"",		"" },		/* 119 */
-	{ NONE,		"",		"",		"" },		/* 120 */
-	{ NONE,		"",		"",		"" },		/* 121 */
-	{ NONE,		"",		"",		"" },		/* 122 */
-	{ NONE,		"",		"",		"" },		/* 123 */
-	{ NONE,		"",		"",		"" },		/* 124 */
-	{ NONE,		"",		"",		"" },		/* 125 */
-	{ NONE,		"",		"",		"" },		/* 126 */
-	{ NONE,		"",		"",		"" }		/* 127 */
+    {	NONE,	"",		"",		"",	 },	/* 0 unused */
+    {	ASCII,	"\033",		"\033",		"\033",	 },	/* 1 ESCape */
+    {	ASCII,	"1",		"!",		"!",	 },	/* 2 1 */
+    {	ASCII,	"2",		"@",		"\000",	 },	/* 3 2 */
+    {	ASCII,	"3",		"#",		"#",	 },	/* 4 3 */
+    {	ASCII,	"4",		"$",		"$",	 },	/* 5 4 */
+    {	ASCII,	"5",		"%",		"%",	 },	/* 6 5 */
+    {	ASCII,	"6",		"^",		"\036",	 },	/* 7 6 */
+    {	ASCII,	"7",		"&",		"&",	 },	/* 8 7 */
+    {	ASCII,	"8",		"*",		"\010",	 },	/* 9 8 */
+    {	ASCII,	"9",		"(",		"(",	 },	/* 10 9 */
+    {	ASCII,	"0",		")",		")",	 },	/* 11 0 */
+    {	ASCII,	"-",		"_",		"\037",	 },	/* 12 - */
+    {	ASCII,	"=",		"+",		"+",	 },	/* 13 = */
+    {	ASCII,	"\177",		"\177",		"\010",	 },	/* 14 backspace */
+    {	ASCII,	"\t",		"\177\t",	"\t",	 },	/* 15 tab */
+    {	ASCII,	"q",		"Q",		"\021",	 },	/* 16 q */
+    {	ASCII,	"w",		"W",		"\027",	 },	/* 17 w */
+    {	ASCII,	"e",		"E",		"\005",	 },	/* 18 e */
+    {	ASCII,	"r",		"R",		"\022",	 },	/* 19 r */
+    {	ASCII,	"t",		"T",		"\024",	 },	/* 20 t */
+    {	ASCII,	"y",		"Y",		"\031",	 },	/* 21 y */
+    {	ASCII,	"u",		"U",		"\025",	 },	/* 22 u */
+    {	ASCII,	"i",		"I",		"\011",	 },	/* 23 i */
+    {	ASCII,	"o",		"O",		"\017",	 },	/* 24 o */
+    {	ASCII,	"p",		"P",		"\020",	 },	/* 25 p */
+    {	ASCII,	"[",		"{",		"\033",	 },	/* 26 [ */
+    {	ASCII,	"]",		"}",		"\035",	 },	/* 27 ] */
+    {	ASCII,	"\r",		"\r",		"\n",	 },	/* 28 return */
+    {	CTL,	"",		"",		"",	 },	/* 29 control */
+    {	ASCII,	"a",		"A",		"\001",	 },	/* 30 a */
+    {	ASCII,	"s",		"S",		"\023",	 },	/* 31 s */
+    {	ASCII,	"d",		"D",		"\004",	 },	/* 32 d */
+    {	ASCII,	"f",		"F",		"\006",	 },	/* 33 f */
+    {	ASCII,	"g",		"G",		"\007",	 },	/* 34 g */
+    {	ASCII,	"h",		"H",		"\010",	 },	/* 35 h */
+    {	ASCII,	"j",		"J",		"\n",	 },	/* 36 j */
+    {	ASCII,	"k",		"K",		"\013",	 },	/* 37 k */
+    {	ASCII,	"l",		"L",		"\014",	 },	/* 38 l */
+    {	ASCII,	";",		":",		";",	 },	/* 39 ; */
+    {	ASCII,	"'",		"\"",		"'",	 },	/* 40 ' */
+    {	ASCII,	"`",		"~",		"`",	 },	/* 41 ` */
+    {	SHIFT,	"",		"",		"",	 },	/* 42 shift */
+    {	ASCII,	"\\",		"|",		"\034",	 },	/* 43 \ */
+    {	ASCII,	"z",		"Z",		"\032",	 },	/* 44 z */
+    {	ASCII,	"x",		"X",		"\030",	 },	/* 45 x */
+    {	ASCII,	"c",		"C",		"\003",	 },	/* 46 c */
+    {	ASCII,	"v",		"V",		"\026",	 },	/* 47 v */
+    {	ASCII,	"b",		"B",		"\002",	 },	/* 48 b */
+    {	ASCII,	"n",		"N",		"\016",	 },	/* 49 n */
+    {	ASCII,	"m",		"M",		"\r",	 },	/* 50 m */
+    {	ASCII,	",",		"<",		"<",	 },	/* 51 , */
+    {	ASCII,	".",		">",		">",	 },	/* 52 . */
+    {	ASCII,	"/",		"?",		"\037",	 },	/* 53 / */
+    {	SHIFT,	"",		"",		"",	 },	/* 54 shift */
+    {	KP,	"*",		"*",		"*",	 },	/* 55 kp * */
+    {	ALT,	"",		"",		"",	 },	/* 56 alt */
+    {	ASCII,	" ",		" ",		"\000",	 },	/* 57 space */
+    {	CAPS,	"",		"",		"",	 },	/* 58 caps */
+    {	FUNC,	"\033[M",	"\033[Y",	"\033[k", },	/* 59 f1 */
+    {	FUNC,	"\033[N",	"\033[Z",	"\033[l", },	/* 60 f2 */
+    {	FUNC,	"\033[O",	"\033[a",	"\033[m", },	/* 61 f3 */
+    {	FUNC,	"\033[P",	"\033[b",	"\033[n", },	/* 62 f4 */
+    {	FUNC,	"\033[Q",	"\033[c",	"\033[o", },	/* 63 f5 */
+    {	FUNC,	"\033[R",	"\033[d",	"\033[p", },	/* 64 f6 */
+    {	FUNC,	"\033[S",	"\033[e",	"\033[q", },	/* 65 f7 */
+    {	FUNC,	"\033[T",	"\033[f",	"\033[r", },	/* 66 f8 */
+    {	FUNC,	"\033[U",	"\033[g",	"\033[s", },	/* 67 f9 */
+    {	FUNC,	"\033[V",	"\033[h",	"\033[t", },	/* 68 f10 */
+    {	NUM,	"",		"",		"",	 },	/* 69 num lock */
+    {	SCROLL,	"",		"",		"",	 },	/* 70 scroll lock */
+    {	KP,	"7",		"\033[H",	"7",	 },	/* 71 kp 7 */
+    {	KP,	"8",		"\033[A",	"8",	 },	/* 72 kp 8 */
+    {	KP,	"9",		"\033[I",	"9",	 },	/* 73 kp 9 */
+    {	KP,	"-",		"-",		"-",	 },	/* 74 kp - */
+    {	KP,	"4",		"\033[D",	"4",	 },	/* 75 kp 4 */
+    {	KP,	"5",		"\033[E",	"5",	 },	/* 76 kp 5 */
+    {	KP,	"6",		"\033[C",	"6",	 },	/* 77 kp 6 */
+    {	KP,	"+",		"+",		"+",	 },	/* 78 kp + */
+    {	KP,	"1",		"\033[F",	"1",	 },	/* 79 kp 1 */
+    {	KP,	"2",		"\033[B",	"2",	 },	/* 80 kp 2 */
+    {	KP,	"3",		"\033[G",	"3",	 },	/* 81 kp 3 */
+    {	KP,	"0",		"\033[L",	"0",	 },	/* 82 kp 0 */
+    {	KP,	".",		"\177",		".",	 },	/* 83 kp . */
+    {	NONE,	"",		"",		"",	 },	/* 84 0 */
+    {	NONE,	"100",		"",		"",	 },	/* 85 0 */
+    {	NONE,	"101",		"",		"",	 },	/* 86 0 */
+    {	FUNC,	"\033[W",	"\033[i",	"\033[u", },	/* 87 f11 */
+    {	FUNC,	"\033[X",	"\033[j",	"\033[v", },	/* 88 f12 */
+    {	NONE,	"102",		"",		"",	 },	/* 89 0 */
+    {	NONE,	"103",		"",		"",	 },	/* 90 0 */
+    {	NONE,	"",		"",		"",	 },	/* 91 0 */
+    {	NONE,	"",		"",		"",	 },	/* 92 0 */
+    {	NONE,	"",		"",		"",	 },	/* 93 0 */
+    {	NONE,	"",		"",		"",	 },	/* 94 0 */
+    {	NONE,	"",		"",		"",	 },	/* 95 0 */
+    {	NONE,	"",		"",		"",	 },	/* 96 0 */
+    {	NONE,	"",		"",		"",	 },	/* 97 0 */
+    {	NONE,	"",		"",		"",	 },	/* 98 0 */
+    {	NONE,	"",		"",		"",	 },	/* 99 0 */
+    {	NONE,	"",		"",		"",	 },	/* 100 */
+    {	NONE,	"",		"",		"",	 },	/* 101 */
+    {	NONE,	"",		"",		"",	 },	/* 102 */
+    {	NONE,	"",		"",		"",	 },	/* 103 */
+    {	NONE,	"",		"",		"",	 },	/* 104 */
+    {	NONE,	"",		"",		"",	 },	/* 105 */
+    {	NONE,	"",		"",		"",	 },	/* 106 */
+    {	NONE,	"",		"",		"",	 },	/* 107 */
+    {	NONE,	"",		"",		"",	 },	/* 108 */
+    {	NONE,	"",		"",		"",	 },	/* 109 */
+    {	NONE,	"",		"",		"",	 },	/* 110 */
+    {	NONE,	"",		"",		"",	 },	/* 111 */
+    {	NONE,	"",		"",		"",	 },	/* 112 */
+    {	NONE,	"",		"",		"",	 },	/* 113 */
+    {	NONE,	"",		"",		"",	 },	/* 114 */
+    {	NONE,	"",		"",		"",	 },	/* 115 */
+    {	NONE,	"",		"",		"",	 },	/* 116 */
+    {	NONE,	"",		"",		"",	 },	/* 117 */
+    {	NONE,	"",		"",		"",	 },	/* 118 */
+    {	NONE,	"",		"",		"",	 },	/* 119 */
+    {	NONE,	"",		"",		"",	 },	/* 120 */
+    {	NONE,	"",		"",		"",	 },	/* 121 */
+    {	NONE,	"",		"",		"",	 },	/* 122 */
+    {	NONE,	"",		"",		"",	 },	/* 123 */
+    {	NONE,	"",		"",		"",	 },	/* 124 */
+    {	NONE,	"",		"",		"",	 },	/* 125 */
+    {	NONE,	"",		"",		"",	 },	/* 126 */
+    {	NONE,	"",		"",		"",	 },	/* 127 */
 };
-
 /*
  * Get characters from the keyboard.  If none are present, return NULL.
  */
@@ -863,18 +871,18 @@ int
 pckbd_cngetc(dev)
 	struct device *dev;
 {
-        register char *cp;
+        register char *cp = NULL;
 	u_char data;
 	static u_char last;
 
         do {
 		/* wait for byte */
-                while ((bus_space_read_1(pckbd_iot, pckbd_status_ioh, 0) & KBS_DIB)
+                while ((bus_space_read_1(pckbd_iot, pckbd_ioh, KBSTATP) & KBS_DIB)
 		    == 0)
 			KBD_DELAY;
 		KBD_DELAY;
 
-                data = bus_space_read_1(pckbd_iot, pckbd_data_ioh, 0);
+                data = bus_space_read_1(pckbd_iot, pckbd_ioh, KBDATAP);
 
                 if (data == KBR_ACK) {
                         ack = 1;
@@ -953,8 +961,8 @@ pckbd_bell(dev, wbd)
 		bus_space_write_1(pckbd_iot, pckbd_timer_ioh, TIMER_CNTR2,
 		    TIMER_DIV(pitch) / 256);
 		/* enable speaker */
-		bus_space_write_1(pckbd_iot, pckbd_pitaux_ioh, 0,
-	    	    bus_space_read_1(pckbd_iot, pckbd_pitaux_ioh, 0) |
+		bus_space_write_1(pckbd_iot, pckbd_ioh, PITAUX_PORT,
+	    	    bus_space_read_1(pckbd_iot, pckbd_ioh, PITAUX_PORT) |
 		      PIT_SPKR);
 		splx(s);
 	}
@@ -972,8 +980,8 @@ pckbd_bell_stop(arg)
 
 	/* disable bell */
 	s = splhigh();
-	bus_space_write_1(pckbd_iot, pckbd_pitaux_ioh, 0,
-	    bus_space_read_1(pckbd_iot, pckbd_pitaux_ioh, 0) & ~PIT_SPKR);
+	bus_space_write_1(pckbd_iot, pckbd_ioh, PITAUX_PORT,
+	    bus_space_read_1(pckbd_iot, pckbd_ioh, PITAUX_PORT) & ~PIT_SPKR);
 	sc->sc_bellactive = 0;
 	splx(s);
 }