src - OpenBSD base system

diff options


context:
space:
mode:

author	Miod Vallat <miod@cvs.openbsd.org>	2008-07-16 16:32:09 +0000
committer	Miod Vallat <miod@cvs.openbsd.org>	2008-07-16 16:32:09 +0000
commit	adb90c171c4675d893a66c5c4a280844643027c6 (patch)
tree	28da3eb37d14937355603098e136e6075b020cd5 /sys
parent	c40ff5a74813ffe5a9ab781208841060e795c4c4 (diff)

Implement pckbc_xt_translation() in gsckbc. Thus, we can attach pckbd instead of

gsckbd; the former will cause a proper translation page to be selected by the keyboard. Because of this, we no longer depend on the page the keyboard is left in by the PDC (page 2 for all machines but the PrecisionBook, which is in page 3), and there is no longer any need to use separate keyboard maps.

Diffstat (limited to 'sys')

-rw-r--r--

sys/arch/hppa/conf/GENERIC

-rw-r--r--

sys/arch/hppa/conf/RAMDISK

-rw-r--r--

sys/arch/hppa/conf/files.hppa

-rw-r--r--

sys/arch/hppa/gsc/Makefile

-rw-r--r--

sys/arch/hppa/gsc/gsckbc.c

-rw-r--r--

sys/arch/hppa/gsc/gsckbd.c

602

-rw-r--r--

sys/arch/hppa/gsc/gsckbdmap.c

1036

-rw-r--r--

sys/arch/hppa/gsc/gsckbdmap.h

-rw-r--r--

sys/arch/hppa/gsc/gsckbdvar.h

-rw-r--r--

sys/arch/hppa/gsc/makemap.awk

359

10 files changed, 22 insertions, 2084 deletions

diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 9aafa0b7b65..c990db0dd58 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC

@@ -1,4 +1,4 @@

-# $OpenBSD: GENERIC,v 1.118 2008/06/07 19:12:32 brad Exp $

+# $OpenBSD: GENERIC,v 1.119 2008/07/16 16:32:08 miod Exp $

# For further information on compiling OpenBSD kernels, see the config(8)

# man page.

@@ -244,7 +244,7 @@ scsibus* at oosiop?

harmony* at gsc? irq 13 # Audio Type 2 (CS4215/AD1849)

audio* at harmony?

gsckbc* at gsc? irq 26

-gsckbd* at gsckbc? # PS/2 keyboard

+pckbd* at gsckbc? # PS/2 keyboard

pms* at gsckbc? # PS/2 mouse

#sh* at eisa? # Interphase Seahawk 4811 EISA/FDDI

@@ -328,7 +328,7 @@ ukphy* at mii? # generic unknown PHYs

# MI devices

#wsdisplay* at vgafb?

wsdisplay* at sti?

-wskbd* at gsckbd? mux 1

+wskbd* at pckbd? mux 1

wskbd* at hilkbd? mux 1

wsmouse* at pms? mux 0

wsmouse* at hilms? mux 0

diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK
index 68530040623..c611a696e6d 100644
--- a/sys/arch/hppa/conf/RAMDISK
+++ b/sys/arch/hppa/conf/RAMDISK

@@ -1,4 +1,4 @@

-# $OpenBSD: RAMDISK,v 1.84 2008/07/02 03:00:03 brad Exp $

+# $OpenBSD: RAMDISK,v 1.85 2008/07/16 16:32:08 miod Exp $

# Diskless kernel config

@@ -222,7 +222,7 @@ scsibus* at oosiop?

#harmony* at gsc? irq 13 # Audio Type 2 (CS4215/AD1849)

#audio* at harmony?

gsckbc* at gsc? irq 26

-gsckbd* at gsckbc? # PS/2 keyboard

+pckbd* at gsckbc? # PS/2 keyboard

#pms* at gsckbc? # PS/2 mouse

#sh* at eisa? # Interphase Seahawk 4811 EISA/FDDI

@@ -306,7 +306,7 @@ ukphy* at mii? # generic unknown PHYs

# MI devices

#wsdisplay* at vgafb?

wsdisplay* at sti?

-wskbd* at gsckbd? mux 1

+wskbd* at pckbd? mux 1

wskbd* at hilkbd? mux 1

#wsmouse* at pms? mux 0

#wsmouse* at hilms? mux 0

