 @@ -1,14 +1,14 @@
-/*	$NetBSD: aac_pci.c,v 1.33 2011/09/29 12:51:28 is Exp $	*/
+/*	$NetBSD: aac_pci.c,v 1.34 2012/09/23 01:10:59 chs Exp $	*/
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * 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.
 @@ -55,27 +55,27 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * from FreeBSD: aac_pci.c,v 1.1 2000/09/13 03:20:34 msmith Exp
  * via OpenBSD: aac_pci.c,v 1.7 2002/03/14 01:26:58 millert Exp
  */
 /*
  * PCI front-end for the `aac' driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.33 2011/09/29 12:51:28 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.34 2012/09/23 01:10:59 chs Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/bus.h>
 #include <machine/endian.h>
 #include <sys/intr.h>
 #include <dev/pci/pcidevs.h>
 @@ -346,31 +346,47 @@ static struct aac_ident {
 	},
+	{
 		PCI_VENDOR_ADP2,
 		PCI_PRODUCT_ADP2_ASR2120S,
 		PCI_VENDOR_IBM,
 		PCI_PRODUCT_IBM_SERVERAID8K,
 		AAC_HWIF_RKT,
 ,
 		"IBM ServeRAID 8k"
 	},
 	{	PCI_VENDOR_ADP2,
 		PCI_PRODUCT_ADP2_ASR2200S,
 		PCI_VENDOR_ADP2,
 		PCI_PRODUCT_ADP2_2405,
 		AAC_HWIF_I960RX,
 ,
 		"Adaptec RAID 2405"
 	},
 	{	PCI_VENDOR_ADP2,
 		PCI_PRODUCT_ADP2_ASR2200S,
 		PCI_VENDOR_ADP2,
 		PCI_PRODUCT_ADP2_3405,
 		AAC_HWIF_I960RX,
 ,
 		"Adaptec RAID 3405"
 	},
 	{	PCI_VENDOR_ADP2,
 		PCI_PRODUCT_ADP2_ASR2200S,
 		PCI_VENDOR_ADP2,
 		PCI_PRODUCT_ADP2_3805,
 		AAC_HWIF_I960RX,
 ,
 		"Adaptec RAID 3805"
 	},
+	{
 		PCI_VENDOR_DEC,
 		PCI_PRODUCT_DEC_21554,
 		PCI_VENDOR_ADP2,
 		PCI_PRODUCT_ADP2_AAC364,
 		AAC_HWIF_STRONGARM,
 ,
 		"Adaptec AAC-364"
 	},
+	{
 		PCI_VENDOR_DEC,
 		PCI_PRODUCT_DEC_21554,
 		PCI_VENDOR_ADP2,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_an_pci.c,v 1.33 2012/01/30 19:41:19 drochner Exp $	*/
