diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2005-04-04 16:31:53 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2005-04-04 16:31:53 +0000 |
| commit | cfd8c60b109c9df7c538e3a0b439fbbe85d76872 (patch) | |
| tree | cff336f10f6842c5ef51986bf046fe1ab04c8bcb | |
| parent | 9aa30abc56e7deca0573fb8acb49ab98bb28641c (diff) | |
new id for PRO/Wireless 2915ABG. fix desc for PRO/Wireless adapters.
| -rw-r--r-- | sys/dev/pci/if_iwi.c | 13 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs | 11 |
2 files changed, 13 insertions, 11 deletions
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c index 3c183b0a160..80467528e84 100644 --- a/sys/dev/pci/if_iwi.c +++ b/sys/dev/pci/if_iwi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwi.c,v 1.32 2005/03/23 14:14:30 damien Exp $ */ +/* $OpenBSD: if_iwi.c,v 1.33 2005/04/04 16:31:52 damien Exp $ */ /*- * Copyright (c) 2004, 2005 @@ -28,7 +28,7 @@ */ /*- - * Intel(R) PRO/Wireless 2200BG/2915ABG driver + * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver * http://www.intel.com/network/connectivity/products/wireless/prowireless_mobile.htm */ @@ -78,9 +78,10 @@ #include <dev/pci/if_iwivar.h> const struct pci_matchid iwi_devices[] = { - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_2200BG_3B }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_2225BG }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_2915ABG_3B }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_WL_2200BG }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_WL_2225BG }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_WL_2915ABG_1 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_WL_2915ABG_2 } }; static const struct ieee80211_rateset iwi_rateset_11a = @@ -253,7 +254,7 @@ iwi_attach(struct device *parent, struct device *self, void *aux) printf(", address %s\n", ether_sprintf(ic->ic_myaddr)); - if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_PRO_2915ABG_3B) { + if (PCI_PRODUCT(pa->pa_id) >= PCI_PRODUCT_INTEL_PRO_WL_2915ABG_1) { /* set supported .11a rates */ ic->ic_sup_rates[IEEE80211_MODE_11A] = iwi_rateset_11a; diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs index 4bf1cbace02..9dd9e9f103c 100644 --- a/sys/dev/pci/pcidevs +++ b/sys/dev/pci/pcidevs @@ -1,4 +1,4 @@ -$OpenBSD: pcidevs,v 1.849 2005/03/28 22:15:21 deraadt Exp $ +$OpenBSD: pcidevs,v 1.850 2005/04/04 16:31:52 damien Exp $ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ /* @@ -1337,7 +1337,7 @@ product INTEL PRO_100_VM_4 0x103c PRO/100 VM product INTEL PRO_100_VE_4 0x103d PRO/100 VE product INTEL PRO_100_VM_5 0x103e PRO/100 VM product INTEL 536EP 0x1040 V.92 Modem -product INTEL PRO_2100_3B 0x1043 PRO/2100 3B +product INTEL PRO_WL_2100 0x1043 PRO/Wireless 2100 product INTEL PROXGB 0x1048 PRO/XGB product INTEL PRO_100_VE_5 0x1050 PRO/100 VE product INTEL PRO_100_VE_6 0x1051 PRO/100 VE @@ -1540,9 +1540,10 @@ product INTEL E7710_MCH_PCIEB1 0x3598 E7710 MCH PCIE product INTEL E7710_MCH_PCIEC0 0x3599 E7710 MCH PCIE product INTEL E7710_MCH_PCIEC1 0x359a E7710 MCH PCIE product INTEL E7710_WMCH 0x359e E7710 WMCH -product INTEL PRO_2200BG_3B 0x4220 PRO/2200BG 3B -product INTEL PRO_2225BG 0x4221 PRO/2225BG -product INTEL PRO_2915ABG_3B 0x4223 PRO/2915ABG 3B +product INTEL PRO_WL_2200BG 0x4220 PRO/Wireless 2200BG +product INTEL PRO_WL_2225BG 0x4221 PRO/Wireless 2225BG +product INTEL PRO_WL_2915ABG_1 0x4223 PRO/Wireless 2915ABG +product INTEL PRO_WL_2915ABG_2 0x4224 PRO/Wireless 2915ABG product INTEL 80960RD 0x5200 i960 RD PCI-PCI product INTEL PRO_100_SERVER 0x5201 PRO 100 Server product INTEL 82371SB_ISA 0x7000 82371SB ISA |