diff options
author | Felix Fietkau <nbd@openwrt.org> | 2010-12-11 18:51:09 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-12-13 15:23:31 -0500 |
commit | 115277a3bc0683d04da797268ddafdc3bf67ca33 (patch) | |
tree | 54b802c99b966ddeb912d595148d4868fb3ec24c /drivers/net/wireless/ath/ath9k/eeprom_4k.c | |
parent | 4ddfcd7daf57247ff718b849a152d97a80b7ae4d (diff) |
ath9k_hw: merge ath9k_hw_get_gain_boundaries_pdadcs between eeprom_def.c and eeprom_4k.c
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/eeprom_4k.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/eeprom_4k.c | 169 |
1 files changed, 1 insertions, 168 deletions
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_4k.c b/drivers/net/wireless/ath/ath9k/eeprom_4k.c index 6102309bc163..b0f744687900 100644 --- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c +++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c | |||
@@ -227,173 +227,6 @@ static u32 ath9k_hw_4k_get_eeprom(struct ath_hw *ah, | |||
227 | } | 227 | } |
228 | } | 228 | } |
229 | 229 | ||
230 | static void ath9k_hw_get_4k_gain_boundaries_pdadcs(struct ath_hw *ah, | ||
231 | struct ath9k_channel *chan, | ||
232 | struct cal_data_per_freq_4k *pRawDataSet, | ||
233 | u8 *bChans, u16 availPiers, | ||
234 | u16 tPdGainOverlap, | ||
235 | u16 *pPdGainBoundaries, u8 *pPDADCValues, | ||
236 | u16 numXpdGains) | ||
237 | { | ||
238 | #define TMP_VAL_VPD_TABLE \ | ||
239 | ((vpdTableI[i][sizeCurrVpdTable - 1] + (ss - maxIndex + 1) * vpdStep)); | ||
240 | int i, j, k; | ||
241 | int16_t ss; | ||
242 | u16 idxL = 0, idxR = 0, numPiers; | ||
243 | static u8 vpdTableL[AR5416_EEP4K_NUM_PD_GAINS] | ||
244 | [AR5416_MAX_PWR_RANGE_IN_HALF_DB]; | ||
245 | static u8 vpdTableR[AR5416_EEP4K_NUM_PD_GAINS] | ||
246 | [AR5416_MAX_PWR_RANGE_IN_HALF_DB]; | ||
247 | static u8 vpdTableI[AR5416_EEP4K_NUM_PD_GAINS] | ||
248 | [AR5416_MAX_PWR_RANGE_IN_HALF_DB]; | ||
249 | |||
250 | u8 *pVpdL, *pVpdR, *pPwrL, *pPwrR; | ||
251 | u8 minPwrT4[AR5416_EEP4K_NUM_PD_GAINS]; | ||
252 | u8 maxPwrT4[AR5416_EEP4K_NUM_PD_GAINS]; | ||
253 | int16_t vpdStep; | ||
254 | int16_t tmpVal; | ||
255 | u16 sizeCurrVpdTable, maxIndex, tgtIndex; | ||
256 | bool match; | ||
257 | int16_t minDelta = 0; | ||
258 | struct chan_centers centers; | ||
259 | #define PD_GAIN_BOUNDARY_DEFAULT 58; | ||
260 | |||
261 | memset(&minPwrT4, 0, AR5416_NUM_PD_GAINS); | ||
262 | ath9k_hw_get_channel_centers(ah, chan, ¢ers); | ||
263 | |||
264 | for (numPiers = 0; numPiers < availPiers; numPiers++) { | ||
265 | if (bChans[numPiers] == AR5416_BCHAN_UNUSED) | ||
266 | break; | ||
267 | } | ||
268 | |||
269 | match = ath9k_hw_get_lower_upper_index( | ||
270 | (u8)FREQ2FBIN(centers.synth_center, | ||
271 | IS_CHAN_2GHZ(chan)), bChans, numPiers, | ||
272 | &idxL, &idxR); | ||
273 | |||
274 | if (match) { | ||
275 | for (i = 0; i < numXpdGains; i++) { | ||
276 | minPwrT4[i] = pRawDataSet[idxL].pwrPdg[i][0]; | ||
277 | maxPwrT4[i] = pRawDataSet[idxL].pwrPdg[i][4]; | ||
278 | ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], | ||
279 | pRawDataSet[idxL].pwrPdg[i], | ||
280 | pRawDataSet[idxL].vpdPdg[i], | ||
281 | AR5416_PD_GAIN_ICEPTS, | ||
282 | vpdTableI[i]); | ||
283 | } | ||
284 | } else { | ||
285 | for (i = 0; i < numXpdGains; i++) { | ||
286 | pVpdL = pRawDataSet[idxL].vpdPdg[i]; | ||
287 | pPwrL = pRawDataSet[idxL].pwrPdg[i]; | ||
288 | pVpdR = pRawDataSet[idxR].vpdPdg[i]; | ||
289 | pPwrR = pRawDataSet[idxR].pwrPdg[i]; | ||
290 | |||
291 | minPwrT4[i] = max(pPwrL[0], pPwrR[0]); | ||
292 | |||
293 | maxPwrT4[i] = | ||
294 | min(pPwrL[AR5416_PD_GAIN_ICEPTS - 1], | ||
295 | pPwrR[AR5416_PD_GAIN_ICEPTS - 1]); | ||
296 | |||
297 | |||
298 | ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], | ||
299 | pPwrL, pVpdL, | ||
300 | AR5416_PD_GAIN_ICEPTS, | ||
301 | vpdTableL[i]); | ||
302 | ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], | ||
303 | pPwrR, pVpdR, | ||
304 | AR5416_PD_GAIN_ICEPTS, | ||
305 | vpdTableR[i]); | ||
306 | |||
307 | for (j = 0; j <= (maxPwrT4[i] - minPwrT4[i]) / 2; j++) { | ||
308 | vpdTableI[i][j] = | ||
309 | (u8)(ath9k_hw_interpolate((u16) | ||
310 | FREQ2FBIN(centers. | ||
311 | synth_center, | ||
312 | IS_CHAN_2GHZ | ||
313 | (chan)), | ||
314 | bChans[idxL], bChans[idxR], | ||
315 | vpdTableL[i][j], vpdTableR[i][j])); | ||
316 | } | ||
317 | } | ||
318 | } | ||
319 | |||
320 | k = 0; | ||
321 | |||
322 | for (i = 0; i < numXpdGains; i++) { | ||
323 | if (i == (numXpdGains - 1)) | ||
324 | pPdGainBoundaries[i] = | ||
325 | (u16)(maxPwrT4[i] / 2); | ||
326 | else | ||
327 | pPdGainBoundaries[i] = | ||
328 | (u16)((maxPwrT4[i] + minPwrT4[i + 1]) / 4); | ||
329 | |||
330 | pPdGainBoundaries[i] = | ||
331 | min((u16)MAX_RATE_POWER, pPdGainBoundaries[i]); | ||
332 | |||
333 | if ((i == 0) && !AR_SREV_5416_20_OR_LATER(ah)) { | ||
334 | minDelta = pPdGainBoundaries[0] - 23; | ||
335 | pPdGainBoundaries[0] = 23; | ||
336 | } else { | ||
337 | minDelta = 0; | ||
338 | } | ||
339 | |||
340 | if (i == 0) { | ||
341 | if (AR_SREV_9280_20_OR_LATER(ah)) | ||
342 | ss = (int16_t)(0 - (minPwrT4[i] / 2)); | ||
343 | else | ||
344 | ss = 0; | ||
345 | } else { | ||
346 | ss = (int16_t)((pPdGainBoundaries[i - 1] - | ||
347 | (minPwrT4[i] / 2)) - | ||
348 | tPdGainOverlap + 1 + minDelta); | ||
349 | } | ||
350 | vpdStep = (int16_t)(vpdTableI[i][1] - vpdTableI[i][0]); | ||
351 | vpdStep = (int16_t)((vpdStep < 1) ? 1 : vpdStep); | ||
352 | |||
353 | while ((ss < 0) && (k < (AR5416_NUM_PDADC_VALUES - 1))) { | ||
354 | tmpVal = (int16_t)(vpdTableI[i][0] + ss * vpdStep); | ||
355 | pPDADCValues[k++] = (u8)((tmpVal < 0) ? 0 : tmpVal); | ||
356 | ss++; | ||
357 | } | ||
358 | |||
359 | sizeCurrVpdTable = (u8) ((maxPwrT4[i] - minPwrT4[i]) / 2 + 1); | ||
360 | tgtIndex = (u8)(pPdGainBoundaries[i] + tPdGainOverlap - | ||
361 | (minPwrT4[i] / 2)); | ||
362 | maxIndex = (tgtIndex < sizeCurrVpdTable) ? | ||
363 | tgtIndex : sizeCurrVpdTable; | ||
364 | |||
365 | while ((ss < maxIndex) && (k < (AR5416_NUM_PDADC_VALUES - 1))) | ||
366 | pPDADCValues[k++] = vpdTableI[i][ss++]; | ||
367 | |||
368 | vpdStep = (int16_t)(vpdTableI[i][sizeCurrVpdTable - 1] - | ||
369 | vpdTableI[i][sizeCurrVpdTable - 2]); | ||
370 | vpdStep = (int16_t)((vpdStep < 1) ? 1 : vpdStep); | ||
371 | |||
372 | if (tgtIndex >= maxIndex) { | ||
373 | while ((ss <= tgtIndex) && | ||
374 | (k < (AR5416_NUM_PDADC_VALUES - 1))) { | ||
375 | tmpVal = (int16_t) TMP_VAL_VPD_TABLE; | ||
376 | pPDADCValues[k++] = (u8)((tmpVal > 255) ? | ||
377 | 255 : tmpVal); | ||
378 | ss++; | ||
379 | } | ||
380 | } | ||
381 | } | ||
382 | |||
383 | while (i < AR5416_PD_GAINS_IN_MASK) { | ||
384 | pPdGainBoundaries[i] = PD_GAIN_BOUNDARY_DEFAULT; | ||
385 | i++; | ||
386 | } | ||
387 | |||
388 | while (k < AR5416_NUM_PDADC_VALUES) { | ||
389 | pPDADCValues[k] = pPDADCValues[k - 1]; | ||
390 | k++; | ||
391 | } | ||
392 | |||
393 | return; | ||
394 | #undef TMP_VAL_VPD_TABLE | ||
395 | } | ||
396 | |||
397 | static void ath9k_hw_set_4k_power_cal_table(struct ath_hw *ah, | 230 | static void ath9k_hw_set_4k_power_cal_table(struct ath_hw *ah, |
398 | struct ath9k_channel *chan, | 231 | struct ath9k_channel *chan, |
399 | int16_t *pTxPowerIndexOffset) | 232 | int16_t *pTxPowerIndexOffset) |
@@ -455,7 +288,7 @@ static void ath9k_hw_set_4k_power_cal_table(struct ath_hw *ah, | |||
455 | if (pEepData->baseEepHeader.txMask & (1 << i)) { | 288 | if (pEepData->baseEepHeader.txMask & (1 << i)) { |
456 | pRawDataset = pEepData->calPierData2G[i]; | 289 | pRawDataset = pEepData->calPierData2G[i]; |
457 | 290 | ||
458 | ath9k_hw_get_4k_gain_boundaries_pdadcs(ah, chan, | 291 | ath9k_hw_get_gain_boundaries_pdadcs(ah, chan, |
459 | pRawDataset, pCalBChans, | 292 | pRawDataset, pCalBChans, |
460 | numPiers, pdGainOverlap_t2, | 293 | numPiers, pdGainOverlap_t2, |
461 | gainBoundaries, | 294 | gainBoundaries, |