 @@ -1,14 +1,14 @@
-/*	$NetBSD: pchb.c,v 1.32 2011/08/20 20:01:08 jakllsch Exp $ */
+/*	$NetBSD: pchb.c,v 1.33 2012/01/30 19:41:18 drochner Exp $ */
 /*-
  * Copyright (c) 1996, 1998, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``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 FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.32 2011/08/20 20:01:08 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.33 2012/01/30 19:41:18 drochner Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 @@ -145,51 +145,46 @@ pchb_get_bus_number(pci_chipset_tag_t pc
 				break;
+			}
 			return pbnum;
+		}
+	}
 	return -1;
+}
 static void
 pchbattach(device_t parent, device_t self, void *aux)
+{
 	struct pchb_softc *sc = device_private(self);
 	const struct pci_attach_args *pa = aux;
 	char devinfo[256];
 	struct pcibus_attach_args pba;
 	struct agpbus_attach_args apa;
 	pcireg_t bcreg;
 	u_char bdnum, pbnum = 0; /* XXX: gcc */
 	pcitag_t tag;
 	int doattach, attachflags, has_agp;
 	aprint_naive("\n");
 	doattach = 0;
 	has_agp = 0;
 	attachflags = pa->pa_flags;
 	sc->sc_dev = self;
 	sc->sc_pa = *pa;
 	/*
 	 * Print out a description, and configure certain chipsets which
 	 * have auxiliary PCI buses.
 	 */
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo,
 	    PCI_REVISION(pa->pa_class));
 	switch (PCI_VENDOR(pa->pa_id)) {
 	/*
 	 * i386 stuff.
 	 */
 	case PCI_VENDOR_SERVERWORKS:
 		pbnum = pci_conf_read(pa->pa_pc, pa->pa_tag, 0x44) & 0xff;
 		if (pbnum == 0)
 			break;
 		/*
 		 * This host bridge has a second PCI bus.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pcib.c,v 1.13 2011/07/01 18:22:08 dyoung Exp $	*/
+/*	$NetBSD: pcib.c,v 1.14 2012/01/30 19:41:18 drochner Exp $	*/
 /*-
  * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``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 FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.13 2011/07/01 18:22:08 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.14 2012/01/30 19:41:18 drochner Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <dev/isa/isavar.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 @@ -175,37 +175,32 @@ pcibmatch(device_t parent, cfdata_t matc
 	if (PCI_CLASS(pa->pa_class) == PCI_CLASS_BRIDGE &&
 	    PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_BRIDGE_ISA) {
 		return (1);
+	}
 	return (0);
+}
 void
 pcibattach(device_t parent, device_t self, void *aux)
+{
 	struct pcib_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	char devinfo[256];
 	aprint_naive("\n");
 	/*
 	 * Just print out a description and defer configuration
 	 * until all PCI devices have been attached.
 	 */
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo,
 	    PCI_REVISION(pa->pa_class));
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_tag = pa->pa_tag;
 	/* If a more specific pcib implementation has already registered a
 	 * power handler, don't overwrite it.
 	 */
  	if (!device_pmf_is_registered(self)) {
  		if (!pmf_device_register(self, NULL, NULL))
  	    		aprint_error_dev(self, "couldn't establish power handler\n");
+	}
 	config_defer(self, pcib_callback);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ahcisata_pci.c,v 1.26 2011/08/06 14:56:33 jakllsch Exp $	*/
+/*	$NetBSD: ahcisata_pci.c,v 1.27 2012/01/30 19:41:18 drochner Exp $	*/
 /*
  * Copyright (c) 2006 Manuel Bouyer.
+ *
  * 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.
+ *
 @@ -16,27 +16,27 @@
  * 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: ahcisata_pci.c,v 1.26 2011/08/06 14:56:33 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.27 2012/01/30 19:41:18 drochner Exp $");
 #include <sys/types.h>
 #include <sys/malloc.h>
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/disklabel.h>
 #include <sys/pmf.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pciidereg.h>
 #include <dev/pci/pciidevar.h>
 @@ -161,46 +161,43 @@ ahci_pci_match(device_t parent, cfdata_t
 	    (force == true))
 		ret = 3;
 	bus_space_unmap(regt, regh, size);
 	return ret;
+}
 static void
 ahci_pci_attach(device_t parent, device_t self, void *aux)
+{
 	struct pci_attach_args *pa = aux;
 	struct ahci_pci_softc *psc = device_private(self);
 	struct ahci_softc *sc = &psc->ah_sc;
 	char devinfo[256];
 	const char *intrstr;
 	bool ahci_cap_64bit;
 	bool ahci_bad_64bit;
 	pci_intr_handle_t intrhandle;
 	sc->sc_atac.atac_dev = self;
 	if (pci_mapreg_map(pa, AHCI_PCI_ABAR,
 	    PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0,
 	    &sc->sc_ahcit, &sc->sc_ahcih, NULL, &sc->sc_ahcis) != 0) {
 		aprint_error_dev(self, "can't map ahci registers\n");
 		return;
+	}
 	psc->sc_pc = pa->pa_pc;
 	psc->sc_pcitag = pa->pa_tag;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, "AHCI disk controller");
 	aprint_naive(": AHCI disk controller\n");
 	aprint_normal(": %s\n", devinfo);
 	if (pci_intr_map(pa, &intrhandle) != 0) {
 		aprint_error_dev(self, "couldn't map interrupt\n");
 		return;
+	}
 	intrstr = pci_intr_string(pa->pa_pc, intrhandle);
 	psc->sc_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_BIO, ahci_intr, sc);
 	if (psc->sc_ih == NULL) {
 		aprint_error_dev(self, "couldn't establish interrupt\n");
 		return;
+	}
 	aprint_normal_dev(self, "interrupting at %s\n",
 	    intrstr ? intrstr : "unknown interrupt");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ubsec.c,v 1.26 2011/11/19 22:51:24 tls Exp $	*/
+/*	$NetBSD: ubsec.c,v 1.27 2012/01/30 19:41:23 drochner Exp $	*/
 /* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.6 2003/01/23 21:06:43 sam Exp $ */
 /*	$OpenBSD: ubsec.c,v 1.127 2003/06/04 14:04:58 jason Exp $	*/
 /*
  * Copyright (c) 2000 Jason L. Wright (jason@thought.net)
  * Copyright (c) 2000 Theo de Raadt (deraadt@openbsd.org)
  * Copyright (c) 2001 Patrik Lindergren (patrik@ipunplugged.com)
+ *
  * 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.
 @@ -25,27 +25,27 @@
  * 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.
+ *
  * Effort sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.26 2011/11/19 22:51:24 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.27 2012/01/30 19:41:23 drochner Exp $");
 #undef UBSEC_DEBUG
 /*
  * uBsec 5[56]01, bcm580xx, bcm582x hardware crypto accelerator
  */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/endian.h>
 #ifdef __NetBSD__
   #define letoh16 htole16
 @@ -303,29 +303,27 @@ ubsec_attach(device_t parent, device_t s
 	const struct ubsec_product *up;
 	pci_chipset_tag_t pc = pa->pa_pc;
 	pci_intr_handle_t ih;
 	const char *intrstr = NULL;
 	struct ubsec_dma *dmap;
 	u_int32_t cmd, i;
 	up = ubsec_lookup(pa);
 	if (up == NULL) {
 		printf("\n");
 		panic("ubsec_attach: impossible");
+	}
-	aprint_naive(": Crypto processor\n");
+	pci_aprint_devinfo_fancy(pa, "Crypto processor", up->ubsec_name, 1);
 	aprint_normal(": %s, rev. %d\n", up->ubsec_name,
 	    PCI_REVISION(pa->pa_class));
 	SIMPLEQ_INIT(&sc->sc_queue);
 	SIMPLEQ_INIT(&sc->sc_qchip);
 	SIMPLEQ_INIT(&sc->sc_queue2);
 	SIMPLEQ_INIT(&sc->sc_qchip2);
 	SIMPLEQ_INIT(&sc->sc_q2free);
 	sc->sc_flags = up->ubsec_flags;
 	sc->sc_statmask = up->ubsec_statmask;
 	cmd = pci_conf_read(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
 	cmd |= PCI_COMMAND_MASTER_ENABLE;
 	pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, cmd);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: amdpm.c,v 1.34 2010/02/07 20:55:46 pgoyette Exp $	*/
+/*	$NetBSD: amdpm.c,v 1.35 2012/01/30 19:41:18 drochner Exp $	*/
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Enami Tsugutomo.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``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 FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdpm.c,v 1.34 2010/02/07 20:55:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdpm.c,v 1.35 2012/01/30 19:41:18 drochner Exp $");
 #include "opt_amdpm.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/callout.h>
 #include <sys/rnd.h>
 #include <sys/bus.h>
 #include <dev/ic/acpipmtimer.h>
 @@ -77,35 +77,31 @@ amdpm_match(device_t parent, cfdata_t ma
 		case PCI_PRODUCT_NVIDIA_XBOX_SMBUS:
 			return (1);
+		}
+	}
 	return (0);
+}
 static void
 amdpm_attach(device_t parent, device_t self, void *aux)
+{
 	struct amdpm_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	char devinfo[256];
 	pcireg_t confreg, pmptrreg;
 	u_int32_t pmreg;
 	int i;
-	aprint_naive("\n");
+	pci_aprint_devinfo(pa, NULL);
 	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo,
 	    PCI_REVISION(pa->pa_class));
 	if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_NVIDIA_XBOX_SMBUS)
 		sc->sc_nforce = 1;
 	else
 		sc->sc_nforce = 0;
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_tag = pa->pa_tag;
 	sc->sc_iot = pa->pa_iot;
 	sc->sc_pa = pa;
 #if 0
 	aprint_normal_dev(&sc->sc_dev, "");

 @@ -1,14 +1,14 @@
-/* $NetBSD: auixp.c,v 1.37 2011/12/02 11:58:44 jmcneill Exp $ */
+/* $NetBSD: auixp.c,v 1.38 2012/01/30 19:41:18 drochner Exp $ */
 /*
  * Copyright (c) 2004, 2005 Reinoud Zandijk <reinoud@netbsd.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.
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  * 3. All advertising materials mentioning features or use of this software
 @@ -40,27 +40,27 @@
  * encodings.
+ *
  * Known problems and issues :
  * - SPDIF is untested and needs some work still (LED stays off)
  * - 32 bit audio playback failed last time i tried but that might an AC'97
  *   codec support problem.
  * - 32 bit recording works but can't try out playing: see above.
  * - no suspend/resume support yet.
  * - multiple codecs are `supported' but not tested; the implemetation needs
  *   some cleaning up.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.37 2011/12/02 11:58:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.38 2012/01/30 19:41:18 drochner Exp $");
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/null.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kmem.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/select.h>
 #include <sys/audioio.h>
 #include <sys/queue.h>
 @@ -1090,43 +1090,38 @@ auixp_match(device_t dev, cfdata_t match
 /* it is... now hook up and set up the resources we need */
 static void
 auixp_attach(device_t parent, device_t self, void *aux)
+{
 	struct auixp_softc *sc;
 	struct pci_attach_args *pa;
 	pcitag_t tag;
 	pci_chipset_tag_t pc;
 	pci_intr_handle_t ih;
 	const struct auixp_card_type *card;
 	const char *intrstr;
 	uint32_t data;
-	char devinfo[256];
+	int error;
 	int revision, error;
 	sc = device_private(self);
 	pa = (struct pci_attach_args *)aux;
 	tag = pa->pa_tag;
 	pc = pa->pa_pc;
 #ifdef DEBUG_AUIXP
 	static_sc = sc;
 #endif
 	/* print information confirming attachment */
-	aprint_naive(": Audio controller\n");
+	pci_aprint_devinfo(pa, "Audio controller");
 	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
 	revision = PCI_REVISION(pa->pa_class);
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo, revision);
 	/* set up details from our set of known `cards'/chips */
 	for (card = auixp_card_types; card->pci_vendor_id; card++)
 		if (PCI_VENDOR(pa->pa_id) == card->pci_vendor_id &&
 		    PCI_PRODUCT(pa->pa_id) == card->pci_product_id) {
 			sc->type = card->type;
 			break;
+		}
 	/* device only has 32 bit non prefetchable memory		*/
 	/* set MEM space access and enable the card's busmastering	*/
 	data = pci_conf_read(pc, tag, PCI_COMMAND_STATUS_REG);
 	data |= (PCI_COMMAND_MEM_ENABLE | PCI_COMMAND_MASTER_ENABLE);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: voodoofb.c,v 1.37 2012/01/25 03:49:12 macallan Exp $	*/
+/*	$NetBSD: voodoofb.c,v 1.38 2012/01/30 19:41:23 drochner Exp $	*/
 /*
  * Copyright (c) 2005, 2006 Michael Lorenz
  * 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.
 @@ -22,27 +22,27 @@
  * 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.
  */
 /*
  * A console driver for 3Dfx Voodoo3 graphics boards
  * Thanks to Andreas Drewke (andreas_dr@gmx.de) for his Voodoo3 driver for BeOS
  * which I used as reference / documentation
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.37 2012/01/25 03:49:12 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.38 2012/01/30 19:41:23 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/callout.h>
 #include <sys/kauth.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pciio.h>
 @@ -337,47 +337,45 @@ voodoofb_match(device_t parent, cfdata_t
 	    PCI_SUBCLASS(pa->pa_class) != PCI_SUBCLASS_DISPLAY_VGA)
 		return 0;
 	if ((PCI_VENDOR(pa->pa_id)==PCI_VENDOR_3DFX) &&
 	    (PCI_PRODUCT(pa->pa_id)>=PCI_PRODUCT_3DFX_VOODOO3))
 		return 100;
 	return 0;
+}
 static void
 voodoofb_attach(device_t parent, device_t self, void *aux)
+{
 	struct voodoofb_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	char devinfo[256];
 	struct wsemuldisplaydev_attach_args aa;
 	struct rasops_info *ri;
 #ifdef VOODOOFB_ENABLE_INTR
 	pci_intr_handle_t ih;
 	const char *intrstr;
 #endif
 	ulong defattr;
 	int console, width, height, i, j;
 	prop_dictionary_t dict;
 	int linebytes, depth, flags;
 	uint32_t bg, fg, ul;
 	sc->sc_dev = self;
 	sc->sc_mode = WSDISPLAYIO_MODE_EMUL;
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_pcitag = pa->pa_tag;
 	sc->sc_dacw = -1;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	printf(": %s (rev. 0x%02x)\n", devinfo, PCI_REVISION(pa->pa_class));
 	sc->sc_memt = pa->pa_memt;
 	sc->sc_iot = pa->pa_iot;
 	sc->sc_pa = *pa;
 	/* the framebuffer */
 	if (pci_mapreg_info(sc->sc_pc, sc->sc_pcitag, 0x14, PCI_MAPREG_TYPE_MEM,
 	    &sc->sc_fb, &sc->sc_fbsize, &flags)) {
 		aprint_error_dev(self, "failed to map the frame buffer.\n");
+	}
 	sc->sc_memsize = sc->sc_fbsize >> 1;	/* VRAM aperture is 2x VRAM */
 	/* memory-mapped registers */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: autri.c,v 1.48 2011/11/24 03:35:58 mrg Exp $	*/
+/*	$NetBSD: autri.c,v 1.49 2012/01/30 19:41:18 drochner Exp $	*/
 /*
  * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
  * 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.
 @@ -25,27 +25,27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Trident 4DWAVE-DX/NX, SiS 7018, ALi M5451 Sound Driver
+ *
  * The register information is taken from the ALSA driver.
+ *
  * Documentation links:
  * - ftp://ftp.alsa-project.org/pub/manuals/trident/
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.48 2011/11/24 03:35:58 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.49 2012/01/30 19:41:18 drochner Exp $");
 #include "midi.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/fcntl.h>
 #include <sys/kmem.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/audioio.h>
 #include <sys/bus.h>
 #include <sys/intr.h>
 @@ -510,41 +510,38 @@ autri_match(device_t parent, cfdata_t ma
 	return 0;
+}
 static void
 autri_attach(device_t parent, device_t self, void *aux)
+{
 	struct autri_softc *sc;
 	struct pci_attach_args *pa;
 	pci_chipset_tag_t pc;
 	struct autri_codec_softc *codec;
 	pci_intr_handle_t ih;
 	char const *intrstr;
 	char devinfo[256];
 	int r;
 	uint32_t reg;
 	sc = device_private(self);
 	pa = (struct pci_attach_args *)aux;
 	pc = pa->pa_pc;
 	aprint_naive(": Audio controller\n");
 	sc->sc_devid = pa->pa_id;
 	sc->sc_class = pa->pa_class;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, "Audio controller");
 	sc->sc_revision = PCI_REVISION(pa->pa_class);
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo, sc->sc_revision);
 	/* map register to memory */
 	if (pci_mapreg_map(pa, AUTRI_PCI_MEMORY_BASE,
 	    PCI_MAPREG_TYPE_MEM, 0, &sc->memt, &sc->memh, NULL, NULL)) {
 		aprint_error_dev(&sc->sc_dev, "can't map memory space\n");
 		return;
+	}
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
 	/* map and establish the interrupt */
 	if (pci_intr_map(pa, &ih)) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hifn7751.c,v 1.48 2011/11/29 03:50:31 tls Exp $	*/
