 @@ -1,14 +1,14 @@
-/* $NetBSD: pckbd.c,v 1.22 2008/03/15 18:46:22 cube Exp $ */
+/* $NetBSD: pckbd.c,v 1.23 2008/03/15 18:59:07 cube Exp $ */
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -65,27 +65,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)pccons.c	5.11 (Berkeley) 5/21/91
  */
 /*
  * code to work keyboard for PC-style console
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.22 2008/03/15 18:46:22 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.23 2008/03/15 18:59:07 cube Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/ioctl.h>
 #include <sys/bus.h>
 #include <dev/pckbport/pckbportvar.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wskbdvar.h>
 @@ -112,36 +112,36 @@ struct pckbd_internal {
 	int t_extended1;
 	struct pckbd_softc *t_sc; /* back pointer */
 };
 struct pckbd_softc {
         device_t sc_dev;
 	struct pckbd_internal *id;
 	int sc_enabled;
 	int sc_ledstate;
-	struct device *sc_wskbddev;
+	device_t sc_wskbddev;
 #ifdef WSDISPLAY_COMPAT_RAWKBD
 	int rawkbd;
 #endif
 };
 static int pckbd_is_console(pckbport_tag_t, pckbport_slot_t);
-int pckbdprobe(struct device *, struct cfdata *, void *);
+int pckbdprobe(device_t, cfdata_t, void *);
-void pckbdattach(struct device *, struct device *, void *);
+void pckbdattach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(pckbd, sizeof(struct pckbd_softc),
     pckbdprobe, pckbdattach, NULL, NULL);
 int	pckbd_enable(void *, int);
 void	pckbd_set_leds(void *, int);
 int	pckbd_ioctl(void *, u_long, void *, int, struct lwp *);
 const struct wskbd_accessops pckbd_accessops = {
 	pckbd_enable,
 	pckbd_set_leds,
 	pckbd_ioctl,
 };
 @@ -291,27 +291,27 @@ pckbd_resume(device_t dv PMF_FN_ARGS)
 		    resp[0]);
 	pckbport_flush(sc->id->t_kbctag, sc->id->t_kbcslot);
 	pckbd_enable(sc, 1);
 	return true;
+}
 /*
  * these are both bad jokes
  */
 int
