summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_iwn.c13
-rw-r--r--sys/dev/pci/pcidevs.h11
-rw-r--r--sys/dev/pci/pcidevs_data.h30
3 files changed, 43 insertions, 11 deletions
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c
index 04dd6e370af..f2fc69c9448 100644
--- a/sys/dev/pci/if_iwn.c
+++ b/sys/dev/pci/if_iwn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwn.c,v 1.95 2010/05/07 11:16:04 dhill Exp $ */
+/* $OpenBSD: if_iwn.c,v 1.96 2010/05/13 09:25:03 damien Exp $ */
/*-
* Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -83,8 +83,15 @@ static const struct pci_matchid iwn_devices[] = {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_IPA_2 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6050_2X2_1 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6050_2X2_2 },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6005_2X2_1 },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6005_2X2_2 }
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6005A_2X2_1 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6005A_2X2_2 },
+#ifdef notyet
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6005B_1X1_1 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6005B_1X1_2 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6005B_2X2_1 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6005B_2X2_2 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6005B_2X2_3 }
+#endif
};
int iwn_match(struct device *, void *, void *);
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 39ae71ab256..79bd18b1cb1 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -2,7 +2,7 @@
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: pcidevs,v 1.1553 2010/05/12 21:30:25 oga Exp
+ * OpenBSD: pcidevs,v 1.1554 2010/05/13 09:22:29 damien Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@@ -2197,12 +2197,17 @@
#define PCI_PRODUCT_INTEL_21145 0x0039 /* 21145 */
#define PCI_PRODUCT_INTEL_CLARKDALE_IGD 0x0042 /* Intel HD graphics */
#define PCI_PRODUCT_INTEL_ARRANDALE_IGD 0x0046 /* Intel HD graphics */
-#define PCI_PRODUCT_INTEL_WIFI_LINK_6005_2X2_1 0x0082 /* Centrino Advanced-N 6205 */
+#define PCI_PRODUCT_INTEL_WIFI_LINK_6005A_2X2_1 0x0082 /* Centrino Advanced-N 6205a */
#define PCI_PRODUCT_INTEL_WIFI_LINK_1000_1 0x0083 /* WiFi Link 1000 */
#define PCI_PRODUCT_INTEL_WIFI_LINK_1000_2 0x0084 /* WiFi Link 1000 */
-#define PCI_PRODUCT_INTEL_WIFI_LINK_6005_2X2_2 0x0085 /* Centrino Advanced-N 6205 */
+#define PCI_PRODUCT_INTEL_WIFI_LINK_6005A_2X2_2 0x0085 /* Centrino Advanced-N 6205a */
#define PCI_PRODUCT_INTEL_WIFI_LINK_6050_2X2_1 0x0087 /* Centrino Advanced-N 6250 */
#define PCI_PRODUCT_INTEL_WIFI_LINK_6050_2X2_2 0x0089 /* Centrino Advanced-N 6250 */
+#define PCI_PRODUCT_INTEL_WIFI_LINK_6005B_1X1_1 0x008a /* Centrino Advanced-N 6205b */
+#define PCI_PRODUCT_INTEL_WIFI_LINK_6005B_1X1_2 0x008b /* Centrino Advanced-N 6205b */
+#define PCI_PRODUCT_INTEL_WIFI_LINK_6005B_2X2_1 0x008f /* Centrino Advanced-N 6205b */
+#define PCI_PRODUCT_INTEL_WIFI_LINK_6005B_2X2_2 0x0090 /* Centrino Advanced-N 6205b */
+#define PCI_PRODUCT_INTEL_WIFI_LINK_6005B_2X2_3 0x0091 /* Centrino Advanced-N 6205b */
#define PCI_PRODUCT_INTEL_80303 0x0309 /* 80303 IOP */
#define PCI_PRODUCT_INTEL_80312 0x030d /* 80312 I/O Companion */
#define PCI_PRODUCT_INTEL_IOXAPIC_A 0x0326 /* IOxAPIC */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 8fa0e6f68c8..c62dd6e0cbf 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,7 +2,7 @@
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: pcidevs,v 1.1553 2010/05/12 21:30:25 oga Exp
+ * OpenBSD: pcidevs,v 1.1554 2010/05/13 09:22:29 damien Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@@ -6476,8 +6476,8 @@ static const struct pci_known_product pci_known_products[] = {
"Intel HD graphics",
},
{
- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6005_2X2_1,
- "Centrino Advanced-N 6205",
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6005A_2X2_1,
+ "Centrino Advanced-N 6205a",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_1000_1,
@@ -6488,8 +6488,8 @@ static const struct pci_known_product pci_known_products[] = {
"WiFi Link 1000",
},
{
- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6005_2X2_2,
- "Centrino Advanced-N 6205",
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6005A_2X2_2,
+ "Centrino Advanced-N 6205a",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6050_2X2_1,
@@ -6500,6 +6500,26 @@ static const struct pci_known_product pci_known_products[] = {
"Centrino Advanced-N 6250",
},
{
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6005B_1X1_1,
+ "Centrino Advanced-N 6205b",
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6005B_1X1_2,
+ "Centrino Advanced-N 6205b",
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6005B_2X2_1,
+ "Centrino Advanced-N 6205b",
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6005B_2X2_2,
+ "Centrino Advanced-N 6205b",
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6005B_2X2_3,
+ "Centrino Advanced-N 6205b",
+ },
+ {
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_80303,
"80303 IOP",
},