 @@ -1,14 +1,14 @@
-/* $NetBSD: pckbc.c,v 1.50 2010/04/19 18:24:26 dyoung Exp $ */
+/* $NetBSD: pckbc.c,v 1.51 2010/08/08 09:33:05 isaki Exp $ */
 /*
  * Copyright (c) 2004 Ben Harris.
  * Copyright (c) 1998
  *	Matthias Drochner.  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
 @@ -17,27 +17,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.50 2010/04/19 18:24:26 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.51 2010/08/08 09:33:05 isaki Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/errno.h>
 #include <sys/queue.h>
 #include <sys/bus.h>
 @@ -451,34 +451,34 @@ pckbc_slot_enable(void *self, pckbc_slot
+}
 static void
 pckbc_set_poll(void *self, pckbc_slot_t slot, int on)
+{
 	struct pckbc_internal *t = (struct pckbc_internal *)self;
 	t->t_slotdata[slot]->polling = on;
 	if (on) {
 		t->t_slotdata[slot]->poll_data = -1;
 		t->t_slotdata[slot]->poll_stat = -1;
 	} else {
-                int s;
+		int s;
-                /*
+		/*
-                 * If disabling polling on a device that's been configured,
+		 * If disabling polling on a device that's been configured,
-                 * make sure there are no bytes left in the FIFO, holding up
+		 * make sure there are no bytes left in the FIFO, holding up
-                 * the interrupt line.  Otherwise we won't get any further
+		 * the interrupt line.  Otherwise we won't get any further
-                 * interrupts.
+		 * interrupts.
-                 */
+		 */
 		if (t->t_sc) {
 			s = spltty();
 			pckbcintr(t->t_sc);
 			splx(s);
+		}
+	}
+}
 static void
 pckbc_intr_establish(void *pt, pckbport_slot_t slot)
+{
 	struct pckbc_internal *t = pt;
 @@ -611,30 +611,30 @@ pckbcintr(void *vsc)
+}
 int
 pckbc_cnattach(bus_space_tag_t iot, bus_addr_t addr,
 	bus_size_t cmd_offset, pckbc_slot_t slot)
+{
 	bus_space_handle_t ioh_d, ioh_c;
 #ifdef PCKBC_CNATTACH_SELFTEST
 	int reply;
 #endif
 	int res = 0;
 	if (bus_space_map(iot, addr + KBDATAP, 1, 0, &ioh_d))
-                return (ENXIO);
+		return (ENXIO);
 	if (bus_space_map(iot, addr + cmd_offset, 1, 0, &ioh_c)) {
 		bus_space_unmap(iot, ioh_d, 1);
-                return (ENXIO);
+		return (ENXIO);
+	}
 	memset(&pckbc_consdata, 0, sizeof(pckbc_consdata));
 	pckbc_consdata.t_iot = iot;
 	pckbc_consdata.t_ioh_d = ioh_d;
 	pckbc_consdata.t_ioh_c = ioh_c;
 	pckbc_consdata.t_addr = addr;
 	callout_init(&pckbc_consdata.t_cleanup, 0);
 	/* flush */
 	(void) pckbc_poll_data1(&pckbc_consdata, PCKBC_KBD_SLOT);
 #ifdef PCKBC_CNATTACH_SELFTEST