Module Name: src
Committed By: christos
Date: Wed May 12 12:26:16 UTC 2010
Modified Files:
src/sys/dev/pci: if_iwn.c pcidevs
Log Message:
Use device names from the OpenBSD iwn driver, adding and modifying device
names as needed. From Sverre Froyen
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/pci/if_iwn.c
cvs rdiff -u -r1.1030 -r1.1031 src/sys/dev/pci/pcidevs
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/if_iwn.c
diff -u src/sys/dev/pci/if_iwn.c:1.44 src/sys/dev/pci/if_iwn.c:1.45
--- src/sys/dev/pci/if_iwn.c:1.44 Sat May 1 22:06:15 2010
+++ src/sys/dev/pci/if_iwn.c Wed May 12 08:26:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwn.c,v 1.44 2010/05/02 02:06:15 christos Exp $ */
+/* $NetBSD: if_iwn.c,v 1.45 2010/05/12 12:26:16 christos Exp $ */
/* $OpenBSD: if_iwn.c,v 1.88 2010/04/10 08:37:36 damien Exp $ */
/*-
@@ -22,7 +22,7 @@
* adapters.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.44 2010/05/02 02:06:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.45 2010/05/12 12:26:16 christos Exp $");
#define IWN_USE_RBUF /* Use local storage for RX */
#undef IWN_HWCRYPTO /* XXX does not even compile yet */
@@ -76,18 +76,6 @@
#include <dev/pci/if_iwnvar.h>
static const pci_product_id_t iwn_devices[] = {
-/* XXX From old NetBSD iwn driver (used by pcidevs) */
- PCI_PRODUCT_INTEL_PRO_WL_4965AGN_1,
- PCI_PRODUCT_INTEL_PRO_WL_4965AGN_2,
- PCI_PRODUCT_INTEL_PRO_WL_5100AGN_1,
- PCI_PRODUCT_INTEL_PRO_WL_5100AGN_2,
- PCI_PRODUCT_INTEL_PRO_WL_5300AGN_1,
- PCI_PRODUCT_INTEL_PRO_WL_5300AGN_2,
- PCI_PRODUCT_INTEL_PRO_WL_5350AGN_1,
- PCI_PRODUCT_INTEL_PRO_WL_5350AGN_2,
- PCI_PRODUCT_INTEL_WIFI_LINK_6000_3X3_2,
-#if 0
-/* XXX From new OpenBSD iwn driver (not in pcidevs) */
PCI_PRODUCT_INTEL_WIFI_LINK_4965_1,
PCI_PRODUCT_INTEL_WIFI_LINK_4965_2,
PCI_PRODUCT_INTEL_WIFI_LINK_5100_1,
@@ -101,13 +89,13 @@
PCI_PRODUCT_INTEL_WIFI_LINK_1000_1,
PCI_PRODUCT_INTEL_WIFI_LINK_1000_2,
PCI_PRODUCT_INTEL_WIFI_LINK_6000_3X3_1,
+ PCI_PRODUCT_INTEL_WIFI_LINK_6000_3X3_2,
PCI_PRODUCT_INTEL_WIFI_LINK_6000_IPA_1,
PCI_PRODUCT_INTEL_WIFI_LINK_6000_IPA_2,
PCI_PRODUCT_INTEL_WIFI_LINK_6050_2X2_1,
PCI_PRODUCT_INTEL_WIFI_LINK_6050_2X2_2,
PCI_PRODUCT_INTEL_WIFI_LINK_6005_2X2_1,
PCI_PRODUCT_INTEL_WIFI_LINK_6005_2X2_2,
-#endif
};
/*
@@ -713,15 +701,12 @@
sc->limits = &iwn6000_sensitivity_limits;
sc->fwname = "iwlwifi-6000-4.ucode";
switch (pid) {
-/* XXX not yet defined for NetBSD (not in pcidevs) */
-#ifdef PCI_PRODUCT_INTEL_WIFI_LINK_6000_IPA_1
case PCI_PRODUCT_INTEL_WIFI_LINK_6000_IPA_1:
case PCI_PRODUCT_INTEL_WIFI_LINK_6000_IPA_2:
sc->sc_flags |= IWN_FLAG_INTERNAL_PA;
sc->txchainmask = IWN_ANT_BC;
sc->rxchainmask = IWN_ANT_BC;
break;
-#endif
default:
sc->txchainmask = IWN_ANT_ABC;
sc->rxchainmask = IWN_ANT_ABC;
Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1030 src/sys/dev/pci/pcidevs:1.1031
--- src/sys/dev/pci/pcidevs:1.1030 Mon May 10 02:38:45 2010
+++ src/sys/dev/pci/pcidevs Wed May 12 08:26:16 2010
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1030 2010/05/10 06:38:45 matt Exp $
+$NetBSD: pcidevs,v 1.1031 2010/05/12 12:26:16 christos Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2230,6 +2230,12 @@
product INTEL PCMC 0x04a3 82434LX/NX PCI, Cache and Memory Controller (PCMC)
product INTEL GDT_RAID1 0x0600 GDT RAID
product INTEL GDT_RAID2 0x061f GDT RAID
+product INTEL WIFI_LINK_6005_2X2_1 0x0082 Centrino Advanced-N 6205
+product INTEL WIFI_LINK_1000_1 0x0083 WiFi Link 1000
+product INTEL WIFI_LINK_1000_2 0x0084 WiFi Link 1000
+product INTEL WIFI_LINK_6005_2X2_2 0x0085 Centrino Advanced-N 6205
+product INTEL WIFI_LINK_6050_2X2_1 0x0087 Centrino Advanced-N 6250
+product INTEL WIFI_LINK_6050_2X2_2 0x0089 Centrino Advanced-N 6250
product INTEL 80960RM 0x0962 i960 RM PCI-PCI
product INTEL 80960RN 0x0964 i960 RN PCI-PCI
product INTEL 82542 0x1000 i82542 Gigabit Ethernet
@@ -2784,15 +2790,20 @@
product INTEL PRO_WL_2915ABG_1 0x4223 PRO/Wireless LAN 2915ABG Mini-PCI Adapter
product INTEL PRO_WL_2915ABG_2 0x4224 PRO/Wireless LAN 2915ABG Mini-PCI Adapter
product INTEL PRO_WL_3945ABG_2 0x4227 PRO/Wireless LAN 3945ABG Mini-PCI Adapter
-product INTEL PRO_WL_4965AGN_1 0x4229 PRO/Wireless LAN 4965AGN Mini-PCI Adapter
-product INTEL PRO_WL_4965AGN_2 0x4230 PRO/Wireless LAN 4965AGN Mini-PCI Adapter
-product INTEL PRO_WL_5100AGN_1 0x4232 Pro/Wireless LAN 5100AGN Mini-PCI Adapter
-product INTEL PRO_WL_5300AGN_1 0x4235 Pro/Wireless LAN 5300AGN Mini-PCI Adapter
-product INTEL PRO_WL_5300AGN_2 0x4236 Pro/Wireless LAN 5300AGN Mini-PCI Adapter
-product INTEL PRO_WL_5100AGN_2 0x4237 Pro/Wireless LAN 5100AGN Mini-PCI Adapter
-product INTEL WIFI_LINK_6000_3X3_2 0x4238 Pro/Wireless LAN 6300AGN Mini-PCI Adapter
-product INTEL PRO_WL_5350AGN_1 0x423a Pro/Wireless LAN 5350AGN Mini-PCI Adapter
-product INTEL PRO_WL_5350AGN_2 0x423b Pro/Wireless LAN 5350AGN Mini-PCI Adapter
+product INTEL WIFI_LINK_4965_1 0x4229 Wireless WiFi Link 4965
+product INTEL WIFI_LINK_6000_3X3_1 0x422b Centrino Ultimate-N 6300
+product INTEL WIFI_LINK_6000_IPA_1 0x422c Centrino Advanced-N 6200
+product INTEL WIFI_LINK_4965_2 0x4230 Wireless WiFi Link 4965
+product INTEL WIFI_LINK_5100_1 0x4232 WiFi Link 5100
+product INTEL WIFI_LINK_5300_1 0x4235 WiFi Link 5300
+product INTEL WIFI_LINK_5300_2 0x4236 WiFi Link 5300
+product INTEL WIFI_LINK_5100_2 0x4237 WiFi Link 5100
+product INTEL WIFI_LINK_6000_3X3_2 0x4238 Centrino Ultimate-N 6300
+product INTEL WIFI_LINK_6000_IPA_2 0x4239 Centrino Advanced-N 6200
+product INTEL WIFI_LINK_5350_1 0x423a WiFi Link 5350
+product INTEL WIFI_LINK_5350_2 0x423b WiFi Link 5350
+product INTEL WIFI_LINK_5150_1 0x423c WiFi Link 5150
+product INTEL WIFI_LINK_5150_2 0x423d WiFi Link 5150
product INTEL 80312_ATU 0x530d 80310 ATU
product INTEL 82371SB_ISA 0x7000 82371SB (PIIX3) PCI-ISA Bridge
product INTEL 82371SB_IDE 0x7010 82371SB (PIIX3) IDE Interface