diff --git a/sys/arch/hppa/conf/files.hppa b/sys/arch/hppa/conf/files.hppa
index a2733fce72a..88d641f032d 100644
--- a/sys/arch/hppa/conf/files.hppa
+++ b/sys/arch/hppa/conf/files.hppa

@@ -1,4 +1,4 @@

-# $OpenBSD: files.hppa,v 1.79 2008/05/28 22:45:57 kettenis Exp $

+# $OpenBSD: files.hppa,v 1.80 2008/07/16 16:32:08 miod Exp $

# hppa-specific configuration info

@@ -284,13 +284,7 @@ device gsckbc: pckbcslot

attach gsckbc at gsc

file arch/hppa/gsc/gsckbc.c gsckbc

-# PS/2 keyboard

-device gsckbd: wskbddev

-attach gsckbd at pckbcslot

-file arch/hppa/gsc/gsckbd.c gsckbd needs-flag

-file arch/hppa/gsc/gsckbdmap.c gsckbd

-# PS/2 mouse

+# PS/2 keyboard and mouse

include "dev/pckbc/files.pckbc"

diff --git a/sys/arch/hppa/gsc/Makefile b/sys/arch/hppa/gsc/Makefile
deleted file mode 100644
index 0aa281730ee..00000000000
--- a/sys/arch/hppa/gsc/Makefile
+++ /dev/null

@@ -1,10 +0,0 @@

-# $OpenBSD: Makefile,v 1.1 2003/02/16 01:42:49 miod Exp $

-AWK= awk

-PROG= makemap.awk

-SOURCE= ../../../dev/pckbc/wskbdmap_mfii.c

-gsckbdmap.c: ${SOURCE} ${PROG}

- /bin/rm -f $@

- ${AWK} -f ${PROG} ${SOURCE} > $@

diff --git a/sys/arch/hppa/gsc/gsckbc.c b/sys/arch/hppa/gsc/gsckbc.c
index 0f52af3ccfa..0ed5d9b220d 100644
--- a/sys/arch/hppa/gsc/gsckbc.c
+++ b/sys/arch/hppa/gsc/gsckbc.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: gsckbc.c,v 1.10 2007/10/01 16:11:19 krw Exp $ */

+/* $OpenBSD: gsckbc.c,v 1.11 2008/07/16 16:32:08 miod Exp $ */

@@ -88,7 +88,7 @@

#include <dev/ic/pckbcvar.h>

#include <dev/pckbc/pckbdreg.h> /* constants for probe magic */

-#include <hppa/gsc/gsckbdvar.h>

+#include <dev/pckbc/pckbdvar.h>

int gsckbc_match(struct device *, void *, void *);

void gsckbc_attach(struct device *, struct device *, void *);

@@ -111,7 +111,7 @@ struct cfdriver gsckbc_cd = {

void gsckbc_intr_establish(struct pckbc_softc *, pckbc_slot_t);

-#include "gsckbd.h"

+#include "pckbd.h"

#if (NGSCKBD > 0)

#include <dev/pckbc/pckbdvar.h>

#endif

@@ -411,11 +411,11 @@ gsckbc_attach(struct device *parent, struct device *self, void *aux)

printf("%s: expecting device type %d, got %d\n",

sc->sc_dv.dv_xname, gsc->sc_type, ident);

} else {

-#if (NGSCKBD > 0)

+#if (NPCKBD > 0)

if (gsc->sc_type == PCKBC_KBD_SLOT &&

ga->ga_dp.dp_mod == PAGE0->mem_kbd.pz_dp.dp_mod &&

bcmp(ga->ga_dp.dp_bc, PAGE0->mem_kbd.pz_dp.dp_bc, 6) == 0)

- gsckbd_cnattach(t, PCKBC_KBD_SLOT);

+ pckbd_cnattach(t, PCKBC_KBD_SLOT);

#endif

pckbc_attach_slot(sc, gsc->sc_type);

}

@@ -590,6 +590,15 @@ pckbc_poll_data(self, slot)

return (c);

}

+int

+pckbc_xt_translation(self, slot, on)

+ pckbc_tag_t self;

+ pckbc_slot_t slot;

+ int on;

+ return (0);

void

pckbc_slot_enable(self, slot, on)

pckbc_tag_t self;

diff --git a/sys/arch/hppa/gsc/gsckbd.c b/sys/arch/hppa/gsc/gsckbd.c
deleted file mode 100644
index 432584bdefb..00000000000
--- a/sys/arch/hppa/gsc/gsckbd.c
+++ /dev/null

