Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci match some more devices.



details:   https://anonhg.NetBSD.org/src/rev/15502ef4c212
branches:  trunk
changeset: 781694:15502ef4c212
user:      chs <chs%NetBSD.org@localhost>
date:      Sun Sep 23 01:10:59 2012 +0000

description:
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 ff5318c826ac -r 15502ef4c212 sys/dev/pci/aac_pci.c
--- a/sys/dev/pci/aac_pci.c     Sun Sep 23 01:10:10 2012 +0000
+++ b/sys/dev/pci/aac_pci.c     Sun Sep 23 01:10:59 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.34 2012/09/23 01:10:59 chs 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.34 2012/09/23 01:10:59 chs 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 ff5318c826ac -r 15502ef4c212 sys/dev/pci/if_an_pci.c
--- a/sys/dev/pci/if_an_pci.c   Sun Sep 23 01:10:10 2012 +0000
+++ b/sys/dev/pci/if_an_pci.c   Sun Sep 23 01:10:59 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.34 2012/09/23 01:10:59 chs 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.34 2012/09/23 01:10:59 chs 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 ff5318c826ac -r 15502ef4c212 sys/dev/pci/if_sip.c
--- a/sys/dev/pci/if_sip.c      Sun Sep 23 01:10:10 2012 +0000
+++ b/sys/dev/pci/if_sip.c      Sun Sep 23 01:10:59 2012 +0000
@@ -1,4 +1,4 @@
-/*     $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.
@@ -73,7 +73,7 @@
  */
 
 #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 $");
 
 
 
@@ -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 ff5318c826ac -r 15502ef4c212 sys/dev/pci/if_tlp_pci.c
--- a/sys/dev/pci/if_tlp_pci.c  Sun Sep 23 01:10:10 2012 +0000
+++ b/sys/dev/pci/if_tlp_pci.c  Sun Sep 23 01:10:59 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.122 2012/09/23 01:10:59 chs 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.122 2012/09/23 01:10:59 chs 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;



Home | Main Index | Thread Index | Old Index