OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: rtl8192u: Replace TRUE and FALSE macros 

Replace all occurrences of TRUE and FALSE by true and false
respectively.

Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ksenija Stanojevic 2015-02-28 00:14:34 +01:00 committed by Greg Kroah-Hartman
parent c703c750cc
commit 4b2faf8022
4 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/staging/rtl8192u/r8192U_core.c
View File

@ -2767,7 +2767,7 @@ static bool rtl8192_adapter_start(struct net_device *dev)
// //
#ifdef TO_DO_LIST #ifdef TO_DO_LIST
if (Adapter->ResetProgress == RESET_TYPE_NORESET) { if (Adapter->ResetProgress == RESET_TYPE_NORESET) {
if (pMgntInfo->RegRfOff == TRUE) { /* User disable RF via registry. */ if (pMgntInfo->RegRfOff == true) { /* User disable RF via registry. */
RT_TRACE((COMP_INIT|COMP_RF), DBG_LOUD, ("InitializeAdapter819xUsb(): Turn off RF for RegRfOff ----------\n")); RT_TRACE((COMP_INIT|COMP_RF), DBG_LOUD, ("InitializeAdapter819xUsb(): Turn off RF for RegRfOff ----------\n"));
MgntActSet_RF_State(Adapter, eRfOff, RF_CHANGE_BY_SW); MgntActSet_RF_State(Adapter, eRfOff, RF_CHANGE_BY_SW);
// Those actions will be discard in MgntActSet_RF_State because of the same state // Those actions will be discard in MgntActSet_RF_State because of the same state
@ -2814,15 +2814,15 @@ static bool rtl8192_adapter_start(struct net_device *dev)
u8 tmpvalue; u8 tmpvalue;
read_nic_byte(dev, 0x301, &tmpvalue); read_nic_byte(dev, 0x301, &tmpvalue);
if (tmpvalue == 0x03) { if (tmpvalue == 0x03) {
priv->bDcut = TRUE; priv->bDcut = true;
RT_TRACE(COMP_POWER_TRACKING, "D-cut\n"); RT_TRACE(COMP_POWER_TRACKING, "D-cut\n");
} else { } else {
priv->bDcut = FALSE; priv->bDcut = false;
RT_TRACE(COMP_POWER_TRACKING, "C-cut\n"); RT_TRACE(COMP_POWER_TRACKING, "C-cut\n");
} }
dm_initialize_txpower_tracking(dev); dm_initialize_txpower_tracking(dev);
if (priv->bDcut == TRUE) { if (priv->bDcut == true) {
u32 i, TempCCk; u32 i, TempCCk;
u32 tmpRegA = rtl8192_QueryBBReg(dev, rOFDM0_XATxIQImbalance, bMaskDWord); u32 tmpRegA = rtl8192_QueryBBReg(dev, rOFDM0_XATxIQImbalance, bMaskDWord);
for (i = 0; i < TxBBGainTableLength; i++) { for (i = 0; i < TxBBGainTableLength; i++) {
@ -2874,11 +2874,11 @@ static bool HalTxCheckStuck819xUsb(struct net_device *dev)
{ {
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
u16 RegTxCounter; u16 RegTxCounter;
bool bStuck = FALSE; bool bStuck = false;
read_nic_word(dev, 0x128, &RegTxCounter); read_nic_word(dev, 0x128, &RegTxCounter);
RT_TRACE(COMP_RESET, "%s():RegTxCounter is %d,TxCounter is %d\n", __func__, RegTxCounter, priv->TxCounter); RT_TRACE(COMP_RESET, "%s():RegTxCounter is %d,TxCounter is %d\n", __func__, RegTxCounter, priv->TxCounter);
if (priv->TxCounter == RegTxCounter) if (priv->TxCounter == RegTxCounter)
bStuck = TRUE; bStuck = true;
priv->TxCounter = RegTxCounter; priv->TxCounter = RegTxCounter;
@ -2920,7 +2920,7 @@ static bool HalRxCheckStuck819xUsb(struct net_device *dev)
{ {
u16 RegRxCounter; u16 RegRxCounter;
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
bool bStuck = FALSE; bool bStuck = false;
static u8 rx_chk_cnt; static u8 rx_chk_cnt;
read_nic_word(dev, 0x130, &RegRxCounter); read_nic_word(dev, 0x130, &RegRxCounter);
RT_TRACE(COMP_RESET, "%s(): RegRxCounter is %d,RxCounter is %d\n", __func__, RegRxCounter, priv->RxCounter); RT_TRACE(COMP_RESET, "%s(): RegRxCounter is %d,RxCounter is %d\n", __func__, RegRxCounter, priv->RxCounter);
@ -2951,7 +2951,7 @@ static bool HalRxCheckStuck819xUsb(struct net_device *dev)
} }
if (priv->RxCounter == RegRxCounter) if (priv->RxCounter == RegRxCounter)
bStuck = TRUE; bStuck = true;
priv->RxCounter = RegRxCounter; priv->RxCounter = RegRxCounter;
@ -2961,10 +2961,10 @@ static bool HalRxCheckStuck819xUsb(struct net_device *dev)
static RESET_TYPE RxCheckStuck(struct net_device *dev) static RESET_TYPE RxCheckStuck(struct net_device *dev)
{ {
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
bool bRxCheck = FALSE; bool bRxCheck = false;
if (priv->IrpPendingCount > 1) if (priv->IrpPendingCount > 1)
bRxCheck = TRUE; bRxCheck = true;
if (bRxCheck) { if (bRxCheck) {
if (HalRxCheckStuck819xUsb(dev)) { if (HalRxCheckStuck819xUsb(dev)) {
@ -4208,7 +4208,7 @@ static void TranslateRxSignalStuff819xUsb(struct sk_buff *skb,
struct net_device *dev = info->dev; struct net_device *dev = info->dev;
struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
bool bpacket_match_bssid, bpacket_toself; bool bpacket_match_bssid, bpacket_toself;
bool bPacketBeacon = FALSE, bToSelfBA = FALSE; bool bPacketBeacon = false, bToSelfBA = false;
static struct ieee80211_rx_stats previous_stats; static struct ieee80211_rx_stats previous_stats;
struct ieee80211_hdr_3addr *hdr;//by amy struct ieee80211_hdr_3addr *hdr;//by amy
u16 fc, type; u16 fc, type;

46
drivers/staging/rtl8192u/r8192U_dm.c
View File

@ -502,7 +502,7 @@ static u8 CCKSwingTable_Ch14[CCK_Table_length][8] = {
static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev) static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
{ {
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
bool bHighpowerstate, viviflag = FALSE; bool bHighpowerstate, viviflag = false;
DCMD_TXCMD_T tx_cmd; DCMD_TXCMD_T tx_cmd;
u8 powerlevelOFDM24G; u8 powerlevelOFDM24G;
int i = 0, j = 0, k = 0; int i = 0, j = 0, k = 0;
@ -558,13 +558,13 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
/* check if the report value is right */ /* check if the report value is right */
for (k = 0; k < 5; k++) { for (k = 0; k < 5; k++) {
if (tmp_report[k] <= 20) { if (tmp_report[k] <= 20) {
viviflag = TRUE; viviflag = true;
break; break;
} }
} }
if (viviflag == TRUE) { if (viviflag == true) {
write_nic_byte(dev, 0x1ba, 0); write_nic_byte(dev, 0x1ba, 0);
viviflag = FALSE; viviflag = false;
RT_TRACE(COMP_POWER_TRACKING, "we filtered the data\n"); RT_TRACE(COMP_POWER_TRACKING, "we filtered the data\n");
for (k = 0; k < 5; k++) for (k = 0; k < 5; k++)
tmp_report[k] = 0; tmp_report[k] = 0;
@ -587,7 +587,7 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
delta = TSSI_13dBm - Avg_TSSI_Meas_from_driver; delta = TSSI_13dBm - Avg_TSSI_Meas_from_driver;
if (delta <= E_FOR_TX_POWER_TRACK) { if (delta <= E_FOR_TX_POWER_TRACK) {
priv->ieee80211->bdynamic_txpower_enable = TRUE; priv->ieee80211->bdynamic_txpower_enable = true;
write_nic_byte(dev, 0x1ba, 0); write_nic_byte(dev, 0x1ba, 0);
RT_TRACE(COMP_POWER_TRACKING, "tx power track is done\n"); RT_TRACE(COMP_POWER_TRACKING, "tx power track is done\n");
RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpowertrackingindex = %d\n", priv->rfa_txpowertrackingindex); RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpowertrackingindex = %d\n", priv->rfa_txpowertrackingindex);
@ -624,10 +624,10 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
if (priv->cck_present_attentuation > -1 && priv->cck_present_attentuation < 23) { if (priv->cck_present_attentuation > -1 && priv->cck_present_attentuation < 23) {
if (priv->ieee80211->current_network.channel == 14 && !priv->bcck_in_ch14) { if (priv->ieee80211->current_network.channel == 14 && !priv->bcck_in_ch14) {
priv->bcck_in_ch14 = TRUE; priv->bcck_in_ch14 = true;
dm_cck_txpower_adjust(dev, priv->bcck_in_ch14); dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
} else if (priv->ieee80211->current_network.channel != 14 && priv->bcck_in_ch14) { } else if (priv->ieee80211->current_network.channel != 14 && priv->bcck_in_ch14) {
priv->bcck_in_ch14 = FALSE; priv->bcck_in_ch14 = false;
dm_cck_txpower_adjust(dev, priv->bcck_in_ch14); dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
} else } else
dm_cck_txpower_adjust(dev, priv->bcck_in_ch14); dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
@ -638,7 +638,7 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
RT_TRACE(COMP_POWER_TRACKING, "priv->cck_present_attentuation = %d\n", priv->cck_present_attentuation); RT_TRACE(COMP_POWER_TRACKING, "priv->cck_present_attentuation = %d\n", priv->cck_present_attentuation);
if (priv->cck_present_attentuation_difference <= -12 || priv->cck_present_attentuation_difference >= 24) { if (priv->cck_present_attentuation_difference <= -12 || priv->cck_present_attentuation_difference >= 24) {
priv->ieee80211->bdynamic_txpower_enable = TRUE; priv->ieee80211->bdynamic_txpower_enable = true;
write_nic_byte(dev, 0x1ba, 0); write_nic_byte(dev, 0x1ba, 0);
RT_TRACE(COMP_POWER_TRACKING, "tx power track--->limited\n"); RT_TRACE(COMP_POWER_TRACKING, "tx power track--->limited\n");
return; return;
@ -651,7 +651,7 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
break; break;
} }
} }
priv->ieee80211->bdynamic_txpower_enable = TRUE; priv->ieee80211->bdynamic_txpower_enable = true;
write_nic_byte(dev, 0x1ba, 0); write_nic_byte(dev, 0x1ba, 0);
} }
@ -684,7 +684,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)
break; break;
} }
} }
priv->btxpower_trackingInit = TRUE; priv->btxpower_trackingInit = true;
/*pHalData->TXPowercount = 0;*/ /*pHalData->TXPowercount = 0;*/
return; return;
} }
@ -734,10 +734,10 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)
tmpCCKindex = tmpCCK20Mindex; tmpCCKindex = tmpCCK20Mindex;
if (priv->ieee80211->current_network.channel == 14 && !priv->bcck_in_ch14) { if (priv->ieee80211->current_network.channel == 14 && !priv->bcck_in_ch14) {
priv->bcck_in_ch14 = TRUE; priv->bcck_in_ch14 = true;
CCKSwingNeedUpdate = 1; CCKSwingNeedUpdate = 1;
} else if (priv->ieee80211->current_network.channel != 14 && priv->bcck_in_ch14) { } else if (priv->ieee80211->current_network.channel != 14 && priv->bcck_in_ch14) {
priv->bcck_in_ch14 = FALSE; priv->bcck_in_ch14 = false;
CCKSwingNeedUpdate = 1; CCKSwingNeedUpdate = 1;
} }
@ -765,7 +765,7 @@ void dm_txpower_trackingcallback(struct work_struct *work)
struct r8192_priv *priv = container_of(dwork, struct r8192_priv, txpower_tracking_wq); struct r8192_priv *priv = container_of(dwork, struct r8192_priv, txpower_tracking_wq);
struct net_device *dev = priv->ieee80211->dev; struct net_device *dev = priv->ieee80211->dev;
if (priv->bDcut == TRUE) if (priv->bDcut == true)
dm_TXPowerTrackingCallback_TSSI(dev); dm_TXPowerTrackingCallback_TSSI(dev);
else else
dm_TXPowerTrackingCallback_ThermalMeter(dev); dm_TXPowerTrackingCallback_ThermalMeter(dev);
@ -1273,9 +1273,9 @@ static void dm_InitializeTXPowerTracking_TSSI(struct net_device *dev)
priv->cck_txbbgain_ch14_table[22].ccktxbb_valuearray[6] = 0x00; priv->cck_txbbgain_ch14_table[22].ccktxbb_valuearray[6] = 0x00;
priv->cck_txbbgain_ch14_table[22].ccktxbb_valuearray[7] = 0x00; priv->cck_txbbgain_ch14_table[22].ccktxbb_valuearray[7] = 0x00;
priv->btxpower_tracking = TRUE; priv->btxpower_tracking = true;
priv->txpower_count = 0; priv->txpower_count = 0;
priv->btxpower_trackingInit = FALSE; priv->btxpower_trackingInit = false;
} }
@ -1289,18 +1289,18 @@ static void dm_InitializeTXPowerTracking_ThermalMeter(struct net_device *dev)
* 3-wire by driver causes RF to go into a wrong state. * 3-wire by driver causes RF to go into a wrong state.
*/ */
if (priv->ieee80211->FwRWRF) if (priv->ieee80211->FwRWRF)
priv->btxpower_tracking = TRUE; priv->btxpower_tracking = true;
else else
priv->btxpower_tracking = FALSE; priv->btxpower_tracking = false;
priv->txpower_count = 0; priv->txpower_count = 0;
priv->btxpower_trackingInit = FALSE; priv->btxpower_trackingInit = false;
} }
void dm_initialize_txpower_tracking(struct net_device *dev) void dm_initialize_txpower_tracking(struct net_device *dev)
{ {
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
if (priv->bDcut == TRUE) if (priv->bDcut == true)
dm_InitializeTXPowerTracking_TSSI(dev); dm_InitializeTXPowerTracking_TSSI(dev);
else else
dm_InitializeTXPowerTracking_ThermalMeter(dev); dm_InitializeTXPowerTracking_ThermalMeter(dev);
@ -1356,7 +1356,7 @@ static void dm_check_txpower_tracking(struct net_device *dev)
#ifdef RTL8190P #ifdef RTL8190P
dm_CheckTXPowerTracking_TSSI(dev); dm_CheckTXPowerTracking_TSSI(dev);
#else #else
if (priv->bDcut == TRUE) if (priv->bDcut == true)
dm_CheckTXPowerTracking_TSSI(dev); dm_CheckTXPowerTracking_TSSI(dev);
else else
dm_CheckTXPowerTracking_ThermalMeter(dev); dm_CheckTXPowerTracking_ThermalMeter(dev);
@ -1466,7 +1466,7 @@ void dm_cck_txpower_adjust(struct net_device *dev, bool binch14)
{ /* dm_CCKTxPowerAdjust */ { /* dm_CCKTxPowerAdjust */
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
if (priv->bDcut == TRUE) if (priv->bDcut == true)
dm_CCKTxPowerAdjust_TSSI(dev, binch14); dm_CCKTxPowerAdjust_TSSI(dev, binch14);
else else
dm_CCKTxPowerAdjust_ThermalMeter(dev, binch14); dm_CCKTxPowerAdjust_ThermalMeter(dev, binch14);
@ -2314,7 +2314,7 @@ static void dm_init_ctstoself(struct net_device *dev)
{ {
struct r8192_priv *priv = ieee80211_priv((struct net_device *)dev); struct r8192_priv *priv = ieee80211_priv((struct net_device *)dev);
priv->ieee80211->bCTSToSelfEnable = TRUE; priv->ieee80211->bCTSToSelfEnable = true;
priv->ieee80211->CTSToSelfTH = CTSToSelfTHVal; priv->ieee80211->CTSToSelfTH = CTSToSelfTHVal;
} }
@ -2327,7 +2327,7 @@ static void dm_ctstoself(struct net_device *dev)
unsigned long curTxOkCnt = 0; unsigned long curTxOkCnt = 0;
unsigned long curRxOkCnt = 0; unsigned long curRxOkCnt = 0;
if (priv->ieee80211->bCTSToSelfEnable != TRUE) { if (priv->ieee80211->bCTSToSelfEnable != true) {
pHTInfo->IOTAction &= ~HT_IOT_ACT_FORCED_CTS2SELF; pHTInfo->IOTAction &= ~HT_IOT_ACT_FORCED_CTS2SELF;
return; return;
} }

12
drivers/staging/rtl8192u/r819xU_firmware.c
View File

@ -164,7 +164,7 @@ static bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev)
CPUCheckMainCodeOKAndTurnOnCPU_Fail: CPUCheckMainCodeOKAndTurnOnCPU_Fail:
RT_TRACE(COMP_ERR, "ERR in %s()\n", __func__); RT_TRACE(COMP_ERR, "ERR in %s()\n", __func__);
rt_status = FALSE; rt_status = false;
return rt_status; return rt_status;
} }
@ -201,7 +201,7 @@ CPUCheckFirmwareReady_Fail:
bool init_firmware(struct net_device *dev) bool init_firmware(struct net_device *dev)
{ {
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
bool rt_status = TRUE; bool rt_status = true;
u32 file_length = 0; u32 file_length = 0;
u8 *mapped_file = NULL; u8 *mapped_file = NULL;
@ -281,7 +281,7 @@ bool init_firmware(struct net_device *dev)
if (rst_opt == OPT_SYSTEM_RESET) if (rst_opt == OPT_SYSTEM_RESET)
release_firmware(fw_entry); release_firmware(fw_entry);
if (rt_status != TRUE) if (rt_status != true)
goto download_firmware_fail; goto download_firmware_fail;
switch (init_step) { switch (init_step) {
@ -304,7 +304,7 @@ bool init_firmware(struct net_device *dev)
/* Check Put Code OK and Turn On CPU */ /* Check Put Code OK and Turn On CPU */
rt_status = CPUcheck_maincodeok_turnonCPU(dev); rt_status = CPUcheck_maincodeok_turnonCPU(dev);
if (rt_status != TRUE) { if (rt_status != true) {
RT_TRACE(COMP_ERR, "CPUcheck_maincodeok_turnonCPU fail!\n"); RT_TRACE(COMP_ERR, "CPUcheck_maincodeok_turnonCPU fail!\n");
goto download_firmware_fail; goto download_firmware_fail;
} }
@ -318,7 +318,7 @@ bool init_firmware(struct net_device *dev)
mdelay(1); mdelay(1);
rt_status = CPUcheck_firmware_ready(dev); rt_status = CPUcheck_firmware_ready(dev);
if (rt_status != TRUE) { if (rt_status != true) {
RT_TRACE(COMP_ERR, "CPUcheck_firmware_ready fail(%d)!\n",rt_status); RT_TRACE(COMP_ERR, "CPUcheck_firmware_ready fail(%d)!\n",rt_status);
goto download_firmware_fail; goto download_firmware_fail;
} }
@ -336,7 +336,7 @@ bool init_firmware(struct net_device *dev)
download_firmware_fail: download_firmware_fail:
RT_TRACE(COMP_ERR, "ERR in %s()\n", __func__); RT_TRACE(COMP_ERR, "ERR in %s()\n", __func__);
rt_status = FALSE; rt_status = false;
return rt_status; return rt_status;
} }

4
drivers/staging/rtl8192u/r819xU_phy.c
View File

@ -1575,10 +1575,10 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev)
priv->cck_present_attentuation); priv->cck_present_attentuation);
if (priv->chan == 14 && !priv->bcck_in_ch14) { if (priv->chan == 14 && !priv->bcck_in_ch14) {
priv->bcck_in_ch14 = TRUE; priv->bcck_in_ch14 = true;
dm_cck_txpower_adjust(dev, priv->bcck_in_ch14); dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
} else if (priv->chan != 14 && priv->bcck_in_ch14) { } else if (priv->chan != 14 && priv->bcck_in_ch14) {
priv->bcck_in_ch14 = FALSE; priv->bcck_in_ch14 = false;
dm_cck_txpower_adjust(dev, priv->bcck_in_ch14); dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
} else { } else {
dm_cck_txpower_adjust(dev, priv->bcck_in_ch14); dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);