@@ -1,602 +0,0 @@

-/* $OpenBSD: gsckbd.c,v 1.8 2008/06/26 05:42:10 ray Exp $ */

-/*

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the above copyright

- * notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright

- * notice, this list of conditions and the following disclaimer in the

- * documentation and/or other materials provided with the distribution.

- *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,

- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR

- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN

- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

- * POSSIBILITY OF SUCH DAMAGE.

- *

- */

-/*

- * Derived from /sys/dev/pckbc/pckbd.c under the following terms:

- * OpenBSD: pckbd.c,v 1.4 2002/03/14 01:27:00 millert Exp

- * NetBSD: pckbd.c,v 1.24 2000/06/05 22:20:57 sommerfeld Exp

- */

-/*-

- *

- * This code is derived from software contributed to The NetBSD Foundation

- * by Charles M. Hannum.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the above copyright

- * notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright

- * notice, this list of conditions and the following disclaimer in the

- * documentation and/or other materials provided with the distribution.

- *

- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS

- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS

- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

- * POSSIBILITY OF SUCH DAMAGE.

- */

-/*-

- *

- * This code is derived from software contributed to Berkeley by

- * William Jolitz and Don Ahn.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the above copyright

- * notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright

- * notice, this list of conditions and the following disclaimer in the

- * documentation and/or other materials provided with the distribution.

- * 3. Neither the name of the University nor the names of its contributors

- * may be used to endorse or promote products derived from this software

- * without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND

- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE

- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

- * SUCH DAMAGE.

- *

- * @(#)pccons.c 5.11 (Berkeley) 5/21/91

- */

-/*

- * A pckbd-like driver for the GSC keyboards found on various HP workstations.

- */

-#include <sys/param.h>

-#include <sys/systm.h>

-#include <sys/device.h>

-#include <sys/malloc.h>

-#include <sys/ioctl.h>

-#include <machine/bus.h>

-#include <dev/ic/pckbcvar.h>

-#include <dev/pckbc/pckbdreg.h>

-#include <hppa/gsc/gsckbdvar.h>

-#include <hppa/gsc/gsckbdmap.h>

-#include <dev/wscons/wsconsio.h>

-#include <dev/wscons/wskbdvar.h>

-#include <dev/wscons/wsksymdef.h>

-#include <dev/wscons/wsksymvar.h>

-struct gsckbd_internal {

- int t_isconsole;

- pckbc_tag_t t_kbctag;

- pckbc_slot_t t_kbcslot;

- int t_lastchar;

- int t_extended;

- int t_releasing;

- int t_extended1;

- struct gsckbd_softc *t_sc; /* back pointer */

-};

-struct gsckbd_softc {

- struct device sc_dev;

- struct gsckbd_internal *id;

- int sc_enabled;

- int sc_ledstate;

- struct device *sc_wskbddev;

-#ifdef WSDISPLAY_COMPAT_RAWKBD

- int rawkbd;

-#endif

-};

-int gsckbd_is_console(pckbc_tag_t, pckbc_slot_t);

-int gsckbdprobe(struct device *, void *, void *);

-void gsckbdattach(struct device *, struct device *, void *);

-struct cfdriver gsckbd_cd = {

- NULL, "gsckbd", DV_DULL

-};

-struct cfattach gsckbd_ca = {

- sizeof(struct gsckbd_softc), gsckbdprobe, gsckbdattach,

-};

-int gsckbd_enable(void *, int);

-void gsckbd_set_leds(void *, int);

-int gsckbd_ioctl(void *, u_long, caddr_t, int, struct proc *);

-const struct wskbd_accessops gsckbd_accessops = {

- gsckbd_enable,

- gsckbd_set_leds,

- gsckbd_ioctl,

-};

-void gsckbd_cngetc(void *, u_int *, int *);

-void gsckbd_cnpollc(void *, int);

-const struct wskbd_consops gsckbd_consops = {

- gsckbd_cngetc,

- gsckbd_cnpollc,

- NULL

-};

-const struct wskbd_mapdata gsckbd_keymapdata = {

- gsckbd_keydesctab, /* XXX */

-#ifdef GSCKBD_LAYOUT

- GSCKBD_LAYOUT,

-#else

- KB_US,

-#endif

-};