+/*	$NetBSD: hifn7751.c,v 1.49 2012/01/30 19:41:19 drochner Exp $	*/
 /*	$FreeBSD: hifn7751.c,v 1.5.2.7 2003/10/08 23:52:00 sam Exp $ */
 /*	$OpenBSD: hifn7751.c,v 1.140 2003/08/01 17:55:54 deraadt Exp $	*/
 /*
  * Invertex AEON / Hifn 7751 driver
  * Copyright (c) 1999 Invertex Inc. All rights reserved.
  * Copyright (c) 1999 Theo de Raadt
  * Copyright (c) 2000-2001 Network Security Technologies, Inc.
  *			http://www.netsec.net
  * Copyright (c) 2003 Hifn Inc.
+ *
  * This driver is based on a previous driver by Invertex, for which they
  * requested:  Please send any comments, feedback, bug-fixes, or feature
 @@ -38,27 +38,27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  * Effort sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
+ *
  */
 /*
  * Driver for various  Hifn pre-HIPP encryption processors.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.48 2011/11/29 03:50:31 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.49 2012/01/30 19:41:19 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/device.h>
 #ifdef __OpenBSD__
 #include <crypto/crypto.h>
 #include <dev/rndvar.h>
 @@ -244,29 +244,27 @@ hifn_attach(device_t parent, device_t se
 	u_int32_t cmd;
 	u_int16_t ena;
 	bus_dma_segment_t seg;
 	bus_dmamap_t dmamap;
 	int rseg;
 	void *kva;
 	hp = hifn_lookup(pa);
 	if (hp == NULL) {
 		printf("\n");
 		panic("hifn_attach: impossible");
+	}
-	aprint_naive(": Crypto processor\n");
+	pci_aprint_devinfo_fancy(pa, "Crypto processor", hp->hifn_name, 1);
 	aprint_normal(": %s, rev. %d\n", hp->hifn_name,
 	    PCI_REVISION(pa->pa_class));
 	sc->sc_pci_pc = pa->pa_pc;
 	sc->sc_pci_tag = pa->pa_tag;
 	sc->sc_flags = hp->hifn_flags;
 	cmd = pci_conf_read(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
 	cmd |= PCI_COMMAND_MASTER_ENABLE;
 	pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, cmd);
 	if (pci_mapreg_map(pa, HIFN_BAR0, PCI_MAPREG_TYPE_MEM, 0,
 	    &sc->sc_st0, &sc->sc_sh0, NULL, &iosize0)) {
 		aprint_error_dev(&sc->sc_dv, "can't map mem space %d\n", 0);

 @@ -1,14 +1,14 @@
-/* $NetBSD: btvmei.c,v 1.27 2012/01/27 18:53:08 para Exp $ */
+/* $NetBSD: btvmei.c,v 1.28 2012/01/30 19:41:18 drochner Exp $ */
 /*
  * Copyright (c) 1999
  *	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
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * 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: btvmei.c,v 1.27 2012/01/27 18:53:08 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.28 2012/01/30 19:41:18 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
 #include <sys/extent.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 @@ -80,39 +80,34 @@ b3_617_match(device_t parent, cfdata_t m
 	if ((PCI_VENDOR(pa->pa_id) != PCI_VENDOR_BIT3)
 	    || (PCI_PRODUCT(pa->pa_id) != PCI_PRODUCT_BIT3_PCIVME617))
 		return (0);
 	return (1);
+}
 static void
 b3_617_attach(device_t parent, device_t self, void *aux)
+{
 	struct b3_617_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	pci_chipset_tag_t pc = pa->pa_pc;
 	int rev;
 	pci_intr_handle_t ih;
 	const char *intrstr;
 	struct vmebus_attach_args vaa;
 	aprint_naive(": VME bus adapter\n");
 	sc->sc_pc = pc;
 	sc->sc_dmat = pa->pa_dmat;
-	rev = PCI_REVISION(pci_conf_read(pc, pa->pa_tag, PCI_CLASS_REG));
+	pci_aprint_devinfo_fancy(pa, "VME bus adapter", "BIT3 PCI-VME 617", 1);
 	aprint_normal(": BIT3 PCI-VME 617 rev %d\n", rev);
 	/*
 	 * Map CSR and mapping table spaces.
 	 * Don't map VME window; parts are mapped as needed to
 	 * save kernel virtual memory space
 	 */
 	if (pci_mapreg_map(pa, 0x14,
 			   PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT,
 , &sc->csrt, &sc->csrh, NULL, NULL) &&
 	    pci_mapreg_map(pa, 0x10,
 			   PCI_MAPREG_TYPE_IO,
 , &sc->csrt, &sc->csrh, NULL, NULL)) {
 		aprint_error_dev(self, "can't map CSR space\n");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: r128fb.c,v 1.27 2012/01/11 16:02:29 macallan Exp $	*/
+/*	$NetBSD: r128fb.c,v 1.28 2012/01/30 19:41:22 drochner Exp $	*/
 /*
  * Copyright (c) 2007 Michael Lorenz
  * 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.
 @@ -21,27 +21,27 @@
  * 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.
  */
 /*
  * A console driver for ATI Rage 128 graphics controllers
  * tested on macppc only so far
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.27 2012/01/11 16:02:29 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.28 2012/01/30 19:41:22 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/lwp.h>
 #include <sys/kauth.h>
 #include <dev/videomode/videomode.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 @@ -188,43 +188,41 @@ r128fb_match(device_t parent, cfdata_t m
 	    (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_ATI_RAGEGLPCI) ||
 	    (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_ATI_RAGE_MOB_M3_AGP))
 		return 100;
 	return (0);
+}
 static void
 r128fb_attach(device_t parent, device_t self, void *aux)
+{
 	struct r128fb_softc	*sc = device_private(self);
 	struct pci_attach_args	*pa = aux;
 	struct rasops_info	*ri;
 	bus_space_tag_t		tag;
 	char devinfo[256];
 	struct wsemuldisplaydev_attach_args aa;
 	prop_dictionary_t	dict;
 	unsigned long		defattr;
 	bool			is_console;
 	int			i, j;
 	uint32_t		reg, flags;
 	uint8_t			tmp;
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_pcitag = pa->pa_tag;
 	sc->sc_memt = pa->pa_memt;
 	sc->sc_iot = pa->pa_iot;
 	sc->sc_dev = self;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	aprint_normal(": %s\n", devinfo);
 	/* fill in parameters from properties */
 	dict = device_properties(self);
 	if (!prop_dictionary_get_uint32(dict, "width", &sc->sc_width)) {
 		aprint_error("%s: no width property\n", device_xname(self));
 		return;
+	}
 	if (!prop_dictionary_get_uint32(dict, "height", &sc->sc_height)) {
 		aprint_error("%s: no height property\n", device_xname(self));
 		return;
+	}
 	if (!prop_dictionary_get_uint32(dict, "depth", &sc->sc_depth)) {
 		aprint_error("%s: no depth property\n", device_xname(self));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: chipsfb.c,v 1.30 2011/07/22 14:34:38 njoly Exp $	*/
+/*	$NetBSD: chipsfb.c,v 1.31 2012/01/30 19:41:18 drochner Exp $	*/
 /*
  * Copyright (c) 2006 Michael Lorenz
  * 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.
 @@ -21,27 +21,27 @@
  * 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.
  */
 /*
  * A console driver for Chips & Technologies 65550 graphics controllers
  * tested on macppc only so far
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: chipsfb.c,v 1.30 2011/07/22 14:34:38 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: chipsfb.c,v 1.31 2012/01/30 19:41:18 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/kauth.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pciio.h>
 #include <dev/pci/wsdisplay_pci.h>
 @@ -79,42 +79,39 @@ chipsfb_pci_match(device_t parent, cfdat
 		return 100;
 	if ((PCI_VENDOR(pa->pa_id) == PCI_VENDOR_CHIPS) &&
 	    (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_CHIPS_65554))
 		return 100;
 	return 0;
+}
 static void
 chipsfb_pci_attach(device_t parent, device_t self, void *aux)
+{
 	struct chipsfb_pci_softc *scp = device_private(self);
 	struct chipsfb_softc *sc = &scp->sc_chips;
 	const struct pci_attach_args *pa = aux;
 	char devinfo[256];
 	pcireg_t screg;
 	scp->sc_pc = pa->pa_pc;
 	scp->sc_pcitag = pa->pa_tag;
 	sc->sc_dev = self;
 	screg = pci_conf_read(scp->sc_pc, scp->sc_pcitag,
 	    PCI_COMMAND_STATUS_REG);
 	screg |= PCI_COMMAND_IO_ENABLE | PCI_COMMAND_MEM_ENABLE;
 	pci_conf_write(scp->sc_pc, scp->sc_pcitag, PCI_COMMAND_STATUS_REG,
 	    screg);
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo,
 	    PCI_REVISION(pa->pa_class));
 	sc->sc_memt = pa->pa_memt;
 	sc->sc_iot = pa->pa_iot;
 	sc->sc_ioctl = chipsfb_pci_ioctl;
 	sc->sc_mmap = NULL;
 	/* the framebuffer */
 	sc->sc_fb = (pci_conf_read(scp->sc_pc, scp->sc_pcitag, PCI_BAR0) &
 	    ~PCI_MAPREG_MEM_TYPE_MASK);
 	sc->sc_fbsize = 0x01000000;	/* 16MB aperture */
 	if (bus_space_map(sc->sc_memt, sc->sc_fb, 0x400000,
 	    BUS_SPACE_MAP_LINEAR, &sc->sc_fbh)) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cmpci.c,v 1.44 2011/11/24 03:35:58 mrg Exp $	*/
+/*	$NetBSD: cmpci.c,v 1.45 2012/01/30 19:41:18 drochner Exp $	*/
 /*
  * Copyright (c) 2000, 2001, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Takuya SHIOZAKI <tshiozak@NetBSD.org> .
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by ITOH Yasufumi.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -33,27 +33,27 @@
+ *
  */
 /*
  * C-Media CMI8x38 Audio Chip Support.
+ *
  * TODO:
  *   - 4ch / 6ch support.
  *   - Joystick support.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.44 2011/11/24 03:35:58 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.45 2012/01/30 19:41:18 drochner Exp $");
 #if defined(AUDIO_DEBUG) || defined(DEBUG)
 #define DPRINTF(x) if (cmpcidebug) printf x
 int cmpcidebug = 0;
 #else
 #define DPRINTF(x)
 #endif
 #include "mpu.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 @@ -371,38 +371,34 @@ cmpci_match(device_t parent, cfdata_t ma
 		return 1;
 	return 0;
+}
 static void
 cmpci_attach(device_t parent, device_t self, void *aux)
+{
 	struct cmpci_softc *sc;
 	struct pci_attach_args *pa;
 	struct audio_attach_args aa;
 	pci_intr_handle_t ih;
 	char const *strintr;
 	char devinfo[256];
 	int i, v;
 	sc = device_private(self);
 	pa = (struct pci_attach_args *)aux;
 	aprint_naive(": Audio controller\n");
 	sc->sc_id = pa->pa_id;
 	sc->sc_class = pa->pa_class;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, "Audio controller");
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo,
 	    PCI_REVISION(sc->sc_class));
 	switch (PCI_PRODUCT(sc->sc_id)) {
 	case PCI_PRODUCT_CMEDIA_CMI8338A:
 		/*FALLTHROUGH*/
 	case PCI_PRODUCT_CMEDIA_CMI8338B:
 		sc->sc_capable = CMPCI_CAP_CMI8338;
 		break;
 	case PCI_PRODUCT_CMEDIA_CMI8738:
 		/*FALLTHROUGH*/
 	case PCI_PRODUCT_CMEDIA_CMI8738B:
 		sc->sc_capable = CMPCI_CAP_CMI8738;
 		break;
+	}

 @@ -1,14 +1,14 @@
-/* $NetBSD: coram.c,v 1.9 2011/08/29 14:47:08 jmcneill Exp $ */
+/* $NetBSD: coram.c,v 1.10 2012/01/30 19:41:18 drochner Exp $ */
 /*
  * Copyright (c) 2008, 2011 Jonathan A. Kollasch
  * 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.
 @@ -17,27 +17,27 @@
  * "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 COPYRIGHT HOLDER 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coram.c,v 1.9 2011/08/29 14:47:08 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coram.c,v 1.10 2012/01/30 19:41:18 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <dev/dtv/dtvif.h>
 #include <dev/pci/cx23885reg.h>
 #include <dev/pci/coramvar.h>
 @@ -153,40 +153,37 @@ coram_match(device_t parent, cfdata_t ma
 	if (coram_board_lookup(PCI_VENDOR(subid), PCI_PRODUCT(subid)) == NULL)
 		return 0;
 	return 1;
+}
 static void
 coram_attach(device_t parent, device_t self, void *v)
+{
 	struct coram_softc *sc = device_private(self);
 	const struct pci_attach_args *pa = v;
 	pci_intr_handle_t ih;
 	pcireg_t reg;
 	char devinfo[256];
 	const char *intrstr;
 	struct coram_iic_softc *cic;
 	uint32_t value;
 	int i;
 #ifdef CORAM_ATTACH_I2C
 	struct i2cbus_attach_args iba;
 #endif
 	sc->sc_dev = self;
-	aprint_naive("\n");
+	pci_aprint_devinfo(pa, NULL);
 	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo, PCI_REVISION(pa->pa_class));
 	reg = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_SUBSYS_ID_REG);
 	sc->sc_board = coram_board_lookup(PCI_VENDOR(reg), PCI_PRODUCT(reg));
 	KASSERT(sc->sc_board != NULL);
 	if (pci_mapreg_map(pa, CX23885_MMBASE, PCI_MAPREG_TYPE_MEM, 0,
 			   &sc->sc_memt, &sc->sc_memh, NULL, &sc->sc_mems)) {
 		aprint_error_dev(self, "couldn't map memory space\n");
 		return;
+	}
 	sc->sc_dmat = pa->pa_dmat;
 	sc->sc_pc = pa->pa_pc;

 @@ -1,14 +1,14 @@
-/* $NetBSD: siisata_pci.c,v 1.9 2010/11/13 13:52:08 uebayasi Exp $ */
+/* $NetBSD: siisata_pci.c,v 1.10 2012/01/30 19:41:23 drochner Exp $ */
 /*
  * Copyright (c) 2006 Manuel Bouyer.
+ *
  * 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.
+ *
 @@ -41,27 +41,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: siisata_pci.c,v 1.9 2010/11/13 13:52:08 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siisata_pci.c,v 1.10 2012/01/30 19:41:23 drochner Exp $");
 #include <sys/types.h>
 #include <sys/malloc.h>
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/ic/siisatavar.h>
 struct siisata_pci_softc {
 	struct siisata_softc si_sc;
 @@ -128,45 +128,42 @@ siisata_pci_match(device_t parent, cfdat
 	if (siisata_pci_lookup(pa) != NULL)
 		return 3;
 	return 0;
+}
 static void
 siisata_pci_attach(device_t parent, device_t self, void *aux)
+{
 	struct pci_attach_args *pa = aux;
 	struct siisata_pci_softc *psc = device_private(self);
 	struct siisata_softc *sc = &psc->si_sc;
 	char devinfo[256];
 	const char *intrstr;
 	pcireg_t csr, memtype;
 	const struct siisata_pci_board *spbp;
 	pci_intr_handle_t intrhandle;
 	bus_space_tag_t memt;
 	bus_space_handle_t memh;
 	uint32_t gcreg;
 	int memh_valid;
 	bus_size_t grsize, prsize;
 	sc->sc_atac.atac_dev = self;
 	psc->sc_pc = pa->pa_pc;
 	psc->sc_pcitag = pa->pa_tag;
-	pci_devinfo(pa->pa_id, pa->pa_class, 1, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, "SATA-II HBA");
 	aprint_naive(": SATA-II HBA\n");
 	aprint_normal(": %s\n", devinfo);
 	/* map BAR 0, global registers */
 	memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, SIISATA_PCI_BAR0);
 	switch (memtype) {
 	case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT:
 	case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_64BIT:
 		memh_valid = (pci_mapreg_map(pa, SIISATA_PCI_BAR0,
 			memtype, 0, &memt, &memh, NULL, &grsize) == 0);
 		break;
 	default:
 		memh_valid = 0;
+	}
 	if (memh_valid) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: wcfb.c,v 1.9 2012/01/11 16:02:30 macallan Exp $ */
+/*	$NetBSD: wcfb.c,v 1.10 2012/01/30 19:41:23 drochner Exp $ */
 /*-
  * Copyright (c) 2010 Michael Lorenz
  * 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.
 @@ -17,27 +17,27 @@
  * ``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 FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wcfb.c,v 1.9 2012/01/11 16:02:30 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wcfb.c,v 1.10 2012/01/30 19:41:23 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/mutex.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/kauth.h>
 #include <sys/kmem.h>
 @@ -146,34 +146,31 @@ wcfb_match(device_t parent, cfdata_t mat
 static void
 wcfb_attach(device_t parent, device_t self, void *aux)
+{
 	struct wcfb_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	struct rasops_info	*ri;
 	prop_dictionary_t	dict;
 	struct wsemuldisplaydev_attach_args aa;
 	int 			i, j;
 	uint32_t		reg;
 	unsigned long		defattr;
 	bool			is_console = 0;
 	char 			devinfo[256];
 	void *wtf;
 	sc->sc_dev = self;
 	sc->putchar = NULL;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	aprint_naive("\n");
 	aprint_normal(": %s\n", devinfo);
 	dict = device_properties(self);
 	prop_dictionary_get_bool(dict, "is_console", &is_console);
 #ifndef WCFB_DEBUG
 	if (!is_console) return;
 #endif
 	sc->sc_memt = pa->pa_memt;
 	sc->sc_iot = pa->pa_iot;
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_pcitag = pa->pa_tag;
 	if (pci_mapreg_map(pa, 0x14, PCI_MAPREG_TYPE_MEM, 0,
 	    &sc->sc_regt, &sc->sc_regh, &sc->sc_reg, &sc->sc_regsize)) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cs4280.c,v 1.63 2011/11/24 03:35:58 mrg Exp $	*/
+/*	$NetBSD: cs4280.c,v 1.64 2012/01/30 19:41:18 drochner Exp $	*/
 /*
  * Copyright (c) 1999, 2000 Tatoku Ogaito.  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. All advertising materials mentioning features or use of this software
 @@ -42,27 +42,27 @@
  *	 wss* at pnpbios?
  * or
  *       sb* at pnpbios?
  * Since I could not find any documents on handling ISA codec,
  * clcs does not support those chips.
  */
 /*
  * TODO
  * Joystick support
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.63 2011/11/24 03:35:58 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.64 2012/01/30 19:41:18 drochner Exp $");
 #include "midi.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/fcntl.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/audioio.h>
 #include <sys/bus.h>
 @@ -233,38 +233,34 @@ cs4280_match(device_t parent, cfdata_t m
 	return 0;
+}
 static void
 cs4280_attach(device_t parent, device_t self, void *aux)
+{
 	struct cs428x_softc *sc;
 	struct pci_attach_args *pa;
 	pci_chipset_tag_t pc;
 	const struct cs4280_card_t *cs_card;
 	char const *intrstr;
 	const char *vendor, *product;
 	pcireg_t reg;
 	char devinfo[256];
 	uint32_t mem;
 	int error;
 	sc = device_private(self);
 	pa = (struct pci_attach_args *)aux;
 	pc = pa->pa_pc;
 	aprint_naive(": Audio controller\n");
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, "Audio controller");
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo,
 	    PCI_REVISION(pa->pa_class));
 	cs_card = cs4280_identify_card(pa);
 	if (cs_card != NULL) {
 		vendor = pci_findvendor(cs_card->id);
 		product = pci_findproduct(cs_card->id);
 		if (vendor == NULL)
 			aprint_normal_dev(&sc->sc_dev,
 					  "vendor 0x%04x product 0x%04x\n",
 					  PCI_VENDOR(cs_card->id),
 					  PCI_PRODUCT(cs_card->id));
 		else if (product == NULL)
 			aprint_normal_dev(&sc->sc_dev, "%s product 0x%04x\n",
 					  vendor, PCI_PRODUCT(cs_card->id));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cs4281.c,v 1.46 2011/11/24 03:35:58 mrg Exp $	*/
