 @@ -1,14 +1,14 @@
-/*	$NetBSD: ahc_isa.c,v 1.36 2009/05/04 12:14:31 cegger Exp $	*/
+/*	$NetBSD: ahc_isa.c,v 1.37 2009/05/05 09:51:23 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.36 2009/05/04 12:14:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_isa.c,v 1.37 2009/05/05 09:51:23 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>
 @@ -157,27 +157,27 @@ __KERNEL_RCSID(0, "$NetBSD: ahc_isa.c,v
  * 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(device_t, cfdata_t, 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),
+CFATTACH_DECL_NEW(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"
  * for "isa0".
  */
 struct ahc_isa_slot {
 	LIST_ENTRY(ahc_isa_slot)	link;
 @@ -361,26 +361,27 @@ ahc_isa_probe(device_t parent, cfdata_t
 void
 ahc_isa_attach(device_t parent, device_t self, void *aux)
+{
 	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;
 	ahc->sc_dev = self;
 	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");
 		return;
+	}
 	if (!ahc_isa_idstring(iot, ioh, idstring)) {
 		aprint_error(": can't read ID string\n");
 		goto free_io;
+	}
 	if ((irq = ahc_aic77xx_irq(iot, ioh)) < 0) {
 		aprint_error(": ahc_aic77xx_irq failed\n");
 @@ -392,27 +393,27 @@ ahc_isa_attach(device_t parent, device_t
 	} else if (strcmp(idstring, "ADP7757") == 0) {
 		aprint_normal(": %s\n", EISA_PRODUCT_ADP7757);
 	} else {
 		aprint_error(": unknown device type %s\n", idstring);
 		goto free_io;
+	}
 	/*
 	 * Tell the bus-DMA interface that we can do 32bit DMA
 	 * NOTE: this variable is first referenced in ahc_init().
 	 */
 	ahc->sc_dmaflags = ISABUS_DMA_32BIT;
-	ahc_set_name(ahc, device_xname(&ahc->sc_dev));
+	ahc_set_name(ahc, device_xname(ahc->sc_dev));
 	ahc->parent_dmat = ia->ia_dmat;
 	ahc->channel = 'A';
 	ahc->chip =  AHC_AIC7770|AHC_VL;
 	ahc->features = AHC_AIC7770_FE;
 	ahc->bugs |= AHC_TMODE_WIDEODD_BUG;
 	ahc->flags |= AHC_PAGESCBS;
 	ahc->tag = iot;
 	ahc->bsh = ioh;
 	if (ahc_softc_init(ahc) != 0)
 		goto free_io;
 	ahc_intr_enable(ahc, false);
 @@ -422,37 +423,37 @@ ahc_isa_attach(device_t parent, device_t
 	intdef = bus_space_read_1(iot, ioh, INTDEF);
 	if (intdef & EDGE_TRIG) {
 		intrtype = IST_EDGE;
 		intrtypestr = "edge triggered";
 	} else {
 		intrtype = IST_LEVEL;
 		intrtypestr = "level sensitive";
+	}
 	ahc->ih = isa_intr_establish(ia->ia_ic, irq,
 	    intrtype, IPL_BIO, ahc_intr, ahc);
 	if (ahc->ih == NULL) {
-		aprint_error_dev(&ahc->sc_dev, "couldn't establish %s interrupt\n",
+		aprint_error_dev(ahc->sc_dev, "couldn't establish %s interrupt\n",
 		       intrtypestr);
 		goto free_io;
+	}
 	/*
 	 * Tell the user what type of interrupts we're using.
 	 * usefull for debugging irq problems
 	 */
 	if (bootverbose) {
-		aprint_verbose_dev(&ahc->sc_dev, "Using %s interrupts\n",
+		aprint_verbose_dev(ahc->sc_dev, "Using %s interrupts\n",
 		       intrtypestr);
+	}
 	/*
 	 * Now that we know we own the resources we need, do the
 	 * card initialization.
 	 */
 	aha2840_load_seeprom(ahc);
 	/* Attach sub-devices */
 	if (ahc_aic77xx_attach(ahc) == 0)
 		return; /* succeed */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ahc_cardbus.c,v 1.26 2009/03/14 15:36:16 dsl Exp $	*/
+/*	$NetBSD: ahc_cardbus.c,v 1.27 2009/05/05 09:51:23 cegger Exp $	*/
 /*-
  * Copyright (c) 2000, 2005 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * 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
 @@ -28,27 +28,27 @@
  * 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.
  */
 /*
  * CardBus front-end for the Adaptec AIC-7xxx family of SCSI controllers.
+ *
  * TODO:
  *	- power management
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_cardbus.c,v 1.26 2009/03/14 15:36:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_cardbus.c,v 1.27 2009/05/05 09:51:23 cegger Exp $");
 #include "opt_ahc_cardbus.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/queue.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <sys/intr.h>
 @@ -75,64 +75,63 @@ __KERNEL_RCSID(0, "$NetBSD: ahc_cardbus.
 struct ahc_cardbus_softc {
 	struct ahc_softc sc_ahc;	/* real AHC */
 	/* CardBus-specific goo. */
 	cardbus_devfunc_t sc_ct;	/* our CardBus devfuncs */
 	cardbus_intr_line_t sc_intrline; /* our interrupt line */
 	cardbustag_t sc_tag;
 	int	sc_cbenable;		/* what CardBus access type to enable */
 	int	sc_csr;			/* CSR bits */
 	bus_size_t sc_size;
 };
-int	ahc_cardbus_match(struct device *, struct cfdata *, void *);
+int	ahc_cardbus_match(device_t, cfdata_t, void *);
-void	ahc_cardbus_attach(struct device *, struct device *, void *);
+void	ahc_cardbus_attach(device_t, device_t, void *);
-int	ahc_cardbus_detach(struct device *, int);
+int	ahc_cardbus_detach(device_t, int);
-int	ahc_activate(struct device *self, enum devact act);
+int	ahc_activate(device_t self, enum devact act);
-CFATTACH_DECL(ahc_cardbus, sizeof(struct ahc_cardbus_softc),
+CFATTACH_DECL_NEW(ahc_cardbus, sizeof(struct ahc_cardbus_softc),
     ahc_cardbus_match, ahc_cardbus_attach, ahc_cardbus_detach, ahc_activate);
 int
-ahc_cardbus_match(struct device *parent, struct cfdata *match,
+ahc_cardbus_match(device_t parent, cfdata_t match, void *aux)
     void *aux)
+{
 	struct cardbus_attach_args *ca = aux;
 	if (CARDBUS_VENDOR(ca->ca_id) == PCI_VENDOR_ADP &&
 	    CARDBUS_PRODUCT(ca->ca_id) == PCI_PRODUCT_ADP_APA1480)
 		return (1);
 	return (0);
+}
 void
-ahc_cardbus_attach(struct device *parent, struct device *self,
+ahc_cardbus_attach(device_t parent, device_t self, void *aux)
     void *aux)
+{
 	struct cardbus_attach_args *ca = aux;
 	struct ahc_cardbus_softc *csc = device_private(self);
 	struct ahc_softc *ahc = &csc->sc_ahc;
 	cardbus_devfunc_t ct = ca->ca_ct;
 	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	bus_space_tag_t bst;
 	bus_space_handle_t bsh;
 	pcireg_t reg;
 	u_int sxfrctl1 = 0;
 	u_char sblkctl;
 	ahc->sc_dev = self;
 	csc->sc_ct = ct;
 	csc->sc_tag = ca->ca_tag;
 	csc->sc_intrline = ca->ca_intrline;
 	printf(": Adaptec ADP-1480 SCSI\n");
 	/*
 	 * Map the device.
 	 */
 	csc->sc_csr = PCI_COMMAND_MASTER_ENABLE;
 	if (Cardbus_mapreg_map(csc->sc_ct, AHC_CARDBUS_MMBA,
 	    PCI_MAPREG_TYPE_MEM|PCI_MAPREG_MEM_TYPE_32BIT, 0,
 	    &bst, &bsh, NULL, &csc->sc_size) == 0) {
 @@ -159,27 +158,27 @@ ahc_cardbus_attach(struct device *parent
 	cardbus_conf_write(cc, cf, ca->ca_tag, PCI_COMMAND_STATUS_REG, reg);
 	/*
 	 * Make sure the latency timer is set to some reasonable
 	 * value.
 	 */
 	reg = cardbus_conf_read(cc, cf, ca->ca_tag, PCI_BHLC_REG);
 	if (PCI_LATTIMER(reg) < 0x20) {
 		reg &= ~(PCI_LATTIMER_MASK << PCI_LATTIMER_SHIFT);
 		reg |= (0x20 << PCI_LATTIMER_SHIFT);
 		cardbus_conf_write(cc, cf, ca->ca_tag, PCI_BHLC_REG, reg);
+	}
-	ahc_set_name(ahc, device_xname(&ahc->sc_dev));
+	ahc_set_name(ahc, device_xname(ahc->sc_dev));
 	ahc->parent_dmat = ca->ca_dmat;
 	ahc->tag = bst;
 	ahc->bsh = bsh;
 	/*
 	 * ADP-1480 is always an AIC-7860.
 	 */
 	ahc->chip = AHC_AIC7860 | AHC_PCI;
 	ahc->features = AHC_AIC7860_FE|AHC_REMOVABLE;
 	ahc->bugs |= AHC_TMODE_WIDEODD_BUG|AHC_CACHETHEN_BUG|AHC_PCI_MWI_BUG;
 	if (PCI_REVISION(ca->ca_class) >= 1)
 		ahc->bugs |= AHC_PCI_2_1_RETRY_BUG;
 @@ -247,27 +246,27 @@ ahc_cardbus_attach(struct device *parent
 	 */
         if ((sxfrctl1 & STPWEN) != 0)
 		ahc->flags |= AHC_TERM_ENB_A;
 	if (ahc_init(ahc)) {
 		ahc_free(ahc);
 		return;
+	}
 	ahc_attach(ahc);
+}
 int
-ahc_cardbus_detach(struct device *self, int flags)
+ahc_cardbus_detach(device_t self, int flags)
+{
 	struct ahc_cardbus_softc *csc = device_private(self);
 	struct ahc_softc *ahc = &csc->sc_ahc;
 	int rv;
 	rv = ahc_detach((void *)ahc, flags);
 	if (rv)
 		return rv;
 	if (ahc->ih) {
 		cardbus_intr_disestablish(csc->sc_ct->ct_cc,
 					  csc->sc_ct->ct_cf, ahc->ih);
 @@ -279,29 +278,29 @@ ahc_cardbus_detach(struct device *self,
 			Cardbus_mapreg_unmap(csc->sc_ct, AHC_CARDBUS_MMBA,
 				ahc->tag, ahc->bsh, csc->sc_size);
 		else if (csc->sc_cbenable == CARDBUS_IO_ENABLE)
 			Cardbus_mapreg_unmap(csc->sc_ct, AHC_CARDBUS_IOBA,
 				ahc->tag, ahc->bsh, csc->sc_size);
 	csc->sc_cbenable = 0;
+	}
 	return (0);
+}
 int
-ahc_activate(struct device *self, enum devact act)
+ahc_activate(device_t self, enum devact act)
+{
-	struct ahc_cardbus_softc *csc = (void*)self;
+	struct ahc_cardbus_softc *csc = device_private(self);
 	struct ahc_softc *ahc = &csc->sc_ahc;
 	int s, rv = 0;
 	s = splhigh();
 	switch (act) {
 	case DVACT_ACTIVATE:
 		rv = EOPNOTSUPP;
 		break;
 	case DVACT_DEACTIVATE:
 		if (ahc->sc_child != NULL)
 			rv = config_deactivate(ahc->sc_child);
 		break;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ahc_eisa.c,v 1.36 2008/04/06 08:54:43 cegger Exp $	*/
+/*	$NetBSD: ahc_eisa.c,v 1.37 2009/05/05 09:51:23 cegger Exp $	*/
 /*
  * Product specific probe and attach routines for:
  * 	274X and aic7770 motherboard 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,
 @@ -22,171 +22,172 @@
  * 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: src/sys/dev/aic7xxx/ahc_eisa.c,v 1.15 2000/01/29 14:22:19 peter Exp $
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_eisa.c,v 1.36 2008/04/06 08:54:43 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_eisa.c,v 1.37 2009/05/05 09:51:23 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 #include <sys/bus.h>
 #include <sys/intr.h>
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsiconf.h>
 #include <dev/eisa/eisareg.h>
 #include <dev/eisa/eisavar.h>
 #include <dev/eisa/eisadevs.h>
 #include <dev/ic/aic7xxx_osm.h>
 #include <dev/ic/aic7xxx_inline.h>
 #include <dev/ic/aic77xxreg.h>
 #include <dev/ic/aic77xxvar.h>
-static int	ahc_eisa_match(struct device *, struct cfdata *, void *);
+static int	ahc_eisa_match(device_t, cfdata_t, void *);
-static void	ahc_eisa_attach(struct device *, struct device *, void *);
+static void	ahc_eisa_attach(device_t, device_t, void *);
-CFATTACH_DECL(ahc_eisa, sizeof(struct ahc_softc),
+CFATTACH_DECL_NEW(ahc_eisa, sizeof(struct ahc_softc),
     ahc_eisa_match, ahc_eisa_attach, NULL, NULL);
 /*
  * 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.
  */
 static int
-ahc_eisa_match(struct device *parent, struct cfdata *match,
+ahc_eisa_match(device_t parent, cfdata_t match, void *aux)
     void *aux)
+{
 	struct eisa_attach_args *ea = aux;
 	bus_space_tag_t iot = ea->ea_iot;
 	bus_space_handle_t ioh;
 	int irq;
 	/* must match one of our known ID strings */
 	if (strcmp(ea->ea_idstring, "ADP7770") &&
 	    strcmp(ea->ea_idstring, "ADP7771"))
 		return (0);
 	if (bus_space_map(iot, EISA_SLOT_ADDR(ea->ea_slot) +
 	    AHC_EISA_SLOT_OFFSET, AHC_EISA_IOSIZE, 0, &ioh))
 		return (0);
 	irq = ahc_aic77xx_irq(iot, ioh);
 	bus_space_unmap(iot, ioh, AHC_EISA_IOSIZE);
 	return (irq >= 0);
+}
 static void
-ahc_eisa_attach(struct device *parent, struct device *self, void *aux)
+ahc_eisa_attach(device_t parent, device_t self, void *aux)
+{
 	struct ahc_softc *ahc = device_private(self);
 	struct eisa_attach_args *ea = aux;
 	eisa_chipset_tag_t ec = ea->ea_ec;
 	eisa_intr_handle_t ih;
 	bus_space_tag_t iot = ea->ea_iot;
 	bus_space_handle_t ioh;
 	int irq, intrtype;
 	const char *intrstr, *intrtypestr;
 	u_int biosctrl;
 	u_int scsiconf;
 	u_int scsiconf1;
 	u_char intdef;
 #ifdef AHC_DEBUG
 	int i;
 #endif
 	ahc->sc_dev = self;
 	if (bus_space_map(iot, EISA_SLOT_ADDR(ea->ea_slot) +
 	    AHC_EISA_SLOT_OFFSET, AHC_EISA_IOSIZE, 0, &ioh)) {
-		aprint_error_dev(&ahc->sc_dev, "could not map I/O addresses");
+		aprint_error_dev(ahc->sc_dev, "could not map I/O addresses");
 		return;
+	}
 	if ((irq = ahc_aic77xx_irq(iot, ioh)) < 0) {
-		aprint_error_dev(&ahc->sc_dev, "ahc_aic77xx_irq failed!");
+		aprint_error_dev(ahc->sc_dev, "ahc_aic77xx_irq failed!");
 		goto free_io;
+	}
 	if (strcmp(ea->ea_idstring, "ADP7770") == 0) {
 		printf(": %s\n", EISA_PRODUCT_ADP7770);
 	} else if (strcmp(ea->ea_idstring, "ADP7771") == 0) {
 		printf(": %s\n", EISA_PRODUCT_ADP7771);
 	} else {
 		printf(": Unknown device type %s", ea->ea_idstring);
 		goto free_io;
+	}
-	ahc_set_name(ahc, device_xname(&ahc->sc_dev));
+	ahc_set_name(ahc, device_xname(ahc->sc_dev));
 	ahc->parent_dmat = ea->ea_dmat;
 	ahc->chip = AHC_AIC7770|AHC_EISA;
 	ahc->features = AHC_AIC7770_FE;
 	ahc->flags = AHC_PAGESCBS;
 	ahc->bugs = AHC_TMODE_WIDEODD_BUG;
 	ahc->tag = iot;
 	ahc->bsh = ioh;
 	ahc->channel = 'A';
 	if (ahc_softc_init(ahc) != 0)
 		goto free_io;
 	ahc_intr_enable(ahc, FALSE);
 	if (ahc_reset(ahc) != 0)
 		goto free_io;
 	if (eisa_intr_map(ec, irq, &ih)) {
-		aprint_error_dev(&ahc->sc_dev, "couldn't map interrupt (%d)\n",
+		aprint_error_dev(ahc->sc_dev, "couldn't map interrupt (%d)\n",
 		    irq);
 		goto free_io;
+	}
 	intdef = bus_space_read_1(iot, ioh, INTDEF);
 	if (intdef & EDGE_TRIG) {
 		intrtype = IST_EDGE;
 		intrtypestr = "edge triggered";
 	} else {
 		intrtype = IST_LEVEL;
 		intrtypestr = "level sensitive";
+	}
 	intrstr = eisa_intr_string(ec, ih);
 	ahc->ih = eisa_intr_establish(ec, ih,
 	    intrtype, IPL_BIO, ahc_intr, ahc);
 	if (ahc->ih == NULL) {
-		aprint_error_dev(&ahc->sc_dev, "couldn't establish %s interrupt",
+		aprint_error_dev(ahc->sc_dev, "couldn't establish %s interrupt",
 		    intrtypestr);
 		if (intrstr != NULL)
 			printf(" at %s", intrstr);
 		printf("\n");
 		goto free_io;
+	}
 	if (intrstr != NULL)
-		printf("%s: %s interrupting at %s\n", device_xname(&ahc->sc_dev),
+		printf("%s: %s interrupting at %s\n", device_xname(ahc->sc_dev),
 		       intrtypestr, intrstr);
 	/*
 	 * Now that we know we own the resources we need, do the
 	 * card initialization.
+	 *
 	 * First, the aic7770 card specific setup.
 	 */
 	biosctrl = ahc_inb(ahc, HA_274_BIOSCTRL);
 	scsiconf = ahc_inb(ahc, SCSICONF);
 	scsiconf1 = ahc_inb(ahc, SCSICONF + 1);
 #ifdef AHC_DEBUG

 @@ -1,14 +1,14 @@
-/*	$NetBSD: aic7xxx_osm.c,v 1.27 2008/04/08 12:07:25 cegger Exp $	*/
+/*	$NetBSD: aic7xxx_osm.c,v 1.28 2009/05/05 09:51:24 cegger Exp $	*/
 /*
  * Bus independent FreeBSD shim for the aic7xxx based adaptec SCSI controllers
+ *
  * Copyright (c) 1994-2001 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, this list of conditions, and the following disclaimer,
  *    without modification.
 @@ -29,27 +29,27 @@
  * 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.
+ *
  * //depot/aic7xxx/freebsd/dev/aic7xxx/aic7xxx_osm.c#12 $
+ *
  * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.c,v 1.31 2002/11/30 19:08:58 scottl Exp $
  */
 /*
  * Ported from FreeBSD by Pascal Renauld, Network Storage Solutions, Inc. - April 2003
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic7xxx_osm.c,v 1.27 2008/04/08 12:07:25 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic7xxx_osm.c,v 1.28 2009/05/05 09:51:24 cegger Exp $");
 #include <dev/ic/aic7xxx_osm.h>
 #include <dev/ic/aic7xxx_inline.h>
 #ifndef AHC_TMODE_ENABLE
 #define AHC_TMODE_ENABLE 0
 #endif
 static void	ahc_action(struct scsipi_channel *chan, scsipi_adapter_req_t req, void *arg);
 static void	ahc_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments);
 static int	ahc_poll(struct ahc_softc *ahc, int wait);
 static void	ahc_setup_data(struct ahc_softc *ahc,
 @@ -66,64 +66,64 @@ static int	ahc_ioctl(struct scsipi_chann
 int
 ahc_attach(struct ahc_softc *ahc)
+{
 	u_long 	s;
 	int i;
 	char ahc_info[256];
 	LIST_INIT(&ahc->pending_scbs);
 	for (i = 0; i < AHC_NUM_TARGETS; i++)
 		TAILQ_INIT(&ahc->untagged_queues[i]);
 	ahc_lock(ahc, &s);
-	ahc->sc_adapter.adapt_dev = &ahc->sc_dev;
+	ahc->sc_adapter.adapt_dev = ahc->sc_dev;
 	ahc->sc_adapter.adapt_nchannels = (ahc->features & AHC_TWIN) ? 2 : 1;
 	ahc->sc_adapter.adapt_openings = ahc->scb_data->numscbs - 1;
 	ahc->sc_adapter.adapt_max_periph = 16;
 	ahc->sc_adapter.adapt_ioctl = ahc_ioctl;
 	ahc->sc_adapter.adapt_minphys = ahc_minphys;
 	ahc->sc_adapter.adapt_request = ahc_action;
 	ahc->sc_channel.chan_adapter = &ahc->sc_adapter;
 	ahc->sc_channel.chan_bustype = &scsi_bustype;
 	ahc->sc_channel.chan_channel = 0;
 	ahc->sc_channel.chan_ntargets = (ahc->features & AHC_WIDE) ? 16 : 8;
 	ahc->sc_channel.chan_nluns = 8 /*AHC_NUM_LUNS*/;
 	ahc->sc_channel.chan_id = ahc->our_id;
 	ahc->sc_channel.chan_flags |= SCSIPI_CHAN_CANGROW;
 	if (ahc->features & AHC_TWIN) {
 		ahc->sc_channel_b = ahc->sc_channel;
 		ahc->sc_channel_b.chan_id = ahc->our_id_b;
 		ahc->sc_channel_b.chan_channel = 1;
+	}
 	ahc_controller_info(ahc, ahc_info, sizeof(ahc_info));
-	printf("%s: %s\n", device_xname(&ahc->sc_dev), ahc_info);
+	printf("%s: %s\n", device_xname(ahc->sc_dev), ahc_info);
 	if ((ahc->flags & AHC_PRIMARY_CHANNEL) == 0) {
-		ahc->sc_child = config_found((void *)&ahc->sc_dev,
+		ahc->sc_child = config_found(ahc->sc_dev,
 		    &ahc->sc_channel, scsiprint);
 		if (ahc->features & AHC_TWIN)
-			ahc->sc_child_b = config_found((void *)&ahc->sc_dev,
+			ahc->sc_child_b = config_found(ahc->sc_dev,
 			    &ahc->sc_channel_b, scsiprint);
 	} else {
 		if (ahc->features & AHC_TWIN)
-			ahc->sc_child = config_found((void *)&ahc->sc_dev,
+			ahc->sc_child = config_found(ahc->sc_dev,
 			    &ahc->sc_channel_b, scsiprint);
-		ahc->sc_child_b = config_found((void *)&ahc->sc_dev,
+		ahc->sc_child_b = config_found(ahc->sc_dev,
 		    &ahc->sc_channel, scsiprint);
+	}
 	ahc_intr_enable(ahc, TRUE);
 	if (ahc->flags & AHC_RESET_BUS_A)
 		ahc_reset_channel(ahc, 'A', TRUE);
 	if ((ahc->features & AHC_TWIN) && ahc->flags & AHC_RESET_BUS_B)
 		ahc_reset_channel(ahc, 'B', TRUE);
 	ahc_unlock(ahc, &s);
 	return (1);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: aic7xxx_osm.h,v 1.21 2009/03/15 15:52:12 cegger Exp $	*/
+/*	$NetBSD: aic7xxx_osm.h,v 1.22 2009/05/05 09:51:24 cegger Exp $	*/
 /*
  * NetBSD platform specific driver option settings, data structures,
  * function declarations and includes.
+ *
  * Copyright (c) 1994-2001 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, this list of conditions, and the following disclaimer,
 @@ -498,27 +498,27 @@ typedef enum
 void ahc_power_state_change(struct ahc_softc *, ahc_power_state);
 #endif
 /******************************** VL/EISA *************************************/
 int aic7770_map_registers(struct ahc_softc *, u_int);
 int aic7770_map_int(struct ahc_softc *, int);
 /********************************* Debug **************************************/
 static __inline void	ahc_print_path(struct ahc_softc *, struct scb *);
 static __inline void	ahc_platform_dump_card_state(struct ahc_softc *);
 static __inline void
 ahc_print_path(struct ahc_softc *ahc, struct scb *scb)
+{
-	printf("%s:", device_xname(&ahc->sc_dev));
+	printf("%s:", device_xname(ahc->sc_dev));
+}
 static __inline void
 ahc_platform_dump_card_state(struct ahc_softc *ahc)
+{
+}
 /**************************** Transfer Settings *******************************/
 void	  ahc_notify_xfer_settings_change(struct ahc_softc *,
 					  struct ahc_devinfo *);
 void	  ahc_platform_set_tags(struct ahc_softc *, struct ahc_devinfo *, int);
 /************************* Initialization/Teardown ****************************/
 int	  ahc_platform_alloc(struct ahc_softc *, void *);

 @@ -27,27 +27,27 @@
  * NO WARRANTY
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ *
- * $Id: aic7xxxvar.h,v 1.55 2008/02/11 21:43:46 dyoung Exp $
+ * $Id: aic7xxxvar.h,v 1.56 2009/05/05 09:51:24 cegger Exp $
+ *
  * $FreeBSD: /repoman/r/ncvs/src/sys/dev/aic7xxx/aic7xxx.h,v 1.44 2003/01/20 20:44:55 gibbs Exp $
  */
 /*
  * Ported from FreeBSD by Pascal Renauld, Network Storage Solutions, Inc. - April 2003
  */
 #ifndef _AIC7XXXVAR_H_
 #define _AIC7XXXVAR_H_
 #undef AHC_DEBUG
 /* Register Definitions */
 @@ -1010,27 +1010,27 @@ struct ahc_suspend_state {
 	/* hsmailbox */
 	uint8_t	crccontrol1;
 	uint8_t	scbbaddr;
 	/* Host and sequencer SCB counts */
 	uint8_t	dff_thrsh;
 	uint8_t	*scratch_ram;
 	uint8_t	*btt;
 };
 typedef void (*ahc_bus_intr_t)(struct ahc_softc *);
 typedef void ahc_callback_t (void *);
 struct ahc_softc {
-	struct device 		  sc_dev;
+	device_t 		  sc_dev;
 	struct scsipi_channel	  sc_channel;
 	struct scsipi_channel 	  sc_channel_b;
 	struct device *		  sc_child;
 	struct device *		  sc_child_b;
 	struct scsipi_adapter	  sc_adapter;
 	bus_space_tag_t           tag;
 	bus_space_handle_t        bsh;
 #ifndef __linux__
 	bus_dma_tag_t		  buffer_dmat;   /* dmat for buffer I/O */
 #endif

 @@ -29,38 +29,38 @@
  * NO WARRANTY
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ *
- * $Id: ahc_pci.c,v 1.64 2009/01/03 03:43:22 yamt Exp $
+ * $Id: ahc_pci.c,v 1.65 2009/05/05 09:51:24 cegger Exp $
+ *
  * //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#57 $
+ *
  * $FreeBSD: /repoman/r/ncvs/src/sys/dev/aic7xxx/aic7xxx_pci.c,v 1.22 2003/01/20 20:44:55 gibbs Exp $
  */
 /*
  * Ported from FreeBSD by Pascal Renauld, Network Storage Solutions, Inc. - April 2003
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_pci.c,v 1.64 2009/01/03 03:43:22 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_pci.c,v 1.65 2009/05/05 09:51:24 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/queue.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 #include <sys/bus.h>
 #include <sys/intr.h>
 #include <dev/pci/pcireg.h>
 @@ -774,27 +774,28 @@ ahc_pci_attach(device_t parent, device_t
 	bus_space_tag_t    st, iot;
 	bus_space_handle_t sh, ioh;
 #ifdef AHC_ALLOW_MEMIO
 	int		   memh_valid;
 	bus_space_tag_t    memt;
 	bus_space_handle_t memh;
 	pcireg_t memtype;
 #endif
 	pci_intr_handle_t  ih;
 	const char        *intrstr;
 	struct ahc_pci_busdata *bd;
 	bool               override_ultra;
-	ahc_set_name(ahc, device_xname(&ahc->sc_dev));
+	ahc->sc_dev = self;
 	ahc_set_name(ahc, device_xname(ahc->sc_dev));
 	ahc->parent_dmat = pa->pa_dmat;
 	command = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
 	subid = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_SUBSYS_ID_REG);
 	entry = ahc_find_pci_device(pa->pa_id, subid, pa->pa_function);
 	if (entry == NULL)
 		return;
 	printf(": %s\n", entry->name);
 	/* Keep information about the PCI bus */
 	bd = malloc(sizeof (struct ahc_pci_busdata), M_DEVBUF, M_NOWAIT);
 	if (bd == NULL) {
 		printf("%s: unable to allocate bus-specific data\n",
 @@ -946,27 +947,27 @@ ahc_pci_attach(device_t parent, device_t
 		/* Normal mode setup */
 		ahc_outb(ahc, CRCCONTROL1, CRCVALCHKEN|CRCENDCHKEN|CRCREQCHKEN
 					  |TARGCRCENDEN);
+	}
 	if (pci_intr_map(pa, &ih)) {
 		printf("%s: couldn't map interrupt\n", ahc_name(ahc));
 		ahc_free(ahc);
 		return;
+	}
 	intrstr = pci_intr_string(pa->pa_pc, ih);
 	ahc->ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, ahc_intr, ahc);
 	if (ahc->ih == NULL) {
-		aprint_error_dev(&ahc->sc_dev,
+		aprint_error_dev(ahc->sc_dev,
 		    "couldn't establish interrupt\n");
 		if (intrstr != NULL)
 			printf(" at %s", intrstr);
 		printf("\n");
 		ahc_free(ahc);
 		return;
+	}
 	if (intrstr != NULL)
 		printf("%s: interrupting at %s\n", ahc_name(ahc), intrstr);
 	dscommand0 = ahc_inb(ahc, DSCOMMAND0);
 	dscommand0 |= MPARCKEN|CACHETHEN;
 	if ((ahc->features & AHC_ULTRA2) != 0) {
 @@ -1052,27 +1053,27 @@ ahc_pci_attach(device_t parent, device_t
 			prop_bool_t usetd;
 			printf("%s: Using left over BIOS settings\n",
 				ahc_name(ahc));
 			ahc->flags &= ~AHC_USEDEFAULTS;
 			/*
 			 * Ignore target device settings and use default
 			 * if BIOS initializes chip's SRAM with some
 			 * conservative settings (async, no tagged
 			 * queuing etc.) and machine dependent device
 			 * property is set.
 			 */
 			usetd = prop_dictionary_get(
-					device_properties(&ahc->sc_dev),
+					device_properties(ahc->sc_dev),
 					"aic7xxx-use-target-defaults");
 			if (usetd != NULL) {
 				KASSERT(prop_object_type(usetd) ==
 					PROP_TYPE_BOOL);
 				if (prop_bool_true(usetd))
 					ahc->flags |= AHC_USETARGETDEFAULTS;
+			}
 			ahc->flags |= AHC_BIOS_ENABLED;
 		} else {
 			/*
 			 * Assume only one connector and always turn
 			 * on termination.
 			 */
 @@ -1130,27 +1131,27 @@ ahc_pci_suspend(device_t dev PMF_FN_ARGS
 static bool
 ahc_pci_resume(device_t dev PMF_FN_ARGS)
+{
 #if 0
 	struct ahc_softc *sc = device_private(dev);
 	return (ahc_resume(sc) == 0);
 #else
 	return true;
 #endif
+}
-CFATTACH_DECL(ahc_pci, sizeof(struct ahc_softc),
+CFATTACH_DECL_NEW(ahc_pci, sizeof(struct ahc_softc),
     ahc_pci_probe, ahc_pci_attach, NULL, NULL);
 static int
 ahc_9005_subdevinfo_valid(uint16_t device, uint16_t vendor,
 			  uint16_t subdevice, uint16_t subvendor)
+{
 	int result;
 	/* Default to invalid. */
 	result = 0;
 	if (vendor == 0x9005
 	 && subvendor == 0x9005
          && subdevice != device
 @@ -1738,27 +1739,27 @@ ahc_aha29160C_setup(struct ahc_softc *ah
+{
 	int error;
 	error = ahc_aic7899_setup(ahc);
 	if (error != 0)
 		return (error);
 	ahc->features |= AHC_REMOVABLE;
 	return (0);
+}
 static int
 ahc_raid_setup(struct ahc_softc *ahc)
+{
-	aprint_normal_dev(&ahc->sc_dev, "RAID functionality unsupported\n");
+	aprint_normal_dev(ahc->sc_dev, "RAID functionality unsupported\n");
 	return (ENXIO);
+}
 static int
 ahc_aha394XX_setup(struct ahc_softc *ahc)
+{
 	switch (ahc->bd->dev) {
 	case AHC_394X_SLOT_CHANNEL_A:
 		ahc->channel = 'A';
 		break;
 	case AHC_394X_SLOT_CHANNEL_B:
 		ahc->channel = 'B';