-int gsckbd_init(struct gsckbd_internal *, pckbc_tag_t, pckbc_slot_t,

- int);

-void gsckbd_input(void *, int);

-static int gsckbd_decode(struct gsckbd_internal *, int,

- u_int *, int *);

-static int gsckbd_led_encode(int);

-static int gsckbd_led_decode(int);

-struct gsckbd_internal gsckbd_consdata;

-int

-gsckbd_is_console(tag, slot)

- pckbc_tag_t tag;

- pckbc_slot_t slot;

- return (gsckbd_consdata.t_isconsole &&

- (tag == gsckbd_consdata.t_kbctag) &&

- (slot == gsckbd_consdata.t_kbcslot));

-/*

- * these are both EXTREMELY bad jokes

- */

-int

-gsckbdprobe(parent, match, aux)

- struct device *parent;

- void *match;

- void *aux;

- struct cfdata *cf = match;

- struct pckbc_attach_args *pa = aux;

- u_char cmd[1], resp[1];

- int res;

- /*

- * XXX There are rumours that a keyboard can be connected

- * to the aux port as well. For me, this didn't work.

- * For further experiments, allow it if explicitly

- * wired in the config file.

- */

- if ((pa->pa_slot != PCKBC_KBD_SLOT) &&

- (cf->cf_loc[PCKBCCF_SLOT] == PCKBCCF_SLOT_DEFAULT))

- return (0);

- /* Flush any garbage. */

- pckbc_flush(pa->pa_tag, pa->pa_slot);

- /* Reset the keyboard. */

- cmd[0] = KBC_RESET;

- res = pckbc_poll_cmd(pa->pa_tag, pa->pa_slot, cmd, 1, 1, resp, 1);

- if (res) {

-#ifdef DEBUG

- printf("gsckbdprobe: reset error %d\n", res);

-#endif

- /*

- * There is probably no keyboard connected.

- * Let the probe succeed if the keyboard is used

- * as console input - it can be connected later.

- */

- return (gsckbd_is_console(pa->pa_tag, pa->pa_slot) ? 1 : 0);

- }

- if (resp[0] != KBR_RSTDONE) {

- printf("gsckbdprobe: reset response 0x%x\n", resp[0]);

- return (0);

- }

- /*

- * Some keyboards seem to leave a second ack byte after the reset.

- * This is kind of stupid, but we account for them anyway by just

- * flushing the buffer.

- */

- pckbc_flush(pa->pa_tag, pa->pa_slot);

- return (2);

-void

-gsckbdattach(parent, self, aux)

- struct device *parent, *self;

- void *aux;

- struct gsckbd_softc *sc = (void *)self;

- struct pckbc_attach_args *pa = aux;

- int isconsole;

- struct wskbddev_attach_args a;

- u_char cmd[1];

- printf("\n");

- isconsole = gsckbd_is_console(pa->pa_tag, pa->pa_slot);

- if (isconsole) {

- sc->id = &gsckbd_consdata;

- /*

- * Some keyboards are not enabled after a reset,

- * so make sure it is enabled now.

- */

- cmd[0] = KBC_ENABLE;

- (void) pckbc_poll_cmd(sc->id->t_kbctag, sc->id->t_kbcslot,

- cmd, 1, 0, 0, 0);

- sc->sc_enabled = 1;

- } else {

- sc->id = malloc(sizeof(struct gsckbd_internal),

- M_DEVBUF, M_WAITOK);

- (void) gsckbd_init(sc->id, pa->pa_tag, pa->pa_slot, 0);

- /* no interrupts until enabled */

- cmd[0] = KBC_DISABLE;

- (void) pckbc_poll_cmd(sc->id->t_kbctag, sc->id->t_kbcslot,

- cmd, 1, 0, 0, 0);

- sc->sc_enabled = 0;

- }

- sc->id->t_sc = sc;

- pckbc_set_inputhandler(sc->id->t_kbctag, sc->id->t_kbcslot,

- gsckbd_input, sc, sc->sc_dev.dv_xname);

- a.console = isconsole;

- a.keymap = &gsckbd_keymapdata;

- a.accessops = &gsckbd_accessops;

- a.accesscookie = sc;

- /*

- * Attach the wskbd, saving a handle to it.

- * XXX XXX XXX

- */

- sc->sc_wskbddev = config_found(self, &a, wskbddevprint);

-int

-gsckbd_enable(v, on)