+/*	$NetBSD: if_an_pci.c,v 1.34 2012/09/23 01:10:59 chs 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.33 2012/01/30 19:41:19 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.34 2012/09/23 01:10:59 chs 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>
 @@ -85,26 +85,27 @@ static int	an_pci_match(device_t, cfdata
 static void	an_pci_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(an_pci, sizeof(struct an_pci_softc),
     an_pci_match, an_pci_attach, NULL, NULL);
 static const struct an_pci_product {
 	u_int32_t	app_vendor;	/* PCI vendor ID */
 	u_int32_t	app_product;	/* PCI product ID */
 } an_pci_products[] = {
 	{ PCI_VENDOR_AIRONET,		PCI_PRODUCT_AIRONET_PC4xxx },
 	{ PCI_VENDOR_AIRONET,		PCI_PRODUCT_AIRONET_PC4500 },
 	{ PCI_VENDOR_AIRONET,		PCI_PRODUCT_AIRONET_PC4800 },
 	{ PCI_VENDOR_AIRONET,		PCI_PRODUCT_AIRONET_PCI350 },
 	{ PCI_VENDOR_AIRONET,		PCI_PRODUCT_AIRONET_MPI350 },
 	{ 0,				0			   }
 };
 static int
 an_pci_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct pci_attach_args *pa = aux;
 	const struct an_pci_product *app;
 	for (app = an_pci_products; app->app_vendor != 0; app++) {
 		if (PCI_VENDOR(pa->pa_id) == app->app_vendor &&
 		    PCI_PRODUCT(pa->pa_id) == app->app_product)
 			return 1;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_sip.c,v 1.154 2012/07/22 14:33:03 matt Exp $	*/
+/*	$NetBSD: if_sip.c,v 1.155 2012/09/23 01:10:59 chs Exp $	*/
 /*-
  * Copyright (c) 2001, 2002 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.
 @@ -63,27 +63,27 @@
  * SiS 7016 10/100, National Semiconductor DP83815 10/100, and
  * National Semiconductor DP83820 10/100/1000 PCI Ethernet
  * controllers.
+ *
  * Originally written to support the SiS 900 by Jason R. Thorpe for
  * Network Computer, Inc.
+ *
  * TODO:
+ *
  *	- Reduce the Rx interrupt load.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.154 2012/07/22 14:33:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.155 2012/09/23 01:10:59 chs 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>
 @@ -727,30 +727,33 @@ sipcom_lookup(const struct pci_attach_ar
 static int
 sipcom_check_64bit(const struct pci_attach_args *pa)
+{
 	static const struct {
 		pci_vendor_id_t c64_vendor;
 		pci_product_id_t c64_product;
 	} card64[] = {
 		/* Asante GigaNIX */
 		{ 0x128a,	0x0002 },
 		/* Accton EN1407-T, Planex GN-1000TE */
 		{ 0x1113,	0x1407 },
-		/* Netgear GA-621 */
+		/* Netgear GA621 */
 		{ 0x1385,	0x621a },
-		/* SMC EZ Card */
+		/* Netgear GA622 */
 		{ 0x1385,	0x622a },
 		/* SMC EZ Card 1000 (9462TX) */
 		{ 0x10b8,	0x9462 },
 		{ 0, 0}
 	};
 	pcireg_t subsys;
 	int i;
 	subsys = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_SUBSYS_ID_REG);
 	for (i = 0; card64[i].c64_vendor != 0; i++) {
 		if (PCI_VENDOR(subsys) == card64[i].c64_vendor &&
 		    PCI_PRODUCT(subsys) == card64[i].c64_product)
 			return (1);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_tlp_pci.c,v 1.121 2011/11/11 23:01:59 jakllsch Exp $	*/
+/*	$NetBSD: if_tlp_pci.c,v 1.122 2012/09/23 01:10:59 chs Exp $	*/
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002 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; and Charles M. Hannum.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -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 Digital Semiconductor ``Tulip'' (21x4x)
  * Ethernet controller family driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.121 2011/11/11 23:01:59 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.122 2012/09/23 01:10:59 chs 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 <machine/endian.h>
 @@ -1534,26 +1534,33 @@ tlp_pci_adaptec_quirks(struct tulip_pci_
+{
 	struct tulip_softc *sc = &psc->sc_tulip;
 	uint8_t *srom = sc->sc_srom, id0;
 	uint16_t id1, id2;
 	if (sc->sc_mediasw == NULL) {
 		id0 = srom[32];
 		switch (id0) {
 		case 0x12:
 			strcpy(psc->sc_tulip.sc_name, "Cogent EM100TX");
 			sc->sc_mediasw = &tlp_cogent_em1x0_mediasw;
 			break;
 		case 0x13:
 			strcpy(psc->sc_tulip.sc_name, "Cogent ???");
  			sc->sc_mediasw = &tlp_cogent_em1x0_mediasw;
 			psc->sc_flags |= TULIP_PCI_SHAREDINTR |
 			    TULIP_PCI_SHAREDROM;
 			break;
 		case 0x15:
 			strcpy(psc->sc_tulip.sc_name, "Cogent EM100FX");
 			sc->sc_mediasw = &tlp_cogent_em1x0_mediasw;
 			break;
 #if 0
 		case XXX:
 			strcpy(psc->sc_tulip.sc_name, "Cogent EM110TX");
 			sc->sc_mediasw = &tlp_cogent_em1x0_mediasw;
 			break;
 #endif
 		default: