- Hook up the new locations of the atkbdc(4), atkbd(4) and psm(4) source

  files after they were repo-copied to sys/dev/atkbdc. The sources of
  atkbdc(4) and its children were moved to the new location in preparation
  for adding an EBus front-end to atkbdc(4) for use on sparc64; i.e. in
  order to not further scatter them over the whole tree which would have
  been the result of adding atkbdc_ebus.c in e.g. sys/sparc64/ebus. Another
  reason for the repo-copies was that some of the sources were misfiled,
  e.g. sys/isa/atkbd_isa.c wasn't ISA-specific at all but for hanging
  atkbd(4) off of atkbdc(4) and was renamed to atkbd_atkbdc.c accordingly.
  Most of sys/isa/psm.c, i.e. expect for its PSMC PNP part, also isn't
  ISA-specific.
- Separate the parts of atkbdc_isa.c which aren't actually ISA-specific
  but are shareable between different atkbdc(4) bus front-ends into
  atkbdc_subr.c (repo-copied from atkbdc_isa.c). While here use
  bus_generic_rl_alloc_resource() and bus_generic_rl_release_resource()
  respectively in atkbdc_isa.c instead of rolling own versions.
- Add sparc64 MD bits to atkbdc(4) and atkbd(4) and an EBus front-end for
  atkbdc(4). PS/2 controllers and input devices are used on a couple of
  Sun OEM boards and occur on either the EBus or the ISA bus. Depending on
  the board it's either the only on-board mean to connect a keyboard and
  mouse or an alternative to either RS232 or USB devices.
- Wrap the PSMC PNP part of psm.c in #ifdef DEV_ISA so it can be compiled
  without isa(4) (e.g. for EBus-only machines). This ISA-specific part
  isn't separated into its own source file, yet, as it requires more work
  than was feasible for 6.0 in order to do it in a clean way. Actually
  philip@ is working on a rewrite of psm(4) so a more comprehensive
  clean-up and separation of hardware dependent and independent parts is
  expected to happen after 6.0.

Tested on:	i386, sparc64 (AX1105, AXe and AXi boards)
Reviewed by:	philip

14 files changed, 522 insertions, 3215 deletions

diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c
index 670a8de..eedc469 100644
--- a/sys/dev/atkbdc/atkbd.c
+++ b/sys/dev/atkbdc/atkbd.c
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
+#include <sys/eventhandler.h>
 #include <sys/proc.h>
 #include <sys/limits.h>
 #include <sys/malloc.h>
@@ -51,16 +52,17 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_param.h>
+
+#include <isa/isareg.h>
 #endif /* __i386__ */
 
 #include <sys/kbio.h>
 #include <dev/kbd/kbdreg.h>
-#include <dev/kbd/atkbdreg.h>
-#include <dev/kbd/atkbdcreg.h>
-
-#include <isa/isareg.h>
+#include <dev/atkbdc/atkbdreg.h>
+#include <dev/atkbdc/atkbdcreg.h>
 
 static timeout_t	atkbd_timeout;
+static void		atkbd_shutdown_final(void *v);
 
 int
 atkbd_probe_unit(int unit, int ctlr, int irq, int flags)
@@ -119,6 +121,10 @@ atkbd_attach_unit(int unit, keyboard_t **kbd, int ctlr, int irq, int flags)
 
 	if (bootverbose)
 		(*sw->diag)(*kbd, bootverbose);
+
+	EVENTHANDLER_REGISTER(shutdown_final, atkbd_shutdown_final, *kbd,
+	    SHUTDOWN_PRI_DEFAULT);
+
 	return 0;
 }
 
@@ -839,7 +845,7 @@ atkbd_check_char(keyboard_t *kbd)
 static int
 atkbd_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg)
 {
-	/* trasnlate LED_XXX bits into the device specific bits */
+	/* translate LED_XXX bits into the device specific bits */
 	static u_char ledmap[8] = {
 		0, 4, 2, 6, 1, 5, 3, 7,
 	};
@@ -1021,6 +1027,30 @@ atkbd_poll(keyboard_t *kbd, int on)
 	return 0;
 }
 
+static void
+atkbd_shutdown_final(void *v)
+{
+#ifdef __sparc64__
+	keyboard_t *kbd = v;
+	KBDC kbdc = ((atkbd_state_t *)kbd->kb_data)->kbdc;
+
+	/*
+	 * Turn off the translation in preparation for handing the keyboard
+	 * over to the OFW as the OBP driver doesn't use translation and
+	 * also doesn't disable it itself resulting in a broken keymap at
+	 * the boot prompt. Also disable the aux port and the interrupts as
+	 * the OBP driver doesn't use them, i.e. polls the keyboard. Not
+	 * disabling the interrupts doesn't cause real problems but the
+	 * responsiveness is a bit better when they are turned off.
+	 */
+	send_kbd_command(kbdc, KBDC_DISABLE_KBD);
+	set_controller_command_byte(kbdc,
+	    KBD_AUX_CONTROL_BITS | KBD_KBD_CONTROL_BITS | KBD_TRANSLATION,
+	    KBD_DISABLE_AUX_PORT | KBD_DISABLE_KBD_INT | KBD_ENABLE_KBD_PORT);
+	send_kbd_command(kbdc, KBDC_ENABLE_KBD);
+#endif
+}
+
 /* local functions */
 
 static int
@@ -1299,11 +1329,10 @@ init_keyboard(KBDC kbdc, int *type, int flags)
 		}
 	}
 
-#ifdef __alpha__
+#if defined(__alpha__) || defined(__sparc64__)
 	if (send_kbd_command_and_data(
 		kbdc, KBDC_SET_SCANCODE_SET, 2) != KBD_ACK) {
 		printf("atkbd: can't set translation.\n");
-		
 	}
 	c |= KBD_TRANSLATION;
 #endif
diff --git a/sys/dev/atkbdc/atkbd_atkbdc.c b/sys/dev/atkbdc/atkbd_atkbdc.c
index 8d238c7..63c30d9 100644
--- a/sys/dev/atkbdc/atkbd_atkbdc.c
+++ b/sys/dev/atkbdc/atkbd_atkbdc.c
@@ -41,11 +41,8 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/kbio.h>
 #include <dev/kbd/kbdreg.h>
-#include <dev/kbd/atkbdreg.h>
-#include <dev/kbd/atkbdcreg.h>
-
-#include <isa/isareg.h>
-#include <isa/isavar.h>
+#include <dev/atkbdc/atkbdreg.h>
+#include <dev/atkbdc/atkbdcreg.h>
 
 typedef struct {
 	struct resource	*intr;
@@ -58,7 +55,7 @@ static void	atkbdidentify(driver_t *driver, device_t dev);
 static int	atkbdprobe(device_t dev);
 static int	atkbdattach(device_t dev);
 static int	atkbdresume(device_t dev);
-static void	atkbd_isa_intr(void *arg);
+static void	atkbdintr(void *arg);
 
 static device_method_t atkbd_methods[] = {
 	DEVMETHOD(device_identify,	atkbdidentify),
@@ -139,7 +136,7 @@ atkbdattach(device_t dev)
 					  RF_SHAREABLE | RF_ACTIVE);
 	if (sc->intr == NULL)
 		return ENXIO;
-	error = bus_setup_intr(dev, sc->intr, INTR_TYPE_TTY, atkbd_isa_intr,
+	error = bus_setup_intr(dev, sc->intr, INTR_TYPE_TTY, atkbdintr,
 			       kbd, &sc->ih);
 	if (error)
 		bus_release_resource(dev, SYS_RES_IRQ, rid, sc->intr);
@@ -169,7 +166,7 @@ atkbdresume(device_t dev)
 }
 
 static void
-atkbd_isa_intr(void *arg)
+atkbdintr(void *arg)
 {
 	keyboard_t *kbd;
 
diff --git a/sys/dev/atkbdc/atkbdc.c b/sys/dev/atkbdc/atkbdc.c
index c0cee01..6889e1e 100644
--- a/sys/dev/atkbdc/atkbdc.c
+++ b/sys/dev/atkbdc/atkbdc.c
@@ -44,10 +44,15 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <sys/rman.h>
 
+#include <dev/atkbdc/atkbdcreg.h>
 
-#include <dev/kbd/atkbdcreg.h>
-
+#ifdef __sparc64__
+#include <dev/ofw/openfirm.h>
+#include <machine/bus_private.h>
+#include <machine/ofw_machdep.h>
+#else
 #include <isa/isareg.h>
+#endif
 
 /* constants */
 
@@ -88,6 +93,10 @@ static atkbdc_softc_t *atkbdc_softc[MAXKBDC] = { &default_kbdc };
 
 static int verbose = KBDIO_DEBUG;
 
+#ifdef __sparc64__
+static struct bus_space_tag atkbdc_bst_store[MAXKBDC];
+#endif
+
 /* function prototypes */
 
 static int atkbdc_setup(atkbdc_softc_t *sc, bus_space_tag_t tag,
@@ -144,14 +153,16 @@ atkbdc_configure(void)
 	bus_space_tag_t tag;
 	bus_space_handle_t h0;
 	bus_space_handle_t h1;
+#ifdef __sparc64__
+	char name[32];
+	phandle_t chosen, node;
+	ihandle_t stdin;
+	bus_addr_t port0;
+	bus_addr_t port1;
+	int space;
+#else
 	int port0;
 	int port1;
-
-	port0 = IO_KBD;
-	resource_int_value("atkbdc", 0, "port", &port0);
-	port1 = IO_KBD + KBD_STATUS_PORT;
-#if 0
-	resource_int_value("atkbdc", 0, "port", &port0);
 #endif
 
 	/* XXX: tag should be passed from the caller */
@@ -163,10 +174,43 @@ atkbdc_configure(void)
 	tag = busspace_isa_io;
 #elif defined(__ia64__)
 	tag = IA64_BUS_SPACE_IO;
+#elif defined(__sparc64__)
+	tag = &atkbdc_bst_store[0];
 #else
 #error "define tag!"
 #endif
 
+#ifdef __sparc64__
+	if ((chosen = OF_finddevice("/chosen")) == -1)
+		return 0;
+	if (OF_getprop(chosen, "stdin", &stdin, sizeof(stdin)) == -1)
+		return 0;
+	if ((node = OF_instance_to_package(stdin)) == -1)
+		return 0;
+	if (OF_getprop(node, "name", name, sizeof(name)) == -1)
+		return 0;
+	name[sizeof(name) - 1] = '\0';
+	if (strcmp(name, "kb_ps2") != 0)
+		return 0;
+	/*
+	 * The stdin handle points to an instance of a PS/2 keyboard
+	 * package but we want the 8042 controller, which is the parent
+	 * of that keyboard node.
+	 */
+	if ((node = OF_parent(node)) == 0)
+		return 0;
+	if (OF_decode_addr(node, 0, &space, &port0) != 0)
+		return 0;
+	h0 = sparc64_fake_bustag(space, port0, tag);
+	bus_space_subregion(tag, h0, KBD_DATA_PORT, 1, &h0);
+	if (OF_decode_addr(node, 1, &space, &port1) != 0)
+		return 0;
+	h1 = sparc64_fake_bustag(space, port1, tag);
+	bus_space_subregion(tag, h1, KBD_STATUS_PORT, 1, &h1);
+#else
+	port0 = IO_KBD;
+	resource_int_value("atkbdc", 0, "port", &port0);
+	port1 = IO_KBD + KBD_STATUS_PORT;
 #if notyet
 	bus_space_map(tag, port0, IO_KBDSIZE, 0, &h0);
 	bus_space_map(tag, port1, IO_KBDSIZE, 0, &h1);
@@ -174,6 +218,7 @@ atkbdc_configure(void)
 	h0 = (bus_space_handle_t)port0;
 	h1 = (bus_space_handle_t)port1;
 #endif
+#endif
 	return atkbdc_setup(atkbdc_softc[0], tag, h0, h1);
 }
 
diff --git a/sys/dev/atkbdc/atkbdc_ebus.c b/sys/dev/atkbdc/atkbdc_ebus.c
new file mode 100644
index 0000000..639203d
--- /dev/null
+++ b/sys/dev/atkbdc/atkbdc_ebus.c
@@ -0,0 +1,304 @@
+/*-
+ * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
+ * Copyright (c) 2005 Marius Strobl <marius@FreeBSD.org>
+ * All rights reserved.
+ *
+ * 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 as
+ *    the first lines of this file unmodified.
+ * 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 AUTHORS ``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 AUTHORS 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.
+ *
+ *	from: FreeBSD: src/sys/isa/atkbdc_isa.c,v 1.31 2005/05/29 04:42:28 nyan
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_kbd.h"
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/bus.h>
+#include <sys/kbio.h>
+#include <sys/malloc.h>
+
+#include <dev/ofw/ofw_bus.h>
+
+#include <machine/resource.h>
+#include <machine/ver.h>
+
+#include <sys/rman.h>
+
+#include <dev/kbd/kbdreg.h>
+#include <dev/atkbdc/atkbdreg.h>
+#include <dev/atkbdc/atkbdc_subr.h>
+#include <dev/atkbdc/atkbdcreg.h>
+#include <dev/atkbdc/psm.h>
+
+static device_probe_t atkbdc_ebus_probe;
+static device_attach_t atkbdc_ebus_attach;
+
+static device_method_t atkbdc_ebus_methods[] = {
+	DEVMETHOD(device_probe,		atkbdc_ebus_probe),
+	DEVMETHOD(device_attach,	atkbdc_ebus_attach),
+	DEVMETHOD(device_suspend,	bus_generic_suspend),
+	DEVMETHOD(device_resume,	bus_generic_resume),
+
+	DEVMETHOD(bus_print_child,	atkbdc_print_child),
+	DEVMETHOD(bus_read_ivar,	atkbdc_read_ivar),
+	DEVMETHOD(bus_write_ivar,	atkbdc_write_ivar),
+	DEVMETHOD(bus_get_resource_list,atkbdc_get_resource_list),
+	DEVMETHOD(bus_alloc_resource,	bus_generic_rl_alloc_resource),
+	DEVMETHOD(bus_release_resource,	bus_generic_rl_release_resource),
+	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
+	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
+	DEVMETHOD(bus_get_resource,	bus_generic_rl_get_resource),
+	DEVMETHOD(bus_set_resource,	bus_generic_rl_set_resource),
+	DEVMETHOD(bus_delete_resource,	bus_generic_rl_delete_resource),
+	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
+	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
+
+	{ 0, 0 }
+};
+
+static driver_t atkbdc_ebus_driver = {
+	ATKBDC_DRIVER_NAME,
+	atkbdc_ebus_methods,
+	sizeof(atkbdc_softc_t *),
+};
+
+DRIVER_MODULE(atkbdc, ebus, atkbdc_ebus_driver, atkbdc_devclass, 0, 0);
+
+static int
+atkbdc_ebus_probe(device_t dev)
+{
+	struct resource *port0, *port1;
+	u_long count, start;
+	int error, rid;
+
+	if (strcmp(ofw_bus_get_name(dev), "8042") != 0)
+		return (ENXIO);
+
+	/*
+	 * On AXi and AXmp boards the NS16550 (used to connect keyboard/
+	 * mouse) share their IRQ lines with the i8042. Any IRQ activity
+	 * (typically during attach) of the NS16550 used to connect the
+	 * keyboard when actually the PS/2 keyboard is selected in OFW
+	 * causes interaction with the OBP i8042 driver resulting in a
+	 * hang and vice versa. As RS232 keyboards and mice obviously
+	 * aren't meant to be used in parallel with PS/2 ones on these
+	 * boards don't attach to the i8042 in case the PS/2 keyboard
+	 * isn't selected in order to prevent such hangs.
+	 * Note that it's not sufficient here to rely on the '8042' node
+	 * only showing up when a PS/2 keyboard is actually connected as
+	 * the user still might have adjusted the 'keyboard' alias to
+	 * point to the RS232 keyboard.
+	 */
+	if ((!strcmp(sparc64_model, "SUNW,UltraAX-MP") ||
+	    !strcmp(sparc64_model, "SUNW,UltraSPARC-IIi-Engine")) &&
+	    OF_finddevice("keyboard") != ofw_bus_get_node(dev)) {
+		device_disable(dev);
+		return (ENXIO);
+	}
+
+	device_set_desc(dev, "Keyboard controller (i8042)");
+
+	/*
+	 * The '8042' node has two identical 8 addresses wide resources
+	 * which are apparently meant to be used one for the keyboard
+	 * half and the other one for the mouse half. To simplify matters
+	 * we use one for the command/data port resource and the other
+	 * one for the status port resource as the atkbdc(4) back-end
+	 * expects two struct resource rather than two bus space handles.
+	 */
+	rid = 0;
+	if (bus_get_resource(dev, SYS_RES_MEMORY, rid, &start, &count) != 0) {
+		device_printf(dev,
+		    "cannot determine command/data port resource\n");
+		return (ENXIO);
+	}
+	port0 = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid, start, start, 1,
+	    RF_ACTIVE);
+	if (port0 == NULL) {
+		device_printf(dev,
+		    "cannot allocate command/data port resource\n");
+		return (ENXIO);
+	}
+
+	rid = 1;
+	if (bus_get_resource(dev, SYS_RES_MEMORY, rid, &start, &count) != 0) {
+		device_printf(dev, "cannot determine status port resource\n");
+		error = ENXIO;
+		goto fail_port0;
+	}
+	start += KBD_STATUS_PORT;
+	port1 = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid, start, start, 1,
+	    RF_ACTIVE);
+	if (port1 == NULL) {
+		device_printf(dev, "cannot allocate status port resource\n");
+		error = ENXIO;
+		goto fail_port0;
+	}
+
+	error = atkbdc_probe_unit(device_get_unit(dev), port0, port1);
+	if (error != 0)
+		device_printf(dev, "atkbdc_porbe_unit failed\n");
+
+	bus_release_resource(dev, SYS_RES_MEMORY, 1, port1);
+ fail_port0:
+	bus_release_resource(dev, SYS_RES_MEMORY, 0, port0);
+
+	return (error);
+}
+
+static int
+atkbdc_ebus_attach(device_t dev)
+{
+	atkbdc_softc_t *sc;
+	atkbdc_device_t *adi;
+	device_t cdev;
+	phandle_t child;
+	u_long count, intr, start;
+	int children, error, rid, unit;
+	char *cname, *dname;
+
+	unit = device_get_unit(dev);
+	sc = *(atkbdc_softc_t **)device_get_softc(dev);
+	if (sc == NULL) {
+		/*
+		 * We have to maintain two copies of the kbdc_softc struct,
+		 * as the low-level console needs to have access to the
+		 * keyboard controller before kbdc is probed and attached.
+		 * kbdc_soft[] contains the default entry for that purpose.
+		 * See atkbdc.c. XXX
+		 */
+		sc = atkbdc_get_softc(unit);
+		if (sc == NULL)
+			return (ENOMEM);
+		device_set_softc(dev, sc);
+	}
+
+	rid = 0;
+	if (bus_get_resource(dev, SYS_RES_MEMORY, rid, &start, &count) != 0) {
+		device_printf(dev,
+		    "cannot determine command/data port resource\n");
+		return (ENXIO);
+	}
+	sc->port0 = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid, start, start,
+	    1, RF_ACTIVE);
+	if (sc->port0 == NULL) {
+		device_printf(dev,
+		    "cannot allocate command/data port resource\n");
+		return (ENXIO);
+	}
+
+	rid = 1;
+	if (bus_get_resource(dev, SYS_RES_MEMORY, rid, &start, &count) != 0) {
+		device_printf(dev, "cannot determine status port resource\n");
+		error = ENXIO;
+		goto fail_port0;
+	}
+	start += KBD_STATUS_PORT;
+	sc->port1 = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid, start, start,
+	    1, RF_ACTIVE);
+	if (sc->port1 == NULL) {
+		device_printf(dev, "cannot allocate status port resource\n");
+		error = ENXIO;
+		goto fail_port0;
+	}
+
+	error = atkbdc_attach_unit(unit, sc, sc->port0, sc->port1);
+	if (error != 0) {
+		device_printf(dev, "atkbdc_attach_unit failed\n");
+		goto fail_port1;
+	}
+
+	/* Attach children. */
+	children = 0;
+	for (child = OF_child(ofw_bus_get_node(dev)); child != 0;
+	    child = OF_peer(child)) {
+		if ((OF_getprop_alloc(child, "name", 1, (void **)&cname)) == -1)
+			continue;
+		if (children >= 2) {
+			device_printf(dev,
+			    "<%s>: only two children per 8042 supported\n",
+			    cname);
+			free(cname, M_OFWPROP);
+			continue;
+		}
+		adi = malloc(sizeof(struct atkbdc_device), M_ATKBDDEV,
+		    M_NOWAIT | M_ZERO);
+		if (adi == NULL) {
+			device_printf(dev, "<%s>: malloc failed\n", cname);
+			free(cname, M_OFWPROP);
+			continue;
+		}
+		if (strcmp(cname, "kb_ps2") == 0) {
+			adi->rid = KBDC_RID_KBD;
+			dname = ATKBD_DRIVER_NAME;
+		} else if (strcmp(cname, "kdmouse") == 0) {
+			adi->rid = KBDC_RID_AUX;
+			dname = PSM_DRIVER_NAME;
+		} else {
+			device_printf(dev, "<%s>: unknown device\n", cname);
+			free(adi, M_ATKBDDEV);
+			free(cname, M_OFWPROP);
+			continue;
+		}
+		intr = bus_get_resource_start(dev, SYS_RES_IRQ, adi->rid);
+		if (intr == 0) {
+			device_printf(dev,
+			    "<%s>: cannot determine interrupt resource\n",
+			    cname);
+			free(adi, M_ATKBDDEV);
+			free(cname, M_OFWPROP);
+			continue;
+		}
+		resource_list_init(&adi->resources);
+		resource_list_add(&adi->resources, SYS_RES_IRQ, adi->rid,
+		    intr, intr, 1);
+		if ((cdev = device_add_child(dev, dname, -1)) == NULL) {
+			device_printf(dev, "<%s>: device_add_child failed\n",
+			    cname);
+			resource_list_free(&adi->resources);
+			free(adi, M_ATKBDDEV);
+			free(cname, M_OFWPROP);
+			continue;
+		}
+		device_set_ivars(cdev, adi);
+		children++;
+	}
+
+	error = bus_generic_attach(dev);
+	if (error != 0) {
+		device_printf(dev, "bus_generic_attach failed\n");
+		goto fail_port1;
+	}
+
+	return (0);
+
+ fail_port1:
+	bus_release_resource(dev, SYS_RES_MEMORY, 1, sc->port1);
+ fail_port0:
+	bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->port0);
+
+	return (error);
+}
diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c
index 5f1408c..deeb7a0 100644
--- a/sys/dev/atkbdc/atkbdc_isa.c
+++ b/sys/dev/atkbdc/atkbdc_isa.c
@@ -38,57 +38,30 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <dev/kbd/atkbdcreg.h>
+#include <dev/atkbdc/atkbdc_subr.h>
+#include <dev/atkbdc/atkbdcreg.h>
 
 #include <isa/isareg.h>
 #include <isa/isavar.h>
 
