Skip to content

L
linux
Commit 26472590 authored by Quytelda Kahja's avatar Quytelda Kahja Committed by Greg Kroah-Hartman
Browse files
Options

staging: rtl8723bs: Clean up whitespace in 'PHY_GetTxPowerLimit()'. 

Wrap lines longer than 80 characters where possible, delete double
newlines, and fix alignment per the kernel coding style guidelines.
Signed-off-by: default avatarQuytelda Kahja <quytelda@tamalin.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e8b8fc8a
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 51 deletions
drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
View file @ 26472590
...@@ -1612,46 +1612,45 @@ static s8 phy_GetChannelIndexOfTxPowerLimit(u8 Band, u8 Channel) ...@@ -1612,46 +1612,45 @@ static s8 phy_GetChannelIndexOfTxPowerLimit(u8 Band, u8 Channel)
return channelIndex; return channelIndex;
} }
s8 PHY_GetTxPowerLimit( s8 PHY_GetTxPowerLimit(struct adapter *Adapter, u32 RegPwrTblSel,
struct adapter *Adapter, enum BAND_TYPE Band, enum CHANNEL_WIDTH Bandwidth,
u32 RegPwrTblSel, u8 RfPath, u8 DataRate, u8 Channel)
enum BAND_TYPE Band,
enum CHANNEL_WIDTH Bandwidth,
u8 RfPath,
u8 DataRate,
u8 Channel
)
{ {
struct hal_com_data *pHalData = GET_HAL_DATA(Adapter); s16 band = -1;
s16 band = -1, regulation = -1, bandwidth = -1, rateSection = -1, channel = -1; s16 regulation = -1;
s16 bandwidth = -1;
s16 rateSection = -1;
s16 channel = -1;
s8 powerLimit = MAX_POWER_INDEX; s8 powerLimit = MAX_POWER_INDEX;
struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
if ((Adapter->registrypriv.RegEnableTxPowerLimit == 2 && pHalData->EEPROMRegulatory != 1) || if (((Adapter->registrypriv.RegEnableTxPowerLimit == 2) &&
Adapter->registrypriv.RegEnableTxPowerLimit == 0) (pHalData->EEPROMRegulatory != 1)) ||
(Adapter->registrypriv.RegEnableTxPowerLimit == 0))
return MAX_POWER_INDEX; return MAX_POWER_INDEX;
switch (Adapter->registrypriv.RegPwrTblSel) { switch (Adapter->registrypriv.RegPwrTblSel) {
case 1: case 1:
regulation = TXPWR_LMT_ETSI; regulation = TXPWR_LMT_ETSI;
break; break;
case 2: case 2:
regulation = TXPWR_LMT_MKK; regulation = TXPWR_LMT_MKK;
break; break;
case 3: case 3:
regulation = TXPWR_LMT_FCC; regulation = TXPWR_LMT_FCC;
break; break;
case 4: case 4:
regulation = TXPWR_LMT_WW; regulation = TXPWR_LMT_WW;
break; break;
default: default:
regulation = (Band == BAND_ON_2_4G) ? pHalData->Regulation2_4G : pHalData->Regulation5G; regulation = (Band == BAND_ON_2_4G) ?
break; pHalData->Regulation2_4G :
pHalData->Regulation5G;
break;
} }
/* DBG_871X("pMgntInfo->RegPwrTblSel %d, final regulation %d\n", Adapter->registrypriv.RegPwrTblSel, regulation); */ /* DBG_871X("pMgntInfo->RegPwrTblSel %d, final regulation %d\n", */
/* Adapter->registrypriv.RegPwrTblSel, regulation); */
if (Band == BAND_ON_2_4G) if (Band == BAND_ON_2_4G)
band = 0; band = 0;
...@@ -1730,8 +1729,8 @@ s8 PHY_GetTxPowerLimit( ...@@ -1730,8 +1729,8 @@ s8 PHY_GetTxPowerLimit(
break; break;
} }
if (Band == BAND_ON_5G && rateSection == 0) if (Band == BAND_ON_5G && rateSection == 0)
DBG_871X("Wrong rate 0x%x: No CCK in 5G Band\n", DataRate); DBG_871X("Wrong rate 0x%x: No CCK in 5G Band\n", DataRate);
/* workaround for wrong index combination to obtain tx power limit, */ /* workaround for wrong index combination to obtain tx power limit, */
/* OFDM only exists in BW 20M */ /* OFDM only exists in BW 20M */
...@@ -1745,22 +1744,26 @@ s8 PHY_GetTxPowerLimit( ...@@ -1745,22 +1744,26 @@ s8 PHY_GetTxPowerLimit(
/* workaround for wrong indxe combination to obtain tx power limit, */ /* workaround for wrong indxe combination to obtain tx power limit, */
/* HT on 80M will reference to HT on 40M */ /* HT on 80M will reference to HT on 40M */
if ((rateSection == 2 || rateSection == 3) && Band == BAND_ON_5G && bandwidth == 2) { if ((rateSection == 2 || rateSection == 3) &&
Band == BAND_ON_5G && bandwidth == 2) {
bandwidth = 1; bandwidth = 1;
} }
if (Band == BAND_ON_2_4G) if (Band == BAND_ON_2_4G)
channel = phy_GetChannelIndexOfTxPowerLimit(BAND_ON_2_4G, Channel); channel = phy_GetChannelIndexOfTxPowerLimit(BAND_ON_2_4G,
Channel);
else if (Band == BAND_ON_5G) else if (Band == BAND_ON_5G)
channel = phy_GetChannelIndexOfTxPowerLimit(BAND_ON_5G, Channel); channel = phy_GetChannelIndexOfTxPowerLimit(BAND_ON_5G,
Channel);
else if (Band == BAND_ON_BOTH) { else if (Band == BAND_ON_BOTH) {
/* BAND_ON_BOTH don't care temporarily */ /* BAND_ON_BOTH don't care temporarily */
} }
if (band == -1 || regulation == -1 || bandwidth == -1 || if (band == -1 || regulation == -1 || bandwidth == -1 ||
rateSection == -1 || channel == -1) { rateSection == -1 || channel == -1) {
/* DBG_871X("Wrong index value to access power limit table [band %d][regulation %d][bandwidth %d][rf_path %d][rate_section %d][chnlGroup %d]\n", */ /* DBG_871X("Wrong index value to access power limit table [band %d][regulation %d][bandwidth %d][rf_path %d][rate_section %d][chnlGroup %d]\n", */
/* band, regulation, bandwidth, RfPath, rateSection, channelGroup); */ /* band, regulation, bandwidth, RfPath, */
/* rateSection, channelGroup); */
return MAX_POWER_INDEX; return MAX_POWER_INDEX;
} }
...@@ -1768,18 +1771,26 @@ s8 PHY_GetTxPowerLimit( ...@@ -1768,18 +1771,26 @@ s8 PHY_GetTxPowerLimit(
if (Band == BAND_ON_2_4G) { if (Band == BAND_ON_2_4G) {
s8 limits[10] = {0}; u8 i = 0; s8 limits[10] = {0}; u8 i = 0;
for (i = 0; i < MAX_REGULATION_NUM; i++) for (i = 0; i < MAX_REGULATION_NUM; i++)
limits[i] = pHalData->TxPwrLimit_2_4G[i][bandwidth][rateSection][channel][RfPath]; limits[i] = pHalData->TxPwrLimit_2_4G[i][bandwidth]
[rateSection]
[channel][RfPath];
powerLimit = (regulation == TXPWR_LMT_WW) ? phy_GetWorldWideLimit(limits) : powerLimit = (regulation == TXPWR_LMT_WW) ?
pHalData->TxPwrLimit_2_4G[regulation][bandwidth][rateSection][channel][RfPath]; phy_GetWorldWideLimit(limits) :
pHalData->TxPwrLimit_2_4G[regulation][bandwidth]
[rateSection][channel][RfPath];
} else if (Band == BAND_ON_5G) { } else if (Band == BAND_ON_5G) {
s8 limits[10] = {0}; u8 i = 0; s8 limits[10] = {0}; u8 i = 0;
for (i = 0; i < MAX_REGULATION_NUM; ++i) for (i = 0; i < MAX_REGULATION_NUM; ++i)
limits[i] = pHalData->TxPwrLimit_5G[i][bandwidth][rateSection][channel][RfPath]; limits[i] = pHalData->TxPwrLimit_5G[i][bandwidth]
[rateSection]
powerLimit = (regulation == TXPWR_LMT_WW) ? phy_GetWorldWideLimit(limits) : [channel][RfPath];
pHalData->TxPwrLimit_5G[regulation][bandwidth][rateSection][channel][RfPath];
powerLimit = (regulation == TXPWR_LMT_WW) ?
phy_GetWorldWideLimit(limits) :
pHalData->TxPwrLimit_5G[regulation][bandwidth]
[rateSection][channel][RfPath];
} else } else
DBG_871X("No power limit table of the specified band\n"); DBG_871X("No power limit table of the specified band\n");
...@@ -1789,22 +1800,20 @@ s8 PHY_GetTxPowerLimit( ...@@ -1789,22 +1800,20 @@ s8 PHY_GetTxPowerLimit(
if (Band == BAND_ON_5G && powerLimit == MAX_POWER_INDEX) { if (Band == BAND_ON_5G && powerLimit == MAX_POWER_INDEX) {
if (bandwidth == 0 || bandwidth == 1) { if (bandwidth == 0 || bandwidth == 1) {
RT_TRACE(COMP_INIT, DBG_LOUD, ("No power limit table of the specified band %d, bandwidth %d, ratesection %d, rf path %d\n", RT_TRACE(COMP_INIT, DBG_LOUD, ("No power limit table of the specified band %d, bandwidth %d, ratesection %d, rf path %d\n",
band, bandwidth, rateSection, RfPath)); band, bandwidth,
rateSection, RfPath));
if (rateSection == 2) if (rateSection == 2)
powerLimit = pHalData->TxPwrLimit_5G[regulation] powerLimit = pHalData->TxPwrLimit_5G[regulation][bandwidth][4][channelGroup][RfPath];
[bandwidth][4][channelGroup][RfPath];
else if (rateSection == 4) else if (rateSection == 4)
powerLimit = pHalData->TxPwrLimit_5G[regulation] powerLimit = pHalData->TxPwrLimit_5G[regulation][bandwidth][2][channelGroup][RfPath];
[bandwidth][2][channelGroup][RfPath];
else if (rateSection == 3) else if (rateSection == 3)
powerLimit = pHalData->TxPwrLimit_5G[regulation] powerLimit = pHalData->TxPwrLimit_5G[regulation][bandwidth][5][channelGroup][RfPath];
[bandwidth][5][channelGroup][RfPath];
else if (rateSection == 5) else if (rateSection == 5)
powerLimit = pHalData->TxPwrLimit_5G[regulation] powerLimit = pHalData->TxPwrLimit_5G[regulation][bandwidth][3][channelGroup][RfPath];
[bandwidth][3][channelGroup][RfPath];
} }
} }
*/ */
/* DBG_871X("TxPwrLmt[Regulation %d][Band %d][BW %d][RFPath %d][Rate 0x%x][Chnl %d] = %d\n", */ /* DBG_871X("TxPwrLmt[Regulation %d][Band %d][BW %d][RFPath %d][Rate 0x%x][Chnl %d] = %d\n", */
/* regulation, pHalData->CurrentBandType, Bandwidth, RfPath, DataRate, Channel, powerLimit); */ /* regulation, pHalData->CurrentBandType, Bandwidth, RfPath, DataRate, Channel, powerLimit); */
return powerLimit; return powerLimit;
...@@ -3294,4 +3303,3 @@ void phy_free_filebuf(struct adapter *padapter) ...@@ -3294,4 +3303,3 @@ void phy_free_filebuf(struct adapter *padapter)
vfree(pHalData->rf_tx_pwr_lmt); vfree(pHalData->rf_tx_pwr_lmt);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7