diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2009-11-04 17:46:53 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2009-11-04 17:46:53 +0000 |
| commit | e1c840f69b784a8f7bc8e396a3e110851fb3204d (patch) | |
| tree | a2b4113cf1679f1466ff20f7a69d6ef745109f39 | |
| parent | 9270c0136d71141ecda1a36b26dffb7a7aca3fad (diff) | |
the hybrid 6000 series (using both internal and external power amplifiers)
never made it into production, so remove some dead code and pci ids.
inspired by a similar change to iwlwifi.
| -rw-r--r-- | sys/dev/pci/if_iwn.c | 15 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwnvar.h | 5 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs | 4 |
3 files changed, 5 insertions, 19 deletions
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index f9f6a33373d..45b779e477c 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.76 2009/11/03 18:57:18 damien Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.77 2009/11/04 17:46:52 damien Exp $ */ /*- * Copyright (c) 2007-2009 Damien Bergamini <damien.bergamini@free.fr> @@ -80,8 +80,6 @@ static const struct pci_matchid iwn_devices[] = { { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_1000_2 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_3X3_1 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_3X3_2 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_HYB_1 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_HYB_2 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_IPA_1 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_IPA_2 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6050_2X2_1 }, @@ -591,12 +589,6 @@ iwn_hal_attach(struct iwn_softc *sc, pci_product_id_t pid) sc->limits = &iwn6000_sensitivity_limits; sc->fwname = "iwn-6000"; switch (pid) { - case PCI_PRODUCT_INTEL_WIFI_LINK_6000_HYB_1: - case PCI_PRODUCT_INTEL_WIFI_LINK_6000_HYB_2: - sc->sc_flags |= IWN_FLAG_HYBRID; - sc->txchainmask = IWN_ANT_AB; - sc->rxchainmask = IWN_ANT_AB; - break; 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; @@ -5317,10 +5309,7 @@ iwn5000_nic_config(struct iwn_softc *sc) } iwn_nic_unlock(sc); - if (sc->sc_flags & IWN_FLAG_HYBRID) { - /* Use internal and external power amplifiers. */ - IWN_WRITE(sc, IWN_GP_DRIVER, IWN_GP_DRIVER_RADIO_2X2_HYB); - } else if (sc->sc_flags & IWN_FLAG_INTERNAL_PA) { + if (sc->sc_flags & IWN_FLAG_INTERNAL_PA) { /* Use internal power amplifier only. */ IWN_WRITE(sc, IWN_GP_DRIVER, IWN_GP_DRIVER_RADIO_2X2_IPA); } diff --git a/sys/dev/pci/if_iwnvar.h b/sys/dev/pci/if_iwnvar.h index 3a9d1c830d9..b399aeee3e3 100644 --- a/sys/dev/pci/if_iwnvar.h +++ b/sys/dev/pci/if_iwnvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwnvar.h,v 1.15 2009/10/28 18:42:47 damien Exp $ */ +/* $OpenBSD: if_iwnvar.h,v 1.16 2009/11/04 17:46:52 damien Exp $ */ /*- * Copyright (c) 2007, 2008 @@ -205,8 +205,7 @@ struct iwn_softc { #define IWN_FLAG_HAS_OTPROM (1 << 1) #define IWN_FLAG_CALIB_DONE (1 << 2) #define IWN_FLAG_USE_ICT (1 << 3) -#define IWN_FLAG_HYBRID (1 << 4) -#define IWN_FLAG_INTERNAL_PA (1 << 5) +#define IWN_FLAG_INTERNAL_PA (1 << 4) uint8_t hw_type; const struct iwn_hal *sc_hal; diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs index 921f3a13ac2..7afd0988738 100644 --- a/sys/dev/pci/pcidevs +++ b/sys/dev/pci/pcidevs @@ -1,4 +1,4 @@ -$OpenBSD: pcidevs,v 1.1504 2009/10/26 20:05:18 marco Exp $ +$OpenBSD: pcidevs,v 1.1505 2009/11/04 17:46:52 damien Exp $ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ /* @@ -2162,8 +2162,6 @@ product INTEL WIFI_LINK_6050_3X3_1 0x0086 WiFi Link 6050 product INTEL WIFI_LINK_6050_2X2_1 0x0087 WiFi Link 6050 product INTEL WIFI_LINK_6050_3X3_2 0x0088 WiFi Link 6050 product INTEL WIFI_LINK_6050_2X2_2 0x0089 WiFi Link 6050 -product INTEL WIFI_LINK_6000_HYB_1 0x008d WiFi Link 6000 -product INTEL WIFI_LINK_6000_HYB_2 0x008e WiFi Link 6000 product INTEL 80303 0x0309 80303 IOP product INTEL 80312 0x030d 80312 I/O Companion product INTEL IOXAPIC_A 0x0326 IOxAPIC |