-static MALLOC_DEFINE(M_ATKBDDEV, "atkbddev", "AT Keyboard device");
-
-/* children */
-typedef struct atkbdc_device {
-	struct resource_list resources;
-	int rid;
-	u_int32_t vendorid;
-	u_int32_t serial;
-	u_int32_t logicalid;
-	u_int32_t compatid;
-} atkbdc_device_t;
-
-/* kbdc */
-static devclass_t atkbdc_devclass;
-
-static int	atkbdc_probe(device_t dev);
-static int	atkbdc_attach(device_t dev);
-static device_t	atkbdc_add_child(device_t bus, int order, char *name,
+static int	atkbdc_isa_probe(device_t dev);
+static int	atkbdc_isa_attach(device_t dev);
+static device_t	atkbdc_isa_add_child(device_t bus, int order, char *name,
 				 int unit);
-static int	atkbdc_print_child(device_t bus, device_t dev);
-static int	atkbdc_read_ivar(device_t bus, device_t dev, int index,
-				 uintptr_t *val);
-static int	atkbdc_write_ivar(device_t bus, device_t dev, int index,
-				  uintptr_t val);
-static struct resource_list
-		*atkbdc_get_resource_list (device_t bus, device_t dev);
-static struct resource
-		*atkbdc_alloc_resource(device_t bus, device_t dev, int type,
-				       int *rid, u_long start, u_long end,
-				       u_long count, u_int flags);
-static int	atkbdc_release_resource(device_t bus, device_t dev, int type,
-					int rid, struct resource *res);
-
-static device_method_t atkbdc_methods[] = {
-	DEVMETHOD(device_probe,		atkbdc_probe),
-	DEVMETHOD(device_attach,	atkbdc_attach),
+
+static device_method_t atkbdc_isa_methods[] = {
+	DEVMETHOD(device_probe,		atkbdc_isa_probe),
+	DEVMETHOD(device_attach,	atkbdc_isa_attach),
 	DEVMETHOD(device_suspend,	bus_generic_suspend),
 	DEVMETHOD(device_resume,	bus_generic_resume),
 
-	DEVMETHOD(bus_add_child,	atkbdc_add_child),
+	DEVMETHOD(bus_add_child,	atkbdc_isa_add_child),
 	DEVMETHOD(bus_print_child,	atkbdc_print_child),
 	DEVMETHOD(bus_read_ivar,	atkbdc_read_ivar),
 	DEVMETHOD(bus_write_ivar,	atkbdc_write_ivar),
 	DEVMETHOD(bus_get_resource_list,atkbdc_get_resource_list),
-	DEVMETHOD(bus_alloc_resource,	atkbdc_alloc_resource),
-	DEVMETHOD(bus_release_resource,	atkbdc_release_resource),
+	DEVMETHOD(bus_alloc_resource,	bus_generic_rl_alloc_resource),
+	DEVMETHOD(bus_release_resource,	bus_generic_rl_release_resource),
 	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
 	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
 	DEVMETHOD(bus_get_resource,	bus_generic_rl_get_resource),
@@ -100,9 +73,9 @@ static device_method_t atkbdc_methods[] = {
 	{ 0, 0 }
 };
 
-static driver_t atkbdc_driver = {
+static driver_t atkbdc_isa_driver = {
 	ATKBDC_DRIVER_NAME,
-	atkbdc_methods,
+	atkbdc_isa_methods,
 	sizeof(atkbdc_softc_t *),
 };
 
@@ -112,7 +85,7 @@ static struct isa_pnp_id atkbdc_ids[] = {
 };
 
 static int
-atkbdc_probe(device_t dev)
+atkbdc_isa_probe(device_t dev)
 {
 	struct resource	*port0;
 	struct resource	*port1;
@@ -167,7 +140,7 @@ atkbdc_probe(device_t dev)
 }
 
 static int
-atkbdc_attach(device_t dev)
+atkbdc_isa_attach(device_t dev)
 {
 	atkbdc_softc_t	*sc;
 	int		unit;
@@ -180,7 +153,7 @@ atkbdc_attach(device_t dev)
 		/*
 		 * We have to maintain two copies of the kbdc_softc struct,
 		 * as the low-level console needs to have access to the
-		 * keyboard controller before kbdc is probed and attached. 
+		 * keyboard controller before kbdc is probed and attached.
 		 * kbdc_soft[] contains the default entry for that purpose.
 		 * See atkbdc.c. XXX
 		 */
@@ -216,7 +189,7 @@ atkbdc_attach(device_t dev)
 }
 
 static device_t
-atkbdc_add_child(device_t bus, int order, char *name, int unit)
+atkbdc_isa_add_child(device_t bus, int order, char *name, int unit)
 {
 	atkbdc_device_t	*ivar;
 	device_t	child;
@@ -258,108 +231,5 @@ atkbdc_add_child(device_t bus, int order, char *name, int unit)
 	return child;
 }
 
-static int
-atkbdc_print_child(device_t bus, device_t dev)
-{
-	atkbdc_device_t *kbdcdev;
-	u_long irq;
-	int flags;
-	int retval = 0;
-
-	kbdcdev = (atkbdc_device_t *)device_get_ivars(dev);
-
-	retval += bus_print_child_header(bus, dev);
-	flags = device_get_flags(dev);
-	if (flags != 0)
-		retval += printf(" flags 0x%x", flags);
-	irq = bus_get_resource_start(dev, SYS_RES_IRQ, kbdcdev->rid);
-	if (irq != 0)
-		retval += printf(" irq %ld", irq);
-	retval += bus_print_child_footer(bus, dev);
-
-	return (retval);
-}
-
-static int
-atkbdc_read_ivar(device_t bus, device_t dev, int index, uintptr_t *val)
-{
-	atkbdc_device_t *ivar;
-
-	ivar = (atkbdc_device_t *)device_get_ivars(dev);
-	switch (index) {
-	case KBDC_IVAR_VENDORID:
-		*val = (u_long)ivar->vendorid;
-		break;
-	case KBDC_IVAR_SERIAL:
-		*val = (u_long)ivar->serial;
-		break;
-	case KBDC_IVAR_LOGICALID:
-		*val = (u_long)ivar->logicalid;
-		break;
-	case KBDC_IVAR_COMPATID:
-		*val = (u_long)ivar->compatid;
-		break;
-	default:
-		return ENOENT;
-	}
-	return 0;
-}
-
-static int
-atkbdc_write_ivar(device_t bus, device_t dev, int index, uintptr_t val)
-{
-	atkbdc_device_t *ivar;
-
-	ivar = (atkbdc_device_t *)device_get_ivars(dev);
-	switch (index) {
-	case KBDC_IVAR_VENDORID:
-		ivar->vendorid = (u_int32_t)val;
-		break;
-	case KBDC_IVAR_SERIAL:
-		ivar->serial = (u_int32_t)val;
-		break;
-	case KBDC_IVAR_LOGICALID:
-		ivar->logicalid = (u_int32_t)val;
-		break;
-	case KBDC_IVAR_COMPATID:
-		ivar->compatid = (u_int32_t)val;
-		break;
-	default:
-		return ENOENT;
-	}
-	return 0;
-}
-
-static struct resource_list
-*atkbdc_get_resource_list (device_t bus, device_t dev)
-{
-	atkbdc_device_t *ivar;
-
-	ivar = (atkbdc_device_t *)device_get_ivars(dev);
-	return &ivar->resources;
-}
-
-static struct resource
-*atkbdc_alloc_resource(device_t bus, device_t dev, int type, int *rid,
-		       u_long start, u_long end, u_long count, u_int flags)
-{
-	atkbdc_device_t *ivar;
-
-	ivar = (atkbdc_device_t *)device_get_ivars(dev);
-	return resource_list_alloc(&ivar->resources, bus, dev, type, rid,
-				   start, end, count, flags);
-}
-
-static int
-atkbdc_release_resource(device_t bus, device_t dev, int type, int rid,
-			struct resource *res)
-{
-	atkbdc_device_t *ivar;
-
-	ivar = (atkbdc_device_t *)device_get_ivars(dev);
-	return resource_list_release(&ivar->resources, bus, dev, type, rid,
-				     res);
-}
-
-DRIVER_MODULE(atkbdc, isa, atkbdc_driver, atkbdc_devclass, 0, 0);
-DRIVER_MODULE(atkbdc, acpi, atkbdc_driver, atkbdc_devclass, 0, 0);
+DRIVER_MODULE(atkbdc, isa, atkbdc_isa_driver, atkbdc_devclass, 0, 0);
+DRIVER_MODULE(atkbdc, acpi, atkbdc_isa_driver, atkbdc_devclass, 0, 0);
diff --git a/sys/dev/atkbdc/atkbdc_subr.c b/sys/dev/atkbdc/atkbdc_subr.c
index 5f1408c..b97b592 100644
--- a/sys/dev/atkbdc/atkbdc_subr.c
+++ b/sys/dev/atkbdc/atkbdc_subr.c
@@ -22,6 +22,8 @@
  * 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.
+ *
+ *	from: FreeBSD: src/sys/isa/atkbdc_isa.c,v 1.31 2005/05/29 04:42:28 nyan Exp
  */
 
 #include <sys/cdefs.h>
@@ -38,227 +40,14 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <dev/kbd/atkbdcreg.h>
-
-#include <isa/isareg.h>
-#include <isa/isavar.h>
-
-static MALLOC_DEFINE(M_ATKBDDEV, "atkbddev", "AT Keyboard device");
-
-/* children */
-typedef struct atkbdc_device {
-	struct resource_list resources;
-	int rid;
-	u_int32_t vendorid;
-	u_int32_t serial;
-	u_int32_t logicalid;
-	u_int32_t compatid;
-} atkbdc_device_t;
-
-/* kbdc */
-static devclass_t atkbdc_devclass;
-
-static int	atkbdc_probe(device_t dev);
-static int	atkbdc_attach(device_t dev);
-static device_t	atkbdc_add_child(device_t bus, int order, char *name,
-				 int unit);
-static int	atkbdc_print_child(device_t bus, device_t dev);
-static int	atkbdc_read_ivar(device_t bus, device_t dev, int index,
-				 uintptr_t *val);
-static int	atkbdc_write_ivar(device_t bus, device_t dev, int index,
-				  uintptr_t val);
-static struct resource_list
-		*atkbdc_get_resource_list (device_t bus, device_t dev);
-static struct resource
-		*atkbdc_alloc_resource(device_t bus, device_t dev, int type,
-				       int *rid, u_long start, u_long end,
-				       u_long count, u_int flags);
-static int	atkbdc_release_resource(device_t bus, device_t dev, int type,
-					int rid, struct resource *res);
-
-static device_method_t atkbdc_methods[] = {
-	DEVMETHOD(device_probe,		atkbdc_probe),
-	DEVMETHOD(device_attach,	atkbdc_attach),
-	DEVMETHOD(device_suspend,	bus_generic_suspend),
-	DEVMETHOD(device_resume,	bus_generic_resume),
-
-	DEVMETHOD(bus_add_child,	atkbdc_add_child),
-	DEVMETHOD(bus_print_child,	atkbdc_print_child),
-	DEVMETHOD(bus_read_ivar,	atkbdc_read_ivar),
-	DEVMETHOD(bus_write_ivar,	atkbdc_write_ivar),
-	DEVMETHOD(bus_get_resource_list,atkbdc_get_resource_list),
-	DEVMETHOD(bus_alloc_resource,	atkbdc_alloc_resource),
-	DEVMETHOD(bus_release_resource,	atkbdc_release_resource),
-	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
-	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
-	DEVMETHOD(bus_get_resource,	bus_generic_rl_get_resource),
-	DEVMETHOD(bus_set_resource,	bus_generic_rl_set_resource),
-	DEVMETHOD(bus_delete_resource,	bus_generic_rl_delete_resource),
-	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
-	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
-
-	{ 0, 0 }
-};
-
-static driver_t atkbdc_driver = {
-	ATKBDC_DRIVER_NAME,
-	atkbdc_methods,
-	sizeof(atkbdc_softc_t *),
-};
-
-static struct isa_pnp_id atkbdc_ids[] = {
-	{ 0x0303d041, "Keyboard controller (i8042)" },	/* PNP0303 */
-	{ 0 }
-};
-
-static int
-atkbdc_probe(device_t dev)
-{
-	struct resource	*port0;
-	struct resource	*port1;
-	u_long		start;
-	u_long		count;
-	int		error;
-	int		rid;
-
-	/* check PnP IDs */
-	if (ISA_PNP_PROBE(device_get_parent(dev), dev, atkbdc_ids) == ENXIO)
-		return ENXIO;
-
-	device_set_desc(dev, "Keyboard controller (i8042)");
-
-	/*
-	 * Adjust I/O port resources.
-	 * The AT keyboard controller uses two ports (a command/data port
-	 * 0x60 and a status port 0x64), which may be given to us in 
-	 * one resource (0x60 through 0x64) or as two separate resources
-	 * (0x60 and 0x64). Furthermore, /boot/device.hints may contain
-	 * just one port, 0x60. We shall adjust resource settings 
-	 * so that these two ports are available as two separate resources.
-	 */
-	device_quiet(dev);
-	rid = 0;
-	if (bus_get_resource(dev, SYS_RES_IOPORT, rid, &start, &count) != 0)
-		return ENXIO;
-	if (count > 1)	/* adjust the count */
-		bus_set_resource(dev, SYS_RES_IOPORT, rid, start, 1);
-	port0 = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid, RF_ACTIVE);
-	if (port0 == NULL)
-		return ENXIO;
-	rid = 1;
-	if (bus_get_resource(dev, SYS_RES_IOPORT, rid, NULL, NULL) != 0)
-		bus_set_resource(dev, SYS_RES_IOPORT, 1,
-				 start + KBD_STATUS_PORT, 1);
-	port1 = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid, RF_ACTIVE);
-	if (port1 == NULL) {
-		bus_release_resource(dev, SYS_RES_IOPORT, 0, port0);
-		return ENXIO;
-	}
-	device_verbose(dev);
-
-	error = atkbdc_probe_unit(device_get_unit(dev), port0, port1);
-	if (error == 0)
-		bus_generic_probe(dev);
-
-	bus_release_resource(dev, SYS_RES_IOPORT, 0, port0);
-	bus_release_resource(dev, SYS_RES_IOPORT, 1, port1);
-
-	return error;
-}
-
-static int
-atkbdc_attach(device_t dev)
-{
-	atkbdc_softc_t	*sc;
-	int		unit;
-	int		error;
-	int		rid;
-
-	unit = device_get_unit(dev);
-	sc = *(atkbdc_softc_t **)device_get_softc(dev);
-	if (sc == NULL) {
-		/*
-		 * We have to maintain two copies of the kbdc_softc struct,
-		 * as the low-level console needs to have access to the
-		 * keyboard controller before kbdc is probed and attached. 
-		 * kbdc_soft[] contains the default entry for that purpose.
-		 * See atkbdc.c. XXX
-		 */
-		sc = atkbdc_get_softc(unit);
-		if (sc == NULL)
-			return ENOMEM;
-	}
-
-	rid = 0;
-	sc->port0 = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
-					   RF_ACTIVE);
-	if (sc->port0 == NULL)
-		return ENXIO;
-	rid = 1;
-	sc->port1 = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
-					   RF_ACTIVE);
-	if (sc->port1 == NULL) {
-		bus_release_resource(dev, SYS_RES_IOPORT, 0, sc->port0);
-		return ENXIO;
-	}
-
-	error = atkbdc_attach_unit(unit, sc, sc->port0, sc->port1);
-	if (error) {
-		bus_release_resource(dev, SYS_RES_IOPORT, 0, sc->port0);
-		bus_release_resource(dev, SYS_RES_IOPORT, 1, sc->port1);
-		return error;
-	}
-	*(atkbdc_softc_t **)device_get_softc(dev) = sc;
-
-	bus_generic_attach(dev);
-
-	return 0;
-}
-
-static device_t
-atkbdc_add_child(device_t bus, int order, char *name, int unit)
-{
-	atkbdc_device_t	*ivar;
-	device_t	child;
-	int		t;
-
-	ivar = malloc(sizeof(struct atkbdc_device), M_ATKBDDEV,
-		M_NOWAIT | M_ZERO);
-	if (!ivar)
-		return NULL;
-
-	child = device_add_child_ordered(bus, order, name, unit);
-	if (child == NULL) {
-		free(ivar, M_ATKBDDEV);
-		return child;
-	}
-
-	resource_list_init(&ivar->resources);
-	ivar->rid = order;
-
-	/*
-	 * If the device is not created by the PnP BIOS or ACPI,
-	 * refer to device hints for IRQ.
-	 */
-	if (ISA_PNP_PROBE(device_get_parent(bus), bus, atkbdc_ids) != 0) {
-		if (resource_int_value(name, unit, "irq", &t) != 0)
-			t = -1;
-	} else {
-		t = bus_get_resource_start(bus, SYS_RES_IRQ, ivar->rid);
-	}
-	if (t > 0)
-		resource_list_add(&ivar->resources, SYS_RES_IRQ, ivar->rid,
-				  t, t, 1);
-
-	if (resource_disabled(name, unit))
-		device_disable(child);
+#include <dev/atkbdc/atkbdc_subr.h>
+#include <dev/atkbdc/atkbdcreg.h>
 
-	device_set_ivars(child, ivar);
+MALLOC_DEFINE(M_ATKBDDEV, "atkbddev", "AT Keyboard device");
 
-	return child;
-}
+devclass_t atkbdc_devclass;
 
