Intel Centrino Wireless-N 130 support

[diro%nixsyspaus.org@localhost]

In reference to this thread:

http://mail-index.netbsd.org/tech-net/2012/01/21/msg003076.html

i've added support for the Intel Centrino Wireless-N 130 adapter with these
patches:

--- external/intel-fw-public/Makefile.orig      2011-05-20 01:59:14.000000000 
+0000
+++ external/intel-fw-public/Makefile   2012-12-07 10:08:40.000000000 +0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.6 2011/05/20 01:59:14 msaitoh Exp $
 
 SUBDIR+=       ipw3945 iwl1000 iwl4965 iwl5000 iwl5150 iwl6000 iwl6005 \
-               iwl6050
+               iwl6030 iwl6050
 
 .include <bsd.subdir.mk>


# Added:
# dist/iwlwifi-6000g2b-6.ucode
# to FILES in:
# external/intel-fw-public/iwl6030/Makefile
#
# Added:
# external/intel-fw-public/iwl6030/dist
# external/intel-fw-public/iwl6030/dist/LICENSE.iwlwifi-6000g2b-ucode
# external/intel-fw-public/iwl6030/dist/README.iwlwifi-6000g2b-ucode
# external/intel-fw-public/iwl6030/dist/iwlwifi-6000g2b-6.ucode
# from:
# 
http://www.intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000g2b-ucode-18.168.6.1.tgz


--- sys/dev/pci/if_iwn.c.orig   2012-01-30 19:41:20.000000000 +0000
+++ sys/dev/pci/if_iwn.c        2012-12-07 15:38:36.000000000 +0000
@@ -99,7 +99,6 @@
        PCI_PRODUCT_INTEL_WIFI_LINK_6005_2X2_2,
        PCI_PRODUCT_INTEL_WIFI_LINK_6230_1,
        PCI_PRODUCT_INTEL_WIFI_LINK_6230_2,
+       PCI_PRODUCT_INTEL_WIFI_LINK_6030_1,
 };
 
 /*
@@ -718,18 +717,7 @@
                break;
        case IWN_HW_REV_TYPE_6005:
                sc->limits = &iwn6000_sensitivity_limits;
-               sc->fwname = "iwlwifi-6000g2a-5.ucode";
+               if (pid == PCI_PRODUCT_INTEL_WIFI_LINK_1030_1 ||
+                   pid == PCI_PRODUCT_INTEL_WIFI_LINK_1030_2 ||
+                   pid == PCI_PRODUCT_INTEL_WIFI_LINK_6230_1 ||
+                   pid == PCI_PRODUCT_INTEL_WIFI_LINK_6230_2) {
+                       sc->fwname = "iwlwifi-6000g2b-6.ucode";
+               }
+               else
+                       sc->fwname = "iwlwifi-6000g2a-5.ucode";
+               break;
+       case IWN_HW_REV_TYPE_6030:
+               sc->limits = &iwn6000_sensitivity_limits;
+               sc->fwname = "iwlwifi-6000g2b-6.ucode";
                break;
        default:
                aprint_normal(": adapter type %d not supported\n", sc->hw_type);

--- sys/dev/pci/if_iwnreg.h.orig        2011-10-08 09:15:08.000000000 +0000
+++ sys/dev/pci/if_iwnreg.h     2012-12-07 15:40:10.000000000 +0000
@@ -210,7 +210,6 @@
 #define IWN_HW_REV_TYPE_6000   7
 #define IWN_HW_REV_TYPE_6050   8
 #define IWN_HW_REV_TYPE_6005   11
+#define IWN_HW_REV_TYPE_6030   34
 
 /* Possible flags for register IWN_GIO_CHICKEN. */
 #define IWN_GIO_CHICKEN_L1A_NO_L0S_RX  (1 << 23)

--- sys/dev/pci/pcidevs.h.orig  2012-06-28 16:07:16.000000000 +0000
+++ sys/dev/pci/pcidevs.h       2012-12-07 15:42:30.000000000 +0000
@@ -2367,7 +2367,6 @@
 #define        PCI_PRODUCT_INTEL_PCMC  0x04a3          /* 82434LX/NX PCI, 
Cache and Memory Controller (PCMC) */
 #define        PCI_PRODUCT_INTEL_GDT_RAID1     0x0600          /* GDT RAID */
 #define        PCI_PRODUCT_INTEL_GDT_RAID2     0x061f          /* GDT RAID */
+#define PCI_PRODUCT_INTEL_WIFI_LINK_6030_1     0x0896  /* Centrino Wireless-N 
130 */
 #define        PCI_PRODUCT_INTEL_80960RM       0x0962          /* i960 RM 
PCI-PCI */
 #define        PCI_PRODUCT_INTEL_80960RN       0x0964          /* i960 RN 
PCI-PCI */
 #define        PCI_PRODUCT_INTEL_82542 0x1000          /* i82542 Gigabit 
Ethernet */

dmesg is here: http://pastebin.ca/2290670 (with the adapter's errors)

iwn doesn't attach in the IWN_HW_REV_TYPE_6005 block of if_iwn.c, but does
under the IWN_HW_REV_TYPE_6030 block.

Help?

TIA