diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2009-03-10 20:39:22 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2009-03-10 20:39:22 +0000 |
| commit | 78c94d8aa48fa9c3a66370c02ae2c8ea94d464b0 (patch) | |
| tree | 64dcd9f08f5331fa26510963488d96f1d3ede412 /sys/dev/pci/if_iwn.c | |
| parent | e19d662685b8911900a8d769a933f7d40013f712 (diff) | |
cleanup the mess in Intel WiFi Link PCI Ids.
WiFi Link 100 Series have been renamed to 1000 Series by Intel too.
Diffstat (limited to 'sys/dev/pci/if_iwn.c')
| -rw-r--r-- | sys/dev/pci/if_iwn.c | 46 |
1 files changed, 23 insertions, 23 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; |