diff options
| -rw-r--r-- | sys/dev/pci/if_iwn.c | 46 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwnreg.h | 4 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs | 42 |
3 files changed, 46 insertions, 46 deletions
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index 75754651bba..c41943d36fc 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.47 2009/02/15 08:58:22 damien Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.48 2009/03/10 20:39:21 damien Exp $ */ /*- * Copyright (c) 2007, 2008 @@ -67,26 +67,26 @@ #include <dev/pci/if_iwnvar.h> static const struct pci_matchid iwn_devices[] = { - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_WL_4965AGN_1 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_WL_4965AGN_2 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_WL_5100AGN_1 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_WL_5100AGN_2 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_WL_5150AGN_1 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_WL_5150AGN_2 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_WL_5300AGN_1 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_WL_5300AGN_2 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_WL_5350AGN_1 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_WL_5350AGN_2 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_6000_1 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_6000_2 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_6000_3 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_6000_4 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_6050_1 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_6050_2 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_6050_3 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_6050_4 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_100_1 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_100_2 } + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_4965_1 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_4965_2 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_5100_1 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_5100_2 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_5150_1 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_5150_2 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_5300_1 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_5300_2 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_5350_1 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_5350_2 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_1 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_2 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_3 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_4 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6050_1 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6050_2 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6050_3 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6050_4 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_1000_1 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_1000_2 } }; int iwn_match(struct device *, void *, void *); @@ -563,9 +563,9 @@ iwn_hal_attach(struct iwn_softc *sc) sc->txantmsk = sc->rxantmsk = IWN_ANT_ABC; sc->ntxchains = sc->nrxchains = 3; break; - case IWN_HW_REV_TYPE_100: + case IWN_HW_REV_TYPE_1000: sc->sc_hal = &iwn5000_hal; - sc->fwname = "iwn-100"; + sc->fwname = "iwn-1000"; sc->critical_temp = 110; sc->txantmsk = IWN_ANT_A; sc->rxantmsk = IWN_ANT_A | IWN_ANT_B; diff --git a/sys/dev/pci/if_iwnreg.h b/sys/dev/pci/if_iwnreg.h index 44ad3838edc..d6ee11d82ab 100644 --- a/sys/dev/pci/if_iwnreg.h +++ b/sys/dev/pci/if_iwnreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwnreg.h,v 1.21 2009/02/15 08:58:22 damien Exp $ */ +/* $OpenBSD: if_iwnreg.h,v 1.22 2009/03/10 20:39:21 damien Exp $ */ /*- * Copyright (c) 2007, 2008 @@ -180,7 +180,7 @@ #define IWN_HW_REV_TYPE_5350 3 #define IWN_HW_REV_TYPE_5150 4 #define IWN_HW_REV_TYPE_5100 5 -#define IWN_HW_REV_TYPE_100 6 +#define IWN_HW_REV_TYPE_1000 6 #define IWN_HW_REV_TYPE_6000 7 #define IWN_HW_REV_TYPE_6050 8 diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs index 012f962ed36..13e79836f40 100644 --- a/sys/dev/pci/pcidevs +++ b/sys/dev/pci/pcidevs @@ -1,4 +1,4 @@ -$OpenBSD: pcidevs,v 1.1459 2009/03/07 10:17:10 jsg Exp $ +$OpenBSD: pcidevs,v 1.1460 2009/03/10 20:39:21 damien Exp $ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ /* @@ -2109,14 +2109,14 @@ product IMS TT3D 0x9135 Twin Turbo 3D /* Intel products */ product INTEL EESISA 0x0008 EES ISA product INTEL 21145 0x0039 21145 -product INTEL WL_6000_1 0x0082 WiFi Link 6000 -product INTEL WL_100_1 0x0083 WiFi Link 100 -product INTEL WL_100_2 0x0084 WiFi Link 100 -product INTEL WL_6000_2 0x0085 WiFi Link 6000 -product INTEL WL_6050_1 0x0086 WiFi Link 6050 -product INTEL WL_6050_2 0x0087 WiFi Link 6050 -product INTEL WL_6050_3 0x0088 WiFi Link 6050 -product INTEL WL_6050_4 0x0089 WiFi Link 6050 +product INTEL WIFI_LINK_6000_1 0x0082 WiFi Link 6000 +product INTEL WIFI_LINK_1000_1 0x0083 WiFi Link 1000 +product INTEL WIFI_LINK_1000_2 0x0084 WiFi Link 1000 +product INTEL WIFI_LINK_6000_2 0x0085 WiFi Link 6000 +product INTEL WIFI_LINK_6050_1 0x0086 WiFi Link 6050 +product INTEL WIFI_LINK_6050_2 0x0087 WiFi Link 6050 +product INTEL WIFI_LINK_6050_3 0x0088 WiFi Link 6050 +product INTEL WIFI_LINK_6050_4 0x0089 WiFi Link 6050 product INTEL 80303 0x0309 80303 IOP product INTEL 80312 0x030d 80312 I/O Companion product INTEL IOXAPIC_A 0x0326 IOxAPIC @@ -2885,18 +2885,18 @@ product INTEL PRO_WL_3945ABG_1 0x4222 PRO/Wireless 3945ABG product INTEL PRO_WL_2915ABG_1 0x4223 PRO/Wireless 2915ABG product INTEL PRO_WL_2915ABG_2 0x4224 PRO/Wireless 2915ABG product INTEL PRO_WL_3945ABG_2 0x4227 PRO/Wireless 3945ABG -product INTEL PRO_WL_4965AGN_1 0x4229 Wireless WiFi Link 4965AGN -product INTEL WL_6000_3 0x422b WiFi Link 6000 -product INTEL PRO_WL_4965AGN_2 0x4230 Wireless WiFi Link 4965AGN -product INTEL PRO_WL_5100AGN_1 0x4232 WiFi Link 5100AGN -product INTEL PRO_WL_5300AGN_1 0x4235 WiFi Link 5300AGN -product INTEL PRO_WL_5300AGN_2 0x4236 WiFi Link 5300AGN -product INTEL PRO_WL_5100AGN_2 0x4237 WiFi Link 5100AGN -product INTEL WL_6000_4 0x4238 WiFi Link 6000 -product INTEL PRO_WL_5350AGN_1 0x423a WiFi Link 5350AGN -product INTEL PRO_WL_5350AGN_2 0x423b WiFi Link 5350AGN -product INTEL PRO_WL_5150AGN_1 0x423c WiFi Link 5150AGN -product INTEL PRO_WL_5150AGN_2 0x423d WiFi Link 5150AGN +product INTEL WIFI_LINK_4965_1 0x4229 Wireless WiFi Link 4965 +product INTEL WIFI_LINK_6000_3 0x422b WiFi Link 6000 +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_4 0x4238 WiFi Link 6000 +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 TURBO_MEMORY 0x444e Turbo Memory product INTEL 80960RD 0x5200 i960 RD PCI-PCI product INTEL PRO_100_SERVER 0x5201 PRO 100 Server |