diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-01-20 14:01:31 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-01-20 14:01:31 -0300 |
commit | b4b7ff4b08e691656c9d77c758fc355833128ac0 (patch) | |
tree | 82fcb00e6b918026dc9f2d1f05ed8eee83874cc0 /drivers/staging/rtl8712/rtl871x_mp.c | |
parent | 35acfa0fc609f2a2cd95cef4a6a9c3a5c38f1778 (diff) |
Linux-libre 4.4-gnupck-4.4-gnu
Diffstat (limited to 'drivers/staging/rtl8712/rtl871x_mp.c')
-rw-r--r-- | drivers/staging/rtl8712/rtl871x_mp.c | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/drivers/staging/rtl8712/rtl871x_mp.c b/drivers/staging/rtl8712/rtl871x_mp.c index 26201ea3c..44da4fe89 100644 --- a/drivers/staging/rtl8712/rtl871x_mp.c +++ b/drivers/staging/rtl8712/rtl871x_mp.c @@ -211,19 +211,18 @@ static u32 bitshift(u32 bitmask) u32 i; for (i = 0; i <= 31; i++) - if (((bitmask>>i) & 0x1) == 1) + if (((bitmask >> i) & 0x1) == 1) break; return i; } static u32 get_bb_reg(struct _adapter *pAdapter, u16 offset, u32 bitmask) { - u32 org_value, bit_shift, new_value; + u32 org_value, bit_shift; org_value = r8712_bb_reg_read(pAdapter, offset); bit_shift = bitshift(bitmask); - new_value = (org_value & bitmask) >> bit_shift; - return new_value; + return (org_value & bitmask) >> bit_shift; } static u8 set_bb_reg(struct _adapter *pAdapter, @@ -237,20 +236,20 @@ static u8 set_bb_reg(struct _adapter *pAdapter, org_value = r8712_bb_reg_read(pAdapter, offset); bit_shift = bitshift(bitmask); new_value = ((org_value & (~bitmask)) | (value << bit_shift)); - } else + } else { new_value = value; + } return r8712_bb_reg_write(pAdapter, offset, new_value); } static u32 get_rf_reg(struct _adapter *pAdapter, u8 path, u8 offset, u32 bitmask) { - u32 org_value, bit_shift, new_value; + u32 org_value, bit_shift; org_value = r8712_rf_reg_read(pAdapter, path, offset); bit_shift = bitshift(bitmask); - new_value = (org_value & bitmask) >> bit_shift; - return new_value; + return (org_value & bitmask) >> bit_shift; } static u8 set_rf_reg(struct _adapter *pAdapter, u8 path, u8 offset, u32 bitmask, @@ -262,8 +261,9 @@ static u8 set_rf_reg(struct _adapter *pAdapter, u8 path, u8 offset, u32 bitmask, org_value = r8712_rf_reg_read(pAdapter, path, offset); bit_shift = bitshift(bitmask); new_value = ((org_value & (~bitmask)) | (value << bit_shift)); - } else + } else { new_value = value; + } return r8712_rf_reg_write(pAdapter, path, offset, new_value); } @@ -305,7 +305,8 @@ static void SetOFDMTxPower(struct _adapter *pAdapter, u8 TxPower) { u32 TxAGC = 0; - TxAGC |= ((TxPower<<24)|(TxPower<<16)|(TxPower<<8)|TxPower); + TxAGC |= ((TxPower << 24) | (TxPower << 16) | (TxPower << 8) | + TxPower); set_bb_reg(pAdapter, rTxAGC_Rate18_06, bTxAGCRate18_06, TxAGC); set_bb_reg(pAdapter, rTxAGC_Rate54_24, bTxAGCRate54_24, TxAGC); set_bb_reg(pAdapter, rTxAGC_Mcs03_Mcs00, bTxAGCRateMCS3_MCS0, TxAGC); @@ -326,12 +327,12 @@ void r8712_SetTxAGCOffset(struct _adapter *pAdapter, u32 ulTxAGCOffset) { u32 TxAGCOffset_B, TxAGCOffset_C, TxAGCOffset_D, tmpAGC; - TxAGCOffset_B = (ulTxAGCOffset&0x000000ff); - TxAGCOffset_C = (ulTxAGCOffset & 0x0000ff00)>>8; - TxAGCOffset_D = (ulTxAGCOffset & 0x00ff0000)>>16; - tmpAGC = (TxAGCOffset_D<<8 | TxAGCOffset_C<<4 | TxAGCOffset_B); + TxAGCOffset_B = (ulTxAGCOffset & 0x000000ff); + TxAGCOffset_C = (ulTxAGCOffset & 0x0000ff00) >> 8; + TxAGCOffset_D = (ulTxAGCOffset & 0x00ff0000) >> 16; + tmpAGC = (TxAGCOffset_D << 8 | TxAGCOffset_C << 4 | TxAGCOffset_B); set_bb_reg(pAdapter, rFPGA0_TxGainStage, - (bXBTxAGC|bXCTxAGC|bXDTxAGC), tmpAGC); + (bXBTxAGC | bXCTxAGC | bXDTxAGC), tmpAGC); } void r8712_SetDataRate(struct _adapter *pAdapter) @@ -377,7 +378,7 @@ void r8712_SwitchBandwidth(struct _adapter *pAdapter) * Set Control channel to upper or lower. These settings are * required only for 40MHz */ set_bb_reg(pAdapter, rCCK0_System, bCCKSideBand, - (HAL_PRIME_CHNL_OFFSET_DONT_CARE>>1)); + (HAL_PRIME_CHNL_OFFSET_DONT_CARE >> 1)); set_bb_reg(pAdapter, rOFDM1_LSTF, 0xC00, HAL_PRIME_CHNL_OFFSET_DONT_CARE); set_bb_reg(pAdapter, rFPGA0_AnalogParameter2, bMaskDWord, 0x18); @@ -490,12 +491,6 @@ void r8712_SwitchAntenna(struct _adapter *pAdapter) set_bb_reg(pAdapter, rCCK0_AFESetting, bMaskByte3, cck_ant_sel_val); } -void r8712_SetCrystalCap(struct _adapter *pAdapter) -{ - set_bb_reg(pAdapter, rFPGA0_AnalogParameter1, bXtalCap, - pAdapter->mppriv.curr_crystalcap); -} - static void TriggerRFThermalMeter(struct _adapter *pAdapter) { /* 0x24: RF Reg[6:5] */ |