Module Name: src
Committed By: riz
Date: Thu Nov 22 17:48:18 UTC 2012
Modified Files:
src/sys/dev/pci [netbsd-6]: aac_pci.c if_an_pci.c if_sip.c if_tlp_pci.c
Log Message:
Pull up following revision(s) (requested by chs in ticket #691):
sys/dev/pci/aac_pci.c: revision 1.34
sys/dev/pci/if_sip.c: revision 1.155
sys/dev/pci/if_tlp_pci.c: revision 1.122
sys/dev/pci/if_an_pci.c: revision 1.34
match some more devices.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/dev/pci/aac_pci.c
cvs rdiff -u -r1.33 -r1.33.2.1 src/sys/dev/pci/if_an_pci.c
cvs rdiff -u -r1.153 -r1.153.2.1 src/sys/dev/pci/if_sip.c
cvs rdiff -u -r1.121 -r1.121.6.1 src/sys/dev/pci/if_tlp_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/aac_pci.c
diff -u src/sys/dev/pci/aac_pci.c:1.33 src/sys/dev/pci/aac_pci.c:1.33.8.1
--- src/sys/dev/pci/aac_pci.c:1.33 Thu Sep 29 12:51:28 2011
+++ src/sys/dev/pci/aac_pci.c Thu Nov 22 17:48:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: aac_pci.c,v 1.33 2011/09/29 12:51:28 is Exp $ */
+/* $NetBSD: aac_pci.c,v 1.33.8.1 2012/11/22 17:48:15 riz Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#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.33.8.1 2012/11/22 17:48:15 riz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -356,11 +356,27 @@ static struct aac_ident {
{ PCI_VENDOR_ADP2,
PCI_PRODUCT_ADP2_ASR2200S,
PCI_VENDOR_ADP2,
+ PCI_PRODUCT_ADP2_2405,
+ AAC_HWIF_I960RX,
+ 0,
+ "Adaptec RAID 2405"
+ },
+ { PCI_VENDOR_ADP2,
+ PCI_PRODUCT_ADP2_ASR2200S,
+ PCI_VENDOR_ADP2,
PCI_PRODUCT_ADP2_3405,
AAC_HWIF_I960RX,
0,
"Adaptec RAID 3405"
},
+ { PCI_VENDOR_ADP2,
+ PCI_PRODUCT_ADP2_ASR2200S,
+ PCI_VENDOR_ADP2,
+ PCI_PRODUCT_ADP2_3805,
+ AAC_HWIF_I960RX,
+ 0,
+ "Adaptec RAID 3805"
+ },
{
PCI_VENDOR_DEC,
PCI_PRODUCT_DEC_21554,
Index: src/sys/dev/pci/if_an_pci.c
diff -u src/sys/dev/pci/if_an_pci.c:1.33 src/sys/dev/pci/if_an_pci.c:1.33.2.1
--- src/sys/dev/pci/if_an_pci.c:1.33 Mon Jan 30 19:41:19 2012
+++ src/sys/dev/pci/if_an_pci.c Thu Nov 22 17:48:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_an_pci.c,v 1.33 2012/01/30 19:41:19 drochner Exp $ */
+/* $NetBSD: if_an_pci.c,v 1.33.2.1 2012/11/22 17:48:18 riz Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#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.33.2.1 2012/11/22 17:48:18 riz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -95,6 +95,7 @@ static const struct an_pci_product {
{ 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 }
};
Index: src/sys/dev/pci/if_sip.c
diff -u src/sys/dev/pci/if_sip.c:1.153 src/sys/dev/pci/if_sip.c:1.153.2.1
--- src/sys/dev/pci/if_sip.c:1.153 Thu Feb 2 19:43:05 2012
+++ src/sys/dev/pci/if_sip.c Thu Nov 22 17:48:16 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sip.c,v 1.153 2012/02/02 19:43:05 tls Exp $ */
+/* $NetBSD: if_sip.c,v 1.153.2.1 2012/11/22 17:48:16 riz Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.153 2012/02/02 19:43:05 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.153.2.1 2012/11/22 17:48:16 riz Exp $");
@@ -737,10 +737,13 @@ sipcom_check_64bit(const struct pci_atta
/* 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}
Index: src/sys/dev/pci/if_tlp_pci.c
diff -u src/sys/dev/pci/if_tlp_pci.c:1.121 src/sys/dev/pci/if_tlp_pci.c:1.121.6.1
--- src/sys/dev/pci/if_tlp_pci.c:1.121 Fri Nov 11 23:01:59 2011
+++ src/sys/dev/pci/if_tlp_pci.c Thu Nov 22 17:48:17 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlp_pci.c,v 1.121 2011/11/11 23:01:59 jakllsch Exp $ */
+/* $NetBSD: if_tlp_pci.c,v 1.121.6.1 2012/11/22 17:48:17 riz Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#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.121.6.1 2012/11/22 17:48:17 riz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1544,6 +1544,13 @@ tlp_pci_adaptec_quirks(struct tulip_pci_
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;
