[src/trunk]: src/sys/dev/pci Add newer Wireless WiFi Link 4965 devices, Centr...

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

details:   https://anonhg.NetBSD.org/src/rev/27f32976d48b
branches:  trunk
changeset: 765201:27f32976d48b
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Sat May 21 12:51:47 2011 +0000

description:
Add newer Wireless WiFi Link 4965 devices, Centrino Wireless-N 1030
and Centrino Advanced-N 6230

diffstat:

 sys/dev/pci/if_iwn.c |  23 ++++++++---------------
 1 files changed, 8 insertions(+), 15 deletions(-)

diffs (53 lines):

diff -r 8d62260b188e -r 27f32976d48b sys/dev/pci/if_iwn.c
--- a/sys/dev/pci/if_iwn.c      Sat May 21 12:49:50 2011 +0000
+++ b/sys/dev/pci/if_iwn.c      Sat May 21 12:51:47 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_iwn.c,v 1.55 2011/05/20 01:59:15 msaitoh Exp $      */
+/*     $NetBSD: if_iwn.c,v 1.56 2011/05/21 12:51:47 msaitoh Exp $      */
 /*     $OpenBSD: if_iwn.c,v 1.96 2010/05/13 09:25:03 damien Exp $      */
 
 /*-
@@ -22,7 +22,7 @@
  * adapters.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.55 2011/05/20 01:59:15 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.56 2011/05/21 12:51:47 msaitoh Exp $");
 
 #define IWN_USE_RBUF   /* Use local storage for RX */
 #undef IWN_HWCRYPTO    /* XXX does not even compile yet */
@@ -73,8 +73,12 @@
 #include <dev/pci/if_iwnvar.h>
 
 static const pci_product_id_t iwn_devices[] = {
+       PCI_PRODUCT_INTEL_WIFI_LINK_1030_1,
+       PCI_PRODUCT_INTEL_WIFI_LINK_1030_2,
        PCI_PRODUCT_INTEL_WIFI_LINK_4965_1,
        PCI_PRODUCT_INTEL_WIFI_LINK_4965_2,
+       PCI_PRODUCT_INTEL_WIFI_LINK_4965_3,
+       PCI_PRODUCT_INTEL_WIFI_LINK_4965_4,
        PCI_PRODUCT_INTEL_WIFI_LINK_5100_1,
        PCI_PRODUCT_INTEL_WIFI_LINK_5100_2,
        PCI_PRODUCT_INTEL_WIFI_LINK_5150_1,
@@ -93,19 +97,8 @@
        PCI_PRODUCT_INTEL_WIFI_LINK_6050_2X2_2,
        PCI_PRODUCT_INTEL_WIFI_LINK_6005_2X2_1,
        PCI_PRODUCT_INTEL_WIFI_LINK_6005_2X2_2,
-#ifdef notyet
-       /*
-        * XXX NetBSD: the 6005A replaces the two 6005, above
-        * (see OpenBSD rev 1.96).
-        */
-       PCI_PRODUCT_INTEL_WIFI_LINK_6005A_2X2_1,
-       PCI_PRODUCT_INTEL_WIFI_LINK_6005A_2X2_2,
-       PCI_PRODUCT_INTEL_WIFI_LINK_6005B_1X1_1,
-       PCI_PRODUCT_INTEL_WIFI_LINK_6005B_1X1_2,
-       PCI_PRODUCT_INTEL_WIFI_LINK_6005B_2X2_1,
-       PCI_PRODUCT_INTEL_WIFI_LINK_6005B_2X2_2,
-       PCI_PRODUCT_INTEL_WIFI_LINK_6005B_2X2_3
-#endif
+       PCI_PRODUCT_INTEL_WIFI_LINK_6230_1,
+       PCI_PRODUCT_INTEL_WIFI_LINK_6230_2,
 };
 
 /*