 @@ -1,14 +1,14 @@
-/*	$NetBSD: ahc_isa.c,v 1.35 2008/04/28 20:23:24 martin Exp $	*/
+/*	$NetBSD: ahc_isa.c,v 1.36 2009/05/04 12:14:31 cegger Exp $	*/
 /*
  * Product specific probe and attach routines for:
  * 	AHA-284X VL-bus SCSI controllers
+ *
  * Copyright (c) 1994, 1995, 1996, 1997, 1998 Justin T. Gibbs.
  * 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 immediately at the beginning of the file, without modification,
 @@ -100,27 +100,27 @@
  * by looking in "EISA i/o space" for 284X controllers.
+ *
  * This relies heavily on i/o port accounting.  We also just use the
  * EISA macros for everything ... it's a real waste to redefine them.
+ *
  * Note: there isn't any #ifdef for FreeBSD in this file, since the
  * FreeBSD EISA driver handles all cases of the 284X.
+ *
  *	-- Jason R. Thorpe <thorpej@NetBSD.org>
  *	   July 12, 1996
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_isa.c,v 1.35 2008/04/28 20:23:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_isa.c,v 1.36 2009/05/04 12:14:31 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <sys/malloc.h>
 #include <sys/reboot.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
 #include <dev/scsipi/scsi_all.h>
 @@ -152,28 +152,28 @@ __KERNEL_RCSID(0, "$NetBSD: ahc_isa.c,v
 #define	AHC_ISA_VID		(EISA_SLOTOFF_VID - AHC_ISA_SLOT_OFFSET)
 #define	AHC_ISA_PID		(EISA_SLOTOFF_PID - AHC_ISA_SLOT_OFFSET)
 #define	AHC_ISA_PRIMING		AHC_ISA_VID	/* enable vendor/product ID */
 /*
  * AHC_ISA_PRIMING register values (write)
  */
 #define	AHC_ISA_PRIMING_VID(index)	(AHC_ISA_VID + (index))
 #define	AHC_ISA_PRIMING_PID(index)	(AHC_ISA_PID + (index))
 int	ahc_isa_idstring(bus_space_tag_t, bus_space_handle_t, char *);
 int	ahc_isa_match(struct isa_attach_args *, bus_addr_t);
-int	ahc_isa_probe(struct device *, struct cfdata *, void *);
+int	ahc_isa_probe(device_t, cfdata_t, void *);
-void	ahc_isa_attach(struct device *, struct device *, void *);
+void	ahc_isa_attach(device_t, device_t, void *);
 void	aha2840_load_seeprom(struct ahc_softc *ahc);
 static int verify_seeprom_cksum(struct seeprom_config *sc);
 CFATTACH_DECL(ahc_isa, sizeof(struct ahc_softc),
     ahc_isa_probe, ahc_isa_attach, NULL, NULL);
 /*
  * This keeps track of which slots are to be checked next if the
  * iobase locator is a wildcard.  A simple static variable isn't enough,
  * since it's conceivable that a system might have more than one ISA
  * bus.
+ *
  * The "bus" member is the unit number of the parent ISA bus, e.g. "0"
 @@ -293,27 +293,27 @@ ahc_isa_match(struct isa_attach_args *ia
 	ia->ia_ndrq = 0;
 	ia->ia_niomem = 0;
 	return (1);
+}
 /*
  * Check the slots looking for a board we recognise
  * If we find one, note it's address (slot) and call
  * the actual probe routine to check it out.
  */
 int
