Add a new wskbd type for Sun type 5 keyboards (WSKBD_TYPE_SUN5).

This is needed since eg Swedish type 4 and 5 keyboard has keycodes
with different keycodes. eg AltGr and Compose are switched in type 5
compared with type 4.

This change will need a new Xserver to allow sun type 5 keyboards.
-moj  ok miod@

2 files changed, 28 insertions, 8 deletions

diff --git a/sys/arch/sparc64/dev/comkbd_ebus.c b/sys/arch/sparc64/dev/comkbd_ebus.c
index b22e61177ab..ec8b943a337 100644
--- a/sys/arch/sparc64/dev/comkbd_ebus.c
+++ b/sys/arch/sparc64/dev/comkbd_ebus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: comkbd_ebus.c,v 1.6 2002/04/08 17:49:42 jason Exp $	*/
+/*	$OpenBSD: comkbd_ebus.c,v 1.7 2002/05/29 20:43:43 maja Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -239,7 +239,11 @@ comkbd_attach(parent, self, aux)
 		cn_tab->cn_dev = makedev(77, sc->sc_dv.dv_unit); /* XXX */
 		cn_tab->cn_pollc = wskbd_cnpollc;
 		cn_tab->cn_getc = wskbd_cngetc;
-		wskbd_cnattach(&comkbd_consops, sc, &sunkbd_keymapdata);
+		if (ISTYPE5(sc->sc_layout)) {
+			wskbd_cnattach(&comkbd_consops, sc, &sunkbd5_keymapdata);
+		} else {
+			wskbd_cnattach(&comkbd_consops, sc, &sunkbd_keymapdata);
+		}
 		sc->sc_ier = IER_ETXRDY | IER_ERXRDY;
 		COM_WRITE(sc, com_ier, sc->sc_ier);
 		COM_READ(sc, com_iir);
@@ -249,7 +253,11 @@ comkbd_attach(parent, self, aux)
 
 
 	a.console = console;
-	a.keymap = &sunkbd_keymapdata;
+	if (ISTYPE5(sc->sc_layout)) {
+		a.keymap = &sunkbd5_keymapdata;
+	} else {
+		a.keymap = &sunkbd_keymapdata;
+	}
 	a.accessops = &comkbd_accessops;
 	a.accesscookie = sc;
 	sc->sc_wskbddev = config_found(self, &a, wskbddevprint);
@@ -308,7 +316,11 @@ comkbd_ioctl(v, cmd, data, flag, p)
 
 	switch (cmd) {
 	case WSKBDIO_GTYPE:
-		*d_int = WSKBD_TYPE_SUN;
+		if (ISTYPE5(sc->sc_layout)) {
+			*d_int = WSKBD_TYPE_SUN5;
+		} else {
+			*d_int = WSKBD_TYPE_SUN;
+		}
 		return (0);
 	case WSKBDIO_SETLEDS:
 		comkbd_setleds(v, *d_int);
diff --git a/sys/arch/sparc64/dev/z8530kbd.c b/sys/arch/sparc64/dev/z8530kbd.c
index 8b8982b83f6..4a12fbc0c97 100644
--- a/sys/arch/sparc64/dev/z8530kbd.c
+++ b/sys/arch/sparc64/dev/z8530kbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530kbd.c,v 1.11 2002/03/21 03:09:33 jason Exp $	*/
+/*	$OpenBSD: z8530kbd.c,v 1.12 2002/05/29 20:43:43 maja Exp $	*/
 /*	$NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $	*/
 
 /*-
@@ -405,12 +405,16 @@ zskbd_attach(parent, self, aux)
 		printf("\n");
 
 	a.console = console;
-	a.keymap = &sunkbd_keymapdata;
+	if (ISTYPE5(zst->zst_layout)) {
+		a.keymap = &sunkbd5_keymapdata;
+	} else {
+		a.keymap = &sunkbd_keymapdata;
+	}
 	a.accessops = &zskbd_accessops;
 	a.accesscookie = zst;
 
 	if (console)
-		wskbd_cnattach(&zskbd_consops, zst, &sunkbd_keymapdata);
+		wskbd_cnattach(&zskbd_consops, zst, a.keymap);
 
 	zst->zst_wskbddev = config_found(self, &a, wskbddevprint);
 }
@@ -1153,7 +1157,11 @@ zskbd_ioctl(v, cmd, data, flag, p)
 
 	switch (cmd) {
 	case WSKBDIO_GTYPE:
-		*d_int = WSKBD_TYPE_SUN;
+		if (ISTYPE5(zst->zst_layout)) {
+			*d_int = WSKBD_TYPE_SUN5;
+		} else {
+			*d_int = WSKBD_TYPE_SUN;
+		}
 		return (0);
 	case WSKBDIO_SETLEDS:
 		zskbd_set_leds(zst, *d_int);