[src/netbsd-6]: src/sys/dev/pci Pull up following revision(s) (requested by c...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9a997c706208
branches:  netbsd-6
changeset: 775495:9a997c706208
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Nov 22 17:48:15 2012 +0000

description:
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.

diffstat:

 sys/dev/pci/aac_pci.c    |  20 ++++++++++++++++++--
 sys/dev/pci/if_an_pci.c  |   5 +++--
 sys/dev/pci/if_sip.c     |  11 +++++++----
 sys/dev/pci/if_tlp_pci.c |  11 +++++++++--
 4 files changed, 37 insertions(+), 10 deletions(-)

diffs (138 lines):

diff -r 25e8591fd01e -r 9a997c706208 sys/dev/pci/aac_pci.c
--- a/sys/dev/pci/aac_pci.c     Thu Nov 22 17:47:10 2012 +0000
+++ b/sys/dev/pci/aac_pci.c     Thu Nov 22 17:48:15 2012 +0000
@@ -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 @@
        {       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,
diff -r 25e8591fd01e -r 9a997c706208 sys/dev/pci/if_an_pci.c
--- a/sys/dev/pci/if_an_pci.c   Thu Nov 22 17:47:10 2012 +0000
+++ b/sys/dev/pci/if_an_pci.c   Thu Nov 22 17:48:15 2012 +0000
@@ -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 @@
        { 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                          }
 };
 
diff -r 25e8591fd01e -r 9a997c706208 sys/dev/pci/if_sip.c
--- a/sys/dev/pci/if_sip.c      Thu Nov 22 17:47:10 2012 +0000
+++ b/sys/dev/pci/if_sip.c      Thu Nov 22 17:48:15 2012 +0000
@@ -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 @@
                /* 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}
diff -r 25e8591fd01e -r 9a997c706208 sys/dev/pci/if_tlp_pci.c
--- a/sys/dev/pci/if_tlp_pci.c  Thu Nov 22 17:47:10 2012 +0000
+++ b/sys/dev/pci/if_tlp_pci.c  Thu Nov 22 17:48:15 2012 +0000
@@ -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 @@
                        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;