-ahc_isa_probe(struct device *parent, struct cfdata *match, void *aux)
+ahc_isa_probe(device_t parent, cfdata_t match, void *aux)
+{
 	struct isa_attach_args *ia = aux;
 	struct ahc_isa_slot *as;
 	if (ahc_isa_slot_initialized == 0) {
 		LIST_INIT(&ahc_isa_all_slots);
 		ahc_isa_slot_initialized = 1;
+	}
 	if (ia->ia_nio < 1)
 		return (0);
 	if (ia->ia_nirq < 1)
 		return (0);
 @@ -350,29 +350,29 @@ ahc_isa_probe(struct device *parent, str
 	for (; as->slot <= AHC_ISA_MAX_SLOT; as->slot++) {
 		if (ahc_isa_match(ia, EISA_SLOT_ADDR(as->slot) +
 		    AHC_ISA_SLOT_OFFSET)) {
 			as->slot++; /* next slot to search */
 			return (1);
+		}
+	}
 	/* No matching cards were found. */
 	return (0);
+}
 void
-ahc_isa_attach(struct device *parent, struct device *self, void *aux)
+ahc_isa_attach(device_t parent, device_t self, void *aux)
+{
-	struct ahc_softc *ahc = (void *)self;
+	struct ahc_softc *ahc = device_private(self);
 	struct isa_attach_args *ia = aux;
 	bus_space_tag_t iot = ia->ia_iot;
 	bus_space_handle_t ioh;
 	int irq, intrtype;
 	const char *intrtypestr;
 	char idstring[EISA_IDSTRINGLEN];
 	u_char intdef;
 	aprint_naive(": SCSI controller\n");
 	if (bus_space_map(iot, ia->ia_io[0].ir_addr, ia->ia_io[0].ir_size,
 , &ioh)) {
 		aprint_error(": can't map i/o space\n");

 @@ -1,40 +1,40 @@
-/*	$NetBSD: lms.c,v 1.54 2008/07/09 20:50:41 joerg Exp $	*/
+/*	$NetBSD: lms.c,v 1.55 2009/05/04 12:14:31 cegger Exp $	*/
 /*-
  * Copyright (c) 1993, 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.
+ *
  * 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: lms.c,v 1.54 2008/07/09 20:50:41 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lms.c,v 1.55 2009/05/04 12:14:31 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
 #include <dev/isa/isavar.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsmousevar.h>
 @@ -45,27 +45,27 @@ __KERNEL_RCSID(0, "$NetBSD: lms.c,v 1.54
 #define	LMS_CNTRL	2       /* offset for control port, write-only */
 #define	LMS_CONFIG	3	/* for configuration port, read-write */
 #define	LMS_NPORTS	4
 struct lms_softc {		/* driver status information */
 	void *sc_ih;
 	bus_space_tag_t sc_iot;		/* bus i/o space identifier */
 	bus_space_handle_t sc_ioh;	/* bus i/o handle */
 	int sc_enabled; /* device is open */
 	int oldbuttons;	/* mouse button status */
-	struct device *sc_wsmousedev;
+	device_t sc_wsmousedev;
 };
 static int lmsprobe(device_t, cfdata_t, void *);
 static void lmsattach(device_t, device_t, void *);
 static int lmsintr(void *);
 CFATTACH_DECL_NEW(lms, sizeof(struct lms_softc),
     lmsprobe, lmsattach, NULL, NULL);
 static int	lms_enable(void *);
 static int	lms_ioctl(void *, u_long, void *, int, struct lwp *);
 static void	lms_disable(void *);

 @@ -1,40 +1,40 @@
-/*	$NetBSD: mms.c,v 1.51 2008/07/09 20:54:13 joerg Exp $	*/
+/*	$NetBSD: mms.c,v 1.52 2009/05/04 12:14:31 cegger Exp $	*/
 /*-
  * Copyright (c) 1993, 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.
+ *
  * 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: mms.c,v 1.51 2008/07/09 20:54:13 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mms.c,v 1.52 2009/05/04 12:14:31 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <machine/intr.h>
 #include <machine/bus.h>
 #include <dev/isa/isavar.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsmousevar.h>
 @@ -42,27 +42,27 @@ __KERNEL_RCSID(0, "$NetBSD: mms.c,v 1.51
 #define	MMS_ADDR	0	/* offset for register select */
 #define	MMS_DATA	1	/* offset for InPort data */
 #define	MMS_IDENT	2	/* offset for identification register */
 #define	MMS_NPORTS	4
 struct mms_softc {		/* driver status information */
 	void *sc_ih;
 	bus_space_tag_t sc_iot;
 	bus_space_handle_t sc_ioh;
 	int sc_enabled; /* device is open */
-	struct device *sc_wsmousedev;
+	device_t sc_wsmousedev;
 };
 static int mmsprobe(device_t, cfdata_t, void *);
 static void mmsattach(device_t, device_t, void *);
 static int mmsintr(void *);
 CFATTACH_DECL_NEW(mms, sizeof(struct mms_softc),
     mmsprobe, mmsattach, NULL, NULL);
 static int	mms_enable(void *);
 static int	mms_ioctl(void *, u_long, void *, int, struct lwp *);
 static void	mms_disable(void *);