-static int
+int
 atkbdc_print_child(device_t bus, device_t dev)
 {
 	atkbdc_device_t *kbdcdev;
@@ -280,7 +69,7 @@ atkbdc_print_child(device_t bus, device_t dev)
 	return (retval);
 }
 
-static int
+int
 atkbdc_read_ivar(device_t bus, device_t dev, int index, uintptr_t *val)
 {
 	atkbdc_device_t *ivar;
@@ -305,7 +94,7 @@ atkbdc_read_ivar(device_t bus, device_t dev, int index, uintptr_t *val)
 	return 0;
 }
 
-static int
+int
 atkbdc_write_ivar(device_t bus, device_t dev, int index, uintptr_t val)
 {
 	atkbdc_device_t *ivar;
@@ -330,36 +119,11 @@ atkbdc_write_ivar(device_t bus, device_t dev, int index, uintptr_t val)
 	return 0;
 }
 
-static struct resource_list
-*atkbdc_get_resource_list (device_t bus, device_t dev)
+struct resource_list
+*atkbdc_get_resource_list(device_t bus, device_t dev)
 {
 	atkbdc_device_t *ivar;
 
 	ivar = (atkbdc_device_t *)device_get_ivars(dev);
 	return &ivar->resources;
 }
-
-static struct resource
-*atkbdc_alloc_resource(device_t bus, device_t dev, int type, int *rid,
-		       u_long start, u_long end, u_long count, u_int flags)
-{
-	atkbdc_device_t *ivar;
-
-	ivar = (atkbdc_device_t *)device_get_ivars(dev);
-	return resource_list_alloc(&ivar->resources, bus, dev, type, rid,
-				   start, end, count, flags);
-}
-
-static int
-atkbdc_release_resource(device_t bus, device_t dev, int type, int rid,
-			struct resource *res)
-{
-	atkbdc_device_t *ivar;
-
-	ivar = (atkbdc_device_t *)device_get_ivars(dev);
-	return resource_list_release(&ivar->resources, bus, dev, type, rid,
-				     res);
-}
-
-DRIVER_MODULE(atkbdc, isa, atkbdc_driver, atkbdc_devclass, 0, 0);
-DRIVER_MODULE(atkbdc, acpi, atkbdc_driver, atkbdc_devclass, 0, 0);
diff --git a/sys/dev/kbd/atkbdreg.h b/sys/dev/atkbdc/atkbdc_subr.h
index f60e48c..fa8f1f8 100644
--- a/sys/dev/kbd/atkbdreg.h
+++ b/sys/dev/atkbdc/atkbdc_subr.h
@@ -23,26 +23,31 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ *	from: FreeBSD: src/sys/isa/atkbdc_isa.c,v 1.31 2005/05/29 04:42:28 nyan Exp
  * $FreeBSD$
  */
 
-#ifndef _DEV_KBD_ATKBDREG_H_
-#define _DEV_KBD_ATKBDREG_H_
+#ifndef _DEV_ATKBDC_ATKBDC_SUBR_H_
+#define	_DEV_ATKBDC_ATKBDC_SUBR_H_
 
-#define ATKBD_DRIVER_NAME	"atkbd"
+MALLOC_DECLARE(M_ATKBDDEV);
 
-/* device configuration flags (atkbdprobe, atkbdattach) */
-#define KB_CONF_FAIL_IF_NO_KBD	(1 << 0) /* don't install if no kbd is found */
-#define KB_CONF_NO_RESET	(1 << 1) /* don't reset the keyboard */
-#define KB_CONF_ALT_SCANCODESET	(1 << 2) /* assume the XT type keyboard */
-#define	KB_CONF_NO_PROBE_TEST	(1 << 3) /* don't test keyboard during probe */
+extern devclass_t atkbdc_devclass;
 
-#ifdef _KERNEL
+/* children */
+typedef struct atkbdc_device {
+	struct resource_list resources;
+	int rid;
+	u_int32_t vendorid;
+	u_int32_t serial;
+	u_int32_t logicalid;
+	u_int32_t compatid;
+} atkbdc_device_t;
 
-int		atkbd_probe_unit(int unit, int ctlr, int irq, int flags);
-int		atkbd_attach_unit(int unit, keyboard_t **kbd,
-				 int ctlr, int irq, int flags);
+/* kbdc */
+int atkbdc_print_child(device_t bus, device_t dev);
+int atkbdc_read_ivar(device_t bus, device_t dev, int index, uintptr_t *val);
+int atkbdc_write_ivar(device_t bus, device_t dev, int index, uintptr_t val);
+struct resource_list *atkbdc_get_resource_list(device_t bus, device_t dev);
 
-#endif
-
-#endif /* !_DEV_KBD_ATKBDREG_H_ */
+#endif /* !_DEV_ATKBDC_ATKBDC_SUBR_H_ */
diff --git a/sys/dev/atkbdc/atkbdcreg.h b/sys/dev/atkbdc/atkbdcreg.h
index 7711c66..0715d9e 100644
--- a/sys/dev/atkbdc/atkbdcreg.h
+++ b/sys/dev/atkbdc/atkbdcreg.h
@@ -31,8 +31,8 @@
  * from kbdio.h,v 1.8 1998/09/25 11:55:46 yokota Exp
  */
 
-#ifndef _DEV_KBD_ATKBDCREG_H_
-#define	_DEV_KBD_ATKBDCREG_H_
+#ifndef _DEV_ATKBDC_ATKBDCREG_H_
+#define	_DEV_ATKBDC_ATKBDCREG_H_
 
 #include "opt_kbd.h"	/* Structures depend on the value if KBDIO_DEBUG */
 
@@ -261,4 +261,4 @@ int set_controller_command_byte(KBDC kbdc, int command, int flag);
 
 #endif /* _KERNEL */
 
-#endif /* !_DEV_KBD_ATKBDCREG_H_ */
+#endif /* !_DEV_ATKBDC_ATKBDCREG_H_ */
diff --git a/sys/dev/atkbdc/atkbdreg.h b/sys/dev/atkbdc/atkbdreg.h
index f60e48c..cf7ee6b 100644
--- a/sys/dev/atkbdc/atkbdreg.h
+++ b/sys/dev/atkbdc/atkbdreg.h
@@ -26,8 +26,8 @@
  * $FreeBSD$
  */
 
-#ifndef _DEV_KBD_ATKBDREG_H_
-#define _DEV_KBD_ATKBDREG_H_
+#ifndef _DEV_ATKBDC_ATKBDREG_H_
+#define _DEV_ATKBDC_ATKBDREG_H_
 
 #define ATKBD_DRIVER_NAME	"atkbd"
 
@@ -45,4 +45,4 @@ int		atkbd_attach_unit(int unit, keyboard_t **kbd,
 
 #endif
 
-#endif /* !_DEV_KBD_ATKBDREG_H_ */
+#endif /* !_DEV_ATKBDC_ATKBDREG_H_ */
diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c
index 7f44b49..a48eda9 100644
--- a/sys/dev/atkbdc/psm.c
+++ b/sys/dev/atkbdc/psm.c
@@ -61,6 +61,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_isa.h"
 #include "opt_psm.h"
 
 #include <sys/param.h>
@@ -82,8 +83,12 @@ __FBSDID("$FreeBSD$");
 #include <sys/mouse.h>
 #include <machine/resource.h>
 
+#ifdef DEV_ISA
 #include <isa/isavar.h>
-#include <dev/kbd/atkbdcreg.h>
+#endif
+
+#include <dev/atkbdc/atkbdcreg.h>
+#include <dev/atkbdc/psm.h>
 
 /*
  * Driver specific options: the following options may be set by
@@ -117,7 +122,6 @@ do {				\
 
 /* end of driver specific options */
 
-#define PSM_DRIVER_NAME		"psm"
 #define PSMCPNP_DRIVER_NAME	"psmcpnp"
 
 /* input queue */
@@ -3469,6 +3473,31 @@ enable_versapad(struct psm_softc *sc)
     return TRUE;				/* PS/2 absolute mode */
 }
 
+/*
+ * Return true if 'now' is earlier than (start + (secs.usecs)).
+ * Now may be NULL and the function will fetch the current time from
+ * getmicrouptime(), or a cached 'now' can be passed in.
+ * All values should be numbers derived from getmicrouptime().
+ */
+static int
+timeelapsed(start, secs, usecs, now)
+	const struct timeval *start, *now;
+	int secs, usecs;
+{
+	struct timeval snow, tv;
+
+	/* if there is no 'now' passed in, the get it as a convience. */
+	if (now == NULL) {
+		getmicrouptime(&snow);
+		now = &snow;
+	}
+	
+	tv.tv_sec = secs;
+	tv.tv_usec = usecs;
+	timevaladd(&tv, start);
+	return (timevalcmp(&tv, now, <));
+}
+
 static int
 psmresume(device_t dev)
 {
@@ -3499,6 +3528,8 @@ psmresume(device_t dev)
 
 DRIVER_MODULE(psm, atkbdc, psm_driver, psm_devclass, 0, 0);
 
+#ifdef DEV_ISA
+
 /*
  * This sucks up assignments from PNPBIOS and ACPI.
  */
@@ -3629,30 +3660,7 @@ psmcpnp_attach(device_t dev)
 	return 0;
 }
 
-/*
- * Return true if 'now' is earlier than (start + (secs.usecs)).
- * Now may be NULL and the function will fetch the current time from
- * getmicrouptime(), or a cached 'now' can be passed in.
- * All values should be numbers derived from getmicrouptime().
- */
-static int
-timeelapsed(start, secs, usecs, now)
-	const struct timeval *start, *now;
-	int secs, usecs;
-{
-	struct timeval snow, tv;
-
-	/* if there is no 'now' passed in, the get it as a convience. */
-	if (now == NULL) {
-		getmicrouptime(&snow);
-		now = &snow;
-	}
-	
-	tv.tv_sec = secs;
-	tv.tv_usec = usecs;
-	timevaladd(&tv, start);
-	return (timevalcmp(&tv, now, <));
-}
-
 DRIVER_MODULE(psmcpnp, isa, psmcpnp_driver, psmcpnp_devclass, 0, 0);
 DRIVER_MODULE(psmcpnp, acpi, psmcpnp_driver, psmcpnp_devclass, 0, 0);
