diff options
Diffstat (limited to 'drivers/staging/vt6655/channel.c')
| -rw-r--r-- | drivers/staging/vt6655/channel.c | 99 |
1 files changed, 7 insertions, 92 deletions
diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/channel.c index b550a1a0844e..4122875ebcaa 100644 --- a/drivers/staging/vt6655/channel.c +++ b/drivers/staging/vt6655/channel.c @@ -25,17 +25,6 @@ static struct ieee80211_rate vnt_rates_bg[] = { { .bitrate = 540, .hw_value = RATE_54M }, }; -static struct ieee80211_rate vnt_rates_a[] = { - { .bitrate = 60, .hw_value = RATE_6M }, - { .bitrate = 90, .hw_value = RATE_9M }, - { .bitrate = 120, .hw_value = RATE_12M }, - { .bitrate = 180, .hw_value = RATE_18M }, - { .bitrate = 240, .hw_value = RATE_24M }, - { .bitrate = 360, .hw_value = RATE_36M }, - { .bitrate = 480, .hw_value = RATE_48M }, - { .bitrate = 540, .hw_value = RATE_54M }, -}; - static struct ieee80211_channel vnt_channels_2ghz[] = { { .center_freq = 2412, .hw_value = 1 }, { .center_freq = 2417, .hw_value = 2 }, @@ -53,51 +42,6 @@ static struct ieee80211_channel vnt_channels_2ghz[] = { { .center_freq = 2484, .hw_value = 14 } }; -static struct ieee80211_channel vnt_channels_5ghz[] = { - { .center_freq = 4915, .hw_value = 15 }, - { .center_freq = 4920, .hw_value = 16 }, - { .center_freq = 4925, .hw_value = 17 }, - { .center_freq = 4935, .hw_value = 18 }, - { .center_freq = 4940, .hw_value = 19 }, - { .center_freq = 4945, .hw_value = 20 }, - { .center_freq = 4960, .hw_value = 21 }, - { .center_freq = 4980, .hw_value = 22 }, - { .center_freq = 5035, .hw_value = 23 }, - { .center_freq = 5040, .hw_value = 24 }, - { .center_freq = 5045, .hw_value = 25 }, - { .center_freq = 5055, .hw_value = 26 }, - { .center_freq = 5060, .hw_value = 27 }, - { .center_freq = 5080, .hw_value = 28 }, - { .center_freq = 5170, .hw_value = 29 }, - { .center_freq = 5180, .hw_value = 30 }, - { .center_freq = 5190, .hw_value = 31 }, - { .center_freq = 5200, .hw_value = 32 }, - { .center_freq = 5210, .hw_value = 33 }, - { .center_freq = 5220, .hw_value = 34 }, - { .center_freq = 5230, .hw_value = 35 }, - { .center_freq = 5240, .hw_value = 36 }, - { .center_freq = 5260, .hw_value = 37 }, - { .center_freq = 5280, .hw_value = 38 }, - { .center_freq = 5300, .hw_value = 39 }, - { .center_freq = 5320, .hw_value = 40 }, - { .center_freq = 5500, .hw_value = 41 }, - { .center_freq = 5520, .hw_value = 42 }, - { .center_freq = 5540, .hw_value = 43 }, - { .center_freq = 5560, .hw_value = 44 }, - { .center_freq = 5580, .hw_value = 45 }, - { .center_freq = 5600, .hw_value = 46 }, - { .center_freq = 5620, .hw_value = 47 }, - { .center_freq = 5640, .hw_value = 48 }, - { .center_freq = 5660, .hw_value = 49 }, - { .center_freq = 5680, .hw_value = 50 }, - { .center_freq = 5700, .hw_value = 51 }, - { .center_freq = 5745, .hw_value = 52 }, - { .center_freq = 5765, .hw_value = 53 }, - { .center_freq = 5785, .hw_value = 54 }, - { .center_freq = 5805, .hw_value = 55 }, - { .center_freq = 5825, .hw_value = 56 } -}; - static struct ieee80211_supported_band vnt_supported_2ghz_band = { .channels = vnt_channels_2ghz, .n_channels = ARRAY_SIZE(vnt_channels_2ghz), @@ -105,13 +49,6 @@ static struct ieee80211_supported_band vnt_supported_2ghz_band = { .n_bitrates = ARRAY_SIZE(vnt_rates_bg), }; -static struct ieee80211_supported_band vnt_supported_5ghz_band = { - .channels = vnt_channels_5ghz, - .n_channels = ARRAY_SIZE(vnt_channels_5ghz), - .bitrates = vnt_rates_a, - .n_bitrates = ARRAY_SIZE(vnt_rates_a), -}; - static void vnt_init_band(struct vnt_private *priv, struct ieee80211_supported_band *supported_band, enum nl80211_band band) @@ -129,23 +66,7 @@ static void vnt_init_band(struct vnt_private *priv, void vnt_init_bands(struct vnt_private *priv) { - switch (priv->byRFType) { - case RF_AIROHA7230: - case RF_UW2452: - case RF_NOTHING: - default: - vnt_init_band(priv, &vnt_supported_5ghz_band, - NL80211_BAND_5GHZ); - fallthrough; - case RF_RFMD2959: - case RF_AIROHA: - case RF_AL2230S: - case RF_UW2451: - case RF_VT3226: - vnt_init_band(priv, &vnt_supported_2ghz_band, - NL80211_BAND_2GHZ); - break; - } + vnt_init_band(priv, &vnt_supported_2ghz_band, NL80211_BAND_2GHZ); } /** @@ -173,23 +94,19 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch) } /* clear NAV */ - MACvRegBitsOn(priv->port_offset, MAC_REG_MACCR, MACCR_CLRNAV); + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_MACCR, MACCR_CLRNAV); /* TX_PE will reserve 3 us for MAX2829 A mode only, * it is for better TX throughput */ - if (priv->byRFType == RF_AIROHA7230) - RFbAL7230SelectChannelPostProcess(priv, priv->byCurrentCh, - ch->hw_value); - priv->byCurrentCh = ch->hw_value; ret &= RFbSelectChannel(priv, priv->byRFType, ch->hw_value); /* Init Synthesizer Table */ if (priv->bEnablePSMode) - RFvWriteWakeProgSyn(priv, priv->byRFType, ch->hw_value); + rf_write_wake_prog_syn(priv, priv->byRFType, ch->hw_value); bb_software_reset(priv); @@ -199,14 +116,12 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch) spin_lock_irqsave(&priv->lock, flags); /* set HW default power register */ - MACvSelectPage1(priv->port_offset); + VT6655_MAC_SELECT_PAGE1(priv->port_offset); RFbSetPower(priv, RATE_1M, priv->byCurrentCh); - VNSvOutPortB(priv->port_offset + MAC_REG_PWRCCK, - priv->byCurPwr); + iowrite8(priv->byCurPwr, priv->port_offset + MAC_REG_PWRCCK); RFbSetPower(priv, RATE_6M, priv->byCurrentCh); - VNSvOutPortB(priv->port_offset + MAC_REG_PWROFDM, - priv->byCurPwr); - MACvSelectPage0(priv->port_offset); + iowrite8(priv->byCurPwr, priv->port_offset + MAC_REG_PWROFDM); + VT6655_MAC_SELECT_PAGE0(priv->port_offset); spin_unlock_irqrestore(&priv->lock, flags); } |