+/*	$NetBSD: cs4281.c,v 1.47 2012/01/30 19:41:19 drochner Exp $	*/
 /*
  * Copyright (c) 2000 Tatoku Ogaito.  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. All advertising materials mentioning features or use of this software
 @@ -33,27 +33,27 @@
 /*
  * Cirrus Logic CS4281 driver.
  * Data sheets can be found
  * http://www.cirrus.com/ftp/pub/4281.pdf
  * ftp://ftp.alsa-project.org/pub/manuals/cirrus/cs4281tm.pdf
+ *
  * TODO:
  *   1: midi and FM support
  *   2: ...
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.46 2011/11/24 03:35:58 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.47 2012/01/30 19:41:19 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/fcntl.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/cs4281reg.h>
 #include <dev/pci/cs428xreg.h>
 @@ -179,37 +179,33 @@ cs4281_match(device_t parent, cfdata_t m
 	if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_CIRRUS_CS4281)
 		return 1;
 	return 0;
+}
 static void
 cs4281_attach(device_t parent, device_t self, void *aux)
+{
 	struct cs428x_softc *sc;
 	struct pci_attach_args *pa;
 	pci_chipset_tag_t pc;
 	char const *intrstr;
 	pcireg_t reg;
 	char devinfo[256];
 	int error;
 	sc = device_private(self);
 	pa = (struct pci_attach_args *)aux;
 	pc = pa->pa_pc;
 	aprint_naive(": Audio controller\n");
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, "Audio controller");
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo,
 	    PCI_REVISION(pa->pa_class));
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_pt = pa->pa_tag;
 	/* Map I/O register */
 	if (pci_mapreg_map(pa, PCI_BA0,
 	    PCI_MAPREG_TYPE_MEM|PCI_MAPREG_MEM_TYPE_32BIT, 0,
 	    &sc->ba0t, &sc->ba0h, NULL, NULL)) {
 		aprint_error_dev(&sc->sc_dev, "can't map BA0 space\n");
 		return;
+	}
 	if (pci_mapreg_map(pa, PCI_BA1,
 	    PCI_MAPREG_TYPE_MEM|PCI_MAPREG_MEM_TYPE_32BIT, 0,

 @@ -1,14 +1,14 @@
-/* $NetBSD: cxdtv.c,v 1.10 2012/01/16 15:33:50 jmcneill Exp $ */
+/* $NetBSD: cxdtv.c,v 1.11 2012/01/30 19:41:19 drochner Exp $ */
 /*
  * Copyright (c) 2008, 2011 Jonathan A. Kollasch
  * 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.
 @@ -17,27 +17,27 @@
  * "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 COPYRIGHT HOLDER 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cxdtv.c,v 1.10 2012/01/16 15:33:50 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxdtv.c,v 1.11 2012/01/30 19:41:19 drochner Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 @@ -176,47 +176,42 @@ cxdtv_match(device_t parent, cfdata_t ma
 		return 0;
 	return 1;
+}
 static void
 cxdtv_attach(device_t parent, device_t self, void *aux)
+{
 	struct cxdtv_softc *sc;
 	const struct pci_attach_args *pa = aux;
 	pci_intr_handle_t ih;
 	pcireg_t reg;
 	const char *intrstr;
 	char devinfo[76];
 	struct i2cbus_attach_args iba;
 	sc = device_private(self);
 	sc->sc_dev = self;
 	sc->sc_pc = pa->pa_pc;
 	aprint_naive("\n");
 	reg = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_SUBSYS_ID_REG);
 	sc->sc_vendor = PCI_VENDOR(reg);
 	sc->sc_product = PCI_PRODUCT(reg);
 	sc->sc_board = cxdtv_board_lookup(sc->sc_vendor, sc->sc_product);
 	KASSERT(sc->sc_board != NULL);
 	pci_aprint_devinfo(pa, NULL);
 	pci_devinfo(reg, pa->pa_class, 0, devinfo, sizeof(devinfo));
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo, PCI_REVISION(pa->pa_class));
 	if (pci_mapreg_map(pa, CXDTV_MMBASE, PCI_MAPREG_TYPE_MEM, 0,
 			   &sc->sc_memt, &sc->sc_memh, NULL, &sc->sc_mems)) {
 		aprint_error_dev(self, "couldn't map memory space\n");
 		return;
+	}
 	sc->sc_dmat = pa->pa_dmat;
 	if (pci_intr_map(pa, &ih)) {
 		aprint_error_dev(self, "couldn't map interrupt\n");
 		return;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ehci_pci.c,v 1.53 2011/07/30 13:19:21 jmcneill Exp $	*/
+/*	$NetBSD: ehci_pci.c,v 1.54 2012/01/30 19:41:19 drochner Exp $	*/
 /*
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net).
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``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 FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.53 2011/07/30 13:19:21 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.54 2012/01/30 19:41:19 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/bus.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/usb_pci.h>
 @@ -110,40 +110,35 @@ ehci_pci_match(device_t parent, cfdata_t
+}
 static void
 ehci_pci_attach(device_t parent, device_t self, void *aux)
+{
 	struct ehci_pci_softc *sc = device_private(self);
 	struct pci_attach_args *pa = (struct pci_attach_args *)aux;
 	pci_chipset_tag_t pc = pa->pa_pc;
 	pcitag_t tag = pa->pa_tag;
 	char const *intrstr;
 	pci_intr_handle_t ih;
 	pcireg_t csr;
 	const char *vendor;
 	char devinfo[256];
 	usbd_status r;
 	int ncomp;
 	struct usb_pci *up;
 	int quirk;
 	sc->sc.sc_dev = self;
 	sc->sc.sc_bus.hci_private = sc;
-	aprint_naive(": USB controller\n");
+	pci_aprint_devinfo(pa, "USB controller");
 	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo,
 	    PCI_REVISION(pa->pa_class));
 	/* Check for quirks */
 	quirk = ehci_pci_lookup_quirkdata(PCI_VENDOR(pa->pa_id),
 					   PCI_PRODUCT(pa->pa_id));
 	/* Map I/O registers */
 	if (pci_mapreg_map(pa, PCI_CBMEM, PCI_MAPREG_TYPE_MEM, 0,
 			   &sc->sc.iot, &sc->sc.ioh, NULL, &sc->sc.sc_size)) {
 		sc->sc.sc_size = 0;
 		aprint_error_dev(self, "can't map memory space\n");
 		return;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_stge.c,v 1.53 2011/03/12 16:52:05 phx Exp $	*/
+/*	$NetBSD: if_stge.c,v 1.54 2012/01/30 19:41:21 drochner Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * 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.
 @@ -25,27 +25,27 @@
  * 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.
  */
 /*
  * Device driver for the Sundance Tech. TC9021 10/100/1000
  * Ethernet controller.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.53 2011/03/12 16:52:05 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.54 2012/01/30 19:41:21 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 @@ -387,27 +387,27 @@ stge_attach(device_t parent, device_t se
 	const struct stge_product *sp;
 	uint8_t enaddr[ETHER_ADDR_LEN];
 	callout_init(&sc->sc_tick_ch, 0);
 	sp = stge_lookup(pa);
 	if (sp == NULL) {
 		printf("\n");
 		panic("ste_attach: impossible");
+	}
 	sc->sc_rev = PCI_REVISION(pa->pa_class);
-	aprint_normal(": %s, rev. %d\n", sp->stge_name, sc->sc_rev);
+	pci_aprint_devinfo_fancy(pa, NULL, sp->stge_name, 1);
 	/*
 	 * Map the device.
 	 */
 	ioh_valid = (pci_mapreg_map(pa, STGE_PCI_IOBA,
 	    PCI_MAPREG_TYPE_IO, 0,
 	    &iot, &ioh, NULL, NULL) == 0);
 	memh_valid = (pci_mapreg_map(pa, STGE_PCI_MMBA,
 	    PCI_MAPREG_TYPE_MEM|PCI_MAPREG_MEM_TYPE_32BIT, 0,
 	    &memt, &memh, NULL, NULL) == 0);
 	if (memh_valid) {
 		sc->sc_st = memt;

 @@ -1,14 +1,14 @@
-/*      $NetBSD: if_wi_pci.c,v 1.53 2011/07/26 20:51:24 dyoung Exp $  */
+/*      $NetBSD: if_wi_pci.c,v 1.54 2012/01/30 19:41:21 drochner Exp $  */
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Hideaki Imaizumi <hiddy@sfc.wide.ad.jp>
  * and Ichiro FUKUHARA (ichiro@ichiro.org).
+ *
  * 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
 @@ -26,27 +26,27 @@
  * 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.
  */
 /*
  * PCI bus front-end for the Intersil PCI WaveLan.
  * Works with Prism2.5 Mini-PCI wavelan.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.53 2011/07/26 20:51:24 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.54 2012/01/30 19:41:21 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 #include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/callout.h>
 #include <net/if.h>
 #include <net/if_ether.h>
 #include <net/if_media.h>
 @@ -280,33 +280,27 @@ wi_pci_attach(device_t parent, device_t
 		if (pci_mapreg_map(pa, WI_PCI_CBMA,
 		    PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT,
 , &iot, &ioh, NULL, NULL) != 0) {
 			printf(": can't map mem space\n");
 			return;
+		}
 		memt = iot;
 		memh = ioh;
 		sc->sc_pci = 1;
 		break;
+	}
 	pci_aprint_devinfo(pa, NULL);
 		char devinfo[256];
 		pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
 		printf(": %s (rev. 0x%02x)\n", devinfo,
 		       PCI_REVISION(pa->pa_class));
 	sc->sc_enabled = 1;
 	sc->sc_enable = wi_pci_enable;
 	sc->sc_iot = iot;
 	sc->sc_ioh = ioh;
 	/* Make sure interrupts are disabled. */
 	CSR_WRITE_2(sc, WI_INT_EN, 0);
 	CSR_WRITE_2(sc, WI_EVENT_ACK, 0xFFFF);
 	if (wpp->wpp_chip == CHIP_PLX_OTHER) {
 		uint32_t command;
 #define	WI_LOCAL_INTCSR		0x4c

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uhci_pci.c,v 1.53 2011/04/04 22:48:15 dyoung Exp $	*/
+/*	$NetBSD: uhci_pci.c,v 1.54 2012/01/30 19:41:23 drochner Exp $	*/
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * 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
 @@ -21,27 +21,27 @@
  * ``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 FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.53 2011/04/04 22:48:15 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.54 2012/01/30 19:41:23 drochner Exp $");
 #include "ehci.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/bus.h>
 #include <dev/pci/pcivar.h>
 @@ -81,38 +81,33 @@ uhci_pci_match(device_t parent, cfdata_t
+}
 static void
 uhci_pci_attach(device_t parent, device_t self, void *aux)
+{
 	struct uhci_pci_softc *sc = device_private(self);
 	struct pci_attach_args *pa = (struct pci_attach_args *)aux;
 	pci_chipset_tag_t pc = pa->pa_pc;
 	pcitag_t tag = pa->pa_tag;
 	char const *intrstr;
 	pci_intr_handle_t ih;
 	pcireg_t csr;
 	const char *vendor;
 	char devinfo[256];
 	usbd_status r;
 	int s;
 	sc->sc.sc_dev = self;
 	sc->sc.sc_bus.hci_private = sc;
-	aprint_naive("\n");
+	pci_aprint_devinfo(pa, NULL);
 	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
 	aprint_normal(": %s (rev. 0x%02x)\n",
 		      devinfo, PCI_REVISION(pa->pa_class));
 	/* Map I/O registers */
 	if (pci_mapreg_map(pa, PCI_CBIO, PCI_MAPREG_TYPE_IO, 0,
 			   &sc->sc.iot, &sc->sc.ioh, NULL, &sc->sc.sc_size)) {
 		aprint_error_dev(self, "can't map i/o space\n");
 		return;
+	}
 	/*
 	 * Disable interrupts, so we don't get any spurious ones.
 	 * Acknowledge all pending interrupts.
 	 */
 	bus_space_write_2(sc->sc.iot, sc->sc.ioh, UHCI_INTR, 0);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vga_pci.c,v 1.53 2011/01/22 15:14:28 cegger Exp $	*/
+/*	$NetBSD: vga_pci.c,v 1.54 2012/01/30 19:41:23 drochner Exp $	*/
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Chris G. Demetriou
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
 @@ -18,27 +18,27 @@
+ *
  * Carnegie Mellon requests users of this software to return to
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.53 2011/01/22 15:14:28 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.54 2012/01/30 19:41:23 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pciio.h>
 #include <dev/ic/mc6845reg.h>
 @@ -176,38 +176,34 @@ vga_pci_match(device_t parent, cfdata_t
 	 */
 	if (!vga_common_probe(pa->pa_iot, pa->pa_memt))
 		return (0);
 	return (1);
+}
 static void
 vga_pci_attach(device_t parent, device_t self, void *aux)
+{
 	struct vga_pci_softc *psc = device_private(self);
 	struct vga_softc *sc = &psc->sc_vga;
 	struct pci_attach_args *pa = aux;
 	char devinfo[256];
 	int bar, reg;
 	sc->sc_dev = self;
 	psc->sc_pc = pa->pa_pc;
 	psc->sc_pcitag = pa->pa_tag;
 	psc->sc_paa = *pa;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	aprint_naive("\n");
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo,
 	    PCI_REVISION(pa->pa_class));
 	/*
 	 * Gather info about all the BARs.  These are used to allow
 	 * the X server to map the VGA device.
 	 */
 	for (bar = 0; bar < NBARS; bar++) {
 		reg = PCI_MAPREG_START + (bar * 4);
 		if (!pci_mapreg_probe(psc->sc_pc, psc->sc_pcitag, reg,
 				      &psc->sc_bars[bar].vb_type)) {
 			/* there is no valid mapping register */
 			continue;
+		}
 		if (PCI_MAPREG_TYPE(psc->sc_bars[bar].vb_type) ==

 @@ -1,14 +1,14 @@
-/*	$NetBSD: emuxki.c,v 1.61 2011/11/24 03:35:58 mrg Exp $	*/
+/*	$NetBSD: emuxki.c,v 1.62 2012/01/30 19:41:19 drochner Exp $	*/
 /*-
  * Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Yannick Montulet, and by Andrew Doran.
+ *
  * 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.
 @@ -39,27 +39,27 @@
  * - bass disappear when you plug rear jack-in on Cambridge FPS2000 speakers
  *   (and presumably all speakers that support front and rear jack-in)
+ *
  * TODO:
  * - Digital Outputs
  * - (midi/mpu),joystick support
  * - Multiple voices play (problem with /dev/audio architecture)
  * - Multiple sources recording (Pb with audio(4))
  * - Independent modification of each channel's parameters (via mixer ?)
  * - DSP FX patches (to make fx like chipmunk)
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.61 2011/11/24 03:35:58 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.62 2012/01/30 19:41:19 drochner Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/systm.h>
 #include <sys/audioio.h>
 #include <sys/select.h>
 #include <sys/mutex.h>
 #include <sys/kmem.h>
 #include <sys/malloc.h>
 #include <dev/audio_if.h>
 #include <dev/audiovar.h>
 @@ -394,48 +394,46 @@ emuxki_match(device_t parent, cfdata_t m
 	case PCI_PRODUCT_CREATIVELABS_SBLIVE2:
 	case PCI_PRODUCT_CREATIVELABS_AUDIGY:
 		return 1;
 	default:
 		return 0;
+	}
+}
 static void
 emuxki_attach(device_t parent, device_t self, void *aux)
+{
 	struct emuxki_softc *sc;
 	struct pci_attach_args *pa;
 	char devinfo[256];
 	pci_intr_handle_t ih;
 	const char *intrstr;
 	sc = device_private(self);
 	sc->sc_dev = self;
 	pa = aux;
 	aprint_naive(": Audio controller\n");
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
 	mutex_init(&sc->sc_index_lock, MUTEX_DEFAULT, IPL_AUDIO);
 	mutex_init(&sc->sc_ac97_index_lock, MUTEX_DEFAULT, IPL_AUDIO);
 	if (pci_mapreg_map(pa, EMU_PCI_CBIO, PCI_MAPREG_TYPE_IO, 0,
 	    &(sc->sc_iot), &(sc->sc_ioh), &(sc->sc_iob),
 			   &(sc->sc_ios))) {
 		aprint_error(": can't map iospace\n");
 		return;
+	}
 	pci_devinfo(pa->pa_id, pa->pa_class, 1, devinfo, sizeof(devinfo));
-	aprint_normal(": %s\n", devinfo);
+	pci_aprint_devinfo(pa, "Audio controller");
 	sc->sc_pc   = pa->pa_pc;
 	sc->sc_dmat = pa->pa_dmat;
 	pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG,
 		pci_conf_read(pa->pa_pc, pa->pa_tag,
 		(PCI_COMMAND_STATUS_REG) | PCI_COMMAND_MASTER_ENABLE));
 	if (pci_intr_map(pa, &ih)) {
 		aprint_error_dev(self, "couldn't map interrupt\n");
 		bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_ios);
 		return;
+	}

 @@ -1,38 +1,38 @@
-/*	$NetBSD: if_iwn.c,v 1.61 2011/10/08 11:07:09 elric Exp $	*/
+/*	$NetBSD: if_iwn.c,v 1.62 2012/01/30 19:41:20 drochner Exp $	*/
 /*	$OpenBSD: if_iwn.c,v 1.96 2010/05/13 09:25:03 damien Exp $	*/
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*
  * Driver for Intel WiFi Link 4965 and 1000/5000/6000 Series 802.11 network
  * adapters.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.61 2011/10/08 11:07:09 elric Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.62 2012/01/30 19:41:20 drochner Exp $");
 #define IWN_USE_RBUF	/* Use local storage for RX */
 #undef IWN_HWCRYPTO	/* XXX does not even compile yet */
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 @@ -329,44 +329,40 @@ iwn_match(device_t parent, cfdata_t matc
 			return 1;
 	return 0;
+}
 static void
 iwn_attach(device_t parent __unused, device_t self, void *aux)
+{
 	struct iwn_softc *sc = device_private(self);
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = &sc->sc_ec.ec_if;
 	struct pci_attach_args *pa = aux;
 	const char *intrstr;
 	char devinfo[256];
 	pci_intr_handle_t ih;
 	pcireg_t memtype, reg;
 	int i, error;
 	int revision;
 	sc->sc_dev = self;
 	sc->sc_pct = pa->pa_pc;
 	sc->sc_pcitag = pa->pa_tag;
 	sc->sc_dmat = pa->pa_dmat;
 	mutex_init(&sc->sc_mtx, MUTEX_DEFAULT, IPL_NONE);
 	callout_init(&sc->calib_to, 0);
 	callout_setfunc(&sc->calib_to, iwn_calib_timeout, sc);
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof devinfo);
+	pci_aprint_devinfo(pa, NULL);
 	revision = PCI_REVISION(pa->pa_class);
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo, revision);
 	/*
 	 * Get the offset of the PCI Express Capability Structure in PCI
 	 * Configuration Space.
 	 */
 	error = pci_get_capability(sc->sc_pct, sc->sc_pcitag,
 	    PCI_CAP_PCIEXPRESS, &sc->sc_cap_off, NULL);
 	if (error == 0) {
 		aprint_error(": PCIe capability structure not found!\n");
 		return;
+	}
 	/* Clear device-specific "PCI retry timeout" register (41h). */

 @@ -1,14 +1,14 @@
-/* $NetBSD: esa.c,v 1.57 2011/12/03 08:20:12 ryo Exp $ */
+/* $NetBSD: esa.c,v 1.58 2012/01/30 19:41:19 drochner Exp $ */
 /*
  * Copyright (c) 2001-2008 Jared D. McNeill <jmcneill@invisible.ca>
  * 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. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
 @@ -29,27 +29,27 @@
  * ESS Allegro-1 / Maestro3 Audio Driver
+ *
  * Based on the FreeBSD maestro3 driver and the NetBSD eap driver.
  * Original driver by Don Kim.
+ *
  * The list management code could possibly be written better, but what
  * we have right now does the job nicely. Thanks to Zach Brown <zab@zabbo.net>
  * and Andrew MacDonald <amac@epsilon.yi.org> for helping me debug the
  * problems with the original list management code present in the Linux
  * driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.57 2011/12/03 08:20:12 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.58 2012/01/30 19:41:19 drochner Exp $");
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/null.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kmem.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/select.h>
 #include <sys/audioio.h>
 #include <sys/bus.h>
 @@ -998,38 +998,36 @@ esa_match(device_t dev, cfdata_t match,
+}
 static void
 esa_attach(device_t parent, device_t self, void *aux)
+{
 	struct esa_softc *sc;
 	struct pci_attach_args *pa;
 	pcitag_t tag;
 	pci_chipset_tag_t pc;
 	pci_intr_handle_t ih;
 	const struct esa_card_type *card;
 	const char *intrstr;
 	uint32_t data;
 	char devinfo[256];
 	int revision, i, error;
 	sc = device_private(self);
 	pa = (struct pci_attach_args *)aux;
 	tag = pa->pa_tag;
 	pc = pa->pa_pc;
 	aprint_naive(": Audio controller\n");
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, "Audio controller");
 	revision = PCI_REVISION(pa->pa_class);
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo, revision);
 	for (card = esa_card_types; card->pci_vendor_id; card++)
 		if (PCI_VENDOR(pa->pa_id) == card->pci_vendor_id &&
 		    PCI_PRODUCT(pa->pa_id) == card->pci_product_id) {
 			sc->type = card->type;
 			sc->delay1 = card->delay1;
 			sc->delay2 = card->delay2;
 			break;
+		}
 	data = pci_conf_read(pc, tag, PCI_COMMAND_STATUS_REG);
 	data |= (PCI_COMMAND_IO_ENABLE | PCI_COMMAND_MEM_ENABLE
 	    | PCI_COMMAND_MASTER_ENABLE);

 @@ -1,14 +1,14 @@
-/*      $NetBSD: esm.c,v 1.55 2011/11/24 03:35:59 mrg Exp $      */
+/*      $NetBSD: esm.c,v 1.56 2012/01/30 19:41:19 drochner Exp $      */
 /*-
  * Copyright (c) 2002, 2003 Matt Fredette
  * All rights reserved.
+ *
  * Copyright (c) 2000, 2001 Rene Hexel <rh@NetBSD.org>
  * All rights reserved.
+ *
  * Copyright (c) 2000 Taku YAMAMOTO <taku@cent.saitama-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
 @@ -56,27 +56,27 @@
  * Zach Brown <zab@zabbo.net>.
+ *
  * busdma()-ize and buffer size reduction were suggested by
  * Cameron Grant <gandalf@vilnya.demon.co.uk>.
  * Also he showed me the way to use busdma() suite.
+ *
  * Internal speaker problems on NEC VersaPro's and Dell Inspiron 7500
  * were looked at by
  * Munehiro Matsuda <haro@tk.kubota.co.jp>,
  * who brought patches based on the Linux driver with some simplification.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.55 2011/11/24 03:35:59 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.56 2012/01/30 19:41:19 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <sys/audioio.h>
 #include <dev/audio_if.h>
 #include <dev/mulaw.h>
 #include <dev/auconv.h>
 @@ -1578,49 +1578,44 @@ esm_match(device_t dev, cfdata_t match,
 	case PCI_VENDOR_ESSTECH2:
 		switch (PCI_PRODUCT(pa->pa_id)) {
 		case PCI_PRODUCT_ESSTECH2_MAESTRO1:
 			return 1;
+		}
+	}
 	return 0;
+}
 static void
 esm_attach(device_t parent, device_t self, void *aux)
+{
 	char devinfo[256];
 	struct esm_softc *ess;
 	struct pci_attach_args *pa;
 	const char *intrstr;
 	pci_chipset_tag_t pc;
 	pcitag_t tag;
 	pci_intr_handle_t ih;
 	pcireg_t csr, data;
 	int revision;
 	uint16_t codec_data;
 	uint16_t pcmbar;
 	int error;
 	ess = device_private(self);
 	ess->sc_dev = self;
 	pa = (struct pci_attach_args *)aux;
 	pc = pa->pa_pc;
 	tag = pa->pa_tag;
 	aprint_naive(": Audio controller\n");
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, "Audio controller");
 	revision = PCI_REVISION(pa->pa_class);
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo, revision);
 	mutex_init(&ess->sc_lock, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&ess->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
 	/* Enable the device. */
 	csr = pci_conf_read(pc, tag, PCI_COMMAND_STATUS_REG);
 	pci_conf_write(pc, tag, PCI_COMMAND_STATUS_REG,
 	    csr | PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_IO_ENABLE);
 	/* Map I/O register */
 	if (pci_mapreg_map(pa, PCI_CBIO, PCI_MAPREG_TYPE_IO, 0,
 	    &ess->st, &ess->sh, NULL, &ess->sz)) {
 		aprint_error_dev(ess->sc_dev, "can't map i/o space\n");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fwohci_pci.c,v 1.39 2010/04/29 06:41:27 kiyohara Exp $	*/
+/*	$NetBSD: fwohci_pci.c,v 1.40 2012/01/30 19:41:19 drochner Exp $	*/
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``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 FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.39 2010/04/29 06:41:27 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.40 2012/01/30 19:41:19 drochner Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/ieee1394/firewire.h>
 @@ -86,36 +86,31 @@ fwohci_pci_match(device_t parent, cfdata
 	if (PCI_CLASS(pa->pa_class) == PCI_CLASS_SERIALBUS &&
 	    PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_SERIALBUS_FIREWIRE &&
 	    PCI_INTERFACE(pa->pa_class) == PCI_INTERFACE_OHCI)
 		return 1;
 	return 0;
+}
 static void
 fwohci_pci_attach(device_t parent, device_t self, void *aux)
+{
 	struct pci_attach_args *pa = (struct pci_attach_args *) aux;
 	struct fwohci_pci_softc *psc = device_private(self);
 	char devinfo[256];
 	char const *intrstr;
 	pci_intr_handle_t ih;
 	uint32_t csr;
-	aprint_naive(": IEEE 1394 Controller\n");
+	pci_aprint_devinfo(pa, "IEEE 1394 Controller");
 	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo,
 	    PCI_REVISION(pa->pa_class));
 	psc->psc_sc.fc.dev = self;
 	psc->psc_sc.fc.dmat = pa->pa_dmat;
 	psc->psc_pc = pa->pa_pc;
 	psc->psc_tag = pa->pa_tag;
 	/* Map I/O registers */
 	if (pci_mapreg_map(pa, PCI_OHCI_MAP_REGISTER, PCI_MAPREG_TYPE_MEM, 0,
 	    &psc->psc_sc.bst, &psc->psc_sc.bsh,
 	    NULL, &psc->psc_sc.bssize)) {
 		aprint_error_dev(self, "can't map OHCI register space\n");
 		goto fail;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_epic_pci.c,v 1.39 2011/07/26 20:51:24 dyoung Exp $	*/
+/*	$NetBSD: if_epic_pci.c,v 1.40 2012/01/30 19:41:19 drochner Exp $	*/
 /*-
  * Copyright (c) 1998, 1999 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
 @@ -26,27 +26,27 @@
  * 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.
  */
 /*
  * PCI bus front-end for the Standard Microsystems Corp. 83C170
  * Ethernet PCI Integrated Controller (EPIC/100) driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_epic_pci.c,v 1.39 2011/07/26 20:51:24 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_epic_pci.c,v 1.40 2012/01/30 19:41:19 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 @@ -157,36 +157,33 @@ epic_pci_attach(device_t parent, device_
 	struct pci_attach_args *pa = aux;
 	pci_chipset_tag_t pc = pa->pa_pc;
 	pci_intr_handle_t ih;
 	const char *intrstr = NULL;
 	const struct epic_pci_product *epp;
 	const struct epic_pci_subsys_info *esp;
 	bus_space_tag_t iot, memt;
 	bus_space_handle_t ioh, memh;
 	int ioh_valid, memh_valid;
 	int error;
 	sc->sc_dev = self;
 	aprint_naive(": Ethernet controller\n");
 	epp = epic_pci_lookup(pa);
 	if (epp == NULL) {
 		aprint_normal("\n");
 		panic("%s: impossible", __func__);
+	}
-	aprint_normal(": %s, rev. %d\n", epp->epp_name,
+	pci_aprint_devinfo_fancy(pa, "Ethernet controller", epp->epp_name, 1);
 	    PCI_REVISION(pa->pa_class));
 	/* power up chip */
 	if ((error = pci_activate(pa->pa_pc, pa->pa_tag, self,
 	    NULL)) && error != EOPNOTSUPP) {
 		aprint_error_dev(self, "cannot activate %d\n", error);
 		return;
+	}
 	/*
 	 * Map the device.
 	 */
 	ioh_valid = (pci_mapreg_map(pa, EPIC_PCI_IOBA,
 	    PCI_MAPREG_TYPE_IO, 0,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: twa.c,v 1.39 2012/01/27 19:48:39 para Exp $ */
+/*	$NetBSD: twa.c,v 1.40 2012/01/30 19:41:23 drochner Exp $ */
 /*	$wasabi: twa.c,v 1.27 2006/07/28 18:17:21 wrstuden Exp $	*/
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jordan Rhody of Wasabi Systems, Inc.
+ *
  * 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
 @@ -57,27 +57,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	$FreeBSD: src/sys/dev/twa/twa.c,v 1.2 2004/04/02 15:09:57 des Exp $
  */
 /*
  * 3ware driver for 9000 series storage controllers.
+ *
  * Author: Vinod Kashyap
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.39 2012/01/27 19:48:39 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.40 2012/01/30 19:41:23 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <sys/proc.h>
 #include <sys/bswap.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/endian.h>
 #include <sys/malloc.h>
 #include <sys/conf.h>
 @@ -1495,28 +1495,27 @@ twa_attach(device_t parent, device_t sel
 	pci_intr_handle_t ih;
 	const char *intrstr;
 	const struct sysctlnode *node;
 	int i;
 	bool use_64bit;
 	sc = device_private(self);
 	pa = aux;
 	pc = pa->pa_pc;
 	sc->pc = pa->pa_pc;
 	sc->tag = pa->pa_tag;
-	aprint_naive(": RAID controller\n");
+	pci_aprint_devinfo_fancy(pa, "RAID controller", "3ware Apache", 0);
 	aprint_normal(": 3ware Apache\n");
 	sc->sc_quirks = 0;
 	if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_3WARE_9000) {
 		sc->sc_nunits = TWA_MAX_UNITS;
 		use_64bit = false;
 		if (pci_mapreg_map(pa, PCI_MAPREG_START, PCI_MAPREG_TYPE_IO, 0,
 	    	    &sc->twa_bus_iot, &sc->twa_bus_ioh, NULL, NULL)) {
 			aprint_error_dev(&sc->twa_dv, "can't map i/o space\n");
 			return;
+		}
 	} else if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_3WARE_9550) {
 		sc->sc_nunits = TWA_MAX_UNITS;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: genfb_pci.c,v 1.32 2011/03/08 03:22:29 macallan Exp $ */
+/*	$NetBSD: genfb_pci.c,v 1.33 2012/01/30 19:41:19 drochner Exp $ */
 /*-
  * Copyright (c) 2007 Michael Lorenz
  * 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.
 @@ -17,27 +17,27 @@
  * ``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 FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.32 2011/03/08 03:22:29 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.33 2012/01/30 19:41:19 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/mutex.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/kauth.h>
 #include <dev/pci/pcidevs.h>
 @@ -91,31 +91,28 @@ pci_genfb_match(device_t parent, cfdata_
 		return matchlvl;
 	return 0;
+}
 static void
 pci_genfb_attach(device_t parent, device_t self, void *aux)
+{
 	struct pci_genfb_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	struct genfb_ops ops;
 	pcireg_t rom;
 	int idx, bar, type;
 	char devinfo[256];
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	aprint_naive("\n");
 	aprint_normal(": %s\n", devinfo);
 	sc->sc_gen.sc_dev = self;
 	sc->sc_memt = pa->pa_memt;
 	sc->sc_iot = pa->pa_iot;
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_pcitag = pa->pa_tag;
 	sc->sc_want_wsfb = 0;
 	genfb_init(&sc->sc_gen);
 	/* firmware / MD code responsible for restoring the display */
 	if (sc->sc_gen.sc_pmfcb == NULL)
 		pmf_device_register1(self, NULL, NULL,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_an_pci.c,v 1.32 2011/07/26 20:51:23 dyoung Exp $	*/
+/*	$NetBSD: if_an_pci.c,v 1.33 2012/01/30 19:41:19 drochner Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Atsushi Onoe.
+ *
  * 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.
 @@ -26,27 +26,27 @@
  * 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.
  */
 /*
  * PCI bus front-end for the Aironet PC4500/PC4800 Wireless LAN Adapter.
  * Unlike WaveLAN, this adapter attached as PCI device using a PLX 9050
  * PCI to "dumb bus" bridge chip.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.32 2011/07/26 20:51:23 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.33 2012/01/30 19:41:19 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/callout.h>
 #include <machine/endian.h>
 @@ -108,40 +108,36 @@ an_pci_match(device_t parent, cfdata_t m
 		if (PCI_VENDOR(pa->pa_id) == app->app_vendor &&
 		    PCI_PRODUCT(pa->pa_id) == app->app_product)
 			return 1;
+	}
 	return 0;
+}
 static void
 an_pci_attach(device_t parent, device_t self, void *aux)
+{
         struct pci_attach_args *pa = (struct pci_attach_args *)aux;
 	struct an_pci_softc *psc = device_private(self);
 	struct an_softc *sc = &psc->sc_an;
         char devinfo[256];
 	char const *intrstr;
 	pci_intr_handle_t ih;
 	bus_size_t iosize;
 	u_int32_t csr;
 	sc->sc_dev = self;
 	psc->sc_pct = pa->pa_pc;
 	psc->sc_pcitag = pa->pa_tag;
-	aprint_naive(": 802.11 controller\n");
+	pci_aprint_devinfo(pa, "802.11 controller");
         pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
         aprint_normal(": %s\n", devinfo);
         /* Map I/O registers */
         if (pci_mapreg_map(pa, AN_PCI_IOBA, PCI_MAPREG_TYPE_IO, 0,
 	    &sc->sc_iot, &sc->sc_ioh, NULL, &iosize) != 0) {
                 aprint_error_dev(self, "unable to map registers\n");
                 return;
+        }
         /* Enable the device. */
         csr = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
         pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG,
                        csr | PCI_COMMAND_MASTER_ENABLE);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_dge.c,v 1.32 2011/11/19 22:51:23 tls Exp $ */
+/*	$NetBSD: if_dge.c,v 1.33 2012/01/30 19:41:19 drochner Exp $ */
 /*
  * Copyright (c) 2004, SUNET, Swedish University Computer Network.
  * All rights reserved.
+ *
  * Written by Anders Magnusson for SUNET, Swedish University Computer Network.
+ *
  * 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
 @@ -70,27 +70,27 @@
  */
 /*
  * Device driver for the Intel 82597EX Ten Gigabit Ethernet controller.
+ *
  * TODO (in no specific order):
  *	HW VLAN support.
  *	TSE offloading (needs kernel changes...)
  *	RAIDC (receive interrupt delay adaptation)
  *	Use memory > 4GB.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.32 2011/11/19 22:51:23 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.33 2012/01/30 19:41:19 drochner Exp $");
 #include "rnd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 @@ -669,29 +669,28 @@ dge_attach(device_t parent, device_t sel
 	pci_chipset_tag_t pc = pa->pa_pc;
 	pci_intr_handle_t ih;
 	const char *intrstr = NULL;
 	bus_dma_segment_t seg;
 	int i, rseg, error;
 	uint8_t enaddr[ETHER_ADDR_LEN];
 	pcireg_t preg, memtype;
 	uint32_t reg;
 	sc->sc_dmat = pa->pa_dmat;
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_pt = pa->pa_tag;
-	preg = PCI_REVISION(pci_conf_read(pc, pa->pa_tag, PCI_CLASS_REG));
+	pci_aprint_devinfo_fancy(pa, "Ethernet controller",
-	aprint_naive(": Ethernet controller\n");
+		"Intel i82597EX 10GbE-LR Ethernet", 1);
 	aprint_normal(": Intel i82597EX 10GbE-LR Ethernet, rev. %d\n", preg);
 	memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, DGE_PCI_BAR);
         if (pci_mapreg_map(pa, DGE_PCI_BAR, memtype, 0,
             &sc->sc_st, &sc->sc_sh, NULL, NULL)) {
                 aprint_error_dev(&sc->sc_dev, "unable to map device registers\n");
                 return;
+        }
 	/* Enable bus mastering */
 	preg = pci_conf_read(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
 	preg |= PCI_COMMAND_MASTER_ENABLE;
 	pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, preg);

 @@ -1,14 +1,14 @@
-/* $NetBSD: gtp.c,v 1.17 2009/05/12 08:23:00 cegger Exp $ */
+/* $NetBSD: gtp.c,v 1.18 2012/01/30 19:41:19 drochner Exp $ */
 /*	$OpenBSD: gtp.c,v 1.1 2002/06/03 16:13:21 mickey Exp $	*/
 /*
  * Copyright (c) 2002 Vladimir Popov <jumbo@narod.ru>
  * 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
 @@ -19,27 +19,27 @@
  * 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.
  */
 /* Gemtek PCI Radio Card Device Driver */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtp.c,v 1.17 2009/05/12 08:23:00 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtp.c,v 1.18 2012/01/30 19:41:19 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/proc.h>
 #include <sys/radioio.h>
 #include <sys/bus.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 @@ -137,33 +137,28 @@ gtp_match(device_t parent, cfdata_t cf,
 #endif
 	return (0);
+}
 static void
 gtp_attach(device_t parent, device_t self, void *aux)
+{
 	struct gtp_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	cfdata_t cf = device_cfdata(&sc->sc_dev);
 	pci_chipset_tag_t pc = pa->pa_pc;
 	bus_size_t iosize;
 	pcireg_t csr;
 	char devinfo[256];
-	aprint_naive(": Radio controller\n");
+	pci_aprint_devinfo(pa, "Radio controller");
 	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo,
 	    PCI_REVISION(pa->pa_class));
 	/* Map I/O registers */
 	if (pci_mapreg_map(pa, PCI_CBIO, PCI_MAPREG_TYPE_IO, 0, &sc->tea.iot,
 	    &sc->tea.ioh, NULL, &iosize)) {
 		aprint_error(": can't map i/o space\n");
 		return;
+	}
 	/* Enable the card */
 	csr = pci_conf_read(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
 	pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG,
 	    csr | PCI_COMMAND_MASTER_ENABLE);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: iha_pci.c,v 1.17 2010/11/13 13:52:07 uebayasi Exp $ */
+/*	$NetBSD: iha_pci.c,v 1.18 2012/01/30 19:41:21 drochner Exp $ */
 /*-
  * Copyright (c) 2001 Izumi Tsutsui.  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.
+ *
 @@ -52,27 +52,27 @@
  * SERVICES; LOSS OF MIND, 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.
  */
 /*
  * Ported to NetBSD by Izumi Tsutsui <tsutsui@NetBSD.org> from OpenBSD:
  * $OpenBSD: iha_pci.c,v 1.2 2001/03/29 23:53:38 krw Exp $
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iha_pci.c,v 1.17 2010/11/13 13:52:07 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iha_pci.c,v 1.18 2012/01/30 19:41:21 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcivar.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsiconf.h>
 #include <dev/ic/ihavar.h>
 @@ -101,33 +101,30 @@ iha_pci_match(device_t parent, cfdata_t
+}
 static void
 iha_pci_attach(device_t parent, device_t self, void *aux)
+{
 	struct iha_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	bus_space_tag_t iot;
 	bus_space_handle_t ioh;
 	pci_intr_handle_t ih;
 	const char *intrstr;
 	pcireg_t command;
 	int ioh_valid;
 	char devinfo[256];
 	sc->sc_dev = self;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	aprint_normal(": %s (rev. 0x%02x)\n",
 	    devinfo, PCI_REVISION(pa->pa_class));
 	command  = pci_conf_read(pa->pa_pc,pa->pa_tag,PCI_COMMAND_STATUS_REG);
 	command |= PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_PARITY_ENABLE;
 	pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, command);
 	/*
 	 * XXX - Tried memory mapping (using code from adw and ahc)
 	 *	 rather that IO mapping, but it didn't work at all..
 	 */
 	ioh_valid = pci_mapreg_map(pa, PCI_MAPREG_START, PCI_MAPREG_TYPE_IO, 0,
 	    &iot, &ioh, NULL, NULL);

 @@ -1,38 +1,38 @@
-/*	$NetBSD: ichsmb.c,v 1.25 2011/05/15 01:00:52 msaitoh Exp $	*/
+/*	$NetBSD: ichsmb.c,v 1.26 2012/01/30 19:41:19 drochner Exp $	*/
 /*	$OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $	*/
 /*
  * Copyright (c) 2005, 2006 Alexander Yurchenko <grange@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*
  * Intel ICH SMBus controller driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.25 2011/05/15 01:00:52 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.26 2012/01/30 19:41:19 drochner Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/rwlock.h>
 #include <sys/proc.h>
 #include <sys/bus.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 @@ -114,34 +114,30 @@ ichsmb_match(device_t parent, cfdata_t m
 	return 0;
+}
 static void
 ichsmb_attach(device_t parent, device_t self, void *aux)
+{
 	struct ichsmb_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	struct i2cbus_attach_args iba;
 	pcireg_t conf;
 	bus_size_t iosize;
 	pci_intr_handle_t ih;
 	const char *intrstr = NULL;
 	char devinfo[256];
 	sc->sc_dev = self;
-	aprint_naive("\n");
+	pci_aprint_devinfo(pa, NULL);
 	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo,
 	    PCI_REVISION(pa->pa_class));
 	/* Read configuration */
 	conf = pci_conf_read(pa->pa_pc, pa->pa_tag, LPCIB_SMB_HOSTC);
 	DPRINTF(("%s: conf 0x%08x\n", device_xname(sc->sc_dev), conf));
 	if ((conf & LPCIB_SMB_HOSTC_HSTEN) == 0) {
 		aprint_error_dev(self, "SMBus disabled\n");
 		return;
+	}
 	/* Map I/O space */
 	if (pci_mapreg_map(pa, LPCIB_SMB_BASE, PCI_MAPREG_TYPE_IO, 0,
 	    &sc->sc_iot, &sc->sc_ioh, NULL, &iosize)) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_cas.c,v 1.14 2011/08/29 14:47:08 jmcneill Exp $	*/
+/*	$NetBSD: if_cas.c,v 1.15 2012/01/30 19:41:19 drochner Exp $	*/
 /*	$OpenBSD: if_cas.c,v 1.29 2009/11/29 16:19:38 kettenis Exp $	*/
 /*
+ *
  * Copyright (C) 2007 Mark Kettenis.
  * Copyright (C) 2001 Eduardo Horvath.
  * 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
 @@ -34,27 +34,27 @@
 /*
  * Driver for Sun Cassini ethernet controllers.
+ *
  * There are basically two variants of this chip: Cassini and
  * Cassini+.  We can distinguish between the two by revision: 0x10 and
  * up are Cassini+.  The most important difference is that Cassini+
  * has a second RX descriptor ring.  Cassini+ will not work without
  * configuring that second ring.  However, since we don't use it we
  * don't actually fill the descriptors, and only hand off the first
  * four to the chip.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.14 2011/08/29 14:47:08 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.15 2012/01/30 19:41:19 drochner Exp $");
 #ifndef _MODULE
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 @@ -311,34 +311,32 @@ next:
 	address = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_MAPREG_ROM);
 	address &= ~PCI_MAPREG_ROM_ENABLE;
 	pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_MAPREG_ROM, address);
 	return (rv);
+}
 void
 cas_attach(device_t parent, device_t self, void *aux)
+{
 	struct pci_attach_args *pa = aux;
 	struct cas_softc *sc = device_private(self);
 	char devinfo[256];
 	prop_data_t data;
 	uint8_t enaddr[ETHER_ADDR_LEN];
 	sc->sc_dev = self;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	sc->sc_rev = PCI_REVISION(pa->pa_class);
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo, sc->sc_rev);
 	sc->sc_dmatag = pa->pa_dmat;
 #define PCI_CAS_BASEADDR	0x10
 	if (pci_mapreg_map(pa, PCI_CAS_BASEADDR, PCI_MAPREG_TYPE_MEM, 0,
 	    &sc->sc_memt, &sc->sc_memh, NULL, &sc->sc_size) != 0) {
 		aprint_error_dev(sc->sc_dev,
 		    "unable to map device registers\n");
 		return;
+	}
 	if ((data = prop_dictionary_get(device_properties(sc->sc_dev),
 	    "mac-address")) != NULL)
 		memcpy(enaddr, prop_data_data_nocopy(data), ETHER_ADDR_LEN);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_et.c,v 1.2 2011/05/18 01:02:43 dyoung Exp $	*/
+/*	$NetBSD: if_et.c,v 1.3 2012/01/30 19:41:20 drochner Exp $	*/
 /*	$OpenBSD: if_et.c,v 1.11 2008/06/08 06:18:07 jsg Exp $	*/
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
+ *
  * This code is derived from software contributed to The DragonFly Project
  * by Sepherosa Ziehau <sepherosa@gmail.com>
+ *
  * 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.
 @@ -27,27 +27,27 @@
  * COPYRIGHT HOLDERS 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.
+ *
  * $DragonFly: src/sys/dev/netif/et/if_et.c,v 1.1 2007/10/12 14:12:42 sephe Exp $
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.2 2011/05/18 01:02:43 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.3 2012/01/30 19:41:20 drochner Exp $");
 #include "opt_inet.h"
 #include "vlan.h"
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 @@ -195,33 +195,30 @@ et_match(device_t dev, cfdata_t match, v
+}
 void
 et_attach(device_t parent, device_t self, void *aux)
+{
 	struct et_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	pci_chipset_tag_t pc = pa->pa_pc;
 	pci_intr_handle_t ih;
 	const char *intrstr;
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	pcireg_t memtype;
 	int error;
 	char devinfo[256];
-	aprint_naive(": Ethernet controller\n");
+	pci_aprint_devinfo(pa, "Ethernet controller");
 	sc->sc_dev = self;
 	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo, PCI_REVISION(pa->pa_class));
 	/*
 	 * Initialize tunables
 	 */
 	sc->sc_rx_intr_npkts = et_rx_intr_npkts;
 	sc->sc_rx_intr_delay = et_rx_intr_delay;
 	sc->sc_tx_intr_nsegs = et_tx_intr_nsegs;
 	sc->sc_timer = et_timer;
 	memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, ET_PCIR_BAR);
 	if (pci_mapreg_map(pa, ET_PCIR_BAR, memtype, 0, &sc->sc_mem_bt,
 	    &sc->sc_mem_bh, NULL, &sc->sc_mem_size)) {
 		aprint_error_dev(self, "could not map mem space\n");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_fxp_pci.c,v 1.77 2011/09/05 04:36:50 msaitoh Exp $	*/
+/*	$NetBSD: if_fxp_pci.c,v 1.78 2012/01/30 19:41:20 drochner Exp $	*/
 /*-
  * Copyright (c) 1997, 1998, 1999, 2000, 2001 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
 @@ -26,27 +26,27 @@
  * 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.
  */
 /*
  * PCI bus front-end for the Intel i82557 fast Ethernet controller
  * driver.  Works with Intel Etherexpress Pro 10+, 100B, 100+ cards.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.77 2011/09/05 04:36:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.78 2012/01/30 19:41:20 drochner Exp $");
 #include "rnd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 @@ -304,28 +304,26 @@ fxp_pci_attach(device_t parent, device_t
 	pci_intr_handle_t ih;
 	const struct fxp_pci_product *fpp;
 	const char *chipname = NULL;
 	const char *intrstr = NULL;
 	bus_space_tag_t iot, memt;
 	bus_space_handle_t ioh, memh;
 	int ioh_valid, memh_valid;
 	bus_addr_t addr;
 	int flags;
 	int error;
 	sc->sc_dev = self;
 	aprint_naive(": Ethernet controller\n");
 	/*
 	 * Map control/status registers.
 	 */
 	ioh_valid = (pci_mapreg_map(pa, FXP_PCI_IOBA,
 	    PCI_MAPREG_TYPE_IO, 0,
 	    &iot, &ioh, NULL, NULL) == 0);
 	/*
 	 * Version 2.1 of the PCI spec, page 196, "Address Maps":
+	 *
 	 *	Prefetchable
+	 *
 	 *	Set to one if there are no side effects on reads, the
 @@ -401,77 +399,75 @@ fxp_pci_attach(device_t parent, device_t
 			sc->sc_flags &= ~FXPF_82559_RXCSUM;
 			sc->sc_flags |= FXPF_EXT_RFA;
+		}
 		if (sc->sc_rev >= FXP_REV_82551_E)
 			chipname = "i82551 Ethernet";
 		/*
 		 * Mark all i82559 and i82550 revisions as having
 		 * the "resume bug".  See i82557.c for details.
 		 */
 		if (sc->sc_rev >= FXP_REV_82559_A0)
 			sc->sc_flags |= FXPF_HAS_RESUME_BUG;
 		aprint_normal(": %s, rev %d\n", chipname != NULL ? chipname :
 		    fpp->fpp_name, sc->sc_rev);
 		break;
 	case PCI_PRODUCT_INTEL_82559ER:
 		sc->sc_flags |= FXPF_FC|FXPF_EXT_TXCB;
 		/*
 		 * i82559ER/82551ER don't support RX hardware checksumming
 		 * even though it has a newer revision number than 82559_A0.
 		 */
 		/* All i82559 have the "resume bug". */
 		sc->sc_flags |= FXPF_HAS_RESUME_BUG;
 		/* Enable the MWI command for memory writes. */
 		if (pa->pa_flags & PCI_FLAGS_MWI_OKAY)
 			sc->sc_flags |= FXPF_MWI;
 		if (sc->sc_rev >= FXP_REV_82551_E)
 			chipname = "Intel i82551ER Ethernet";
 		aprint_normal(": %s, rev %d\n", chipname != NULL ? chipname :
 		    fpp->fpp_name, sc->sc_rev);
 		break;
 	case PCI_PRODUCT_INTEL_82801BA_LAN:
 	case PCI_PRODUCT_INTEL_PRO_100_VE_0:
 	case PCI_PRODUCT_INTEL_PRO_100_VE_1:
 	case PCI_PRODUCT_INTEL_PRO_100_VM_0:
 	case PCI_PRODUCT_INTEL_PRO_100_VM_1:
 	case PCI_PRODUCT_INTEL_82562EH_HPNA_0:
 	case PCI_PRODUCT_INTEL_82562EH_HPNA_1:
 	case PCI_PRODUCT_INTEL_82562EH_HPNA_2:
 	case PCI_PRODUCT_INTEL_PRO_100_VM_2:
 		/*
 		 * The ICH-2 and ICH-3 have the "resume bug".
 		 */
 		sc->sc_flags |= FXPF_HAS_RESUME_BUG;
 		/* FALLTHROUGH */
 	default:
 		aprint_normal(": %s, rev %d\n", fpp->fpp_name, sc->sc_rev);
 		if (sc->sc_rev >= FXP_REV_82558_A4)
 			sc->sc_flags |= FXPF_FC|FXPF_EXT_TXCB;
 		if (sc->sc_rev >= FXP_REV_82559_A0)
 			sc->sc_flags |= FXPF_82559_RXCSUM;
 		break;
+	}
 	pci_aprint_devinfo_fancy(pa, "Ethernet controller",
 		(chipname ? chipname : fpp->fpp_name), 1);
 	/* Make sure bus-mastering is enabled. */
 	pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG,
 	    pci_conf_read(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG) |
 	    PCI_COMMAND_MASTER_ENABLE);
   	/*
 	 * Under some circumstances (such as APM suspend/resume
 	 * cycles, and across ACPI power state changes), the
 	 * i82257-family can lose the contents of critical PCI
 	 * configuration registers, causing the card to be
 	 * non-responsive and useless.  This occurs on the Sony VAIO
 	 * Z505-series, among others.  Preserve them here so they can
 	 * be later restored (by fxp_pci_confreg_restore()).

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_gem_pci.c,v 1.43 2010/11/13 13:52:06 uebayasi Exp $ */
+/*	$NetBSD: if_gem_pci.c,v 1.44 2012/01/30 19:41:20 drochner Exp $ */
 /*
+ *
  * Copyright (C) 2001 Eduardo Horvath.
  * 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
 @@ -24,27 +24,27 @@
  * 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.
+ *
  */
 /*
  * PCI bindings for Apple GMAC, Sun ERI and Sun GEM Ethernet controllers
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.43 2010/11/13 13:52:06 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.44 2012/01/30 19:41:20 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <machine/endian.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 @@ -138,55 +138,52 @@ isshared_pins(u_int8_t* buf)
 static inline int
 isserdes(u_int8_t* buf)
+{
 	return buf[0] == 's' && buf[1] == 'e' && buf[2] == 'r' &&
 	    buf[3] == 'd' && buf[4] == 'e' && buf[5] == 's';
+}
 void
 gem_pci_attach(device_t parent, device_t self, void *aux)
+{
 	struct pci_attach_args *pa = aux;
 	struct gem_pci_softc *gsc = device_private(self);
 	struct gem_softc *sc = &gsc->gsc_gem;
 	char devinfo[256];
 	prop_data_t data;
 	uint8_t enaddr[ETHER_ADDR_LEN];
 	u_int8_t		*enp;
 	bus_space_handle_t	romh;
 	u_int8_t		buf[0x0800];
 	int			dataoff, vpdoff, serdes;
 	int i, got_addr = 0;
 #ifdef GEM_DEBUG
 	int j;
 #endif
 	struct pci_vpd		*vpd;
 	static const u_int8_t promhdr[] = { 0x55, 0xaa };
 #define PROMHDR_PTR_DATA	0x18
 	static const u_int8_t promdat[] = {
 x50, 0x43, 0x49, 0x52,		/* "PCIR" */
 		PCI_VENDOR_SUN & 0xff, PCI_VENDOR_SUN >> 8,
 		PCI_PRODUCT_SUN_GEMNETWORK & 0xff,
 		PCI_PRODUCT_SUN_GEMNETWORK >> 8
 	};
 #define PROMDATA_PTR_VPD	0x08
 #define PROMDATA_DATA2		0x0a
-	aprint_naive(": Ethernet controller\n");
+	pci_aprint_devinfo(pa, "Ethernet controller");
 	sc->sc_dev = self;
 	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
 	sc->sc_chiprev = PCI_REVISION(pa->pa_class);
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo, sc->sc_chiprev);
 	/*
 	 * Some Sun GEMs/ERIs do have their intpin register bogusly set to 0,
 	 * although it should be 1. correct that.
 	 */
 	if (pa->pa_intrpin == 0)
 		pa->pa_intrpin = 1;
 	sc->sc_variant = GEM_UNKNOWN;
 	sc->sc_dmatag = pa->pa_dmat;
 	sc->sc_flags |= GEM_PCI;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ipw.c,v 1.52 2010/11/15 05:57:07 uebayasi Exp $	*/
+/*	$NetBSD: if_ipw.c,v 1.53 2012/01/30 19:41:20 drochner Exp $	*/
 /*	FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.15 2005/11/13 17:17:40 damien Exp 	*/
 /*-
  * Copyright (c) 2004, 2005
  *      Damien Bergamini <damien.bergamini@free.fr>. 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 unmodified, this list of conditions, and the following
  *    disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -19,27 +19,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.52 2010/11/15 05:57:07 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.53 2012/01/30 19:41:20 drochner Exp $");
 /*-
  * Intel(R) PRO/Wireless 2100 MiniPCI driver
  * http://www.intel.com/network/connectivity/products/wireless/prowireless_mobile.htm
  */
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 @@ -168,41 +168,38 @@ ipw_match(device_t parent, cfdata_t matc
+}
 /* Base Address Register */
 #define IPW_PCI_BAR0	0x10
 static void
 ipw_attach(device_t parent, device_t self, void *aux)
+{
 	struct ipw_softc *sc = device_private(self);
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = &sc->sc_if;
 	struct pci_attach_args *pa = aux;
 	const char *intrstr;
 	char devinfo[256];
 	bus_space_tag_t memt;
 	bus_space_handle_t memh;
 	bus_addr_t base;
 	pci_intr_handle_t ih;
 	uint32_t data;
 	uint16_t val;
-	int i, revision, error;
+	int i, error;
 	sc->sc_pct = pa->pa_pc;
 	sc->sc_pcitag = pa->pa_tag;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof devinfo);
+	pci_aprint_devinfo(pa, NULL);
 	revision = PCI_REVISION(pa->pa_class);
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo, revision);
 	/* enable bus-mastering */
 	data = pci_conf_read(sc->sc_pct, pa->pa_tag, PCI_COMMAND_STATUS_REG);
 	data |= PCI_COMMAND_MASTER_ENABLE;
 	pci_conf_write(sc->sc_pct, pa->pa_tag, PCI_COMMAND_STATUS_REG, data);
 	/* map the register window */
 	error = pci_mapreg_map(pa, IPW_PCI_BAR0, PCI_MAPREG_TYPE_MEM |
 	    PCI_MAPREG_MEM_TYPE_32BIT, 0, &memt, &memh, &base, &sc->sc_sz);
 	if (error != 0) {
 		aprint_error_dev(&sc->sc_dev, "could not map memory space\n");
 		return;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: radeonfb.c,v 1.52 2012/01/11 16:02:30 macallan Exp $ */
+/*	$NetBSD: radeonfb.c,v 1.53 2012/01/30 19:41:23 drochner Exp $ */
 /*-
  * Copyright (c) 2006 Itronix Inc.
  * All rights reserved.
+ *
  * Written by Garrett D'Amore for Itronix Inc.
+ *
  * 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
 @@ -60,27 +60,27 @@
  * portions of the Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
  * NON-INFRINGEMENT.  IN NO EVENT SHALL ATI, VA LINUX SYSTEMS AND/OR
  * THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
  * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.52 2012/01/11 16:02:30 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.53 2012/01/30 19:41:23 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/lwp.h>
 #include <sys/kauth.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wsfont/wsfont.h>
 @@ -440,31 +440,27 @@ radeonfb_attach(device_t parent, device_
 	const char		*mptr;
 	bus_size_t		bsz;
 	pcireg_t		screg;
 	int			i, j, fg, bg, ul, flags;
 	uint32_t		v;
 	sc->sc_dev = dev;
 	sc->sc_id = pa->pa_id;
 	for (i = 0; radeonfb_devices[i].devid; i++) {
 		if (PCI_PRODUCT(sc->sc_id) == radeonfb_devices[i].devid)
 			break;
+	}
-	pci_devinfo(sc->sc_id, pa->pa_class, 0, sc->sc_devinfo,
+	pci_aprint_devinfo(pa, NULL);
 	    sizeof(sc->sc_devinfo));
 	aprint_naive("\n");
 	aprint_normal(": %s\n", sc->sc_devinfo);
 	DPRINTF((prop_dictionary_externalize(device_properties(dev))));
 	KASSERT(radeonfb_devices[i].devid != 0);
 	sc->sc_pt = pa->pa_tag;
 	sc->sc_iot = pa->pa_iot;
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_family = radeonfb_devices[i].family;
 	sc->sc_flags = radeonfb_devices[i].flags;
 	/* enable memory and IO access */
 	screg = pci_conf_read(sc->sc_pc, sc->sc_pt, PCI_COMMAND_STATUS_REG);
 	screg |= PCI_COMMAND_IO_ENABLE | PCI_COMMAND_MEM_ENABLE;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: yds.c,v 1.52 2011/11/24 03:35:59 mrg Exp $	*/
+/*	$NetBSD: yds.c,v 1.53 2012/01/30 19:41:23 drochner Exp $	*/
 /*
  * Copyright (c) 2000, 2001 Kazuki Sakamoto and Minoura Makoto.
  * 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.
 @@ -29,27 +29,27 @@
  * Yamaha YMF724[B-F]/740[B-C]/744/754
+ *
  * Documentation links:
  * - ftp://ftp.alsa-project.org/pub/manuals/yamaha/
  * - ftp://ftp.alsa-project.org/pub/manuals/yamaha/pci/
+ *
  * TODO:
  * - FM synth volume (difficult: mixed before ac97)
  * - Digital in/out (SPDIF) support
  * - Effect??
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.52 2011/11/24 03:35:59 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.53 2012/01/30 19:41:23 drochner Exp $");
 #include "mpu.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/fcntl.h>
 #include <sys/kmem.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcireg.h>
 @@ -730,38 +730,37 @@ yds_resume(device_t dv, const pmf_qual_t
 	return true;
+}
 static void
 yds_attach(device_t parent, device_t self, void *aux)
+{
 	struct yds_softc *sc;
 	struct pci_attach_args *pa;
 	pci_chipset_tag_t pc;
 	char const *intrstr;
 	pci_intr_handle_t ih;
 	pcireg_t reg;
 	struct yds_codec_softc *codec;
 	char devinfo[256];
 	int i, r, to;
 	int revision;
 	int ac97_id2;
 	sc = device_private(self);
 	sc->sc_dev = self;
 	pa = (struct pci_attach_args *)aux;
 	pc = pa->pa_pc;
 	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
 	revision = PCI_REVISION(pa->pa_class);
 	printf(": %s (rev. 0x%02x)\n", devinfo, revision);
 	pci_aprint_devinfo(pa, NULL);
 	/* Map register to memory */
 	if (pci_mapreg_map(pa, YDS_PCI_MBA, PCI_MAPREG_TYPE_MEM, 0,
 			   &sc->memt, &sc->memh, NULL, NULL)) {
 		aprint_error_dev(self, "can't map memory space\n");
 		return;
+	}
 	/* Map and establish the interrupt. */
 	if (pci_intr_map(pa, &ih)) {
 		aprint_error_dev(self, "couldn't map interrupt\n");
 		return;
+	}

 @@ -1,35 +1,35 @@
-/*	$NetBSD: if_iwi.c,v 1.88 2011/11/19 22:51:23 tls Exp $  */
+/*	$NetBSD: if_iwi.c,v 1.89 2012/01/30 19:41:20 drochner Exp $  */
 /*	$OpenBSD: if_iwi.c,v 1.111 2010/11/15 19:11:57 damien Exp $	*/
 /*-
  * Copyright (c) 2004-2008
  *      Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.88 2011/11/19 22:51:23 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.89 2012/01/30 19:41:20 drochner Exp $");
 /*-
  * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver
  * http://www.intel.com/network/connectivity/products/wireless/prowireless_mobile.htm
  */
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 @@ -193,41 +193,38 @@ iwi_match(device_t parent, cfdata_t matc
+}
 /* Base Address Register */
 #define IWI_PCI_BAR0	0x10
 static void
 iwi_attach(device_t parent, device_t self, void *aux)
+{
 	struct iwi_softc *sc = device_private(self);
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = &sc->sc_if;
 	struct pci_attach_args *pa = aux;
 	const char *intrstr;
 	char devinfo[256];
 	bus_space_tag_t memt;
 	bus_space_handle_t memh;
 	pci_intr_handle_t ih;
 	pcireg_t data;
 	uint16_t val;
-	int error, revision, i;
+	int error, i;
 	sc->sc_dev = self;
 	sc->sc_pct = pa->pa_pc;
 	sc->sc_pcitag = pa->pa_tag;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof devinfo);
+	pci_aprint_devinfo(pa, NULL);
 	revision = PCI_REVISION(pa->pa_class);
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo, revision);
 	/* clear unit numbers allocated to IBSS */
 	sc->sc_unr = 0;
 	/* power up chip */
 	if ((error = pci_activate(pa->pa_pc, pa->pa_tag, self,
 	    NULL)) && error != EOPNOTSUPP) {
 		aprint_error_dev(self, "cannot activate %d\n", error);
 		return;
+	}
 	/* clear device specific PCI configuration register 0x41 */
 	data = pci_conf_read(sc->sc_pct, sc->sc_pcitag, 0x40);

 @@ -1,14 +1,14 @@
-/* $NetBSD: if_mtd_pci.c,v 1.16 2011/07/26 20:51:24 dyoung Exp $ */
+/* $NetBSD: if_mtd_pci.c,v 1.17 2012/01/30 19:41:20 drochner Exp $ */
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Peter Bex <Peter.Bex@student.kun.nl>.
+ *
  * 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.
 @@ -27,27 +27,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.
  */
 /*
  * PCI interface for MTD803 cards
  * Written by Peter Bex (peter.bex@student.kun.nl)
  */
 /* TODO: Check why in IO space, the MII won't work. Memory mapped works */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mtd_pci.c,v 1.16 2011/07/26 20:51:24 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mtd_pci.c,v 1.17 2012/01/30 19:41:20 drochner Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <net/if_ether.h>
 #include <net/if_media.h>
 #include <sys/bus.h>
 #include <dev/mii/miivar.h>
 #include <dev/ic/mtd803reg.h>
 #include <dev/ic/mtd803var.h>
 #include <dev/pci/pcidevs.h>
 @@ -87,30 +87,28 @@ mtd_pci_match(device_t parent, cfdata_t
 	return (0);
+}
 static void
 mtd_pci_attach(device_t parent, device_t self, void *aux)
+{
 	struct pci_attach_args * const pa = aux;
 	struct mtd_softc * const sc = device_private(self);
 	pci_intr_handle_t ih;
 	const char *intrstring = NULL;
 	bus_space_tag_t iot, memt;
 	bus_space_handle_t ioh, memh;
 	int io_valid, mem_valid;
 	char devinfo[256];
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	printf(": %s (rev. 0x%02x)\n", devinfo, PCI_REVISION(pa->pa_class));
 	io_valid = (pci_mapreg_map(pa, PCI_IO_MAP_REG, PCI_MAPREG_TYPE_IO,
 , &iot, &ioh, NULL, NULL) == 0);
 	mem_valid = (pci_mapreg_map(pa, PCI_MEM_MAP_REG, PCI_MAPREG_TYPE_MEM
 			| PCI_MAPREG_MEM_TYPE_32BIT, 0, &memt, &memh,
 			NULL, NULL) == 0);
 	if (mem_valid) {
 		sc->bus_tag = memt;
 		sc->bus_handle = memh;
 	} else if (io_valid) {
 		sc->bus_tag = iot;
 		sc->bus_handle = ioh;

 @@ -1,37 +1,37 @@
-/*	$NetBSD: if_nfe.c,v 1.54 2011/01/23 03:15:06 tsutsui Exp $	*/
+/*	$NetBSD: if_nfe.c,v 1.55 2012/01/30 19:41:20 drochner Exp $	*/
 /*	$OpenBSD: if_nfe.c,v 1.77 2008/02/05 16:52:50 brad Exp $	*/
 /*-
  * Copyright (c) 2006, 2007 Damien Bergamini <damien.bergamini@free.fr>
  * Copyright (c) 2005, 2006 Jonathan Gray <jsg@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.54 2011/01/23 03:15:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.55 2012/01/30 19:41:20 drochner Exp $");
 #include "opt_inet.h"
 #include "vlan.h"
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/queue.h>
 #include <sys/kernel.h>
 @@ -210,33 +210,31 @@ nfe_match(device_t dev, cfdata_t match,
 	return 0;
+}
 void
 nfe_attach(device_t parent, device_t self, void *aux)
+{
 	struct nfe_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	pci_chipset_tag_t pc = pa->pa_pc;
 	pci_intr_handle_t ih;
 	const char *intrstr;
 	struct ifnet *ifp;
 	pcireg_t memtype, csr;
 	char devinfo[256];
 	int mii_flags = 0;
 	sc->sc_dev = self;
 	sc->sc_pc = pa->pa_pc;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo, PCI_REVISION(pa->pa_class));
 	memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, NFE_PCI_BA);
 	switch (memtype) {
 	case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT:
 	case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_64BIT:
 		if (pci_mapreg_map(pa, NFE_PCI_BA, memtype, 0, &sc->sc_memt,
 		    &sc->sc_memh, NULL, &sc->sc_mems) == 0)
 			break;
 		/* FALLTHROUGH */
 	default:
 		aprint_error_dev(self, "could not map mem space\n");
 		return;
+	}

 @@ -1,38 +1,38 @@
-/*	$NetBSD: if_ral_pci.c,v 1.18 2011/07/26 20:51:24 dyoung Exp $	*/
+/*	$NetBSD: if_ral_pci.c,v 1.19 2012/01/30 19:41:20 drochner Exp $	*/
 /*	$OpenBSD: if_ral_pci.c,v 1.6 2006/01/09 20:03:43 damien Exp $  */
 /*-
  * Copyright (c) 2005, 2006
  *	Damien Bergamini <damien.bergamini@free.fr>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*
  * PCI front-end for the Ralink RT2560/RT2561/RT2561S/RT2661 driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ral_pci.c,v 1.18 2011/07/26 20:51:24 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ral_pci.c,v 1.19 2012/01/30 19:41:20 drochner Exp $");
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <sys/intr.h>
 @@ -114,35 +114,32 @@ ral_pci_match(device_t parent, cfdata_t
+		}
+	}
 	return 0;
+}
 void
 ral_pci_attach(device_t parent, device_t self, void *aux)
+{
 	struct ral_pci_softc *psc = device_private(self);
 	struct rt2560_softc *sc = &psc->sc_sc;
 	const struct pci_attach_args *pa = aux;
 	const char *intrstr;
 	char devinfo[256];
 	bus_addr_t base;
 	pci_intr_handle_t ih;
 	pcireg_t reg;
-	int error, revision;
+	int error;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	revision = PCI_REVISION(pa->pa_class);
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo, revision);
 	psc->sc_opns = (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_RALINK_RT2560) ?
 	    &ral_rt2560_opns : &ral_rt2661_opns;
 	sc->sc_dmat = pa->pa_dmat;
 	psc->sc_pc = pa->pa_pc;
 	/* enable the appropriate bits in the PCI CSR */
 	reg = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
 	reg |= PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_MEM_ENABLE;
 	pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, reg);
 	/* map control/status registers */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_re_pci.c,v 1.40 2010/07/27 21:48:41 jakllsch Exp $	*/
+/*	$NetBSD: if_re_pci.c,v 1.41 2012/01/30 19:41:20 drochner Exp $	*/
 /*
  * Copyright (c) 1997, 1998-2003
  *	Bill Paul <wpaul@windriver.com>.  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.
 @@ -36,27 +36,27 @@
 /*
  * RealTek 8139C+/8169/8169S/8110S PCI NIC driver
+ *
  * Written by Bill Paul <wpaul@windriver.com>
  * Senior Networking Software Engineer
  * Wind River Systems
+ *
  * NetBSD bus-specific frontends for written by
  * Jonathan Stone <jonathan@netbsd.org>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_re_pci.c,v 1.40 2010/07/27 21:48:41 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_re_pci.c,v 1.41 2012/01/30 19:41:20 drochner Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <net/if.h>
 #include <net/if_ether.h>
 #include <net/if_media.h>
 #include <sys/bus.h>
 @@ -216,28 +216,27 @@ re_pci_attach(device_t parent, device_t
 			bus_space_unmap(memt, memh, memsize);
 	} else if (memh_valid) {
 		sc->rtk_btag = memt;
 		sc->rtk_bhandle = memh;
 		sc->rtk_bsize = memsize;
 	} else {
 		aprint_error(": can't map registers\n");
 		return;
+	}
 	t = re_pci_lookup(pa);
 	KASSERT(t != NULL);
-	aprint_normal(": %s (rev. 0x%02x)\n",
+	pci_aprint_devinfo_fancy(pa, NULL, t->rtk_name, 1);
 	    t->rtk_name, PCI_REVISION(pa->pa_class));
 	if (t->rtk_basetype == RTK_8139CPLUS)
 		sc->sc_quirk |= RTKQ_8139CPLUS;
 	if (t->rtk_basetype == RTK_8168 ||
 	    t->rtk_basetype == RTK_8101E)
 		sc->sc_quirk |= RTKQ_PCIE;
 	if (pci_dma64_available(pa) && (sc->sc_quirk & RTKQ_PCIE))
 		sc->sc_dmat = pa->pa_dmat64;
 	else
 		sc->sc_dmat = pa->pa_dmat;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_rtk_pci.c,v 1.42 2010/11/02 16:54:29 jakllsch Exp $	*/
+/*	$NetBSD: if_rtk_pci.c,v 1.43 2012/01/30 19:41:20 drochner Exp $	*/
 /*
  * Copyright (c) 1997, 1998
  *	Bill Paul <wpaul@ctr.columbia.edu>.  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.
 @@ -37,27 +37,27 @@
 /*
  * Realtek 8129/8139 PCI NIC driver
+ *
  * Supports several extremely cheap PCI 10/100 adapters based on
  * the Realtek chipset. Datasheets can be obtained from
  * www.realtek.com.tw.
+ *
  * Written by Bill Paul <wpaul@ctr.columbia.edu>
  * Electrical Engineering Department
  * Columbia University, New York City
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtk_pci.c,v 1.42 2010/11/02 16:54:29 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtk_pci.c,v 1.43 2012/01/30 19:41:20 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/device.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 @@ -159,29 +159,27 @@ rtk_pci_attach(device_t parent, device_t
 	bus_space_handle_t ioh, memh;
 	bus_size_t iosize, memsize;
 	pcireg_t csr;
 	const char *intrstr = NULL;
 	const struct rtk_type *t;
 	bool ioh_valid, memh_valid;
 	sc->sc_dev = self;
 	psc->sc_pc = pa->pa_pc;
 	t = rtk_pci_lookup(pa);
 	KASSERT(t != NULL);
-	aprint_naive("\n");
+	pci_aprint_devinfo_fancy(pa, NULL, t->rtk_name, 1);
 	aprint_normal(": %s (rev. 0x%02x)\n",
 	    t->rtk_name, PCI_REVISION(pa->pa_class));
 	/*
 	 * Map control/status registers.
+	 *
 	 * The original FreeBSD's driver has the following comment:
+	 *
 	 *   Default to using PIO access for this driver. On SMP systems,
 	 *   there appear to be problems with memory mapped mode:
 	 *   it looks like doing too many memory mapped access
 	 *   back to back in rapid succession can hang the bus.
 	 *   I'm inclined to blame this on crummy design/construction
 	 *   on the part of Realtek. Memory mapped mode does appear to
 	 *   work on uniprocessor systems though.

 @@ -1,14 +1,14 @@
-/* $NetBSD: if_vge.c,v 1.51 2010/04/05 07:20:27 joerg Exp $ */
+/* $NetBSD: if_vge.c,v 1.52 2012/01/30 19:41:21 drochner Exp $ */
 /*-
  * Copyright (c) 2004
  *	Bill Paul <wpaul@windriver.com>.  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.
 @@ -25,27 +25,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD
  * 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/vge/if_vge.c,v 1.5 2005/02/07 19:39:29 glebius Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.51 2010/04/05 07:20:27 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.52 2012/01/30 19:41:21 drochner Exp $");
 /*
  * VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
+ *
  * Written by Bill Paul <wpaul@windriver.com>
  * Senior Networking Software Engineer
  * Wind River Systems
  */
 /*
  * The VIA Networking VT6122 is a 32bit, 33/66 MHz PCI device that
  * combines a tri-speed ethernet MAC and PHY, with the following
  * features:
 @@ -934,28 +934,27 @@ static void
 vge_attach(device_t parent, device_t self, void *aux)
+{
 	uint8_t	*eaddr;
 	struct vge_softc *sc = device_private(self);
 	struct ifnet *ifp;
 	struct pci_attach_args *pa = aux;
 	pci_chipset_tag_t pc = pa->pa_pc;
 	const char *intrstr;
 	pci_intr_handle_t ih;
 	uint16_t val;
 	sc->sc_dev = self;
-	aprint_normal(": VIA VT612X Gigabit Ethernet (rev. %#x)\n",
+	pci_aprint_devinfo_fancy(pa, NULL, "VIA VT612X Gigabit Ethernet", 1);
 	    PCI_REVISION(pa->pa_class));
 	/* Make sure bus-mastering is enabled */
         pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG,
 	    pci_conf_read(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG) |
 	    PCI_COMMAND_MASTER_ENABLE);
 	/*
 	 * Map control/status registers.
 	 */
 	if (pci_mapreg_map(pa, VGE_PCI_LOMEM, PCI_MAPREG_TYPE_MEM, 0,
 	    &sc->sc_bst, &sc->sc_bsh, NULL, NULL) != 0) {
 		aprint_error_dev(self, "couldn't map memory\n");
 		return;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pciide_common.c,v 1.51 2011/05/17 17:34:54 dyoung Exp $	*/
+/*	$NetBSD: pciide_common.c,v 1.52 2012/01/30 19:41:22 drochner Exp $	*/
 /*
  * Copyright (c) 1999, 2000, 2001, 2003 Manuel Bouyer.
+ *
  * 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.
 @@ -60,27 +60,27 @@
 /*
  * PCI IDE controller driver.
+ *
  * Author: Christopher G. Demetriou, March 2, 1998 (derived from NetBSD
  * sys/dev/pci/ppb.c, revision 1.16).
+ *
  * See "PCI IDE Controller Specification, Revision 1.0 3/4/94" and
  * "Programming Interface for Bus Master IDE Controller, Revision 1.0
  * 5/16/94" from the PCI SIG.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.51 2011/05/17 17:34:54 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.52 2012/01/30 19:41:22 drochner Exp $");
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pciidereg.h>
 #include <dev/pci/pciidevar.h>
 #include <dev/ic/wdcreg.h>
 #ifdef ATADEBUG
 @@ -110,48 +110,47 @@ pciide_lookup_product(pcireg_t id, const
 	if (pp->chip_map == NULL)
 		return NULL;
 	return pp;
+}
 void
 pciide_common_attach(struct pciide_softc *sc, const struct pci_attach_args *pa, const struct pciide_product_desc *pp)
+{
 	pci_chipset_tag_t pc = pa->pa_pc;
 	pcitag_t tag = pa->pa_tag;
 #if NATA_DMA
 	pcireg_t csr;
 #endif
-	char devinfo[256];
+	const char *displaydev = NULL;
-	const char *displaydev;
+	int dontprint = 0;
 	aprint_naive(": disk controller\n");
 	sc->sc_pci_id = pa->pa_id;
 	if (pp == NULL) {
 		/* should only happen for generic pciide devices */
 		sc->sc_pp = &default_product_desc;
 		pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
 		displaydev = devinfo;
 	} else {
 		sc->sc_pp = pp;
-		displaydev = sc->sc_pp->ide_name;
+		/* if ide_name == NULL, printf is done in chip-specific map */
 		if (pp->ide_name)
 			displaydev = pp->ide_name;
 		else
 			dontprint = 1;
+	}
-	/* if displaydev == NULL, printf is done in chip-specific map */
+	if (dontprint) {
-	if (displaydev)
+		aprint_naive("disk controller\n");
-		aprint_normal(": %s (rev. 0x%02x)\n", displaydev,
+		aprint_normal("\n"); /* ??? */
-		    PCI_REVISION(pa->pa_class));
+	} else
-	else
+		pci_aprint_devinfo_fancy(pa, "disk controller", displaydev, 1);
 		aprint_normal("\n");
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_tag = pa->pa_tag;
 #if NATA_DMA
 	/* Set up DMA defaults; these might be adjusted by chip_map. */
 	sc->sc_dma_maxsegsz = IDEDMA_BYTE_COUNT_MAX;
 	sc->sc_dma_boundary = IDEDMA_BYTE_COUNT_ALIGN;
 #endif
 #ifdef ATADEBUG
 	if (atadebug_pciide_mask & DEBUG_PROBE)
 		pci_conf_print(sc->sc_pc, sc->sc_tag, NULL);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_vr.c,v 1.108 2011/11/19 22:51:23 tls Exp $	*/
+/*	$NetBSD: if_vr.c,v 1.109 2012/01/30 19:41:21 drochner Exp $	*/
 /*-
  * Copyright (c) 1998, 1999 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
 @@ -87,27 +87,27 @@
  * The Rhine has a serious flaw in its transmit DMA mechanism:
  * transmit buffers must be longword aligned. Unfortunately,
  * the kernel doesn't guarantee that mbufs will be filled in starting
  * at longword boundaries, so we have to do a buffer copy before
  * transmission.
+ *
  * Apparently, the receive DMA mechanism also has the same flaw.  This
  * means that on systems with struct alignment requirements, incoming
  * frames must be copied to a new buffer which shifts the data forward
  * 2 bytes so that the payload is aligned on a 4-byte boundary.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.108 2011/11/19 22:51:23 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.109 2012/01/30 19:41:21 drochner Exp $");
 #include "rnd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/device.h>
 @@ -1430,41 +1430,37 @@ vr_shutdown(device_t self, int howto)
  * Attach the interface. Allocate softc structures, do ifmedia
  * setup and ethernet/BPF attach.
  */
 static void
 vr_attach(device_t parent, device_t self, void *aux)
+{
 	struct vr_softc *sc = device_private(self);
 	struct pci_attach_args *pa = (struct pci_attach_args *) aux;
 	bus_dma_segment_t seg;
 	uint32_t reg;
 	struct ifnet *ifp;
 	uint8_t eaddr[ETHER_ADDR_LEN], mac;
 	int i, rseg, error;
 	char devinfo[256];
 #define	PCI_CONF_WRITE(r, v)	pci_conf_write(sc->vr_pc, sc->vr_tag, (r), (v))
 #define	PCI_CONF_READ(r)	pci_conf_read(sc->vr_pc, sc->vr_tag, (r))
 	sc->vr_dev = self;
 	sc->vr_pc = pa->pa_pc;
 	sc->vr_tag = pa->pa_tag;
 	sc->vr_id = pa->pa_id;
 	callout_init(&sc->vr_tick_ch, 0);
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	aprint_naive("\n");
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo,
 	    PCI_REVISION(pa->pa_class));
 	/*
 	 * Handle power management nonsense.
 	 */
 	sc->vr_save_iobase = PCI_CONF_READ(VR_PCI_LOIO);
 	sc->vr_save_membase = PCI_CONF_READ(VR_PCI_LOMEM);
 	sc->vr_save_irq = PCI_CONF_READ(PCI_INTERRUPT_REG);
 	/* power up chip */
 	if ((error = pci_activate(pa->pa_pc, pa->pa_tag, self,
 	    vr_restore_state)) && error != EOPNOTSUPP) {
 		aprint_error_dev(self, "cannot activate %d\n",

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_vte.c,v 1.3 2011/04/28 17:32:48 bouyer Exp $	*/
+/*	$NetBSD: if_vte.c,v 1.4 2012/01/30 19:41:21 drochner Exp $	*/
 /*
  * Copyright (c) 2011 Manuel Bouyer.  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.
+ *
 @@ -45,27 +45,27 @@
  * 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/vte/if_vte.c,v 1.2 2010/12/31 01:23:04 yongari Exp */
 /* Driver for DM&P Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.3 2011/04/28 17:32:48 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.4 2012/01/30 19:41:21 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/sysctl.h>
 @@ -165,32 +165,30 @@ vte_match(device_t parent, cfdata_t cf,
+}
 static void
 vte_attach(device_t parent, device_t self, void *aux)
+{
 	struct vte_softc *sc = device_private(self);
 	struct pci_attach_args * const pa = (struct pci_attach_args *)aux;
 	struct ifnet * const ifp = &sc->vte_if;
 	int h_valid;
 	pcireg_t reg, csr;
 	pci_intr_handle_t intrhandle;
 	const char *intrstr;
 	int error;
 	char devinfo[256];
 	const struct sysctlnode *node;
 	int vte_nodenum;
 	sc->vte_dev = self;
 	aprint_normal("\n");
 	callout_init(&sc->vte_tick_ch, 0);
 	/* Map the device. */
 	h_valid = 0;
 	reg = pci_conf_read(pa->pa_pc, pa->pa_tag, VTE_PCI_BMEM);
 	if (PCI_MAPREG_TYPE(reg) == PCI_MAPREG_TYPE_MEM) {
 		h_valid = (pci_mapreg_map(pa, VTE_PCI_BMEM,
 		    PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT,
 , &sc->vte_bustag, &sc->vte_bushandle, NULL, NULL) == 0);
+	}
 	if (h_valid == 0) {
 		reg = pci_conf_read(pa->pa_pc, pa->pa_tag, VTE_PCI_BIO);
 @@ -200,28 +198,27 @@ vte_attach(device_t parent, device_t sel
 			    &sc->vte_bushandle, NULL, NULL) == 0);
+		}
+	}
 	if (h_valid == 0) {
 		aprint_error_dev(self, "unable to map device registers\n");
 		return;
+	}
 	sc->vte_dmatag = pa->pa_dmat;
 	/* Enable the device. */
 	csr = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
 	pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG,
 	    csr | PCI_COMMAND_MASTER_ENABLE);
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	aprint_normal_dev(self, "%s\n", devinfo);
 	/* Reset the ethernet controller. */
 	vte_reset(sc);
 	if ((error = vte_dma_alloc(sc)) != 0)
 		return;
 	/* Load station address. */
 	vte_get_macaddr(sc);
 	aprint_normal_dev(self, "Ethernet address %s\n",
 	    ether_sprintf(sc->vte_eaddr));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_wm.c,v 1.225 2011/11/28 18:21:46 bouyer Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.226 2012/01/30 19:41:21 drochner Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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
 @@ -66,27 +66,27 @@
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/
 /*
  * Device driver for the Intel i8254x family of Gigabit Ethernet chips.
+ *
  * TODO (in order of importance):
+ *
  *	- Rework how parameters are loaded from the EEPROM.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.225 2011/11/28 18:21:46 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.226 2012/01/30 19:41:21 drochner Exp $");
 #include "rnd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 @@ -1133,28 +1133,27 @@ wm_attach(device_t parent, device_t self
 		printf("\n");
 		panic("wm_attach: impossible");
+	}
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_pcitag = pa->pa_tag;
 	if (pci_dma64_available(pa))
 		sc->sc_dmat = pa->pa_dmat64;
 	else
 		sc->sc_dmat = pa->pa_dmat;
 	sc->sc_rev = PCI_REVISION(pci_conf_read(pc, pa->pa_tag, PCI_CLASS_REG));
-	aprint_naive(": Ethernet controller\n");
+	pci_aprint_devinfo_fancy(pa, "Ethernet controller", wmp->wmp_name, 1);
 	aprint_normal(": %s, rev. %d\n", wmp->wmp_name, sc->sc_rev);
 	sc->sc_type = wmp->wmp_type;
 	if (sc->sc_type < WM_T_82543) {
 		if (sc->sc_rev < 2) {
 			aprint_error_dev(sc->sc_dev,
 			    "i82542 must be at least rev. 2\n");
 			return;
+		}
 		if (sc->sc_rev < 3)
 			sc->sc_type = WM_T_82542_2_0;
+	}
 	if ((sc->sc_type == WM_T_82575) || (sc->sc_type == WM_T_82576)

 @@ -1,34 +1,34 @@
-/*  $NetBSD: if_wpi.c,v 1.49 2011/04/02 08:11:31 mbalmer Exp $    */
+/*  $NetBSD: if_wpi.c,v 1.50 2012/01/30 19:41:21 drochner Exp $    */
 /*-
  * Copyright (c) 2006, 2007
  *	Damien Bergamini <damien.bergamini@free.fr>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.49 2011/04/02 08:11:31 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.50 2012/01/30 19:41:21 drochner Exp $");
 /*
  * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
  */
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 @@ -199,46 +199,43 @@ wpi_attach_once(void)
+{
 	mutex_init(&wpi_firmware_mutex, MUTEX_DEFAULT, IPL_NONE);
 	return 0;
+}
 static void
 wpi_attach(device_t parent __unused, device_t self, void *aux)
+{
 	struct wpi_softc *sc = device_private(self);
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = &sc->sc_ec.ec_if;
 	struct pci_attach_args *pa = aux;
 	const char *intrstr;
 	char devinfo[256];
 	bus_space_tag_t memt;
 	bus_space_handle_t memh;
 	pci_intr_handle_t ih;
 	pcireg_t data;
-	int error, ac, revision;
+	int error, ac;
 	RUN_ONCE(&wpi_firmware_init, wpi_attach_once);
 	sc->fw_used = false;
 	sc->sc_dev = self;
 	sc->sc_pct = pa->pa_pc;
 	sc->sc_pcitag = pa->pa_tag;
 	callout_init(&sc->calib_to, 0);
 	callout_setfunc(&sc->calib_to, wpi_calib_timeout, sc);
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof devinfo);
+	pci_aprint_devinfo(pa, NULL);
 	revision = PCI_REVISION(pa->pa_class);
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo, revision);
 	/* enable bus-mastering */
 	data = pci_conf_read(sc->sc_pct, sc->sc_pcitag, PCI_COMMAND_STATUS_REG);
 	data |= PCI_COMMAND_MASTER_ENABLE;
 	pci_conf_write(sc->sc_pct, sc->sc_pcitag, PCI_COMMAND_STATUS_REG, data);
 	/* map the register window */
 	error = pci_mapreg_map(pa, WPI_PCI_BAR0, PCI_MAPREG_TYPE_MEM |
 		PCI_MAPREG_MEM_TYPE_32BIT, 0, &memt, &memh, NULL, &sc->sc_sz);
 	if (error != 0) {
 		aprint_error_dev(self, "could not map memory space\n");
 		return;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: igsfb_pci.c,v 1.22 2011/08/27 20:02:18 martin Exp $ */
+/*	$NetBSD: igsfb_pci.c,v 1.23 2012/01/30 19:41:21 drochner Exp $ */
 /*
  * Copyright (c) 2002, 2003 Valeriy E. Ushakov
  * 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.
 @@ -21,27 +21,27 @@
  * 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.
  */
 /*
  * Integraphics Systems IGA 168x and CyberPro series.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igsfb_pci.c,v 1.22 2011/08/27 20:02:18 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igsfb_pci.c,v 1.23 2012/01/30 19:41:21 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #ifdef __sparc__  /* XXX: this doesn't belong here */
 #include <machine/autoconf.h>
 #endif
 #include <sys/bus.h>
 #include <sys/intr.h>
 @@ -146,32 +146,30 @@ igsfb_pci_match(device_t parent, cfdata_
+{
 	struct pci_attach_args *pa = aux;
 	return igsfb_pci_match_by_id(pa->pa_id);
+}
 static void
 igsfb_pci_attach(device_t parent, device_t self, void *aux)
+{
 	struct igsfb_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	int isconsole;
 	char devinfo[256];
 	sc->sc_dev = self;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	printf(": %s (rev. 0x%02x)\n", devinfo, PCI_REVISION(pa->pa_class));
 #if defined(__sparc__) && !defined(KRUPS_FORCE_SERIAL_CONSOLE)
 	/* XXX: this doesn't belong here */
 	if (PCITAG_NODE(pa->pa_tag) == prom_instance_to_package(prom_stdout()))
+	{
 		int b, d, f;
 		pci_decompose_tag(pa->pa_pc, pa->pa_tag, &b, &d, &f);
 		igsfb_pci_cnattach(pa->pa_iot, pa->pa_memt, pa->pa_pc, b,d,f);
+	}
 #endif
 	isconsole = 0;

 @@ -1,41 +1,41 @@
-/*	$NetBSD: jmide.c,v 1.11 2011/08/13 16:04:09 jakllsch Exp $	*/
+/*	$NetBSD: jmide.c,v 1.12 2012/01/30 19:41:22 drochner Exp $	*/
 /*
  * Copyright (c) 2007 Manuel Bouyer.
+ *
  * 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.
+ *
  * 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: jmide.c,v 1.11 2011/08/13 16:04:09 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jmide.c,v 1.12 2012/01/30 19:41:22 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pciidereg.h>
 #include <dev/pci/pciidevar.h>
 #include <dev/pci/jmide_reg.h>
 #include <dev/ic/ahcisatavar.h>
 @@ -136,49 +136,46 @@ jmide_match(device_t parent, cfdata_t ma
 	if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_JMICRON) {
 		if (jmide_lookup(pa->pa_id))
 			return (4); /* higher than ahcisata */
+	}
 	return (0);
+}
 static void
 jmide_attach(device_t parent, device_t self, void *aux)
+{
 	struct pci_attach_args *pa = aux;
 	struct jmide_softc *sc = device_private(self);
 	const struct jmide_product *jp;
         char devinfo[256];
 	const char *intrstr;
         pci_intr_handle_t intrhandle;
 	u_int32_t pcictrl0 = pci_conf_read(pa->pa_pc, pa->pa_tag,
 	    PCI_JM_CONTROL0);
 	u_int32_t pcictrl1 = pci_conf_read(pa->pa_pc, pa->pa_tag,
 	    PCI_JM_CONTROL1);
 	struct pciide_product_desc *pp;
 	int ahci_used = 0;
 	sc->sc_pciide.sc_wdcdev.sc_atac.atac_dev = self;
 	jp = jmide_lookup(pa->pa_id);
 	if (jp == NULL) {
 		printf("jmide_attach: WTF?\n");
 		return;
+	}
 	sc->sc_npata = jp->jm_npata;
 	sc->sc_nsata = jp->jm_nsata;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+        pci_aprint_devinfo(pa, "JMICRON PATA/SATA disk controller");
         aprint_naive(": JMICRON PATA/SATA disk controller\n");
         aprint_normal(": %s\n", devinfo);
 	aprint_normal("%s: ", JM_NAME(sc));
 	if (sc->sc_npata)
 		aprint_normal("%d PATA port%s", sc->sc_npata,
 		    (sc->sc_npata > 1) ? "s" : "");
 	if (sc->sc_nsata)
 		aprint_normal("%s%d SATA port%s", sc->sc_npata ? ", " : "",
 		    sc->sc_nsata, (sc->sc_nsata > 1) ? "s" : "");
 	aprint_normal("\n");
 	if (pci_intr_map(pa, &intrhandle) != 0) {
                 aprint_error("%s: couldn't map interrupt\n", JM_NAME(sc));
                 return;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pm2fb.c,v 1.11 2012/01/11 16:02:30 macallan Exp $	*/
+/*	$NetBSD: pm2fb.c,v 1.12 2012/01/30 19:41:22 drochner Exp $	*/
 /*
  * Copyright (c) 2009 Michael Lorenz
  * 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.
 @@ -21,27 +21,27 @@
  * 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.
  */
 /*
  * A console driver for Permedia 2 graphics controllers
  * tested on sparc64 only so far
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pm2fb.c,v 1.11 2012/01/11 16:02:30 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm2fb.c,v 1.12 2012/01/30 19:41:22 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/lwp.h>
 #include <sys/kauth.h>
 #include <dev/videomode/videomode.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 @@ -214,42 +214,40 @@ pm2fb_match(device_t parent, cfdata_t ma
 	/* only cards tested on so far - likely need a list */
 	if ((PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_3DLABS_PERMEDIA2) ||
 	    (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_3DLABS_PERMEDIA2V))
 		return 100;
 	return (0);
+}
 static void
 pm2fb_attach(device_t parent, device_t self, void *aux)
+{
 	struct pm2fb_softc	*sc = device_private(self);
 	struct pci_attach_args	*pa = aux;
 	struct rasops_info	*ri;
 	char devinfo[256];
 	struct wsemuldisplaydev_attach_args aa;
 	prop_dictionary_t	dict;
 	unsigned long		defattr;
 	bool			is_console;
 	int i, j;
 	uint32_t flags;
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_pcitag = pa->pa_tag;
 	sc->sc_memt = pa->pa_memt;
 	sc->sc_iot = pa->pa_iot;
 	sc->sc_dev = self;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	aprint_normal(": %s\n", devinfo);
 	/* fill in parameters from properties */
 	dict = device_properties(self);
 	if (!prop_dictionary_get_uint32(dict, "width", &sc->sc_width)) {
 		aprint_error("%s: no width property\n", device_xname(self));
 		return;
+	}
 	if (!prop_dictionary_get_uint32(dict, "height", &sc->sc_height)) {
 		aprint_error("%s: no height property\n", device_xname(self));
 		return;
+	}
 	if (!prop_dictionary_get_uint32(dict, "depth", &sc->sc_depth)) {
 		aprint_error("%s: no depth property\n", device_xname(self));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: joy_pci.c,v 1.19 2011/12/05 19:20:55 christos Exp $	*/
+/*	$NetBSD: joy_pci.c,v 1.20 2012/01/30 19:41:22 drochner Exp $	*/
 /*-
  * Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Martin Husemann <martin@NetBSD.org>.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``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 FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_pci.c,v 1.19 2011/12/05 19:20:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_pci.c,v 1.20 2012/01/30 19:41:22 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/ic/joyvar.h>
 @@ -81,32 +81,30 @@ bar_is_io(pci_chipset_tag_t pc, pcitag_t
 	mask = pci_conf_read(pc, tag, reg);
 	pci_conf_write(pc, tag, reg, address);
 	return (PCI_MAPREG_TYPE(address) == PCI_MAPREG_TYPE_IO &&
 	    PCI_MAPREG_IO_SIZE(mask) > 0);
+}
 static void
 joy_pci_attach(device_t parent, device_t self, void *aux)
+{
 	struct joy_pci_softc *psc = device_private(self);
 	struct joy_softc *sc = &psc->sc_joy;
 	struct pci_attach_args *pa = aux;
 	char devinfo[256];
 	bus_size_t mapsize;
 	int reg;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	aprint_normal(": %s (rev 0x%02x)\n", devinfo, PCI_REVISION(pa->pa_class));
 	for (reg = PCI_MAPREG_START; reg < PCI_MAPREG_END;
 	     reg += sizeof(pcireg_t))
 		if (bar_is_io(pa->pa_pc, pa->pa_tag, reg))
 			break;
 	if (reg >= PCI_MAPREG_END) {
 		aprint_error_dev(self,
 		    "violates PCI spec, no IO region found\n");
 		return;
+	}
 	if (pci_mapreg_map(pa, reg, PCI_MAPREG_TYPE_IO, 0,
 	    &sc->sc_iot, &sc->sc_ioh, NULL, &mapsize)) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machfb.c,v 1.72 2012/01/11 16:02:29 macallan Exp $	*/
+/*	$NetBSD: machfb.c,v 1.73 2012/01/30 19:41:22 drochner Exp $	*/
 /*
  * Copyright (c) 2002 Bang Jun-Young
  * Copyright (c) 2005, 2006, 2007 Michael Lorenz
  * 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
 @@ -24,27 +24,27 @@
  * 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.
  */
 /*
  * Some code is derived from ATI Rage Pro and Derivatives Programmer's Guide.
  */
 #include <sys/cdefs.h>
 __KERNEL_RCSID(0,
-	"$NetBSD: machfb.c,v 1.72 2012/01/11 16:02:29 macallan Exp $");
+	"$NetBSD: machfb.c,v 1.73 2012/01/30 19:41:22 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/callout.h>
 #include <sys/lwp.h>
 #include <sys/kauth.h>
 #include <dev/videomode/videomode.h>
 #include <dev/videomode/edidvar.h>
 @@ -495,54 +495,50 @@ mach64_match(device_t parent, cfdata_t m
 	return 0;
+}
 static void
 mach64_attach(device_t parent, device_t self, void *aux)
+{
 	struct mach64_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	struct rasops_info *ri;
 	prop_data_t edid_data;
 #if defined(__sparc__) || defined(__powerpc__)
 	const struct videomode *mode = NULL;
 #endif
 	char devinfo[256];
 	int bar, id, expected_id;
 	int is_gx;
 	const char **memtype_names;
 	struct wsemuldisplaydev_attach_args aa;
 	long defattr;
 	int setmode, width, height;
 	pcireg_t screg;
 	uint32_t reg;
 	const pcireg_t enables = PCI_COMMAND_MEM_ENABLE|PCI_COMMAND_IO_ENABLE;
 	sc->sc_dev = self;
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_pcitag = pa->pa_tag;
 	sc->sc_dacw = -1;
 	sc->sc_mode = WSDISPLAYIO_MODE_EMUL;
 	sc->sc_nbus = pa->pa_bus;
 	sc->sc_ndev = pa->pa_device;
 	sc->sc_nfunc = pa->pa_function;
 	sc->sc_locked = 0;
 	sc->sc_iot = pa->pa_iot;
 	sc->sc_accessops.ioctl = mach64_ioctl;
 	sc->sc_accessops.mmap = mach64_mmap;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, "Graphics processor");
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo,
 	    PCI_REVISION(pa->pa_class));
 	aprint_naive(": Graphics processor\n");
 #ifdef MACHFB_DEBUG
 	printf(prop_dictionary_externalize(device_properties(self)));
 #endif
 	/* enable memory and disable IO access */
 	screg = pci_conf_read(sc->sc_pc, sc->sc_pcitag, PCI_COMMAND_STATUS_REG);
 	if ((screg & enables) != enables) {
 		screg |= enables;
 		pci_conf_write(sc->sc_pc, sc->sc_pcitag,
 		    PCI_COMMAND_STATUS_REG, screg);
+	}
 	for (bar = 0; bar < NBARS; bar++) {
 		reg = PCI_MAPREG_START + (bar * 4);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mpt_pci.c,v 1.20 2009/11/24 15:51:39 njoly Exp $	*/
+/*	$NetBSD: mpt_pci.c,v 1.21 2012/01/30 19:41:22 drochner Exp $	*/
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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
 @@ -36,27 +36,27 @@
  */
 /*
  * Additional contributions by Garrett D'Amore on behalf of TELES AG.
  */
 /*
  * mpt_pci.c:
+ *
  * NetBSD PCI-specific routines for LSI Fusion adapters.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpt_pci.c,v 1.20 2009/11/24 15:51:39 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpt_pci.c,v 1.21 2012/01/30 19:41:22 drochner Exp $");
 #include <dev/ic/mpt.h>			/* pulls in all headers */
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #define	MPT_PCI_MMBA		(PCI_MAPREG_START+0x04)
 struct mpt_pci_softc {
 	mpt_softc_t sc_mpt;
 	pci_chipset_tag_t sc_pc;
 @@ -124,32 +124,28 @@ mpt_pci_match(device_t parent, cfdata_t
 static void
 mpt_pci_attach(device_t parent, device_t self, void *aux)
+{
 	struct mpt_pci_softc *psc = device_private(self);
 	mpt_softc_t *mpt = &psc->sc_mpt;
 	struct pci_attach_args *pa = aux;
 	pci_intr_handle_t ih;
 	const char *intrstr;
 	pcireg_t reg, memtype;
 	bus_space_tag_t memt;
 	bus_space_handle_t memh;
 	int memh_valid;
 	char devinfo[200];
-	pci_devinfo(pa->pa_id, 0, 0, devinfo, sizeof (devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	aprint_naive("\n");
 	aprint_normal(": %s\n", devinfo);
 	psc->sc_pc = pa->pa_pc;
 	psc->sc_tag = pa->pa_tag;
 	mpt->sc_dmat = pa->pa_dmat;
 	/*
 	 * Map the device.
 	 */
 	memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, MPT_PCI_MMBA);
 	switch (memtype) {
 	case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT:
 	case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_64BIT:

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mvsata_pci.c,v 1.6 2011/01/31 16:30:48 jakllsch Exp $	*/
+/*	$NetBSD: mvsata_pci.c,v 1.7 2012/01/30 19:41:22 drochner Exp $	*/
 /*
  * Copyright (c) 2008 KIYOHARA Takashi
  * 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.
+ *
 @@ -16,27 +16,27 @@
  * 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: mvsata_pci.c,v 1.6 2011/01/31 16:30:48 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsata_pci.c,v 1.7 2012/01/30 19:41:22 drochner Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/pmf.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pciidereg.h>
 #include <dev/pci/pciidevar.h>
 #include <dev/ic/mvsatareg.h>
 @@ -145,38 +145,35 @@ mvsata_pci_match(device_t parent, struct
+}
 static void
 mvsata_pci_attach(device_t parent, device_t self, void *aux)
+{
 	struct pci_attach_args *pa = aux;
 	struct mvsata_pci_softc *psc = device_private(self);
 	struct mvsata_softc *sc = &psc->psc_sc;
 	pci_intr_handle_t intrhandle;
 	pcireg_t csr;
 	bus_size_t size;
 	uint32_t reg, mask;
 	int read_pre_amps, hc, port, rv, i;
 	char devinfo[256];
 	const char *intrstr;
 	sc->sc_wdcdev.sc_atac.atac_dev = self;
 	sc->sc_model = PCI_PRODUCT(pa->pa_id);
 	sc->sc_rev = PCI_REVISION(pa->pa_class);
 	sc->sc_dmat = pa->pa_dmat;
 	sc->sc_enable_intr = mvsata_pci_enable_intr;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, "Marvell Serial-ATA Host Controller");
 	aprint_naive(": Marvell Serial-ATA Host Controller\n");
 	aprint_normal(": %s\n", devinfo);
 	/* Map I/O register */
 	if (pci_mapreg_map(pa, PCI_MAPREG_START,
 	    PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0,
 	    &psc->psc_iot, &psc->psc_ioh, NULL, &size) != 0) {
 		aprint_error_dev(self, "can't map registers\n");
 		return;
+	}
 	psc->psc_pc = pa->pa_pc;
 	psc->psc_tag = pa->pa_tag;
 	if (bus_space_subregion(psc->psc_iot, psc->psc_ioh,
 	    MVSATA_PCI_HCARBITER_SPACE_OFFSET,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nca_pci.c,v 1.1 2010/04/01 04:04:11 jakllsch Exp $  */
+/*	$NetBSD: nca_pci.c,v 1.2 2012/01/30 19:41:22 drochner Exp $  */
 /*
  * Copyright (c) 2010 Jonathan A. Kollasch
  * 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.
 @@ -22,27 +22,27 @@
  * 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.
  */
 /*
  * PCI attachment for 5380-compatible Domex 536 SCSI controller,
  * found on Domex DMX-3191D.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nca_pci.c,v 1.1 2010/04/01 04:04:11 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nca_pci.c,v 1.2 2012/01/30 19:41:22 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/buf.h>
 #include <sys/bus.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 @@ -64,34 +64,30 @@ nca_pci_match(device_t parent, cfdata_t
+{
 	struct pci_attach_args *pa = aux;
 	if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_DOMEX &&
 	    PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_DOMEX_PCISCSI)
 		return 1;
 	return 0;
+}
 static void
 nca_pci_attach(device_t parent, device_t self, void *aux)
+{
 	struct ncr5380_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	char devinfo[128];
 	sc->sc_dev = self;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, "SCSI controller");
 	aprint_naive(": SCSI controller\n");
 	aprint_normal(": %s (rev 0x%02x)\n", devinfo,
 		      PCI_REVISION(pa->pa_class));
 	if (pci_mapreg_map(pa, 0x10, PCI_MAPREG_TYPE_IO, 0,
             &sc->sc_regt, &sc->sc_regh, NULL, NULL)) {
                 aprint_error_dev(self, "could not map IO space\n");
                 return;
+        }
 	/* The Domex 536 seems to be driven by polling,
 	 * don't bother mapping an interrupt handler.
 	 */
 	sc->sc_rev = NCR_VARIANT_CXD1180;
 	sc->sci_r0 = 0;

 @@ -14,27 +14,27 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*
  * Minimalistic driver for the SIS315 Pro frame buffer found on the
  * Lemote Fuloong 2F systems.
  * Does not support accelaration, mode change, secondary output, or
  * anything fancy.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sisfb.c,v 1.1 2011/08/27 13:28:37 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sisfb.c,v 1.2 2012/01/30 19:41:23 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <uvm/uvm_extern.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pciio.h>
 @@ -212,44 +212,42 @@ sisfb_match(device_t parent, cfdata_t ma
 		return 100;
 	return (0);
+}
 void
 sisfb_attach(device_t parent, device_t self, void *aux)
+{
 	struct sisfb_softc *sc = device_private(self);
 	struct pci_attach_args *pa = (struct pci_attach_args *)aux;
 	struct rasops_info *ri;
 	struct wsemuldisplaydev_attach_args waa;
 	bus_size_t fbsize, mmiosize, iosize;
 	struct sisfb *fb;
 	char devinfo[256];
 	int console;
 	unsigned long defattr;
 	sc->sc_dev = self;
 	console = sisfbcn.vcs.scr_ri.ri_hw != NULL;
 	if (console)
 		fb = &sisfbcn;
 	else {
 		fb = &sc->sc_fb_store;
+	}
 	sc->sc_fb = fb;
 	fb->sc = sc;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	aprint_normal(": %s\n", devinfo);
 	if (!console) {
 		fb->fbt = pa->pa_memt;
 		fb->mmiot = pa->pa_memt;
 		fb->iot = pa->pa_iot;
 		if (pci_mapreg_map(pa, PCI_MAPREG_START, PCI_MAPREG_TYPE_MEM,
 		    BUS_SPACE_MAP_LINEAR, &fb->fbt, &fb->fbh, NULL, &fbsize) != 0) {
 			aprint_error_dev(self, ": can't map frame buffer\n");
 			return;
+		}
 		if (pci_mapreg_map(pa, PCI_MAPREG_START + 4, PCI_MAPREG_TYPE_MEM,
 , &fb->mmiot, &fb->mmioh, NULL, &mmiosize) != 0) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nfsmb.c,v 1.21 2010/05/08 07:41:44 pgoyette Exp $	*/
+/*	$NetBSD: nfsmb.c,v 1.22 2012/01/30 19:41:22 drochner Exp $	*/
 /*
  * Copyright (c) 2007 KIYOHARA Takashi
  * 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.
+ *
 @@ -16,27 +16,27 @@
  * 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: nfsmb.c,v 1.21 2010/05/08 07:41:44 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfsmb.c,v 1.22 2012/01/30 19:41:22 drochner Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/rwlock.h>
 #include <sys/proc.h>
 #include <sys/bus.h>
 #include <dev/i2c/i2cvar.h>
 #include <dev/pci/pcivar.h>
 @@ -131,32 +131,28 @@ nfsmbc_match(device_t parent, cfdata_t m
+	}
 	return 0;
+}
 static void
 nfsmbc_attach(device_t parent, device_t self, void *aux)
+{
 	struct nfsmbc_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	struct nfsmbc_attach_args nfsmbca;
 	pcireg_t reg;
 	int baseregs[2];
 	char devinfo[256];
-	aprint_naive("\n");
+	pci_aprint_devinfo(pa, NULL);
 	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo,
 	    PCI_REVISION(pa->pa_class));
 	sc->sc_dev = self;
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_tag = pa->pa_tag;
 	sc->sc_pa = pa;
 	sc->sc_iot = pa->pa_iot;
 	nfsmbca.nfsmb_iot = sc->sc_iot;
 	switch (PCI_PRODUCT(pa->pa_id)) {
 	case PCI_PRODUCT_NVIDIA_NFORCE2_SMBUS:
 	case PCI_PRODUCT_NVIDIA_NFORCE2_400_SMBUS:
 	case PCI_PRODUCT_NVIDIA_NFORCE3_SMBUS:

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ohci_pci.c,v 1.47 2011/04/04 22:48:15 dyoung Exp $	*/
+/*	$NetBSD: ohci_pci.c,v 1.48 2012/01/30 19:41:22 drochner Exp $	*/
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * 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
 @@ -21,27 +21,27 @@
  * ``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 FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.47 2011/04/04 22:48:15 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.48 2012/01/30 19:41:22 drochner Exp $");
 #include "ehci.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/bus.h>
 #include <dev/pci/pcivar.h>
 @@ -78,37 +78,33 @@ ohci_pci_match(device_t parent, cfdata_t
 	return 0;
+}
 static void
 ohci_pci_attach(device_t parent, device_t self, void *aux)
+{
 	struct ohci_pci_softc *sc = device_private(self);
 	struct pci_attach_args *pa = (struct pci_attach_args *)aux;
 	pci_chipset_tag_t pc = pa->pa_pc;
 	pcitag_t tag = pa->pa_tag;
 	char const *intrstr;
 	pci_intr_handle_t ih;
 	pcireg_t csr;
 	char devinfo[256];
 	usbd_status r;
 	const char *vendor;
 	sc->sc.sc_dev = self;
 	sc->sc.sc_bus.hci_private = sc;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, "USB Controller");
 	aprint_normal(": %s (rev. 0x%02x)\n",
 	    devinfo, PCI_REVISION(pa->pa_class));
 	aprint_naive(": USB Controller\n");
 	/* Map I/O registers */
 	if (pci_mapreg_map(pa, PCI_CBMEM, PCI_MAPREG_TYPE_MEM, 0,
 			   &sc->sc.iot, &sc->sc.ioh, NULL, &sc->sc.sc_size)) {
 		sc->sc.sc_size = 0;
 		aprint_error_dev(self, "can't map mem space\n");
 		return;
+	}
 	/* Disable interrupts, so we don't get any spurious ones. */
 	bus_space_write_4(sc->sc.iot, sc->sc.ioh, OHCI_INTERRUPT_DISABLE,
 			  OHCI_ALL_INTRS);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pccbb.c,v 1.203 2011/08/01 11:20:26 drochner Exp $	*/
+/*	$NetBSD: pccbb.c,v 1.204 2012/01/30 19:41:22 drochner Exp $	*/
 /*
  * Copyright (c) 1998, 1999 and 2000
  *      HAYAKAWA Koichi.  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.
 @@ -16,27 +16,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: pccbb.c,v 1.203 2011/08/01 11:20:26 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.204 2012/01/30 19:41:22 drochner Exp $");
 /*
 #define CBB_DEBUG
 #define SHOW_REGS
 */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/reboot.h>		/* for bootverbose */
 #include <sys/syslog.h>
 @@ -372,50 +372,44 @@ pccbbchilddet(device_t self, device_t ch
 	if (sc->sc_csc == device_private(child))
 		sc->sc_csc = NULL;
 	splx(s);
+}
 void
 pccbbattach(device_t parent, device_t self, void *aux)
+{
 	struct pccbb_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	pci_chipset_tag_t pc = pa->pa_pc;
 	pcireg_t busreg, reg, sock_base;
 	bus_addr_t sockbase;
 	char devinfo[256];
 	int flags;
 #ifdef __HAVE_PCCBB_ATTACH_HOOK
 	pccbb_attach_hook(parent, self, pa);
 #endif
 	sc->sc_dev = self;
 	mutex_init(&sc->sc_pwr_mtx, MUTEX_DEFAULT, IPL_BIO);
 	cv_init(&sc->sc_pwr_cv, "pccpwr");
 	callout_init(&sc->sc_insert_ch, 0);
 	callout_setfunc(&sc->sc_insert_ch, pci113x_insert, sc);
 	sc->sc_chipset = cb_chipset(pa->pa_id, &flags);
-	aprint_naive("\n");
+	pci_aprint_devinfo(pa, NULL);
 	DPRINTF(("(chipflags %x)", flags));
 	pci_devinfo(pa->pa_id, 0, 0, devinfo, sizeof(devinfo));
 	aprint_normal(": %s (rev. 0x%02x)", devinfo,
 	    PCI_REVISION(pa->pa_class));
 	DPRINTF((" (chipflags %x)", flags));
 	aprint_normal("\n");
 	TAILQ_INIT(&sc->sc_memwindow);
 	TAILQ_INIT(&sc->sc_iowindow);
 	sc->sc_rbus_iot = rbus_pccbb_parent_io(pa);
 	sc->sc_rbus_memt = rbus_pccbb_parent_mem(pa);
 #if 0
 	printf("pa->pa_memt: %08x vs rbus_mem->rb_bt: %08x\n",
 	       pa->pa_memt, sc->sc_rbus_memt->rb_bt);
 #endif
 	sc->sc_flags &= ~CBB_MEMHMAPPED;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pcscp.c,v 1.45 2010/11/13 13:52:08 uebayasi Exp $	*/
+/*	$NetBSD: pcscp.c,v 1.46 2012/01/30 19:41:22 drochner Exp $	*/
 /*-
  * Copyright (c) 1997, 1998, 1999 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; Izumi Tsutsui.
+ *
  * 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
 @@ -29,27 +29,27 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * pcscp.c: device dependent code for AMD Am53c974 (PCscsi-PCI)
  * written by Izumi Tsutsui <tsutsui@NetBSD.org>
+ *
  * Technical manual available at
  * http://www.amd.com/files/connectivitysolutions/networking/archivednetworking/19113.pdf
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcscp.c,v 1.45 2010/11/13 13:52:08 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcscp.c,v 1.46 2012/01/30 19:41:22 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/buf.h>
 #include <sys/bus.h>
 #include <sys/intr.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsiconf.h>
 @@ -151,31 +151,29 @@ pcscp_match(device_t parent, cfdata_t cf
 static void
 pcscp_attach(device_t parent, device_t self, void *aux)
+{
 	struct pcscp_softc *esc = device_private(self);
 	struct ncr53c9x_softc *sc = &esc->sc_ncr53c9x;
 	struct pci_attach_args *pa = aux;
 	bus_space_tag_t iot;
 	bus_space_handle_t ioh;
 	pci_intr_handle_t ih;
 	const char *intrstr;
 	pcireg_t csr;
 	bus_dma_segment_t seg;
 	int error, rseg;
 	char devinfo[256];
 	sc->sc_dev = self;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	aprint_normal(": %s\n", devinfo);
 	aprint_normal("%s", device_xname(sc->sc_dev));
 	if (pci_mapreg_map(pa, IO_MAP_REG, PCI_MAPREG_TYPE_IO, 0,
 	    &iot, &ioh, NULL, NULL)) {
 		aprint_error(": unable to map registers\n");
 		return;
+	}
 	sc->sc_glue = &pcscp_glue;
 	esc->sc_st = iot;
 	esc->sc_sh = ioh;
 	esc->sc_dmat = pa->pa_dmat;

 @@ -1,38 +1,38 @@
-/* $NetBSD: piixpm.c,v 1.38 2012/01/07 15:59:46 pgoyette Exp $ */
+/* $NetBSD: piixpm.c,v 1.39 2012/01/30 19:41:22 drochner Exp $ */
 /*	$OpenBSD: piixpm.c,v 1.20 2006/02/27 08:25:02 grange Exp $	*/
 /*
  * Copyright (c) 2005, 2006 Alexander Yurchenko <grange@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*
  * Intel PIIX and compatible Power Management controller driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.38 2012/01/07 15:59:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.39 2012/01/30 19:41:22 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/rwlock.h>
 #include <sys/proc.h>
 #include <sys/bus.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 @@ -148,39 +148,34 @@ piixpm_match(device_t parent, cfdata_t m
 	return 0;
+}
 static void
 piixpm_attach(device_t parent, device_t self, void *aux)
+{
 	struct piixpm_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	struct i2cbus_attach_args iba;
 	pcireg_t base, conf;
 	pcireg_t pmmisc;
 	pci_intr_handle_t ih;
 	char devinfo[256];
 	const char *intrstr = NULL;
 	sc->sc_dev = self;
 	sc->sc_id = pa->pa_id;
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_pcitag = pa->pa_tag;
-	aprint_naive("\n");
+	pci_aprint_devinfo(pa, NULL);
 	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo,
 	    PCI_REVISION(pa->pa_class));
 	if (!pmf_device_register(self, piixpm_suspend, piixpm_resume))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	/* Read configuration */
 	conf = pci_conf_read(pa->pa_pc, pa->pa_tag, PIIX_SMB_HOSTC);
 	DPRINTF(("%s: conf 0x%x\n", device_xname(self), conf));
 	if ((PCI_VENDOR(pa->pa_id) != PCI_VENDOR_INTEL) ||
 	    (PCI_PRODUCT(pa->pa_id) != PCI_PRODUCT_INTEL_82371AB_PMC))
 		goto nopowermanagement;
 	/* check whether I/O access to PM regs is enabled */

 @@ -1,14 +1,14 @@
-/* $NetBSD: radeonfbvar.h,v 1.12 2011/12/30 14:32:31 macallan Exp $ */
+/* $NetBSD: radeonfbvar.h,v 1.13 2012/01/30 19:41:23 drochner Exp $ */
 /*-
  * Copyright (c) 2006 Itronix Inc.
  * All rights reserved.
+ *
  * Written by Garrett D'Amore for Itronix Inc.
+ *
  * 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
 @@ -204,28 +204,26 @@ struct radeonfb_display {
 };
 struct radeon_tmds_pll {
 	uint32_t		rtp_freq;
 	uint32_t		rtp_pll;
 };
 struct radeonfb_softc {
 	device_t		sc_dev;
 	uint16_t		sc_family;
 	uint16_t		sc_flags;
 	pcireg_t		sc_id;
 	char			sc_devinfo[256];
 	bus_space_tag_t		sc_regt;
 	bus_space_handle_t	sc_regh;
 	bus_size_t		sc_regsz;
 	bus_addr_t		sc_regaddr;
 	bus_space_tag_t		sc_memt;
 	bus_space_handle_t	sc_memh;
 	bus_size_t		sc_memsz;
 	bus_addr_t		sc_memaddr;
 	bus_space_tag_t		sc_iot;
 	bus_space_handle_t	sc_ioh;
 	bus_size_t		sc_iosz;

 @@ -1,34 +1,34 @@
-/*	$NetBSD: sdhc_pci.c,v 1.4 2011/02/02 04:18:14 jakllsch Exp $	*/
+/*	$NetBSD: sdhc_pci.c,v 1.5 2012/01/30 19:41:23 drochner Exp $	*/
 /*	$OpenBSD: sdhc_pci.c,v 1.7 2007/10/30 18:13:45 chl Exp $	*/
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc_pci.c,v 1.4 2011/02/02 04:18:14 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc_pci.c,v 1.5 2012/01/30 19:41:23 drochner Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/pmf.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/sdmmc/sdhcreg.h>
 #include <dev/sdmmc/sdhcvar.h>
 #include <dev/sdmmc/sdmmcvar.h>
 @@ -166,44 +166,40 @@ sdhc_pci_match(device_t parent, cfdata_t
 	return 0;
+}
 static void
 sdhc_pci_attach(device_t parent, device_t self, void *aux)
+{
 	struct sdhc_pci_softc *sc = device_private(self);
 	struct pci_attach_args *pa = (struct pci_attach_args *)aux;
 	pci_chipset_tag_t pc = pa->pa_pc;
 	pcitag_t tag = pa->pa_tag;
 	pci_intr_handle_t ih;
 	pcireg_t csr;
 	pcireg_t slotinfo;
 	char devinfo[256];
 	char const *intrstr;
 	int nslots;
 	int reg;
 	int cnt;
 	bus_space_tag_t iot;
 	bus_space_handle_t ioh;
 	bus_size_t size;
 	uint32_t flags;
 	sc->sc.sc_dev = self;
 	sc->sc.sc_dmat = pa->pa_dmat;
 	sc->sc.sc_host = NULL;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo,
 	    PCI_REVISION(pa->pa_class));
 	aprint_naive("\n");
 	/* Some controllers needs special treatment. */
 	flags = sdhc_pci_lookup_quirk_flags(pa);
 	if (ISSET(flags, SDHC_PCI_QUIRK_TI_HACK))
 		sdhc_pci_quirk_ti_hack(pa);
 	if (ISSET(flags, SDHC_PCI_QUIRK_FORCE_DMA))
 		SET(sc->sc.sc_flags, SDHC_FLAG_FORCE_DMA);
 	if (ISSET(flags, SDHC_PCI_QUIRK_NO_PWR0))
 		SET(sc->sc.sc_flags, SDHC_FLAG_NO_PWR0);
 	/*
 	 * Map and attach all hosts supported by the host controller.
 	 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: voyager.c,v 1.8 2011/12/13 14:41:55 macallan Exp $	*/
+/*	$NetBSD: voyager.c,v 1.9 2012/01/30 19:41:23 drochner Exp $	*/
 /*
  * Copyright (c) 2009, 2011 Michael Lorenz
  * 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.
 @@ -16,27 +16,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: voyager.c,v 1.8 2011/12/13 14:41:55 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voyager.c,v 1.9 2012/01/30 19:41:23 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/lwp.h>
 #include <sys/kauth.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pciio.h>
 @@ -139,41 +139,39 @@ voyager_match(device_t parent, cfdata_t
 	/* only chip tested on so far - may need a list */
 	if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_SILMOTION_SM502)
 		return 100;
 	return (0);
+}
 static void
 voyager_attach(device_t parent, device_t self, void *aux)
+{
 	struct voyager_softc	*sc = device_private(self);
 	struct pci_attach_args	*pa = aux;
 	pci_intr_handle_t ih;
 	char devinfo[256];
 	struct voyager_attach_args vaa;
 	struct i2cbus_attach_args iba;
 	uint32_t reg;
 	const char *intrstr;
 	int i;
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_pcitag = pa->pa_tag;
 	sc->sc_memt = pa->pa_memt;
 	sc->sc_iot = pa->pa_iot;
 	sc->sc_dev = self;
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+	pci_aprint_devinfo(pa, NULL);
 	aprint_normal(": %s\n", devinfo);
 	if (pci_mapreg_map(pa, 0x14, PCI_MAPREG_TYPE_MEM, 0,
 	    &sc->sc_memt, &sc->sc_regh, &sc->sc_reg, &sc->sc_regsize)) {
 		aprint_error("%s: failed to map registers.\n",
 		    device_xname(sc->sc_dev));
+	}
 	if (pci_mapreg_map(pa, 0x10, PCI_MAPREG_TYPE_MEM,
 	    BUS_SPACE_MAP_LINEAR,
 	    &sc->sc_memt, &sc->sc_fbh, &sc->sc_fb, &sc->sc_fbsize)) {
 		aprint_error("%s: failed to map the frame buffer.\n",
 		    device_xname(sc->sc_dev));
+	}