- void *v;

- int on;

- struct gsckbd_softc *sc = v;

- u_char cmd[1];

- int res;

- if (on) {

- if (sc->sc_enabled && !sc->id->t_isconsole)

- return (EBUSY);

- pckbc_slot_enable(sc->id->t_kbctag, sc->id->t_kbcslot, 1);

- cmd[0] = KBC_ENABLE;

- res = pckbc_poll_cmd(sc->id->t_kbctag, sc->id->t_kbcslot,

- cmd, 1, 0, NULL, 0);

- if (res) {

- printf("gsckbd_enable: command error\n");

- return (res);

- }

- sc->sc_enabled = 1;

- } else {

- if (sc->id->t_isconsole)

- return (EBUSY);

- cmd[0] = KBC_DISABLE;

- res = pckbc_enqueue_cmd(sc->id->t_kbctag, sc->id->t_kbcslot,

- cmd, 1, 0, 1, 0);

- if (res) {

- printf("gsckbd_disable: command error\n");

- return (res);

- }

- pckbc_slot_enable(sc->id->t_kbctag, sc->id->t_kbcslot, 0);

- sc->sc_enabled = 0;

- }

- return (0);

-static int

-gsckbd_decode(id, datain, type, dataout)

- struct gsckbd_internal *id;

- int datain;

- u_int *type;

- int *dataout;

- int key;

- if (datain == KBR_BREAK) {

- id->t_releasing = 1; /* next keycode is a release */

- return 0;

- }

- if (datain == KBR_EXTENDED0) {

- id->t_extended = 0x80;

- return 0;

- } else if (datain == KBR_EXTENDED1) {

- id->t_extended1 = 2;

- return 0;

- }

- /*

- * Map extended keys to codes 128-254

- * Note that we do not use (datain & 0x7f) because function key

- * F7 produces non-extended 0x83 code. Sucker.

- */

- key = datain | id->t_extended;

- id->t_extended = 0;

- /*

- * process BREAK sequence (EXT1 14 77):

- * map to (unused) code 7F

- */

- if (id->t_extended1 == 2 && datain == 0x14) {

- id->t_extended1 = 1;

- return 0;

- } else if (id->t_extended1 == 1 && datain == 0x77) {

- id->t_extended1 = 0;

- key = 0x7f;

- } else if (id->t_extended1 > 0) {

- id->t_extended1 = 0;

- }

- if (id->t_releasing) {

- id->t_releasing = 0;

- *type = WSCONS_EVENT_KEY_UP;

- *dataout = key;

- id->t_lastchar = 0;

- } else {

- /* Always ignore typematic keys */

- if (key == id->t_lastchar)

- return 0;

- *dataout = id->t_lastchar = key;

- *type = WSCONS_EVENT_KEY_DOWN;

- }

- return 1;

-int

-gsckbd_init(t, kbctag, kbcslot, console)

- struct gsckbd_internal *t;

- pckbc_tag_t kbctag;

- pckbc_slot_t kbcslot;

- int console;

- bzero(t, sizeof(struct gsckbd_internal));

- t->t_isconsole = console;

- t->t_kbctag = kbctag;

- t->t_kbcslot = kbcslot;

- return (0);

-static int

-gsckbd_led_encode(led)

- int led;

- int res;

- res = 0;

- if (led & WSKBD_LED_SCROLL)

- res |= 0x01;

- if (led & WSKBD_LED_NUM)

- res |= 0x02;

- if (led & WSKBD_LED_CAPS)

- res |= 0x04;

- return(res);

-static int

-gsckbd_led_decode(led)

- int led;

- int res;

- res = 0;

- if (led & 0x01)

- res |= WSKBD_LED_SCROLL;

- if (led & 0x02)

- res |= WSKBD_LED_NUM;

- if (led & 0x04)

- res |= WSKBD_LED_CAPS;

- return(res);

-void

-gsckbd_set_leds(v, leds)

- void *v;

- int leds;

- struct gsckbd_softc *sc = v;

- u_char cmd[2];

- cmd[0] = KBC_MODEIND;

- cmd[1] = gsckbd_led_encode(leds);

- sc->sc_ledstate = cmd[1];

- pckbc_enqueue_cmd(sc->id->t_kbctag, sc->id->t_kbcslot,

- cmd, 2, 0, 0, 0);

-/*

- * Got a console receive interrupt -

- * the console processor wants to give us a character.

- */

