From f6a801cad9453c48087f7b98189c3dccbf12a9bc Mon Sep 17 00:00:00 2001 From: coypu Date: Sat, 17 Sep 2016 08:15:18 +0300 Subject: [PATCH 17/27] squash GetScaledPower --- .../isc/atheros_hal/dist/ar5211/ar5211_reset.c | 26 ++++++++++++---------- sys/external/isc/atheros_hal/dist/ar5212/ar5111.c | 6 ++--- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/sys/external/isc/atheros_hal/dist/ar5211/ar5211_reset.c b/sys/external/isc/atheros_hal/dist/ar5211/ar5211_reset.c index 14c2087..c7f2d1b 100644 --- a/sys/external/isc/atheros_hal/dist/ar5211/ar5211_reset.c +++ b/sys/external/isc/atheros_hal/dist/ar5211/ar5211_reset.c @@ -122,8 +122,8 @@ static HAL_BOOL ar5211SetTransmitPower(struct ath_hal *, static void ar5211SetRateTable(struct ath_hal *, RD_EDGES_POWER *pRdEdgesPower, TRGT_POWER_INFO *pPowerInfo, uint16_t numChannels, const struct ieee80211_channel *chan); -static uint16_t ar5211GetScaledPower(uint16_t channel, uint16_t pcdacValue, - const PCDACS_EEPROM *pSrcStruct); +static HAL_BOOL ar5211GetScaledPower(uint16_t channel, uint16_t pcdacValue, + const PCDACS_EEPROM *pSrcStruct, uint16_t * powerValue); static HAL_BOOL ar5211FindValueInList(uint16_t channel, uint16_t pcdacValue, const PCDACS_EEPROM *pSrcStruct, uint16_t *powerValue); static uint16_t ar5211GetInterpolatedValue(uint16_t target, @@ -1689,20 +1689,19 @@ ar5211SetRateTable(struct ath_hal *ah, RD_EDGES_POWER *pRdEdgesPower, /* * Get or interpolate the pcdac value from the calibrated data */ -uint16_t +HAL_BOOL ar5211GetScaledPower(uint16_t channel, uint16_t pcdacValue, - const PCDACS_EEPROM *pSrcStruct) + const PCDACS_EEPROM *pSrcStruct, uint16_t * powerValue) { - uint16_t powerValue; uint16_t lFreq, rFreq; /* left and right frequency values */ uint16_t llPcdac, ulPcdac; /* lower and upper left pcdac values */ uint16_t lrPcdac, urPcdac; /* lower and upper right pcdac values */ uint16_t lPwr, uPwr; /* lower and upper temp pwr values */ uint16_t lScaledPwr, rScaledPwr; /* left and right scaled power */ - if (ar5211FindValueInList(channel, pcdacValue, pSrcStruct, &powerValue)) + if (ar5211FindValueInList(channel, pcdacValue, pSrcStruct, powerValue)) /* value was copied from srcStruct */ - return powerValue; + return AH_TRUE; ar5211GetLowerUpperValues(channel, pSrcStruct->pChannelList, pSrcStruct->numChannels, &lFreq, &rFreq); @@ -1712,18 +1711,21 @@ ar5211GetScaledPower(uint16_t channel, uint16_t pcdacValue, &lrPcdac, &urPcdac); /* get the power index for the pcdac value */ - ar5211FindValueInList(lFreq, llPcdac, pSrcStruct, &lPwr); - ar5211FindValueInList(lFreq, ulPcdac, pSrcStruct, &uPwr); + if (! ar5211FindValueInList(lFreq, llPcdac, pSrcStruct, &lPwr) || + ! ar5211FindValueInList(lFreq, ulPcdac, pSrcStruct, &uPwr)) + return AH_FALSE; lScaledPwr = ar5211GetInterpolatedValue(pcdacValue, llPcdac, ulPcdac, lPwr, uPwr, 0); - ar5211FindValueInList(rFreq, lrPcdac, pSrcStruct, &lPwr); - ar5211FindValueInList(rFreq, urPcdac, pSrcStruct, &uPwr); + if (! ar5211FindValueInList(rFreq, lrPcdac, pSrcStruct, &lPwr) || + ! ar5211FindValueInList(rFreq, urPcdac, pSrcStruct, &uPwr)) + return AH_FALSE; rScaledPwr = ar5211GetInterpolatedValue(pcdacValue, lrPcdac, urPcdac, lPwr, uPwr, 0); - return ar5211GetInterpolatedValue(channel, lFreq, rFreq, + *powerValue = ar5211GetInterpolatedValue(channel, lFreq, rFreq, lScaledPwr, rScaledPwr, 0); + return AH_TRUE; } /* diff --git a/sys/external/isc/atheros_hal/dist/ar5212/ar5111.c b/sys/external/isc/atheros_hal/dist/ar5212/ar5111.c index 53cfc62..9c0a669 100644 --- a/sys/external/isc/atheros_hal/dist/ar5212/ar5111.c +++ b/sys/external/isc/atheros_hal/dist/ar5212/ar5111.c @@ -539,7 +539,7 @@ ar5111SetPowerTable(struct ath_hal *ah, */ static HAL_BOOL ar5212GetScaledPower(uint16_t channel, uint16_t pcdacValue, - const PCDACS_EEPROM *pSrcStruct, uint16_t * scaledPower) + const PCDACS_EEPROM *pSrcStruct, uint16_t * powerValue) { uint16_t lFreq, rFreq; /* left and right frequency values */ uint16_t llPcdac, ulPcdac; /* lower and upper left pcdac values */ @@ -547,7 +547,7 @@ ar5212GetScaledPower(uint16_t channel, uint16_t pcdacValue, uint16_t lPwr, uPwr; /* lower and upper temp pwr values */ uint16_t lScaledPwr, rScaledPwr; /* left and right scaled power */ - if (ar5212FindValueInList(channel, pcdacValue, pSrcStruct, scaledPower)) { + if (ar5212FindValueInList(channel, pcdacValue, pSrcStruct, powerValue)) { /* value was copied from srcStruct */ return AH_TRUE; } @@ -571,7 +571,7 @@ ar5212GetScaledPower(uint16_t channel, uint16_t pcdacValue, return AH_FALSE; rScaledPwr = interpolate(pcdacValue, lrPcdac, urPcdac, lPwr, uPwr); - * scaledPower = interpolate(channel, lFreq, rFreq, lScaledPwr, rScaledPwr); + *powerValue = interpolate(channel, lFreq, rFreq, lScaledPwr, rScaledPwr); return AH_TRUE; } -- 2.9.3