-pckbdprobe(struct device *parent, struct cfdata *cf, void *aux)
+pckbdprobe(device_t parent, cfdata_t cf, void *aux)
+{
 	struct pckbport_attach_args *pa = aux;
 	int res;
 	u_char cmd[1], resp[1];
 	/*
 	 * XXX There are rumours that a keyboard can be connected
 	 * to the aux port as well. For me, this didn't work.
 	 * For further experiments, allow it if explicitly
 	 * wired in the config file.
 	 */
 	if ((pa->pa_slot != PCKBPORT_KBD_SLOT) &&
 	    (cf->cf_loc[PCKBPORTCF_SLOT] == PCKBPORTCF_SLOT_DEFAULT))
 @@ -343,27 +343,27 @@ pckbdprobe(struct device *parent, struct
 	 * Some keyboards seem to leave a second ack byte after the reset.
 	 * This is kind of stupid, but we account for them anyway by just
 	 * flushing the buffer.
 	 */
 	pckbport_flush(pa->pa_tag, pa->pa_slot);
 	if (pckbd_set_xtscancode(pa->pa_tag, pa->pa_slot))
 		return 0;
 	return 2;
+}
 void
-pckbdattach(struct device *parent, struct device *self, void *aux)
+pckbdattach(device_t parent, device_t self, void *aux)
+{
 	struct pckbd_softc *sc = device_private(self);
 	struct pckbport_attach_args *pa = aux;
 	struct wskbddev_attach_args a;
 	int isconsole;
 	u_char cmd[1];
 	aprint_naive("\n");
 	aprint_normal("\n");
 	sc->sc_dev = self;
 	isconsole = pckbd_is_console(pa->pa_tag, pa->pa_slot);

 @@ -1,14 +1,14 @@
-/* $NetBSD: pckbport.c,v 1.12 2008/03/15 18:46:22 cube Exp $ */
+/* $NetBSD: pckbport.c,v 1.13 2008/03/15 18:59:07 cube 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: pckbport.c,v 1.12 2008/03/15 18:46:22 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbport.c,v 1.13 2008/03/15 18:59:07 cube 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 <dev/pckbport/pckbdreg.h>
 #include <dev/pckbport/pckbportvar.h>
 @@ -118,44 +118,44 @@ pckbport_attach(void *cookie, struct pck
 	pckbport_tag_t t;
 	if (cookie == pckbport_cntag.t_cookie &&
 	    ops == pckbport_cntag.t_ops)
 		return &pckbport_cntag;
 	t = malloc(sizeof(struct pckbport_tag), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (t == NULL) return NULL;
 	callout_init(&t->t_cleanup, 0);
 	t->t_cookie = cookie;
 	t->t_ops = ops;
 	return t;
+}
-struct device *
+device_t
-pckbport_attach_slot(struct device *dev, pckbport_tag_t t,
+pckbport_attach_slot(device_t dev, pckbport_tag_t t,
     pckbport_slot_t slot)
+{
 	struct pckbport_attach_args pa;
 	void *sdata;
-	struct device *found;
+	device_t found;
 	int alloced = 0;
 	int locs[PCKBPORTCF_NLOCS];
 	pa.pa_tag = t;
 	pa.pa_slot = slot;
 	if (t->t_slotdata[slot] == NULL) {
 		sdata = malloc(sizeof(struct pckbport_slotdata),
 		    M_DEVBUF, M_NOWAIT);
 		if (sdata == NULL) {
-			printf("%s: no memory\n", dev->dv_xname);
+			aprint_error_dev(dev, "no memory\n");
 			return 0;
+		}
 		t->t_slotdata[slot] = sdata;
 		pckbport_init_slotdata(t->t_slotdata[slot]);
 		alloced++;
+	}
 	locs[PCKBPORTCF_SLOT] = slot;
 	found = config_found_sm_loc(dev, "pckbport", locs, &pa,
 				    pckbportprint, config_stdsubmatch);
 	if (found == NULL && alloced) {

 @@ -1,14 +1,14 @@
-/* $NetBSD: pckbportvar.h,v 1.7 2008/03/15 18:46:22 cube Exp $ */
+/* $NetBSD: pckbportvar.h,v 1.8 2008/03/15 18:59:07 cube 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
 @@ -86,21 +86,20 @@ int pckbport_poll_cmd(pckbport_tag_t, pc
 			int, u_char *, int);
 int pckbport_enqueue_cmd(pckbport_tag_t, pckbport_slot_t, u_char *, int,
 			   int, int, u_char *);
 int pckbport_poll_data(pckbport_tag_t, pckbport_slot_t);
 void pckbport_set_poll(pckbport_tag_t, pckbport_slot_t, int);
 int pckbport_xt_translation(pckbport_tag_t, pckbport_slot_t, int);
 void pckbport_slot_enable(pckbport_tag_t, pckbport_slot_t, int);
 /* calls from pckbc etc */
 int pckbport_cnattach(void *, struct pckbport_accessops const *,
 			      pckbport_slot_t);
 pckbport_tag_t pckbport_attach(void *,
 				       struct pckbport_accessops const *);
-struct device *pckbport_attach_slot(struct device *, pckbport_tag_t,
+device_t pckbport_attach_slot(device_t, pckbport_tag_t, pckbport_slot_t);
 					    pckbport_slot_t);
 void pckbportintr(pckbport_tag_t, pckbport_slot_t, int);
 /* md hook for use without mi wscons */
 int pckbport_machdep_cnattach(pckbport_tag_t, pckbport_slot_t);
 #endif /* _DEV_PCKBPORT_PCKBPORTVAR_H_ */

 @@ -1,14 +1,14 @@
-/* $NetBSD: pms.c,v 1.25 2008/03/15 18:46:22 cube Exp $ */
+/* $NetBSD: pms.c,v 1.26 2008/03/15 18:59:07 cube Exp $ */
 /*-
  * Copyright (c) 2004 Kentaro Kurahone.
  * Copyright (c) 2004 Ales Krenek.
  * Copyright (c) 1994 Charles M. Hannum.
  * Copyright (c) 1992, 1993 Erik Forsberg.
  * 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.
 @@ -16,27 +16,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.25 2008/03/15 18:46:22 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.26 2008/03/15 18:59:07 cube Exp $");
 #include "opt_pms.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/bus.h>
 #include <dev/pckbport/pckbportvar.h>
 @@ -61,28 +61,28 @@ int pmsdebug = 1;
 const enum pms_type tries[] = {
 	PMS_SCROLL5, PMS_SCROLL3, PMS_STANDARD, PMS_UNKNOWN
 };
 const struct pms_protocol pms_protocols[] = {
 	{ { 0, 0, 0 }, 0, "unknown protocol" },
 	{ { 0, 0, 0 }, 0, "no scroll wheel (3 buttons)" },
 	{ { 200, 100, 80 }, 3, "scroll wheel (3 buttons)" },
 	{ { 200, 200, 80 }, 4, "scroll wheel (5 buttons)" },
 	{ { 0, 0, 0 }, 0, "synaptics" }
 };
-int pmsprobe(struct device *, struct cfdata *, void *);
+int pmsprobe(device_t, cfdata_t, void *);
-void pmsattach(struct device *, struct device *, void *);
+void pmsattach(device_t, device_t, void *);
 void pmsinput(void *, int);
 CFATTACH_DECL_NEW(pms, sizeof(struct pms_softc),
     pmsprobe, pmsattach, NULL, NULL);
 static int	pms_protocol(pckbport_tag_t, pckbport_slot_t);
 static void	do_enable(struct pms_softc *);
 static void	do_disable(struct pms_softc *);
 static void	pms_reset_thread(void*);
 int	pms_enable(void *);
 int	pms_ioctl(void *, u_long, void *, int, struct lwp *);
 void	pms_disable(void *);
 @@ -119,28 +119,27 @@ pms_protocol(pckbport_tag_t tag, pckbpor
 		if (res)
 			return PMS_UNKNOWN;
 		if (resp[0] == p->response) {
 			DPRINTF(("pms_protocol: found mouse protocol %d\n",
 				tries[j]));
 			return tries[j];
+		}
+	}
 	DPRINTF(("pms_protocol: standard PS/2 protocol (no scroll wheel)\n"));
 	return PMS_STANDARD;
+}
 int
-pmsprobe(struct device *parent, struct cfdata *match,
+pmsprobe(device_t parent, cfdata_t match, void *aux)
     void *aux)
+{
 	struct pckbport_attach_args *pa = aux;
 	u_char cmd[1], resp[2];
 	int res;
 	if (pa->pa_slot != PCKBPORT_AUX_SLOT)
 		return 0;
 	/* Flush any garbage. */
 	pckbport_flush(pa->pa_tag, pa->pa_slot);
 	/* reset the device */
 	cmd[0] = PMS_RESET;
 @@ -158,27 +157,27 @@ pmsprobe(struct device *parent, struct c
 	/* get type number (0 = mouse) */
 	if (resp[1] != 0) {
 #ifdef DEBUG
 		printf("pmsprobe: type 0x%x\n", resp[1]);
 #endif
 		return 0;
+	}
 	return 10;
+}
 void
-pmsattach(struct device *parent, struct device *self, void *aux)
+pmsattach(device_t parent, device_t self, void *aux)
+{
 	struct pms_softc *sc = device_private(self);
 	struct pckbport_attach_args *pa = aux;
 	struct wsmousedev_attach_args a;
 	u_char cmd[2], resp[2];
 	int res;
 	sc->sc_dev = self;
 	sc->sc_kbctag = pa->pa_tag;
 	sc->sc_kbcslot = pa->pa_slot;
 	aprint_naive("\n");
 	aprint_normal("\n");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmsvar.h,v 1.6 2008/03/15 18:46:22 cube Exp $	*/
+/*	$NetBSD: pmsvar.h,v 1.7 2008/03/15 18:59:07 cube Exp $	*/
 /*-
  * Copyright (c) 2004 Kentaro Kurahone.
  * Copyright (c) 2004 Ales Krenek.
  * Copyright (c) 1994 Charles M. Hannum.
  * Copyright (c) 1992, 1993 Erik Forsberg.
  * 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.
 @@ -49,24 +49,24 @@ struct pms_softc {		/* driver status inf
 	int sc_kbcslot;
 	int sc_enabled;		/* input enabled? */
 #ifndef PMS_DISABLE_POWERHOOK
 	void *sc_powerhook;	/* cookie from power hook */
 	int sc_suspended;	/* suspended? */
 #endif /* !PMS_DISABLE_POWERHOOK */
 	int inputstate;		/* number of bytes received for this packet */
 	u_int buttons;		/* mouse button status */
 	enum pms_type protocol;
 	unsigned char packet[6];
 	struct timeval last, current;
-	struct device *sc_wsmousedev;
+	device_t sc_wsmousedev;
 	struct lwp *sc_event_thread;
 #ifdef PMS_SYNAPTICS_TOUCHPAD
 	union {
 		struct synaptics_softc synaptics;
 	} u;
 #endif
 };
 #endif