-void

-gsckbd_input(vsc, data)

- void *vsc;

- int data;

- struct gsckbd_softc *sc = vsc;

- int type, key;

-#ifdef WSDISPLAY_COMPAT_RAWKBD

- if (sc->rawkbd) {

- char d = data;

- wskbd_rawinput(sc->sc_wskbddev, &d, 1);

- return;

- }

-#endif

- if (gsckbd_decode(sc->id, data, &type, &key))

- wskbd_input(sc->sc_wskbddev, type, key);

-int

-gsckbd_ioctl(v, cmd, data, flag, p)

- void *v;

- u_long cmd;

- caddr_t data;

- int flag;

- struct proc *p;

- struct gsckbd_softc *sc = v;

- switch (cmd) {

- case WSKBDIO_GTYPE:

- *(int *)data = WSKBD_TYPE_GSC;

- return 0;

- case WSKBDIO_SETLEDS:

- {

- char cmd[2];

- int res;

- cmd[0] = KBC_MODEIND;

- cmd[1] = gsckbd_led_encode(*(int *)data);

- sc->sc_ledstate = cmd[1];

- res = pckbc_enqueue_cmd(sc->id->t_kbctag, sc->id->t_kbcslot,

- cmd, 2, 0, 1, 0);

- return (res);

- }

- case WSKBDIO_GETLEDS:

- *(int *)data = gsckbd_led_decode(sc->sc_ledstate);

- return (0);

-#ifdef WSDISPLAY_COMPAT_RAWKBD

- case WSKBDIO_SETMODE:

- sc->rawkbd = (*(int *)data == WSKBD_RAW);

- return (0);

-#endif

- }

- return -1;

-int

-gsckbd_cnattach(kbctag, kbcslot)

- pckbc_tag_t kbctag;

- int kbcslot;

- char cmd[1];

- int res;

- res = gsckbd_init(&gsckbd_consdata, kbctag, kbcslot, 1);

-#if 0 /* we allow the console to be attached if no keyboard is present */

- if (res)

- return (res);

-#endif

- /* Just to be sure. */

- cmd[0] = KBC_ENABLE;

- res = pckbc_poll_cmd(kbctag, kbcslot, cmd, 1, 0, 0, 0);

-#if 0

- if (res)

- return (res);

-#endif

- wskbd_cnattach(&gsckbd_consops, &gsckbd_consdata, &gsckbd_keymapdata);

- return (0);

-/* ARGSUSED */

-void

-gsckbd_cngetc(v, type, data)

- void *v;

- u_int *type;

- int *data;

- struct gsckbd_internal *t = v;

- int val;

- for (;;) {

- val = pckbc_poll_data(t->t_kbctag, t->t_kbcslot);

- if ((val != -1) && gsckbd_decode(t, val, type, data))

- return;

- }

-void

-gsckbd_cnpollc(v, on)

- void *v;

- int on;

- struct gsckbd_internal *t = v;

- pckbc_set_poll(t->t_kbctag, t->t_kbcslot, on);

diff --git a/sys/arch/hppa/gsc/gsckbdmap.c b/sys/arch/hppa/gsc/gsckbdmap.c
deleted file mode 100644
index 0c952b3879d..00000000000
--- a/sys/arch/hppa/gsc/gsckbdmap.c
+++ /dev/null

@@ -1,1036 +0,0 @@

-/* $OpenBSD: gsckbdmap.c,v 1.22 2008/06/26 05:42:10 ray Exp $ */

-/*

- * THIS FILE IS AUTOMAGICALLY GENERATED. DO NOT EDIT.

- *

- * generated by:

- * OpenBSD: makemap.awk,v 1.6 2005/05/12 16:21:23 miod Exp

- * generated from:

- */

-/* OpenBSD: wskbdmap_mfii.c,v 1.35 2008/03/21 17:10:46 miod Exp */

-/* $NetBSD: wskbdmap_mfii.c,v 1.15 2000/05/19 16:40:04 drochner Exp $ */

-/*

- * PLEASE DO NOT FORGET TO REGEN

- * sys/arch/hppa/gsc/gsckbdmap.c

- * sys/dev/usb/ukbdmap.c

- * AFTER ANY CHANGES TO THIS FILE!

- */

-/*-

- *

- * This code is derived from software contributed to The NetBSD Foundation

- * by Juergen Hannken-Illjes.