+
+#endif /* DEV_ISA */
diff --git a/sys/dev/atkbdc/psm.h b/sys/dev/atkbdc/psm.h
new file mode 100644
index 0000000..e687728
--- /dev/null
+++ b/sys/dev/atkbdc/psm.h
@@ -0,0 +1,32 @@
+/*-
+ * Copyright (c) 1992, 1993 Erik Forsberg.
+ * Copyright (c) 1996, 1997 Kazutaka YOKOTA.
+ * All rights reserved.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ``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 I 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.
+ *
+ *	from: FreeBSD: src/sys/isa/psm.c,v 1.84 2005/01/10 13:05:58 philip
+ * $FreeBSD$
+ */
+
+#ifndef _DEV_ATKBDC_PSM_H_
+#define	_DEV_ATKBDC_PSM_H_
+
+#define	PSM_DRIVER_NAME	"psm"
+
+#endif /* !_DEV_ATKBDC_PSM_H_ */
diff --git a/sys/dev/kbd/atkbd.c b/sys/dev/kbd/atkbd.c
deleted file mode 100644
index 670a8de..0000000
--- a/sys/dev/kbd/atkbd.c
+++ /dev/null
@@ -1,1441 +0,0 @@
-/*-
- * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
- * All rights reserved.
- *
- * 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 as
- *    the first lines of this file unmodified.
- * 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 AUTHORS ``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 AUTHORS 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "opt_kbd.h"
-#include "opt_atkbd.h"
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/bus.h>
-#include <sys/proc.h>
-#include <sys/limits.h>
-#include <sys/malloc.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
-
-#ifdef __i386__
-#include <machine/md_var.h>
-#include <machine/psl.h>
-#include <machine/vm86.h>
-#include <machine/pc/bios.h>
-
-#include <vm/vm.h>
-#include <vm/pmap.h>
-#include <vm/vm_param.h>
-#endif /* __i386__ */
-
-#include <sys/kbio.h>
-#include <dev/kbd/kbdreg.h>
-#include <dev/kbd/atkbdreg.h>
-#include <dev/kbd/atkbdcreg.h>
-
-#include <isa/isareg.h>
-
-static timeout_t	atkbd_timeout;
-
-int
-atkbd_probe_unit(int unit, int ctlr, int irq, int flags)
-{
-	keyboard_switch_t *sw;
-	int args[2];
-	int error;
-
-	sw = kbd_get_switch(ATKBD_DRIVER_NAME);
-	if (sw == NULL)
-		return ENXIO;
-
-	args[0] = ctlr;
-	args[1] = irq;
-	error = (*sw->probe)(unit, args, flags);
-	if (error)
-		return error;
-	return 0;
-}
-
-int
-atkbd_attach_unit(int unit, keyboard_t **kbd, int ctlr, int irq, int flags)
-{
-	keyboard_switch_t *sw;
-	int args[2];
-	int error;
-
-	sw = kbd_get_switch(ATKBD_DRIVER_NAME);
-	if (sw == NULL)
-		return ENXIO;
-
-	/* reset, initialize and enable the device */
-	args[0] = ctlr;
-	args[1] = irq;
-	*kbd = NULL;
-	error = (*sw->probe)(unit, args, flags);
-	if (error)
-		return error;
-	error = (*sw->init)(unit, kbd, args, flags);
-	if (error)
-		return error;
-	(*sw->enable)(*kbd);
-
-#ifdef KBD_INSTALL_CDEV
-	/* attach a virtual keyboard cdev */
-	error = kbd_attach(*kbd);
-	if (error)
-		return error;
-#endif
-
-	/*
-	 * This is a kludge to compensate for lost keyboard interrupts.
-	 * A similar code used to be in syscons. See below. XXX
-	 */
-	atkbd_timeout(*kbd);
-
-	if (bootverbose)
-		(*sw->diag)(*kbd, bootverbose);
-	return 0;
-}
-
-static void
-atkbd_timeout(void *arg)
-{
-	keyboard_t *kbd;
-	int s;
-
-	/*
-	 * The original text of the following comments are extracted 
-	 * from syscons.c (1.287)
-	 * 
-	 * With release 2.1 of the Xaccel server, the keyboard is left
-	 * hanging pretty often. Apparently an interrupt from the
-	 * keyboard is lost, and I don't know why (yet).
-	 * This ugly hack calls the low-level interrupt routine if input
-	 * is ready for the keyboard and conveniently hides the problem. XXX
-	 *
-	 * Try removing anything stuck in the keyboard controller; whether
-	 * it's a keyboard scan code or mouse data. The low-level
-	 * interrupt routine doesn't read the mouse data directly, 
-	 * but the keyboard controller driver will, as a side effect.
-	 */
-	/*
-	 * And here is bde's original comment about this:
-	 *
-	 * This is necessary to handle edge triggered interrupts - if we
-	 * returned when our IRQ is high due to unserviced input, then there
-	 * would be no more keyboard IRQs until the keyboard is reset by
-	 * external powers.
-	 *
-	 * The keyboard apparently unwedges the irq in most cases.
-	 */
-	s = spltty();
-	kbd = (keyboard_t *)arg;
-	if ((*kbdsw[kbd->kb_index]->lock)(kbd, TRUE)) {
-		/*
-		 * We have seen the lock flag is not set. Let's reset
-		 * the flag early, otherwise the LED update routine fails
-		 * which may want the lock during the interrupt routine.
-		 */
-		(*kbdsw[kbd->kb_index]->lock)(kbd, FALSE);
-		if ((*kbdsw[kbd->kb_index]->check_char)(kbd))
-			(*kbdsw[kbd->kb_index]->intr)(kbd, NULL);
-	}
-	splx(s);
-	timeout(atkbd_timeout, arg, hz/10);
-}
-
-/* LOW-LEVEL */
-
-#define ATKBD_DEFAULT	0
-
-typedef struct atkbd_state {
-	KBDC		kbdc;		/* keyboard controller */
-					/* XXX: don't move this field; pcvt
-					 * expects `kbdc' to be the first
-					 * field in this structure. */
-	int		ks_mode;	/* input mode (K_XLATE,K_RAW,K_CODE) */
-	int		ks_flags;	/* flags */
-#define COMPOSE		(1 << 0)
-	int		ks_polling;
-	int		ks_state;	/* shift/lock key state */
-	int		ks_accents;	/* accent key index (> 0) */
-	u_int		ks_composed_char; /* composed char code (> 0) */
-	u_char		ks_prefix;	/* AT scan code prefix */
-} atkbd_state_t;
-
-/* keyboard driver declaration */
-static int		atkbd_configure(int flags);
-static kbd_probe_t	atkbd_probe;
-static kbd_init_t	atkbd_init;
-static kbd_term_t	atkbd_term;
-static kbd_intr_t	atkbd_intr;
-static kbd_test_if_t	atkbd_test_if;
-static kbd_enable_t	atkbd_enable;
-static kbd_disable_t	atkbd_disable;
-static kbd_read_t	atkbd_read;
-static kbd_check_t	atkbd_check;
-static kbd_read_char_t	atkbd_read_char;
-static kbd_check_char_t	atkbd_check_char;
-static kbd_ioctl_t	atkbd_ioctl;
-static kbd_lock_t	atkbd_lock;
-static kbd_clear_state_t atkbd_clear_state;
-static kbd_get_state_t	atkbd_get_state;
-static kbd_set_state_t	atkbd_set_state;
-static kbd_poll_mode_t	atkbd_poll;
-
-static keyboard_switch_t atkbdsw = {
-	atkbd_probe,
-	atkbd_init,
-	atkbd_term,
-	atkbd_intr,
-	atkbd_test_if,
-	atkbd_enable,
-	atkbd_disable,
-	atkbd_read,
-	atkbd_check,
-	atkbd_read_char,
-	atkbd_check_char,
-	atkbd_ioctl,
-	atkbd_lock,
-	atkbd_clear_state,
-	atkbd_get_state,
-	atkbd_set_state,
-	genkbd_get_fkeystr,
-	atkbd_poll,
-	genkbd_diag,
-};
-
-KEYBOARD_DRIVER(atkbd, atkbdsw, atkbd_configure);
-
-/* local functions */
-static int		get_typematic(keyboard_t *kbd);
-static int		setup_kbd_port(KBDC kbdc, int port, int intr);
-static int		get_kbd_echo(KBDC kbdc);
-static int		probe_keyboard(KBDC kbdc, int flags);
-static int		init_keyboard(KBDC kbdc, int *type, int flags);
-static int		write_kbd(KBDC kbdc, int command, int data);
-static int		get_kbd_id(KBDC kbdc);
-static int		typematic(int delay, int rate);
-static int		typematic_delay(int delay);
-static int		typematic_rate(int rate);
-
-/* local variables */
-
-/* the initial key map, accent map and fkey strings */
-#ifdef ATKBD_DFLT_KEYMAP
-#define KBD_DFLT_KEYMAP
-#include "atkbdmap.h"
-#endif
-#include <dev/kbd/kbdtables.h>
-
-/* structures for the default keyboard */
-static keyboard_t	default_kbd;
-static atkbd_state_t	default_kbd_state;
-static keymap_t		default_keymap;
-static accentmap_t	default_accentmap;
-static fkeytab_t	default_fkeytab[NUM_FKEYS];
-
-/* 
- * The back door to the keyboard driver!
- * This function is called by the console driver, via the kbdio module,
- * to tickle keyboard drivers when the low-level console is being initialized.
- * Almost nothing in the kernel has been initialied yet.  Try to probe
- * keyboards if possible.
- * NOTE: because of the way the low-level console is initialized, this routine
- * may be called more than once!!
- */
-static int
-atkbd_configure(int flags)
-{
-	keyboard_t *kbd;
-	int arg[2];
-	int i;
-
-	/* probe the keyboard controller */
-	atkbdc_configure();
-
-	/* if the driver is disabled, unregister the keyboard if any */
-	if (resource_disabled("atkbd", ATKBD_DEFAULT)) {
-		i = kbd_find_keyboard(ATKBD_DRIVER_NAME, ATKBD_DEFAULT);
-		if (i >= 0) {
-			kbd = kbd_get_keyboard(i);
-			kbd_unregister(kbd);
-			kbd->kb_flags &= ~KB_REGISTERED;
-		}
-		return 0;
-	}
-	
-	/* XXX: a kludge to obtain the device configuration flags */
-	if (resource_int_value("atkbd", ATKBD_DEFAULT, "flags", &i) == 0)
-		flags |= i;
-
-	/* probe the default keyboard */
-	arg[0] = -1;
-	arg[1] = -1;
-	kbd = NULL;
-	if (atkbd_probe(ATKBD_DEFAULT, arg, flags))
-		return 0;
-	if (atkbd_init(ATKBD_DEFAULT, &kbd, arg, flags))
-		return 0;
-
-	/* return the number of found keyboards */
-	return 1;
-}
-
-/* low-level functions */
-
-/* detect a keyboard */
-static int
-atkbd_probe(int unit, void *arg, int flags)
-{
-	KBDC kbdc;
-	int *data = (int *)arg;	/* data[0]: controller, data[1]: irq */
-
-	/* XXX */
-	if (unit == ATKBD_DEFAULT) {
-		if (KBD_IS_PROBED(&default_kbd))
-			return 0;
-	}
-
-	kbdc = atkbdc_open(data[0]);
-	if (kbdc == NULL)
-		return ENXIO;
-	if (probe_keyboard(kbdc, flags)) {
-		if (flags & KB_CONF_FAIL_IF_NO_KBD)
-			return ENXIO;
-	}
-	return 0;
-}
-
-/* reset and initialize the device */
-static int
-atkbd_init(int unit, keyboard_t **kbdp, void *arg, int flags)
-{
-	keyboard_t *kbd;
-	atkbd_state_t *state;
-	keymap_t *keymap;
-	accentmap_t *accmap;
-	fkeytab_t *fkeymap;
-	int fkeymap_size;
-	int delay[2];
-	int *data = (int *)arg;	/* data[0]: controller, data[1]: irq */
-	int error, needfree;
-
-	/* XXX */
-	if (unit == ATKBD_DEFAULT) {
-		*kbdp = kbd = &default_kbd;
-		if (KBD_IS_INITIALIZED(kbd) && KBD_IS_CONFIGURED(kbd))
-			return 0;
-		state = &default_kbd_state;
-		keymap = &default_keymap;
-		accmap = &default_accentmap;
-		fkeymap = default_fkeytab;
-		fkeymap_size =
-			sizeof(default_fkeytab)/sizeof(default_fkeytab[0]);
-		needfree = 0;
-	} else if (*kbdp == NULL) {
-		*kbdp = kbd = malloc(sizeof(*kbd), M_DEVBUF, M_NOWAIT | M_ZERO);
-		state = malloc(sizeof(*state), M_DEVBUF, M_NOWAIT | M_ZERO);
-		/* NB: these will always be initialized 'cuz !KBD_IS_PROBED */
-		keymap = malloc(sizeof(key_map), M_DEVBUF, M_NOWAIT);
-		accmap = malloc(sizeof(accent_map), M_DEVBUF, M_NOWAIT);
-		fkeymap = malloc(sizeof(fkey_tab), M_DEVBUF, M_NOWAIT);
-		fkeymap_size = sizeof(fkey_tab)/sizeof(fkey_tab[0]);
-		needfree = 1;
-		if ((kbd == NULL) || (state == NULL) || (keymap == NULL)
-		     || (accmap == NULL) || (fkeymap == NULL)) {
-			error = ENOMEM;
-			goto bad;
-		}
-	} else if (KBD_IS_INITIALIZED(*kbdp) && KBD_IS_CONFIGURED(*kbdp)) {
-		return 0;
-	} else {
-		kbd = *kbdp;
-		state = (atkbd_state_t *)kbd->kb_data;
-		bzero(state, sizeof(*state));
-		keymap = kbd->kb_keymap;
-		accmap = kbd->kb_accentmap;
-		fkeymap = kbd->kb_fkeytab;
-		fkeymap_size = kbd->kb_fkeytab_size;
-		needfree = 0;
-	}
-
-	if (!KBD_IS_PROBED(kbd)) {
-		state->kbdc = atkbdc_open(data[0]);
-		if (state->kbdc == NULL) {
-			error = ENXIO;
-			goto bad;
-		}
-		kbd_init_struct(kbd, ATKBD_DRIVER_NAME, KB_OTHER, unit, flags,
-				0, 0);
-		bcopy(&key_map, keymap, sizeof(key_map));
-		bcopy(&accent_map, accmap, sizeof(accent_map));
-		bcopy(fkey_tab, fkeymap,
-		      imin(fkeymap_size*sizeof(fkeymap[0]), sizeof(fkey_tab)));
-		kbd_set_maps(kbd, keymap, accmap, fkeymap, fkeymap_size);
-		kbd->kb_data = (void *)state;
-	
-		if (probe_keyboard(state->kbdc, flags)) { /* shouldn't happen */
-			if (flags & KB_CONF_FAIL_IF_NO_KBD) {
-				error = ENXIO;
-				goto bad;
-			}
-		} else {
-			KBD_FOUND_DEVICE(kbd);
-		}
-		atkbd_clear_state(kbd);
-		state->ks_mode = K_XLATE;
-		/* 
-		 * FIXME: set the initial value for lock keys in ks_state
-		 * according to the BIOS data?
-		 */
-		KBD_PROBE_DONE(kbd);
-	}
-	if (!KBD_IS_INITIALIZED(kbd) && !(flags & KB_CONF_PROBE_ONLY)) {
-		kbd->kb_config = flags & ~KB_CONF_PROBE_ONLY;
-		if (KBD_HAS_DEVICE(kbd)
-	    	    && init_keyboard(state->kbdc, &kbd->kb_type, kbd->kb_config)
-	    	    && (kbd->kb_config & KB_CONF_FAIL_IF_NO_KBD)) {
-			kbd_unregister(kbd);
-			error = ENXIO;
-			goto bad;
-		}
-		atkbd_ioctl(kbd, KDSETLED, (caddr_t)&state->ks_state);
-		get_typematic(kbd);
-		delay[0] = kbd->kb_delay1;
-		delay[1] = kbd->kb_delay2;
-		atkbd_ioctl(kbd, KDSETREPEAT, (caddr_t)delay);
-		KBD_INIT_DONE(kbd);
-	}
-	if (!KBD_IS_CONFIGURED(kbd)) {
-		if (kbd_register(kbd) < 0) {
-			error = ENXIO;
-			goto bad;
-		}
-		KBD_CONFIG_DONE(kbd);
-	}
-
-	return 0;
-bad:
-	if (needfree) {
-		if (state != NULL)
-			free(state, M_DEVBUF);
-		if (keymap != NULL)
-			free(keymap, M_DEVBUF);
-		if (accmap != NULL)
-			free(accmap, M_DEVBUF);
-		if (fkeymap != NULL)
-			free(fkeymap, M_DEVBUF);
-		if (kbd != NULL) {
-			free(kbd, M_DEVBUF);
-			*kbdp = NULL;	/* insure ref doesn't leak to caller */
-		}
-	}
-	return error;
-}
-
-/* finish using this keyboard */
-static int
-atkbd_term(keyboard_t *kbd)
-{
-	kbd_unregister(kbd);
-	return 0;
-}
-
-/* keyboard interrupt routine */
-static int
-atkbd_intr(keyboard_t *kbd, void *arg)
-{
-	atkbd_state_t *state;
-	int delay[2];
-	int c;
-
-	if (KBD_IS_ACTIVE(kbd) && KBD_IS_BUSY(kbd)) {
-		/* let the callback function to process the input */
-		(*kbd->kb_callback.kc_func)(kbd, KBDIO_KEYINPUT,
-					    kbd->kb_callback.kc_arg);
-	} else {
-		/* read and discard the input; no one is waiting for input */
-		do {
-			c = atkbd_read_char(kbd, FALSE);
-		} while (c != NOKEY);
-
-		if (!KBD_HAS_DEVICE(kbd)) {
-			/*
-			 * The keyboard was not detected before;
-			 * it must have been reconnected!
-			 */
-			state = (atkbd_state_t *)kbd->kb_data;
-			init_keyboard(state->kbdc, &kbd->kb_type,
-				      kbd->kb_config);
-			atkbd_ioctl(kbd, KDSETLED, (caddr_t)&state->ks_state);
-			get_typematic(kbd);
-			delay[0] = kbd->kb_delay1;
-			delay[1] = kbd->kb_delay2;
-			atkbd_ioctl(kbd, KDSETREPEAT, (caddr_t)delay);
-			KBD_FOUND_DEVICE(kbd);
-		}
-	}
-	return 0;
-}
-
-/* test the interface to the device */
-static int
-atkbd_test_if(keyboard_t *kbd)
-{
-	int error;
-	int s;
-
-	error = 0;
-	empty_both_buffers(((atkbd_state_t *)kbd->kb_data)->kbdc, 10);
-	s = spltty();
-	if (!test_controller(((atkbd_state_t *)kbd->kb_data)->kbdc))
-		error = EIO;
-	else if (test_kbd_port(((atkbd_state_t *)kbd->kb_data)->kbdc) != 0)
-		error = EIO;
-	splx(s);
-
-	return error;
-}
-
-/* 
- * Enable the access to the device; until this function is called,
- * the client cannot read from the keyboard.
- */
-static int
-atkbd_enable(keyboard_t *kbd)
-{
-	int s;
-
-	s = spltty();
-	KBD_ACTIVATE(kbd);
-	splx(s);
-	return 0;
-}
-
-/* disallow the access to the device */
-static int
-atkbd_disable(keyboard_t *kbd)
-{
-	int s;
-
-	s = spltty();
-	KBD_DEACTIVATE(kbd);
-	splx(s);
-	return 0;
-}
-
-/* read one byte from the keyboard if it's allowed */
-static int
-atkbd_read(keyboard_t *kbd, int wait)
-{
-	int c;
-
-	if (wait)
-		c = read_kbd_data(((atkbd_state_t *)kbd->kb_data)->kbdc);
-	else
-		c = read_kbd_data_no_wait(((atkbd_state_t *)kbd->kb_data)->kbdc);
-	if (c != -1)
-		++kbd->kb_count;
-	return (KBD_IS_ACTIVE(kbd) ? c : -1);
-}
-
-/* check if data is waiting */
-static int
-atkbd_check(keyboard_t *kbd)
-{
-	if (!KBD_IS_ACTIVE(kbd))
-		return FALSE;
-	return kbdc_data_ready(((atkbd_state_t *)kbd->kb_data)->kbdc);
-}
-
-/* read char from the keyboard */
-static u_int
-atkbd_read_char(keyboard_t *kbd, int wait)
-{
-	atkbd_state_t *state;
-	u_int action;
-	int scancode;
-	int keycode;
-
-	state = (atkbd_state_t *)kbd->kb_data;
-next_code:
-	/* do we have a composed char to return? */
-	if (!(state->ks_flags & COMPOSE) && (state->ks_composed_char > 0)) {
-		action = state->ks_composed_char;
-		state->ks_composed_char = 0;
-		if (action > UCHAR_MAX)
-			return ERRKEY;
-		return action;
-	}
-
-	/* see if there is something in the keyboard port */
-	if (wait) {
-		do {
-			scancode = read_kbd_data(state->kbdc);
-		} while (scancode == -1);
-	} else {
-		scancode = read_kbd_data_no_wait(state->kbdc);
-		if (scancode == -1)
-			return NOKEY;
-	}
-	++kbd->kb_count;
-
-#if KBDIO_DEBUG >= 10
-	printf("atkbd_read_char(): scancode:0x%x\n", scancode);
-#endif
-
-	/* return the byte as is for the K_RAW mode */
-	if (state->ks_mode == K_RAW)
-		return scancode;
-
-	/* translate the scan code into a keycode */
-	keycode = scancode & 0x7F;
-	switch (state->ks_prefix) {
-	case 0x00:	/* normal scancode */
-		switch(scancode) {
-		case 0xB8:	/* left alt (compose key) released */
-			if (state->ks_flags & COMPOSE) {
-				state->ks_flags &= ~COMPOSE;
-				if (state->ks_composed_char > UCHAR_MAX)
-					state->ks_composed_char = 0;
-			}
-			break;
-		case 0x38:	/* left alt (compose key) pressed */
-			if (!(state->ks_flags & COMPOSE)) {
-				state->ks_flags |= COMPOSE;
-				state->ks_composed_char = 0;
-			}
-			break;
-		case 0xE0:
-		case 0xE1:
-			state->ks_prefix = scancode;
-			goto next_code;
-		}
-		break;
-	case 0xE0:      /* 0xE0 prefix */
-		state->ks_prefix = 0;
-		switch (keycode) {
-		case 0x1C:	/* right enter key */
-			keycode = 0x59;
-			break;
-		case 0x1D:	/* right ctrl key */
-			keycode = 0x5A;
-			break;
-		case 0x35:	/* keypad divide key */
-	    		keycode = 0x5B;
-	    		break;
-		case 0x37:	/* print scrn key */
-	    		keycode = 0x5C;
-	    		break;
-		case 0x38:	/* right alt key (alt gr) */
-	    		keycode = 0x5D;
-	    		break;
-		case 0x46:	/* ctrl-pause/break on AT 101 (see below) */
-			keycode = 0x68;
-	    		break;
-		case 0x47:	/* grey home key */
-	    		keycode = 0x5E;
-	    		break;
-		case 0x48:	/* grey up arrow key */
-	    		keycode = 0x5F;
-	    		break;
-		case 0x49:	/* grey page up key */
-	    		keycode = 0x60;
-	    		break;
-		case 0x4B:	/* grey left arrow key */
-	    		keycode = 0x61;
-	    		break;
-		case 0x4D:	/* grey right arrow key */
-	    		keycode = 0x62;
-	    		break;
-		case 0x4F:	/* grey end key */
-	    		keycode = 0x63;
-	    		break;
-		case 0x50:	/* grey down arrow key */
-	    		keycode = 0x64;
-	    		break;
-		case 0x51:	/* grey page down key */
-	    		keycode = 0x65;
-	    		break;
-		case 0x52:	/* grey insert key */
-	    		keycode = 0x66;
-	    		break;
-		case 0x53:	/* grey delete key */
-	    		keycode = 0x67;
-	    		break;
-		/* the following 3 are only used on the MS "Natural" keyboard */
-		case 0x5b:	/* left Window key */
-	    		keycode = 0x69;
-	    		break;
-		case 0x5c:	/* right Window key */
-	    		keycode = 0x6a;
-	    		break;
-		case 0x5d:	/* menu key */
-	    		keycode = 0x6b;
-	    		break;
-		case 0x5e:	/* power key */
-			keycode = 0x6d;
-			break;
-		case 0x5f:	/* sleep key */
-			keycode = 0x6e;
-			break;
-		case 0x63:	/* wake key */
-			keycode = 0x6f;
-			break;
-		default:	/* ignore everything else */
-	    		goto next_code;
-		}
-		break;
-    	case 0xE1:	/* 0xE1 prefix */
-		/* 
-		 * The pause/break key on the 101 keyboard produces:
-		 * E1-1D-45 E1-9D-C5
-		 * Ctrl-pause/break produces:
-		 * E0-46 E0-C6 (See above.)
-		 */
-		state->ks_prefix = 0;
-		if (keycode == 0x1D)
-	    		state->ks_prefix = 0x1D;
-		goto next_code;
-		/* NOT REACHED */
-    	case 0x1D:	/* pause / break */
-		state->ks_prefix = 0;
-		if (keycode != 0x45)
-			goto next_code;
-		keycode = 0x68;
-		break;
-	}
-
-	if (kbd->kb_type == KB_84) {
-		switch (keycode) {
-		case 0x37:	/* *(numpad)/print screen */
-			if (state->ks_flags & SHIFTS)
-	    			keycode = 0x5c;	/* print screen */
-			break;
-		case 0x45:	/* num lock/pause */
-			if (state->ks_flags & CTLS)
-				keycode = 0x68;	/* pause */
-			break;
-		case 0x46:	/* scroll lock/break */
-			if (state->ks_flags & CTLS)
-				keycode = 0x6c;	/* break */
-			break;
-		}
-	} else if (kbd->kb_type == KB_101) {
-		switch (keycode) {
-		case 0x5c:	/* print screen */
-			if (state->ks_flags & ALTS)
-				keycode = 0x54;	/* sysrq */
-			break;
-		case 0x68:	/* pause/break */
-			if (state->ks_flags & CTLS)
-				keycode = 0x6c;	/* break */
-			break;
-		}
-	}
-
-	/* return the key code in the K_CODE mode */
-	if (state->ks_mode == K_CODE)
-		return (keycode | (scancode & 0x80));
-
-	/* compose a character code */
-	if (state->ks_flags & COMPOSE) {
-		switch (keycode | (scancode & 0x80)) {
-		/* key pressed, process it */
-		case 0x47: case 0x48: case 0x49:	/* keypad 7,8,9 */
-			state->ks_composed_char *= 10;
-			state->ks_composed_char += keycode - 0x40;
-			if (state->ks_composed_char > UCHAR_MAX)
-				return ERRKEY;
-			goto next_code;
-		case 0x4B: case 0x4C: case 0x4D:	/* keypad 4,5,6 */
-			state->ks_composed_char *= 10;
-			state->ks_composed_char += keycode - 0x47;
-			if (state->ks_composed_char > UCHAR_MAX)
-				return ERRKEY;
-			goto next_code;
-		case 0x4F: case 0x50: case 0x51:	/* keypad 1,2,3 */
-			state->ks_composed_char *= 10;
-			state->ks_composed_char += keycode - 0x4E;
-			if (state->ks_composed_char > UCHAR_MAX)
-				return ERRKEY;
-			goto next_code;
-		case 0x52:				/* keypad 0 */
-			state->ks_composed_char *= 10;
-			if (state->ks_composed_char > UCHAR_MAX)
-				return ERRKEY;
-			goto next_code;
-
-		/* key released, no interest here */
-		case 0xC7: case 0xC8: case 0xC9:	/* keypad 7,8,9 */
-		case 0xCB: case 0xCC: case 0xCD:	/* keypad 4,5,6 */
-		case 0xCF: case 0xD0: case 0xD1:	/* keypad 1,2,3 */
-		case 0xD2:				/* keypad 0 */
-			goto next_code;
-
-		case 0x38:				/* left alt key */
-			break;
-
-		default:
-			if (state->ks_composed_char > 0) {
-				state->ks_flags &= ~COMPOSE;
-				state->ks_composed_char = 0;
-				return ERRKEY;
-			}
-			break;
-		}
-	}
-
-	/* keycode to key action */
-	action = genkbd_keyaction(kbd, keycode, scancode & 0x80,
-				  &state->ks_state, &state->ks_accents);
-	if (action == NOKEY)
-		goto next_code;
-	else
-		return action;
-}
-
-/* check if char is waiting */
-static int
-atkbd_check_char(keyboard_t *kbd)
-{
-	atkbd_state_t *state;
-
-	if (!KBD_IS_ACTIVE(kbd))
-		return FALSE;
-	state = (atkbd_state_t *)kbd->kb_data;
-	if (!(state->ks_flags & COMPOSE) && (state->ks_composed_char > 0))
-		return TRUE;
-	return kbdc_data_ready(state->kbdc);
-}
-
-/* some useful control functions */
-static int
-atkbd_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg)
-{
-	/* trasnlate LED_XXX bits into the device specific bits */
-	static u_char ledmap[8] = {
-		0, 4, 2, 6, 1, 5, 3, 7,
-	};
-	atkbd_state_t *state = kbd->kb_data;
-	int error;
-	int s;
-	int i;
-
-	s = spltty();
-	switch (cmd) {
-
-	case KDGKBMODE:		/* get keyboard mode */
-		*(int *)arg = state->ks_mode;
-		break;
-	case KDSKBMODE:		/* set keyboard mode */
-		switch (*(int *)arg) {
-		case K_XLATE:
-			if (state->ks_mode != K_XLATE) {
-				/* make lock key state and LED state match */
-				state->ks_state &= ~LOCK_MASK;
-				state->ks_state |= KBD_LED_VAL(kbd);
-			}
-			/* FALLTHROUGH */
-		case K_RAW:
-		case K_CODE:
-			if (state->ks_mode != *(int *)arg) {
-				atkbd_clear_state(kbd);
-				state->ks_mode = *(int *)arg;
-			}
-			break;
-		default:
-			splx(s);
-			return EINVAL;
-		}
-		break;
-
-	case KDGETLED:		/* get keyboard LED */
-		*(int *)arg = KBD_LED_VAL(kbd);
-		break;
-	case KDSETLED:		/* set keyboard LED */
-		/* NOTE: lock key state in ks_state won't be changed */
-		if (*(int *)arg & ~LOCK_MASK) {
-			splx(s);
-			return EINVAL;
-		}
-		i = *(int *)arg;
-		/* replace CAPS LED with ALTGR LED for ALTGR keyboards */
-		if (state->ks_mode == K_XLATE &&
-		    kbd->kb_keymap->n_keys > ALTGR_OFFSET) {
-			if (i & ALKED)
-				i |= CLKED;
-			else
-				i &= ~CLKED;
-		}
-		if (KBD_HAS_DEVICE(kbd)) {
-			error = write_kbd(state->kbdc, KBDC_SET_LEDS,
-					  ledmap[i & LED_MASK]);
-			if (error) {
-				splx(s);
-				return error;
-			}
-		}
-		KBD_LED_VAL(kbd) = *(int *)arg;
-		break;
-
-	case KDGKBSTATE:	/* get lock key state */
-		*(int *)arg = state->ks_state & LOCK_MASK;
-		break;
-	case KDSKBSTATE:	/* set lock key state */
-		if (*(int *)arg & ~LOCK_MASK) {
-			splx(s);
-			return EINVAL;
-		}
-		state->ks_state &= ~LOCK_MASK;
-		state->ks_state |= *(int *)arg;
-		splx(s);
-		/* set LEDs and quit */
-		return atkbd_ioctl(kbd, KDSETLED, arg);
-
-	case KDSETREPEAT:	/* set keyboard repeat rate (new interface) */
-		splx(s);
-		if (!KBD_HAS_DEVICE(kbd))
-			return 0;
-		i = typematic(((int *)arg)[0], ((int *)arg)[1]);
-		error = write_kbd(state->kbdc, KBDC_SET_TYPEMATIC, i);
-		if (error == 0) {
-			kbd->kb_delay1 = typematic_delay(i);
-			kbd->kb_delay2 = typematic_rate(i);
-		}
-		return error;
-
-	case KDSETRAD:		/* set keyboard repeat rate (old interface) */
-		splx(s);
-		if (!KBD_HAS_DEVICE(kbd))
-			return 0;
-		error = write_kbd(state->kbdc, KBDC_SET_TYPEMATIC, *(int *)arg);
-		if (error == 0) {
-			kbd->kb_delay1 = typematic_delay(*(int *)arg);
-			kbd->kb_delay2 = typematic_rate(*(int *)arg);
-		}
-		return error;
-
-	case PIO_KEYMAP:	/* set keyboard translation table */
-	case PIO_KEYMAPENT:	/* set keyboard translation table entry */
-	case PIO_DEADKEYMAP:	/* set accent key translation table */
-		state->ks_accents = 0;
-		/* FALLTHROUGH */
-	default:
-		splx(s);
-		return genkbd_commonioctl(kbd, cmd, arg);
-	}
-
-	splx(s);
-	return 0;
-}
-
-/* lock the access to the keyboard */
-static int
-atkbd_lock(keyboard_t *kbd, int lock)
-{
-	return kbdc_lock(((atkbd_state_t *)kbd->kb_data)->kbdc, lock);
-}
-
-/* clear the internal state of the keyboard */
-static void
-atkbd_clear_state(keyboard_t *kbd)
-{
-	atkbd_state_t *state;
-
-	state = (atkbd_state_t *)kbd->kb_data;
-	state->ks_flags = 0;
-	state->ks_polling = 0;
-	state->ks_state &= LOCK_MASK;	/* preserve locking key state */
-	state->ks_accents = 0;
-	state->ks_composed_char = 0;
-#if 0
-	state->ks_prefix = 0; /* XXX */
-#endif
-}
-
-/* save the internal state */
-static int
-atkbd_get_state(keyboard_t *kbd, void *buf, size_t len)
-{
-	if (len == 0)
-		return sizeof(atkbd_state_t);
-	if (len < sizeof(atkbd_state_t))
-		return -1;
-	bcopy(kbd->kb_data, buf, sizeof(atkbd_state_t));
-	return 0;
-}
-
-/* set the internal state */
-static int
-atkbd_set_state(keyboard_t *kbd, void *buf, size_t len)
-{
-	if (len < sizeof(atkbd_state_t))
-		return ENOMEM;
-	if (((atkbd_state_t *)kbd->kb_data)->kbdc
-		!= ((atkbd_state_t *)buf)->kbdc)
-		return ENOMEM;
-	bcopy(buf, kbd->kb_data, sizeof(atkbd_state_t));
-	return 0;
-}
-
-static int
-atkbd_poll(keyboard_t *kbd, int on)
-{
-	atkbd_state_t *state;
-	int s;
-
-	state = (atkbd_state_t *)kbd->kb_data;
-	s = spltty();
-	if (on)
-		++state->ks_polling;
-	else
-		--state->ks_polling;
-	splx(s);
-	return 0;
-}
-
-/* local functions */
-
-static int
-get_typematic(keyboard_t *kbd)
-{
-#ifdef __i386__
-	/*
-	 * Only some systems allow us to retrieve the keyboard repeat 
-	 * rate previously set via the BIOS...
-	 */
-	struct vm86frame vmf;
-	u_int32_t p;
-
-	bzero(&vmf, sizeof(vmf));
-	vmf.vmf_ax = 0xc000;
-	vm86_intcall(0x15, &vmf);
-	if ((vmf.vmf_eflags & PSL_C) || vmf.vmf_ah)
-		return ENODEV;
-        p = BIOS_PADDRTOVADDR(((u_int32_t)vmf.vmf_es << 4) + vmf.vmf_bx);
-	if ((readb(p + 6) & 0x40) == 0)	/* int 16, function 0x09 supported? */
-		return ENODEV;
-	vmf.vmf_ax = 0x0900;
-	vm86_intcall(0x16, &vmf);
-	if ((vmf.vmf_al & 0x08) == 0)	/* int 16, function 0x0306 supported? */
-		return ENODEV;
-	vmf.vmf_ax = 0x0306;
-	vm86_intcall(0x16, &vmf);
-	kbd->kb_delay1 = typematic_delay(vmf.vmf_bh << 5);
-	kbd->kb_delay2 = typematic_rate(vmf.vmf_bl);
-	return 0;
-#else
-	return ENODEV;
-#endif /* __i386__ */
-}
-
-static int
-setup_kbd_port(KBDC kbdc, int port, int intr)
-{
-	if (!set_controller_command_byte(kbdc,
-		KBD_KBD_CONTROL_BITS,
-		((port) ? KBD_ENABLE_KBD_PORT : KBD_DISABLE_KBD_PORT)
-		    | ((intr) ? KBD_ENABLE_KBD_INT : KBD_DISABLE_KBD_INT)))
-		return 1;
-	return 0;
-}
-
-static int
-get_kbd_echo(KBDC kbdc)
-{
-	/* enable the keyboard port, but disable the keyboard intr. */
-	if (setup_kbd_port(kbdc, TRUE, FALSE))
-		/* CONTROLLER ERROR: there is very little we can do... */
-		return ENXIO;
-
-	/* see if something is present */
-	write_kbd_command(kbdc, KBDC_ECHO);
-	if (read_kbd_data(kbdc) != KBD_ECHO) {
-		empty_both_buffers(kbdc, 10);
-		test_controller(kbdc);
-		test_kbd_port(kbdc);
-		return ENXIO;
-	}
-
-	/* enable the keyboard port and intr. */
-	if (setup_kbd_port(kbdc, TRUE, TRUE)) {
-		/*
-		 * CONTROLLER ERROR 
-		 * This is serious; the keyboard intr is left disabled! 
-		 */
-		return ENXIO;
-	}
-    
-	return 0;
-}
-
-static int
-probe_keyboard(KBDC kbdc, int flags)
-{
-	/*
-	 * Don't try to print anything in this function.  The low-level 
-	 * console may not have been initialized yet...
-	 */
-	int err;
-	int c;
-	int m;
-
-	if (!kbdc_lock(kbdc, TRUE)) {
-		/* driver error? */
-		return ENXIO;
-	}
-
-	/* temporarily block data transmission from the keyboard */
-	write_controller_command(kbdc, KBDC_DISABLE_KBD_PORT);
-
-	/* flush any noise in the buffer */
-	empty_both_buffers(kbdc, 100);
-
-	/* save the current keyboard controller command byte */
-	m = kbdc_get_device_mask(kbdc) & ~KBD_KBD_CONTROL_BITS;
-	c = get_controller_command_byte(kbdc);
-	if (c == -1) {
-		/* CONTROLLER ERROR */
-		kbdc_set_device_mask(kbdc, m);
-		kbdc_lock(kbdc, FALSE);
-		return ENXIO;
-	}
-
-	/* 
-	 * The keyboard may have been screwed up by the boot block.
-	 * We may just be able to recover from error by testing the controller
-	 * and the keyboard port. The controller command byte needs to be
-	 * saved before this recovery operation, as some controllers seem 
-	 * to set the command byte to particular values.
-	 */
-	test_controller(kbdc);
-	if (!(flags & KB_CONF_NO_PROBE_TEST))
-		test_kbd_port(kbdc);
-
-	err = get_kbd_echo(kbdc);
-
-	/*
-	 * Even if the keyboard doesn't seem to be present (err != 0),
-	 * we shall enable the keyboard port and interrupt so that
-	 * the driver will be operable when the keyboard is attached
-	 * to the system later.  It is NOT recommended to hot-plug
-	 * the AT keyboard, but many people do so...
-	 */
-	kbdc_set_device_mask(kbdc, m | KBD_KBD_CONTROL_BITS);
-	setup_kbd_port(kbdc, TRUE, TRUE);
-#if 0
-	if (err == 0) {
-		kbdc_set_device_mask(kbdc, m | KBD_KBD_CONTROL_BITS);
-	} else {
-		/* try to restore the command byte as before */
-		set_controller_command_byte(kbdc, 0xff, c);
-		kbdc_set_device_mask(kbdc, m);
-	}
-#endif
-
-	kbdc_lock(kbdc, FALSE);
-	return err;
-}
-
-static int
-init_keyboard(KBDC kbdc, int *type, int flags)
-{
-	int codeset;
-	int id;
-	int c;
-
-	if (!kbdc_lock(kbdc, TRUE)) {
-		/* driver error? */
-		return EIO;
-	}
-
-	/* temporarily block data transmission from the keyboard */
-	write_controller_command(kbdc, KBDC_DISABLE_KBD_PORT);
-
-	/* save the current controller command byte */
-	empty_both_buffers(kbdc, 200);
-	c = get_controller_command_byte(kbdc);
-	if (c == -1) {
-		/* CONTROLLER ERROR */
-		kbdc_lock(kbdc, FALSE);
-		printf("atkbd: unable to get the current command byte value.\n");
-		return EIO;
-	}
-	if (bootverbose)
-		printf("atkbd: the current kbd controller command byte %04x\n",
-		       c);
-#if 0
-	/* override the keyboard lock switch */
-	c |= KBD_OVERRIDE_KBD_LOCK;
-#endif
-
-	/* enable the keyboard port, but disable the keyboard intr. */
-	if (setup_kbd_port(kbdc, TRUE, FALSE)) {
-		/* CONTROLLER ERROR: there is very little we can do... */
-		printf("atkbd: unable to set the command byte.\n");
-		kbdc_lock(kbdc, FALSE);
-		return EIO;
-	}
-
-	/* 
-	 * Check if we have an XT keyboard before we attempt to reset it. 
-	 * The procedure assumes that the keyboard and the controller have 
-	 * been set up properly by BIOS and have not been messed up 
-	 * during the boot process.
-	 */
-	codeset = -1;
-	if (flags & KB_CONF_ALT_SCANCODESET)
-		/* the user says there is a XT keyboard */
-		codeset = 1;
-#ifdef KBD_DETECT_XT_KEYBOARD
-	else if ((c & KBD_TRANSLATION) == 0) {
-		/* SET_SCANCODE_SET is not always supported; ignore error */
-		if (send_kbd_command_and_data(kbdc, KBDC_SET_SCANCODE_SET, 0)
-			== KBD_ACK) 
-			codeset = read_kbd_data(kbdc);
-	}
-	if (bootverbose)
-		printf("atkbd: scancode set %d\n", codeset);
-#endif /* KBD_DETECT_XT_KEYBOARD */
- 
-	*type = KB_OTHER;
-	id = get_kbd_id(kbdc);
-	switch(id) {
-	case 0x41ab:	/* 101/102/... Enhanced */
-	case 0x83ab:	/* ditto */
-	case 0x54ab:	/* SpaceSaver */
-	case 0x84ab:	/* ditto */
-#if 0
-	case 0x90ab:	/* 'G' */
-	case 0x91ab:	/* 'P' */
-	case 0x92ab:	/* 'A' */
-#endif
-		*type = KB_101;
-		break;
-	case -1:	/* AT 84 keyboard doesn't return ID */
-		*type = KB_84;
-		break;
-	default:
-		break;
-	}
-	if (bootverbose)
-		printf("atkbd: keyboard ID 0x%x (%d)\n", id, *type);
-
-	/* reset keyboard hardware */
-	if (!(flags & KB_CONF_NO_RESET) && !reset_kbd(kbdc)) {
-		/*
-		 * KEYBOARD ERROR
-		 * Keyboard reset may fail either because the keyboard
-		 * doen't exist, or because the keyboard doesn't pass
-		 * the self-test, or the keyboard controller on the
-		 * motherboard and the keyboard somehow fail to shake hands.
-		 * It is just possible, particularly in the last case,
-		 * that the keyboard controller may be left in a hung state.
-		 * test_controller() and test_kbd_port() appear to bring
-		 * the keyboard controller back (I don't know why and how,
-		 * though.)
-		 */
-		empty_both_buffers(kbdc, 10);
-		test_controller(kbdc);
-		test_kbd_port(kbdc);
-		/*
-		 * We could disable the keyboard port and interrupt... but, 
-		 * the keyboard may still exist (see above). 
-		 */
-		set_controller_command_byte(kbdc, 0xff, c);
-		kbdc_lock(kbdc, FALSE);
-		if (bootverbose)
-			printf("atkbd: failed to reset the keyboard.\n");
-		return EIO;
-	}
-
-	/*
-	 * Allow us to set the XT_KEYBD flag so that keyboards
-	 * such as those on the IBM ThinkPad laptop computers can be used
-	 * with the standard console driver.
-	 */
-	if (codeset == 1) {
-		if (send_kbd_command_and_data(kbdc,
-			KBDC_SET_SCANCODE_SET, codeset) == KBD_ACK) {
-			/* XT kbd doesn't need scan code translation */
-			c &= ~KBD_TRANSLATION;
-		} else {
-			/*
-			 * KEYBOARD ERROR 
-			 * The XT kbd isn't usable unless the proper scan
-			 * code set is selected. 
-			 */
-			set_controller_command_byte(kbdc, 0xff, c);
-			kbdc_lock(kbdc, FALSE);
-			printf("atkbd: unable to set the XT keyboard mode.\n");
-			return EIO;
-		}
-	}
-
-#ifdef __alpha__
-	if (send_kbd_command_and_data(
-		kbdc, KBDC_SET_SCANCODE_SET, 2) != KBD_ACK) {
-		printf("atkbd: can't set translation.\n");
-		
-	}
-	c |= KBD_TRANSLATION;
-#endif
-
-	/* enable the keyboard port and intr. */
-	if (!set_controller_command_byte(kbdc, 
-		KBD_KBD_CONTROL_BITS | KBD_TRANSLATION | KBD_OVERRIDE_KBD_LOCK,
-		(c & (KBD_TRANSLATION | KBD_OVERRIDE_KBD_LOCK))
-		    | KBD_ENABLE_KBD_PORT | KBD_ENABLE_KBD_INT)) {
-		/*
-		 * CONTROLLER ERROR 
-		 * This is serious; we are left with the disabled
-		 * keyboard intr. 
-		 */
-		set_controller_command_byte(kbdc, 0xff, c);
-		kbdc_lock(kbdc, FALSE);
-		printf("atkbd: unable to enable the keyboard port and intr.\n");
-		return EIO;
-	}
-
-	kbdc_lock(kbdc, FALSE);
-	return 0;
-}
-
-static int
-write_kbd(KBDC kbdc, int command, int data)
-{
-    int s;
-
-    /* prevent the timeout routine from polling the keyboard */
-    if (!kbdc_lock(kbdc, TRUE)) 
-	return EBUSY;
-
-    /* disable the keyboard and mouse interrupt */
-    s = spltty();
-#if 0
-    c = get_controller_command_byte(kbdc);
-    if ((c == -1) 
-	|| !set_controller_command_byte(kbdc, 
-            kbdc_get_device_mask(kbdc),
-            KBD_DISABLE_KBD_PORT | KBD_DISABLE_KBD_INT
-                | KBD_DISABLE_AUX_PORT | KBD_DISABLE_AUX_INT)) {
-	/* CONTROLLER ERROR */
-        kbdc_lock(kbdc, FALSE);
-	splx(s);
-	return EIO;
-    }
-    /* 
-     * Now that the keyboard controller is told not to generate 
-     * the keyboard and mouse interrupts, call `splx()' to allow 
-     * the other tty interrupts. The clock interrupt may also occur, 
-     * but the timeout routine (`scrn_timer()') will be blocked 
-     * by the lock flag set via `kbdc_lock()'
-     */
-    splx(s);
-#endif
-
-    if (send_kbd_command_and_data(kbdc, command, data) != KBD_ACK)
-        send_kbd_command(kbdc, KBDC_ENABLE_KBD);
-
-#if 0
-    /* restore the interrupts */
-    if (!set_controller_command_byte(kbdc,
-            kbdc_get_device_mask(kbdc),
-	    c & (KBD_KBD_CONTROL_BITS | KBD_AUX_CONTROL_BITS))) { 
-	/* CONTROLLER ERROR */
-    }
-#else
-    splx(s);
-#endif
-    kbdc_lock(kbdc, FALSE);
-
-    return 0;
-}
-
-static int
-get_kbd_id(KBDC kbdc)
-{
-	int id1, id2;
-
-	empty_both_buffers(kbdc, 10);
-	id1 = id2 = -1;
-	if (send_kbd_command(kbdc, KBDC_SEND_DEV_ID) != KBD_ACK)
-		return -1;
-
-	DELAY(10000); 	/* 10 msec delay */
-	id1 = read_kbd_data(kbdc);
-	if (id1 != -1)
-		id2 = read_kbd_data(kbdc);
-
-	if ((id1 == -1) || (id2 == -1)) {
-		empty_both_buffers(kbdc, 10);
-		test_controller(kbdc);
-		test_kbd_port(kbdc);
-		return -1;
-	}
-	return ((id2 << 8) | id1);
-}
-
-static int delays[] = { 250, 500, 750, 1000 };
-static int rates[] = {  34,  38,  42,  46,  50,  55,  59,  63,
-			68,  76,  84,  92, 100, 110, 118, 126,
-		       136, 152, 168, 184, 200, 220, 236, 252,
-		       272, 304, 336, 368, 400, 440, 472, 504 };
-
-static int
-typematic_delay(int i)
-{
-	return delays[(i >> 5) & 3];
-}
-
-static int
-typematic_rate(int i)
-{
-	return rates[i & 0x1f];
-}
-
-static int
-typematic(int delay, int rate)
-{
-	int value;
-	int i;
-
-	for (i = sizeof(delays)/sizeof(delays[0]) - 1; i > 0; --i) {
-		if (delay >= delays[i])
-			break;
-	}
-	value = i << 5;
-	for (i = sizeof(rates)/sizeof(rates[0]) - 1; i > 0; --i) {
-		if (rate >= rates[i])
-			break;
-	}
-	value |= i;
-	return value;
-}
diff --git a/sys/dev/kbd/atkbdc.c b/sys/dev/kbd/atkbdc.c
deleted file mode 100644
index c0cee01..0000000
--- a/sys/dev/kbd/atkbdc.c
+++ /dev/null
@@ -1,1042 +0,0 @@
-/*-
- * Copyright (c) 1996-1999
- * Kazutaka YOKOTA (yokota@zodiac.mech.utsunomiya-u.ac.jp)
- * All rights reserved.
- *
- * 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. The name of the author may not be used to endorse or promote 
- *    products derived from this software without specific prior written 
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
- *
- * from kbdio.c,v 1.13 1998/09/25 11:55:46 yokota Exp
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "opt_kbd.h"
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bus.h>
-#include <sys/malloc.h>
-#include <sys/syslog.h>
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/rman.h>
-
-
-#include <dev/kbd/atkbdcreg.h>
-
-#include <isa/isareg.h>
-
-/* constants */
-
-#define MAXKBDC		1		/* XXX */
-
-/* macros */
-
-#ifndef MAX
-#define MAX(x, y)	((x) > (y) ? (x) : (y))
-#endif
-
-#define kbdcp(p)	((atkbdc_softc_t *)(p))
-#define nextq(i)	(((i) + 1) % KBDQ_BUFSIZE)
-#define availq(q)	((q)->head != (q)->tail)
-#if KBDIO_DEBUG >= 2
-#define emptyq(q)	((q)->tail = (q)->head = (q)->qcount = 0)
-#else
-#define emptyq(q)	((q)->tail = (q)->head = 0)
-#endif
-
-#define read_data(k)	(bus_space_read_1((k)->iot, (k)->ioh0, 0))
-#define read_status(k)	(bus_space_read_1((k)->iot, (k)->ioh1, 0))
-#define write_data(k, d)	\
-			(bus_space_write_1((k)->iot, (k)->ioh0, 0, (d)))
-#define write_command(k, d)	\
-			(bus_space_write_1((k)->iot, (k)->ioh1, 0, (d)))
-
-/* local variables */
-
-/*
- * We always need at least one copy of the kbdc_softc struct for the
- * low-level console.  As the low-level console accesses the keyboard
- * controller before kbdc, and all other devices, is probed, we
- * statically allocate one entry. XXX
- */
-static atkbdc_softc_t default_kbdc;
-static atkbdc_softc_t *atkbdc_softc[MAXKBDC] = { &default_kbdc };
-
-static int verbose = KBDIO_DEBUG;
-
-/* function prototypes */
-
-static int atkbdc_setup(atkbdc_softc_t *sc, bus_space_tag_t tag,
-			bus_space_handle_t h0, bus_space_handle_t h1);
-static int addq(kqueue *q, int c);
-static int removeq(kqueue *q);
-static int wait_while_controller_busy(atkbdc_softc_t *kbdc);
-static int wait_for_data(atkbdc_softc_t *kbdc);
-static int wait_for_kbd_data(atkbdc_softc_t *kbdc);
-static int wait_for_kbd_ack(atkbdc_softc_t *kbdc);
-static int wait_for_aux_data(atkbdc_softc_t *kbdc);
-static int wait_for_aux_ack(atkbdc_softc_t *kbdc);
-
-atkbdc_softc_t
-*atkbdc_get_softc(int unit)
-{
-	atkbdc_softc_t *sc;
-
-	if (unit >= sizeof(atkbdc_softc)/sizeof(atkbdc_softc[0]))
-		return NULL;
-	sc = atkbdc_softc[unit];
-	if (sc == NULL) {
-		sc = atkbdc_softc[unit]
-		   = malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT | M_ZERO);
-		if (sc == NULL)
-			return NULL;
-	}
-	return sc;
-}
-
-int
-atkbdc_probe_unit(int unit, struct resource *port0, struct resource *port1)
-{
-	if (rman_get_start(port0) <= 0)
-		return ENXIO;
-	if (rman_get_start(port1) <= 0)
-		return ENXIO;
-	return 0;
-}
-
-int
-atkbdc_attach_unit(int unit, atkbdc_softc_t *sc, struct resource *port0,
-		   struct resource *port1)
-{
-	return atkbdc_setup(sc, rman_get_bustag(port0),
-			    rman_get_bushandle(port0),
-			    rman_get_bushandle(port1));
-}
-
-/* the backdoor to the keyboard controller! XXX */
-int
-atkbdc_configure(void)
-{
-	bus_space_tag_t tag;
-	bus_space_handle_t h0;
-	bus_space_handle_t h1;
-	int port0;
-	int port1;
-
-	port0 = IO_KBD;
-	resource_int_value("atkbdc", 0, "port", &port0);
-	port1 = IO_KBD + KBD_STATUS_PORT;
-#if 0
-	resource_int_value("atkbdc", 0, "port", &port0);
-#endif
-
-	/* XXX: tag should be passed from the caller */
-#if defined(__i386__)
-	tag = I386_BUS_SPACE_IO;
-#elif defined(__amd64__)
-	tag = AMD64_BUS_SPACE_IO;
-#elif defined(__alpha__)
-	tag = busspace_isa_io;
-#elif defined(__ia64__)
-	tag = IA64_BUS_SPACE_IO;
-#else
-#error "define tag!"
-#endif
-
-#if notyet
-	bus_space_map(tag, port0, IO_KBDSIZE, 0, &h0);
-	bus_space_map(tag, port1, IO_KBDSIZE, 0, &h1);
-#else
-	h0 = (bus_space_handle_t)port0;
-	h1 = (bus_space_handle_t)port1;
-#endif
-	return atkbdc_setup(atkbdc_softc[0], tag, h0, h1);
-}
-
-static int
-atkbdc_setup(atkbdc_softc_t *sc, bus_space_tag_t tag, bus_space_handle_t h0,
-	     bus_space_handle_t h1)
-{
-	if (sc->ioh0 == 0) {	/* XXX */
-	    sc->command_byte = -1;
-	    sc->command_mask = 0;
-	    sc->lock = FALSE;
-	    sc->kbd.head = sc->kbd.tail = 0;
-	    sc->aux.head = sc->aux.tail = 0;
-#if KBDIO_DEBUG >= 2
-	    sc->kbd.call_count = 0;
-	    sc->kbd.qcount = sc->kbd.max_qcount = 0;
-	    sc->aux.call_count = 0;
-	    sc->aux.qcount = sc->aux.max_qcount = 0;
-#endif
-	}
-	sc->iot = tag;
-	sc->ioh0 = h0;
-	sc->ioh1 = h1;
-	return 0;
-}
-
-/* open a keyboard controller */
-KBDC 
-atkbdc_open(int unit)
-{
-    if (unit <= 0)
-	unit = 0;
-    if (unit >= MAXKBDC)
-	return NULL;
-    if ((atkbdc_softc[unit]->port0 != NULL)
-	|| (atkbdc_softc[unit]->ioh0 != 0))		/* XXX */
-	return (KBDC)atkbdc_softc[unit];
-    return NULL;
-}
-
-/*
- * I/O access arbitration in `kbdio'
- *
- * The `kbdio' module uses a simplistic convention to arbitrate
- * I/O access to the controller/keyboard/mouse. The convention requires
- * close cooperation of the calling device driver.
- *
- * The device drivers which utilize the `kbdio' module are assumed to
- * have the following set of routines.
- *    a. An interrupt handler (the bottom half of the driver).
- *    b. Timeout routines which may briefly poll the keyboard controller.
- *    c. Routines outside interrupt context (the top half of the driver).
- * They should follow the rules below:
- *    1. The interrupt handler may assume that it always has full access 
- *       to the controller/keyboard/mouse.
- *    2. The other routines must issue `spltty()' if they wish to 
- *       prevent the interrupt handler from accessing 
- *       the controller/keyboard/mouse.
- *    3. The timeout routines and the top half routines of the device driver
- *       arbitrate I/O access by observing the lock flag in `kbdio'.
- *       The flag is manipulated via `kbdc_lock()'; when one wants to
- *       perform I/O, call `kbdc_lock(kbdc, TRUE)' and proceed only if
- *       the call returns with TRUE. Otherwise the caller must back off.
- *       Call `kbdc_lock(kbdc, FALSE)' when necessary I/O operaion
- *       is finished. This mechanism does not prevent the interrupt 
- *       handler from being invoked at any time and carrying out I/O.
- *       Therefore, `spltty()' must be strategically placed in the device
- *       driver code. Also note that the timeout routine may interrupt
- *       `kbdc_lock()' called by the top half of the driver, but this
- *       interruption is OK so long as the timeout routine observes
- *       rule 4 below.
- *    4. The interrupt and timeout routines should not extend I/O operation
- *       across more than one interrupt or timeout; they must complete any
- *       necessary I/O operation within one invocation of the routine.
- *       This means that if the timeout routine acquires the lock flag,
- *       it must reset the flag to FALSE before it returns.
- */
-
-/* set/reset polling lock */
-int 
-kbdc_lock(KBDC p, int lock)
-{
-    int prevlock;
-
-    prevlock = kbdcp(p)->lock;
-    kbdcp(p)->lock = lock;
-
-    return (prevlock != lock);
-}
-
-/* check if any data is waiting to be processed */
-int
-kbdc_data_ready(KBDC p)
-{
-    return (availq(&kbdcp(p)->kbd) || availq(&kbdcp(p)->aux) 
-	|| (read_status(kbdcp(p)) & KBDS_ANY_BUFFER_FULL));
-}
-
-/* queuing functions */
-
-static int
-addq(kqueue *q, int c)
-{
-    if (nextq(q->tail) != q->head) {
-	q->q[q->tail] = c;
-	q->tail = nextq(q->tail);
-#if KBDIO_DEBUG >= 2
-        ++q->call_count;
-        ++q->qcount;
-	if (q->qcount > q->max_qcount)
-            q->max_qcount = q->qcount;
-#endif
-	return TRUE;
-    }
-    return FALSE;
-}
-
-static int
-removeq(kqueue *q)
-{
-    int c;
-
-    if (q->tail != q->head) {
-	c = q->q[q->head];
-	q->head = nextq(q->head);
-#if KBDIO_DEBUG >= 2
-        --q->qcount;
-#endif
-	return c;
-    }
-    return -1;
-}
-
-/* 
- * device I/O routines
- */
-static int
-wait_while_controller_busy(struct atkbdc_softc *kbdc)
-{
-    /* CPU will stay inside the loop for 100msec at most */
-    int retry = 5000;
-    int f;
-
-    while ((f = read_status(kbdc)) & KBDS_INPUT_BUFFER_FULL) {
-	if ((f & KBDS_BUFFER_FULL) == KBDS_KBD_BUFFER_FULL) {
-	    DELAY(KBDD_DELAYTIME);
-	    addq(&kbdc->kbd, read_data(kbdc));
-	} else if ((f & KBDS_BUFFER_FULL) == KBDS_AUX_BUFFER_FULL) {
-	    DELAY(KBDD_DELAYTIME);
-	    addq(&kbdc->aux, read_data(kbdc));
-	}
-        DELAY(KBDC_DELAYTIME);
-        if (--retry < 0)
-    	    return FALSE;
-    }
-    return TRUE;
-}
-
-/*
- * wait for any data; whether it's from the controller, 
- * the keyboard, or the aux device.
- */
-static int
-wait_for_data(struct atkbdc_softc *kbdc)
-{
-    /* CPU will stay inside the loop for 200msec at most */
-    int retry = 10000;
-    int f;
-
-    while ((f = read_status(kbdc) & KBDS_ANY_BUFFER_FULL) == 0) {
-        DELAY(KBDC_DELAYTIME);
-        if (--retry < 0)
-    	    return 0;
-    }
-    DELAY(KBDD_DELAYTIME);
-    return f;
-}
-
-/* wait for data from the keyboard */
-static int
-wait_for_kbd_data(struct atkbdc_softc *kbdc)
-{
-    /* CPU will stay inside the loop for 200msec at most */
-    int retry = 10000;
-    int f;
-
-    while ((f = read_status(kbdc) & KBDS_BUFFER_FULL)
-	    != KBDS_KBD_BUFFER_FULL) {
-        if (f == KBDS_AUX_BUFFER_FULL) {
-	    DELAY(KBDD_DELAYTIME);
-	    addq(&kbdc->aux, read_data(kbdc));
-	}
-        DELAY(KBDC_DELAYTIME);
-        if (--retry < 0)
-    	    return 0;
-    }
-    DELAY(KBDD_DELAYTIME);
-    return f;
-}
-
-/* 
- * wait for an ACK(FAh), RESEND(FEh), or RESET_FAIL(FCh) from the keyboard.
- * queue anything else.
- */
-static int
-wait_for_kbd_ack(struct atkbdc_softc *kbdc)
-{
-    /* CPU will stay inside the loop for 200msec at most */
-    int retry = 10000;
-    int f;
-    int b;
-
-    while (retry-- > 0) {
-        if ((f = read_status(kbdc)) & KBDS_ANY_BUFFER_FULL) {
-	    DELAY(KBDD_DELAYTIME);
-            b = read_data(kbdc);
-	    if ((f & KBDS_BUFFER_FULL) == KBDS_KBD_BUFFER_FULL) {
-		if ((b == KBD_ACK) || (b == KBD_RESEND) 
-		    || (b == KBD_RESET_FAIL))
-		    return b;
-		addq(&kbdc->kbd, b);
-	    } else if ((f & KBDS_BUFFER_FULL) == KBDS_AUX_BUFFER_FULL) {
-		addq(&kbdc->aux, b);
-	    }
-	}
-        DELAY(KBDC_DELAYTIME);
-    }
-    return -1;
-}
-
-/* wait for data from the aux device */
-static int
-wait_for_aux_data(struct atkbdc_softc *kbdc)
-{
-    /* CPU will stay inside the loop for 200msec at most */
-    int retry = 10000;
-    int f;
-
-    while ((f = read_status(kbdc) & KBDS_BUFFER_FULL)
-	    != KBDS_AUX_BUFFER_FULL) {
-        if (f == KBDS_KBD_BUFFER_FULL) {
-	    DELAY(KBDD_DELAYTIME);
-	    addq(&kbdc->kbd, read_data(kbdc));
-	}
-        DELAY(KBDC_DELAYTIME);
-        if (--retry < 0)
-    	    return 0;
-    }
-    DELAY(KBDD_DELAYTIME);
-    return f;
-}
-
-/* 
- * wait for an ACK(FAh), RESEND(FEh), or RESET_FAIL(FCh) from the aux device.
- * queue anything else.
- */
-static int
-wait_for_aux_ack(struct atkbdc_softc *kbdc)
-{
-    /* CPU will stay inside the loop for 200msec at most */
-    int retry = 10000;
-    int f;
-    int b;
-
-    while (retry-- > 0) {
-        if ((f = read_status(kbdc)) & KBDS_ANY_BUFFER_FULL) {
-	    DELAY(KBDD_DELAYTIME);
-            b = read_data(kbdc);
-	    if ((f & KBDS_BUFFER_FULL) == KBDS_AUX_BUFFER_FULL) {
-		if ((b == PSM_ACK) || (b == PSM_RESEND) 
-		    || (b == PSM_RESET_FAIL))
-		    return b;
-		addq(&kbdc->aux, b);
-	    } else if ((f & KBDS_BUFFER_FULL) == KBDS_KBD_BUFFER_FULL) {
-		addq(&kbdc->kbd, b);
-	    }
-	}
-        DELAY(KBDC_DELAYTIME);
-    }
-    return -1;
-}
-
-/* write a one byte command to the controller */
-int
-write_controller_command(KBDC p, int c)
-{
-    if (!wait_while_controller_busy(kbdcp(p)))
-	return FALSE;
-    write_command(kbdcp(p), c);
-    return TRUE;
-}
-
-/* write a one byte data to the controller */
-int
-write_controller_data(KBDC p, int c)
-{
-    if (!wait_while_controller_busy(kbdcp(p)))
-	return FALSE;
-    write_data(kbdcp(p), c);
-    return TRUE;
-}
-
-/* write a one byte keyboard command */
-int
-write_kbd_command(KBDC p, int c)
-{
-    if (!wait_while_controller_busy(kbdcp(p)))
-	return FALSE;
-    write_data(kbdcp(p), c);
-    return TRUE;
-}
-
-/* write a one byte auxiliary device command */
-int
-write_aux_command(KBDC p, int c)
-{
-    if (!write_controller_command(p, KBDC_WRITE_TO_AUX))
-	return FALSE;
-    return write_controller_data(p, c);
-}
-
-/* send a command to the keyboard and wait for ACK */
-int
-send_kbd_command(KBDC p, int c)
-{
-    int retry = KBD_MAXRETRY;
-    int res = -1;
-
-    while (retry-- > 0) {
-	if (!write_kbd_command(p, c))
-	    continue;
-        res = wait_for_kbd_ack(kbdcp(p));
-        if (res == KBD_ACK)
-    	    break;
-    }
-    return res;
-}
-
-/* send a command to the auxiliary device and wait for ACK */
-int
-send_aux_command(KBDC p, int c)
-{
-    int retry = KBD_MAXRETRY;
-    int res = -1;
-
-    while (retry-- > 0) {
-	if (!write_aux_command(p, c))
-	    continue;
-	/*
-	 * FIXME: XXX
-	 * The aux device may have already sent one or two bytes of 
-	 * status data, when a command is received. It will immediately 
-	 * stop data transmission, thus, leaving an incomplete data 
-	 * packet in our buffer. We have to discard any unprocessed
-	 * data in order to remove such packets. Well, we may remove 
-	 * unprocessed, but necessary data byte as well... 
-	 */
-	emptyq(&kbdcp(p)->aux);
-        res = wait_for_aux_ack(kbdcp(p));
-        if (res == PSM_ACK)
-    	    break;
-    }
-    return res;
-}
-
-/* send a command and a data to the keyboard, wait for ACKs */
-int
-send_kbd_command_and_data(KBDC p, int c, int d)
-{
-    int retry;
-    int res = -1;
-
-    for (retry = KBD_MAXRETRY; retry > 0; --retry) {
-	if (!write_kbd_command(p, c))
-	    continue;
-        res = wait_for_kbd_ack(kbdcp(p));
-        if (res == KBD_ACK)
-    	    break;
-        else if (res != KBD_RESEND)
-    	    return res;
-    }
-    if (retry <= 0)
-	return res;
-
-    for (retry = KBD_MAXRETRY, res = -1; retry > 0; --retry) {
-	if (!write_kbd_command(p, d))
-	    continue;
-        res = wait_for_kbd_ack(kbdcp(p));
-        if (res != KBD_RESEND)
-    	    break;
-    }
-    return res;
-}
-
-/* send a command and a data to the auxiliary device, wait for ACKs */
-int
-send_aux_command_and_data(KBDC p, int c, int d)
-{
-    int retry;
-    int res = -1;
-
-    for (retry = KBD_MAXRETRY; retry > 0; --retry) {
-	if (!write_aux_command(p, c))
-	    continue;
-	emptyq(&kbdcp(p)->aux);
-        res = wait_for_aux_ack(kbdcp(p));
-        if (res == PSM_ACK)
-    	    break;
-        else if (res != PSM_RESEND)
-    	    return res;
-    }
-    if (retry <= 0)
-	return res;
-
-    for (retry = KBD_MAXRETRY, res = -1; retry > 0; --retry) {
-	if (!write_aux_command(p, d))
-	    continue;
-        res = wait_for_aux_ack(kbdcp(p));
-        if (res != PSM_RESEND)
-    	    break;
-    }
-    return res;
-}
-
-/* 
- * read one byte from any source; whether from the controller,
- * the keyboard, or the aux device
- */
-int
-read_controller_data(KBDC p)
-{
-    if (availq(&kbdcp(p)->kbd)) 
-        return removeq(&kbdcp(p)->kbd);
-    if (availq(&kbdcp(p)->aux)) 
-        return removeq(&kbdcp(p)->aux);
-    if (!wait_for_data(kbdcp(p)))
-        return -1;		/* timeout */
-    return read_data(kbdcp(p));
-}
-
-#if KBDIO_DEBUG >= 2
-static int call = 0;
-#endif
-
-/* read one byte from the keyboard */
-int
-read_kbd_data(KBDC p)
-{
-#if KBDIO_DEBUG >= 2
-    if (++call > 2000) {
-	call = 0;
-	log(LOG_DEBUG, "kbdc: kbd q: %d calls, max %d chars, "
-			     "aux q: %d calls, max %d chars\n",
-		       kbdcp(p)->kbd.call_count, kbdcp(p)->kbd.max_qcount,
-		       kbdcp(p)->aux.call_count, kbdcp(p)->aux.max_qcount);
-    }
-#endif
-
-    if (availq(&kbdcp(p)->kbd)) 
-        return removeq(&kbdcp(p)->kbd);
-    if (!wait_for_kbd_data(kbdcp(p)))
-        return -1;		/* timeout */
-    return read_data(kbdcp(p));
-}
-
-/* read one byte from the keyboard, but return immediately if 
- * no data is waiting
- */
-int
-read_kbd_data_no_wait(KBDC p)
-{
-    int f;
-
-#if KBDIO_DEBUG >= 2
-    if (++call > 2000) {
-	call = 0;
-	log(LOG_DEBUG, "kbdc: kbd q: %d calls, max %d chars, "
-			     "aux q: %d calls, max %d chars\n",
-		       kbdcp(p)->kbd.call_count, kbdcp(p)->kbd.max_qcount,
-		       kbdcp(p)->aux.call_count, kbdcp(p)->aux.max_qcount);
-    }
-#endif
-
-    if (availq(&kbdcp(p)->kbd)) 
-        return removeq(&kbdcp(p)->kbd);
-    f = read_status(kbdcp(p)) & KBDS_BUFFER_FULL;
-    if (f == KBDS_AUX_BUFFER_FULL) {
-        DELAY(KBDD_DELAYTIME);
-        addq(&kbdcp(p)->aux, read_data(kbdcp(p)));
-        f = read_status(kbdcp(p)) & KBDS_BUFFER_FULL;
-    }
-    if (f == KBDS_KBD_BUFFER_FULL) {
-        DELAY(KBDD_DELAYTIME);
-        return read_data(kbdcp(p));
-    }
-    return -1;		/* no data */
-}
-
-/* read one byte from the aux device */
-int
-read_aux_data(KBDC p)
-{
-    if (availq(&kbdcp(p)->aux)) 
-        return removeq(&kbdcp(p)->aux);
-    if (!wait_for_aux_data(kbdcp(p)))
-        return -1;		/* timeout */
-    return read_data(kbdcp(p));
-}
-
-/* read one byte from the aux device, but return immediately if 
- * no data is waiting
- */
-int
-read_aux_data_no_wait(KBDC p)
-{
-    int f;
-
-    if (availq(&kbdcp(p)->aux)) 
-        return removeq(&kbdcp(p)->aux);
-    f = read_status(kbdcp(p)) & KBDS_BUFFER_FULL;
-    if (f == KBDS_KBD_BUFFER_FULL) {
-        DELAY(KBDD_DELAYTIME);
-        addq(&kbdcp(p)->kbd, read_data(kbdcp(p)));
-        f = read_status(kbdcp(p)) & KBDS_BUFFER_FULL;
-    }
-    if (f == KBDS_AUX_BUFFER_FULL) {
-        DELAY(KBDD_DELAYTIME);
-        return read_data(kbdcp(p));
-    }
-    return -1;		/* no data */
-}
-
-/* discard data from the keyboard */
-void
-empty_kbd_buffer(KBDC p, int wait)
-{
-    int t;
-    int b;
-    int f;
-#if KBDIO_DEBUG >= 2
-    int c1 = 0;
-    int c2 = 0;
-#endif
-    int delta = 2;
-
-    for (t = wait; t > 0; ) { 
-        if ((f = read_status(kbdcp(p))) & KBDS_ANY_BUFFER_FULL) {
-	    DELAY(KBDD_DELAYTIME);
-            b = read_data(kbdcp(p));
-	    if ((f & KBDS_BUFFER_FULL) == KBDS_AUX_BUFFER_FULL) {
-		addq(&kbdcp(p)->aux, b);
-#if KBDIO_DEBUG >= 2
-		++c2;
-            } else {
-		++c1;
-#endif
-	    }
-	    t = wait;
-	} else {
-	    t -= delta;
-	}
-        DELAY(delta*1000);
-    }
-#if KBDIO_DEBUG >= 2
-    if ((c1 > 0) || (c2 > 0))
-        log(LOG_DEBUG, "kbdc: %d:%d char read (empty_kbd_buffer)\n", c1, c2);
-#endif
-
-    emptyq(&kbdcp(p)->kbd);
-}
-
-/* discard data from the aux device */
-void
-empty_aux_buffer(KBDC p, int wait)
-{
-    int t;
-    int b;
-    int f;
-#if KBDIO_DEBUG >= 2
-    int c1 = 0;
-    int c2 = 0;
-#endif
-    int delta = 2;
-
-    for (t = wait; t > 0; ) { 
-        if ((f = read_status(kbdcp(p))) & KBDS_ANY_BUFFER_FULL) {
-	    DELAY(KBDD_DELAYTIME);
-            b = read_data(kbdcp(p));
-	    if ((f & KBDS_BUFFER_FULL) == KBDS_KBD_BUFFER_FULL) {
-		addq(&kbdcp(p)->kbd, b);
-#if KBDIO_DEBUG >= 2
-		++c1;
-            } else {
-		++c2;
-#endif
-	    }
-	    t = wait;
-	} else {
-	    t -= delta;
-	}
-	DELAY(delta*1000);
-    }
-#if KBDIO_DEBUG >= 2
-    if ((c1 > 0) || (c2 > 0))
-        log(LOG_DEBUG, "kbdc: %d:%d char read (empty_aux_buffer)\n", c1, c2);
-#endif
-
-    emptyq(&kbdcp(p)->aux);
-}
-
-/* discard any data from the keyboard or the aux device */
-void
-empty_both_buffers(KBDC p, int wait)
-{
-    int t;
-    int f;
-#if KBDIO_DEBUG >= 2
-    int c1 = 0;
-    int c2 = 0;
-#endif
-    int delta = 2;
-
-    for (t = wait; t > 0; ) { 
-        if ((f = read_status(kbdcp(p))) & KBDS_ANY_BUFFER_FULL) {
-	    DELAY(KBDD_DELAYTIME);
-            (void)read_data(kbdcp(p));
-#if KBDIO_DEBUG >= 2
-	    if ((f & KBDS_BUFFER_FULL) == KBDS_KBD_BUFFER_FULL)
-		++c1;
-            else
-		++c2;
-#endif
-	    t = wait;
-	} else {
-	    t -= delta;
-	}
-	DELAY(delta*1000);
-    }
-#if KBDIO_DEBUG >= 2
-    if ((c1 > 0) || (c2 > 0))
-        log(LOG_DEBUG, "kbdc: %d:%d char read (empty_both_buffers)\n", c1, c2);
-#endif
-
-    emptyq(&kbdcp(p)->kbd);
-    emptyq(&kbdcp(p)->aux);
-}
-
-/* keyboard and mouse device control */
-
-/* NOTE: enable the keyboard port but disable the keyboard 
- * interrupt before calling "reset_kbd()".
- */
-int
-reset_kbd(KBDC p)
-{
-    int retry = KBD_MAXRETRY;
-    int again = KBD_MAXWAIT;
-    int c = KBD_RESEND;		/* keep the compiler happy */
-
-    while (retry-- > 0) {
-        empty_both_buffers(p, 10);
-        if (!write_kbd_command(p, KBDC_RESET_KBD))
-	    continue;
-	emptyq(&kbdcp(p)->kbd);
-        c = read_controller_data(p);
-	if (verbose || bootverbose)
-            log(LOG_DEBUG, "kbdc: RESET_KBD return code:%04x\n", c);
-        if (c == KBD_ACK)	/* keyboard has agreed to reset itself... */
-    	    break;
-    }
-    if (retry < 0)
-        return FALSE;
-
-    while (again-- > 0) {
-        /* wait awhile, well, in fact we must wait quite loooooooooooong */
-        DELAY(KBD_RESETDELAY*1000);
-        c = read_controller_data(p);	/* RESET_DONE/RESET_FAIL */
-        if (c != -1) 	/* wait again if the controller is not ready */
-    	    break;
-    }
-    if (verbose || bootverbose)
-        log(LOG_DEBUG, "kbdc: RESET_KBD status:%04x\n", c);
-    if (c != KBD_RESET_DONE)
-        return FALSE;
-    return TRUE;
-}
-
-/* NOTE: enable the aux port but disable the aux interrupt
- * before calling `reset_aux_dev()'.
- */
-int
-reset_aux_dev(KBDC p)
-{
-    int retry = KBD_MAXRETRY;
-    int again = KBD_MAXWAIT;
-    int c = PSM_RESEND;		/* keep the compiler happy */
-
-    while (retry-- > 0) {
-        empty_both_buffers(p, 10);
-        if (!write_aux_command(p, PSMC_RESET_DEV))
-	    continue;
-	emptyq(&kbdcp(p)->aux);
-	/* NOTE: Compaq Armada laptops require extra delay here. XXX */
-	for (again = KBD_MAXWAIT; again > 0; --again) {
-            DELAY(KBD_RESETDELAY*1000);
-            c = read_aux_data_no_wait(p);
-	    if (c != -1)
-		break;
-	}
-        if (verbose || bootverbose)
-            log(LOG_DEBUG, "kbdc: RESET_AUX return code:%04x\n", c);
-        if (c == PSM_ACK)	/* aux dev is about to reset... */
-    	    break;
-    }
-    if (retry < 0)
-        return FALSE;
-
-    for (again = KBD_MAXWAIT; again > 0; --again) {
-        /* wait awhile, well, quite looooooooooooong */
-        DELAY(KBD_RESETDELAY*1000);
-        c = read_aux_data_no_wait(p);	/* RESET_DONE/RESET_FAIL */
-        if (c != -1) 	/* wait again if the controller is not ready */
-    	    break;
-    }
-    if (verbose || bootverbose)
-        log(LOG_DEBUG, "kbdc: RESET_AUX status:%04x\n", c);
-    if (c != PSM_RESET_DONE)	/* reset status */
-        return FALSE;
-
-    c = read_aux_data(p);	/* device ID */
-    if (verbose || bootverbose)
-        log(LOG_DEBUG, "kbdc: RESET_AUX ID:%04x\n", c);
-    /* NOTE: we could check the device ID now, but leave it later... */
-    return TRUE;
-}
-
-/* controller diagnostics and setup */
-
-int
-test_controller(KBDC p)
-{
-    int retry = KBD_MAXRETRY;
-    int again = KBD_MAXWAIT;
-    int c = KBD_DIAG_FAIL;
-
-    while (retry-- > 0) {
-        empty_both_buffers(p, 10);
-        if (write_controller_command(p, KBDC_DIAGNOSE))
-    	    break;
-    }
-    if (retry < 0)
-        return FALSE;
-
-    emptyq(&kbdcp(p)->kbd);
-    while (again-- > 0) {
-        /* wait awhile */
-        DELAY(KBD_RESETDELAY*1000);
-        c = read_controller_data(p);	/* DIAG_DONE/DIAG_FAIL */
-        if (c != -1) 	/* wait again if the controller is not ready */
-    	    break;
-    }
-    if (verbose || bootverbose)
-        log(LOG_DEBUG, "kbdc: DIAGNOSE status:%04x\n", c);
-    return (c == KBD_DIAG_DONE);
-}
-
-int
-test_kbd_port(KBDC p)
-{
-    int retry = KBD_MAXRETRY;
-    int again = KBD_MAXWAIT;
-    int c = -1;
-
-    while (retry-- > 0) {
-        empty_both_buffers(p, 10);
-        if (write_controller_command(p, KBDC_TEST_KBD_PORT))
-    	    break;
-    }
-    if (retry < 0)
-        return FALSE;
-
-    emptyq(&kbdcp(p)->kbd);
-    while (again-- > 0) {
-        c = read_controller_data(p);
-        if (c != -1) 	/* try again if the controller is not ready */
-    	    break;
-    }
-    if (verbose || bootverbose)
-        log(LOG_DEBUG, "kbdc: TEST_KBD_PORT status:%04x\n", c);
-    return c;
-}
-
-int
-test_aux_port(KBDC p)
-{
-    int retry = KBD_MAXRETRY;
-    int again = KBD_MAXWAIT;
-    int c = -1;
-
-    while (retry-- > 0) {
-        empty_both_buffers(p, 10);
-        if (write_controller_command(p, KBDC_TEST_AUX_PORT))
-    	    break;
-    }
-    if (retry < 0)
-        return FALSE;
-
-    emptyq(&kbdcp(p)->kbd);
-    while (again-- > 0) {
-        c = read_controller_data(p);
-        if (c != -1) 	/* try again if the controller is not ready */
-    	    break;
-    }
-    if (verbose || bootverbose)
-        log(LOG_DEBUG, "kbdc: TEST_AUX_PORT status:%04x\n", c);
-    return c;
-}
-
-int
-kbdc_get_device_mask(KBDC p)
-{
-    return kbdcp(p)->command_mask;
-}
-
-void
-kbdc_set_device_mask(KBDC p, int mask)
-{
-    kbdcp(p)->command_mask = 
-	mask & (KBD_KBD_CONTROL_BITS | KBD_AUX_CONTROL_BITS);
-}
-
-int
-get_controller_command_byte(KBDC p)
-{
-    if (kbdcp(p)->command_byte != -1)
-	return kbdcp(p)->command_byte;
-    if (!write_controller_command(p, KBDC_GET_COMMAND_BYTE))
-	return -1;
-    emptyq(&kbdcp(p)->kbd);
-    kbdcp(p)->command_byte = read_controller_data(p);
-    return kbdcp(p)->command_byte;
-}
-
-int
-set_controller_command_byte(KBDC p, int mask, int command)
-{
-    if (get_controller_command_byte(p) == -1)
-	return FALSE;
-
-    command = (kbdcp(p)->command_byte & ~mask) | (command & mask);
-    if (command & KBD_DISABLE_KBD_PORT) {
-	if (!write_controller_command(p, KBDC_DISABLE_KBD_PORT))
-	    return FALSE;
-    }
-    if (!write_controller_command(p, KBDC_SET_COMMAND_BYTE))
-	return FALSE;
-    if (!write_controller_data(p, command))
-	return FALSE;
-    kbdcp(p)->command_byte = command;
-
-    if (verbose)
-        log(LOG_DEBUG, "kbdc: new command byte:%04x (set_controller...)\n",
-	    command);
-
-    return TRUE;
-}
diff --git a/sys/dev/kbd/atkbdcreg.h b/sys/dev/kbd/atkbdcreg.h
deleted file mode 100644
index 7711c66..0000000
--- a/sys/dev/kbd/atkbdcreg.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/*-
- * Copyright (c) 1996-1999
- * Kazutaka YOKOTA (yokota@zodiac.mech.utsunomiya-u.ac.jp)
- * All rights reserved.
- *
- * 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. The name of the author may not be used to endorse or promote 
- *    products derived from this software without specific prior written 
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
- *
- * $FreeBSD$
- * from kbdio.h,v 1.8 1998/09/25 11:55:46 yokota Exp
- */
-
-#ifndef _DEV_KBD_ATKBDCREG_H_
-#define	_DEV_KBD_ATKBDCREG_H_
-
-#include "opt_kbd.h"	/* Structures depend on the value if KBDIO_DEBUG */
-
-/* constants */
-
-/* I/O ports */
-#define KBD_STATUS_PORT 	4	/* status port, read */
-#define KBD_COMMAND_PORT	4	/* controller command port, write */
-#define KBD_DATA_PORT		0	/* data port, read/write 
-					 * also used as keyboard command
-					 * and mouse command port 
-					 */
-
-/* controller commands (sent to KBD_COMMAND_PORT) */
-#define KBDC_SET_COMMAND_BYTE 	0x0060
-#define KBDC_GET_COMMAND_BYTE 	0x0020
-#define KBDC_WRITE_TO_AUX    	0x00d4
-#define KBDC_DISABLE_AUX_PORT 	0x00a7
-#define KBDC_ENABLE_AUX_PORT 	0x00a8
-#define KBDC_TEST_AUX_PORT   	0x00a9
-#define KBDC_DIAGNOSE	     	0x00aa
-#define KBDC_TEST_KBD_PORT   	0x00ab
-#define KBDC_DISABLE_KBD_PORT 	0x00ad
-#define KBDC_ENABLE_KBD_PORT 	0x00ae
-
-/* controller command byte (set by KBDC_SET_COMMAND_BYTE) */
-#define KBD_TRANSLATION		0x0040
-#define KBD_RESERVED_BITS	0x0004
-#define KBD_OVERRIDE_KBD_LOCK	0x0008
-#define KBD_ENABLE_KBD_PORT    	0x0000
-#define KBD_DISABLE_KBD_PORT   	0x0010
-#define KBD_ENABLE_AUX_PORT	0x0000
-#define KBD_DISABLE_AUX_PORT	0x0020
-#define KBD_ENABLE_AUX_INT	0x0002
-#define KBD_DISABLE_AUX_INT	0x0000
-#define KBD_ENABLE_KBD_INT     	0x0001
-#define KBD_DISABLE_KBD_INT    	0x0000
-#define KBD_KBD_CONTROL_BITS	(KBD_DISABLE_KBD_PORT | KBD_ENABLE_KBD_INT)
-#define KBD_AUX_CONTROL_BITS	(KBD_DISABLE_AUX_PORT | KBD_ENABLE_AUX_INT)
-
-/* keyboard device commands (sent to KBD_DATA_PORT) */
-#define KBDC_RESET_KBD	     	0x00ff
-#define KBDC_ENABLE_KBD		0x00f4
-#define KBDC_DISABLE_KBD	0x00f5
-#define KBDC_SET_DEFAULTS	0x00f6
-#define KBDC_SEND_DEV_ID	0x00f2
-#define KBDC_SET_LEDS		0x00ed
-#define KBDC_ECHO		0x00ee
-#define KBDC_SET_SCANCODE_SET	0x00f0
-#define KBDC_SET_TYPEMATIC	0x00f3
-
-/* aux device commands (sent to KBD_DATA_PORT) */
-#define PSMC_RESET_DEV	     	0x00ff
-#define PSMC_ENABLE_DEV      	0x00f4
-#define PSMC_DISABLE_DEV     	0x00f5
-#define PSMC_SET_DEFAULTS	0x00f6
-#define PSMC_SEND_DEV_ID     	0x00f2
-#define PSMC_SEND_DEV_STATUS 	0x00e9
-#define PSMC_SEND_DEV_DATA	0x00eb
-#define PSMC_SET_SCALING11	0x00e6
-#define PSMC_SET_SCALING21	0x00e7
-#define PSMC_SET_RESOLUTION	0x00e8
-#define PSMC_SET_STREAM_MODE	0x00ea
-#define PSMC_SET_REMOTE_MODE	0x00f0
-#define PSMC_SET_SAMPLING_RATE	0x00f3
-
-/* PSMC_SET_RESOLUTION argument */
-#define PSMD_RES_LOW		0	/* typically 25ppi */
-#define PSMD_RES_MEDIUM_LOW	1	/* typically 50ppi */
-#define PSMD_RES_MEDIUM_HIGH	2	/* typically 100ppi (default) */
-#define PSMD_RES_HIGH		3	/* typically 200ppi */
-#define PSMD_MAX_RESOLUTION	PSMD_RES_HIGH
-
-/* PSMC_SET_SAMPLING_RATE */
-#define PSMD_MAX_RATE		255	/* FIXME: not sure if it's possible */
-
-/* status bits (KBD_STATUS_PORT) */
-#define KBDS_BUFFER_FULL	0x0021
-#define KBDS_ANY_BUFFER_FULL	0x0001
-#define KBDS_KBD_BUFFER_FULL	0x0001
-#define KBDS_AUX_BUFFER_FULL	0x0021
-#define KBDS_INPUT_BUFFER_FULL	0x0002
-
-/* return code */
-#define KBD_ACK 		0x00fa
-#define KBD_RESEND		0x00fe
-#define KBD_RESET_DONE		0x00aa
-#define KBD_RESET_FAIL		0x00fc
-#define KBD_DIAG_DONE		0x0055
-#define KBD_DIAG_FAIL		0x00fd
-#define KBD_ECHO		0x00ee
-
-#define PSM_ACK 		0x00fa
-#define PSM_RESEND		0x00fe
-#define PSM_RESET_DONE		0x00aa
-#define PSM_RESET_FAIL		0x00fc
-
-/* aux device ID */
-#define PSM_MOUSE_ID		0
-#define PSM_BALLPOINT_ID	2
-#define PSM_INTELLI_ID		3
-#define PSM_EXPLORER_ID		4
-#define PSM_4DMOUSE_ID		6
-#define PSM_4DPLUS_ID		8
-#define PSM_4DPLUS_RFSW35_ID	24
-
-#ifdef _KERNEL
-
-#define ATKBDC_DRIVER_NAME	"atkbdc"
-
-/* 
- * driver specific options: the following options may be set by
- * `options' statements in the kernel configuration file. 
- */
-
-/* retry count */
-#ifndef KBD_MAXRETRY
-#define KBD_MAXRETRY	3
-#endif
-
-/* timing parameters */
-#ifndef KBD_RESETDELAY
-#define KBD_RESETDELAY  200     /* wait 200msec after kbd/mouse reset */
-#endif
-#ifndef KBD_MAXWAIT
-#define KBD_MAXWAIT	5 	/* wait 5 times at most after reset */
-#endif
-
-/* I/O recovery time */
-#define KBDC_DELAYTIME	20
-#define KBDD_DELAYTIME	7
-
-/* debug option */
-#ifndef KBDIO_DEBUG
-#define KBDIO_DEBUG	0
-#endif
-
-/* end of driver specific options */
-
-/* types/structures */
-
-#define KBDQ_BUFSIZE	32
-
-typedef struct _kqueue {
-    int head;
-    int tail;
-    unsigned char q[KBDQ_BUFSIZE];
-#if KBDIO_DEBUG >= 2
-    int call_count;
-    int qcount;
-    int max_qcount;
-#endif
-} kqueue;
-
-struct resource;
-
-typedef struct atkbdc_softc {
-    struct resource *port0;	/* data port */
-    struct resource *port1;	/* status port */
-    bus_space_tag_t iot;
-    bus_space_handle_t ioh0;
-    bus_space_handle_t ioh1;
-    int command_byte;		/* current command byte value */
-    int command_mask;		/* command byte mask bits for kbd/aux devices */
-    int lock;			/* FIXME: XXX not quite a semaphore... */
-    kqueue kbd;			/* keyboard data queue */
-    kqueue aux;			/* auxiliary data queue */
-} atkbdc_softc_t; 
-
-enum kbdc_device_ivar {
-	KBDC_IVAR_VENDORID,
-	KBDC_IVAR_SERIAL,
-	KBDC_IVAR_LOGICALID,
-	KBDC_IVAR_COMPATID, 
-};
-
-typedef caddr_t KBDC;
-
-#define KBDC_RID_KBD	0
-#define KBDC_RID_AUX	1
-
-/* function prototypes */
-
-atkbdc_softc_t *atkbdc_get_softc(int unit);
-int atkbdc_probe_unit(int unit, struct resource *port0, struct resource *port1);
-int atkbdc_attach_unit(int unit, atkbdc_softc_t *sc, struct resource *port0,
-		       struct resource *port1);
-int atkbdc_configure(void);
-
-KBDC atkbdc_open(int unit);
-int kbdc_lock(KBDC kbdc, int lock);
-int kbdc_data_ready(KBDC kbdc);
-
-int write_controller_command(KBDC kbdc,int c);
-int write_controller_data(KBDC kbdc,int c);
-
-int write_kbd_command(KBDC kbdc,int c);
-int write_aux_command(KBDC kbdc,int c);
-int send_kbd_command(KBDC kbdc,int c);
-int send_aux_command(KBDC kbdc,int c);
-int send_kbd_command_and_data(KBDC kbdc,int c,int d);
-int send_aux_command_and_data(KBDC kbdc,int c,int d);
-
-int read_controller_data(KBDC kbdc);
-int read_kbd_data(KBDC kbdc);
-int read_kbd_data_no_wait(KBDC kbdc);
-int read_aux_data(KBDC kbdc);
-int read_aux_data_no_wait(KBDC kbdc);
-
-void empty_kbd_buffer(KBDC kbdc, int t);
-void empty_aux_buffer(KBDC kbdc, int t);
-void empty_both_buffers(KBDC kbdc, int t);
-
-int reset_kbd(KBDC kbdc);
-int reset_aux_dev(KBDC kbdc);
-
-int test_controller(KBDC kbdc);
-int test_kbd_port(KBDC kbdc);
-int test_aux_port(KBDC kbdc);
-
-int kbdc_get_device_mask(KBDC kbdc);
-void kbdc_set_device_mask(KBDC kbdc, int mask);
-
-int get_controller_command_byte(KBDC kbdc);
-int set_controller_command_byte(KBDC kbdc, int command, int flag);
-
-#endif /* _KERNEL */
-
-#endif /* !_DEV_KBD_ATKBDCREG_H_ */