aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin P. Mattock <justinmattock@gmail.com>2012-04-30 17:39:21 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-02 00:50:58 -0400
commit8ef3a7ed35a09431336faf2f3ce53d4d0959cea1 (patch)
treefd6cb57a3f58253eb0399feace9acf15fb918809
parentffae3055d23275b7b0abd4c1b0b750662b62ccf1 (diff)
staging:rtl8192u Fix typos and comments
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/rtl8192u/r8192U.h4
-rw-r--r--drivers/staging/rtl8192u/r8192U_core.c24
-rw-r--r--drivers/staging/rtl8192u/r8192U_dm.c16
-rw-r--r--drivers/staging/rtl8192u/r819xU_cmdpkt.c2
-rw-r--r--drivers/staging/rtl8192u/r819xU_firmware.c2
-rw-r--r--drivers/staging/rtl8192u/r819xU_phy.c4
6 files changed, 26 insertions, 26 deletions
diff --git a/drivers/staging/rtl8192u/r8192U.h b/drivers/staging/rtl8192u/r8192U.h
index ebcb5b06de6..b4e99f42123 100644
--- a/drivers/staging/rtl8192u/r8192U.h
+++ b/drivers/staging/rtl8192u/r8192U.h
@@ -98,7 +98,7 @@ do { if(rt_global_debug_component & component) \
98#define COMP_INIT BIT2 // during driver initialization / halt / reset. 98#define COMP_INIT BIT2 // during driver initialization / halt / reset.
99 99
100 100
101#define COMP_RECV BIT3 // Revive part data path. 101#define COMP_RECV BIT3 // Receive data path.
102#define COMP_SEND BIT4 // Send part path. 102#define COMP_SEND BIT4 // Send part path.
103#define COMP_IO BIT5 // I/O Related. Added by Annie, 2006-03-02. 103#define COMP_IO BIT5 // I/O Related. Added by Annie, 2006-03-02.
104#define COMP_POWER BIT6 // 802.11 Power Save mode or System/Device Power state related. 104#define COMP_POWER BIT6 // 802.11 Power Save mode or System/Device Power state related.
@@ -322,7 +322,7 @@ typedef struct _tx_fwinfo_819x_usb {
322 u8 TxSubCarrier:2; // This is used for legacy OFDM rate only. 322 u8 TxSubCarrier:2; // This is used for legacy OFDM rate only.
323 u8 STBC:2; 323 u8 STBC:2;
324 u8 AllowAggregation:1; 324 u8 AllowAggregation:1;
325 u8 RtsHT:1; //Interprete RtsRate field as high throughput data rate 325 u8 RtsHT:1; //Interpret RtsRate field as high throughput data rate
326 u8 RtsShort:1; //Short PLCP for CCK, or short GI for 11n MCS 326 u8 RtsShort:1; //Short PLCP for CCK, or short GI for 11n MCS
327 u8 RtsBandwidth:1; // This is used for HT MCS rate only. 327 u8 RtsBandwidth:1; // This is used for HT MCS rate only.
328 u8 RtsSubcarrier:2; // This is used for legacy OFDM rate only. 328 u8 RtsSubcarrier:2; // This is used for legacy OFDM rate only.
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index be860456d72..5981d665832 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -203,7 +203,7 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv* priv)
203 { 203 {
204 Dot11d_Init(ieee); 204 Dot11d_Init(ieee);
205 ieee->bGlobalDomain = false; 205 ieee->bGlobalDomain = false;
206 //actually 8225 & 8256 rf chip only support B,G,24N mode 206 //actually 8225 & 8256 rf chips only support B,G,24N mode
207 if ((priv->rf_chip == RF_8225) || (priv->rf_chip == RF_8256)) 207 if ((priv->rf_chip == RF_8225) || (priv->rf_chip == RF_8256))
208 { 208 {
209 min_chan = 1; 209 min_chan = 1;
@@ -1476,7 +1476,7 @@ static void rtl8192_tx_isr(struct urb *tx_urb)
1476 if(tcb_desc->queue_index != TXCMD_QUEUE) { 1476 if(tcb_desc->queue_index != TXCMD_QUEUE) {
1477 if(tx_urb->status == 0) { 1477 if(tx_urb->status == 0) {
1478 dev->trans_start = jiffies; 1478 dev->trans_start = jiffies;
1479 // As act as station mode, destination shall be unicast address. 1479 // Act as station mode, destination shall be unicast address.
1480 //priv->ieee80211->stats.tx_bytes+=(skb->len - priv->ieee80211->tx_headroom); 1480 //priv->ieee80211->stats.tx_bytes+=(skb->len - priv->ieee80211->tx_headroom);
1481 //priv->ieee80211->stats.tx_packets++; 1481 //priv->ieee80211->stats.tx_packets++;
1482 priv->stats.txoktotal++; 1482 priv->stats.txoktotal++;
@@ -1527,8 +1527,8 @@ static void rtl8192_tx_isr(struct urb *tx_urb)
1527 * function, it should contain enough tx irq; 1527 * function, it should contain enough tx irq;
1528 * 2. check packet type; 1528 * 2. check packet type;
1529 * 3. initialize sendlist, check whether the to-be send packet no greater than 1 1529 * 3. initialize sendlist, check whether the to-be send packet no greater than 1
1530 * 4. aggregates the packets, and fill firmware info and tx desc to it, etc. 1530 * 4. aggregates the packets, and fill firmware info and tx desc into it, etc.
1531 * 5. check whether the packet could be sent, otherwise just insert to wait head 1531 * 5. check whether the packet could be sent, otherwise just insert into wait head
1532 * */ 1532 * */
1533 skb = skb_dequeue(&priv->ieee80211->skb_drv_aggQ[queue_index]); 1533 skb = skb_dequeue(&priv->ieee80211->skb_drv_aggQ[queue_index]);
1534 if(!check_nic_enough_desc(dev, queue_index)) { 1534 if(!check_nic_enough_desc(dev, queue_index)) {
@@ -2783,7 +2783,7 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
2783 (TCR_MXDMA_2048<<TCR_MXDMA_OFFSET)| // Max DMA Burst Size per Tx DMA Burst, 7: reserved. 2783 (TCR_MXDMA_2048<<TCR_MXDMA_OFFSET)| // Max DMA Burst Size per Tx DMA Burst, 7: reserved.
2784 (priv->ShortRetryLimit<<TCR_SRL_OFFSET)| // Short retry limit 2784 (priv->ShortRetryLimit<<TCR_SRL_OFFSET)| // Short retry limit
2785 (priv->LongRetryLimit<<TCR_LRL_OFFSET) | // Long retry limit 2785 (priv->LongRetryLimit<<TCR_LRL_OFFSET) | // Long retry limit
2786 (false ? TCR_SAT: 0); // FALSE: HW provides PLCP length and LENGEXT, TURE: SW provides them 2786 (false ? TCR_SAT: 0); // FALSE: HW provides PLCP length and LENGEXT, TRUE: SW provides them
2787#ifdef TO_DO_LIST 2787#ifdef TO_DO_LIST
2788 if(Adapter->bInHctTest) 2788 if(Adapter->bInHctTest)
2789 pHalData->ReceiveConfig = pHalData->CSMethod | 2789 pHalData->ReceiveConfig = pHalData->CSMethod |
@@ -3437,7 +3437,7 @@ if(Adapter->ResetProgress == RESET_TYPE_NORESET)
3437 { // User disable RF via registry. 3437 { // User disable RF via registry.
3438 RT_TRACE((COMP_INIT|COMP_RF), DBG_LOUD, ("InitializeAdapter819xUsb(): Turn off RF for RegRfOff ----------\n")); 3438 RT_TRACE((COMP_INIT|COMP_RF), DBG_LOUD, ("InitializeAdapter819xUsb(): Turn off RF for RegRfOff ----------\n"));
3439 MgntActSet_RF_State(Adapter, eRfOff, RF_CHANGE_BY_SW); 3439 MgntActSet_RF_State(Adapter, eRfOff, RF_CHANGE_BY_SW);
3440 // Those action will be discard in MgntActSet_RF_State because of the same state 3440 // Those actions will be discard in MgntActSet_RF_State because of the same state
3441 for(eRFPath = 0; eRFPath <pHalData->NumTotalRFPath; eRFPath++) 3441 for(eRFPath = 0; eRFPath <pHalData->NumTotalRFPath; eRFPath++)
3442 PHY_SetRFReg(Adapter, (RF90_RADIO_PATH_E)eRFPath, 0x4, 0xC00, 0x0); 3442 PHY_SetRFReg(Adapter, (RF90_RADIO_PATH_E)eRFPath, 0x4, 0xC00, 0x0);
3443 } 3443 }
@@ -3458,7 +3458,7 @@ if(Adapter->ResetProgress == RESET_TYPE_NORESET)
3458 if(pHalData->eRFPowerState == eRfOff) 3458 if(pHalData->eRFPowerState == eRfOff)
3459 { 3459 {
3460 MgntActSet_RF_State(Adapter, eRfOff, pMgntInfo->RfOffReason); 3460 MgntActSet_RF_State(Adapter, eRfOff, pMgntInfo->RfOffReason);
3461 // Those action will be discard in MgntActSet_RF_State because of the same state 3461 // Those actions will be discard in MgntActSet_RF_State because of the same state
3462 for(eRFPath = 0; eRFPath <pHalData->NumTotalRFPath; eRFPath++) 3462 for(eRFPath = 0; eRFPath <pHalData->NumTotalRFPath; eRFPath++)
3463 PHY_SetRFReg(Adapter, (RF90_RADIO_PATH_E)eRFPath, 0x4, 0xC00, 0x0); 3463 PHY_SetRFReg(Adapter, (RF90_RADIO_PATH_E)eRFPath, 0x4, 0xC00, 0x0);
3464 } 3464 }
@@ -4516,7 +4516,7 @@ u8 HwRateToMRate90(bool bIsHT, u8 rate)
4516 4516
4517/** 4517/**
4518 * Function: UpdateRxPktTimeStamp 4518 * Function: UpdateRxPktTimeStamp
4519 * Overview: Record down the TSF time stamp when receiving a packet 4519 * Overview: Record the TSF time stamp when receiving a packet
4520 * 4520 *
4521 * Input: 4521 * Input:
4522 * PADAPTER Adapter 4522 * PADAPTER Adapter
@@ -4558,8 +4558,8 @@ long rtl819x_translate_todbm(u8 signal_strength_index )// 0-100 index.
4558 4558
4559/* 2008/01/22 MH We can not declare RSSI/EVM total value of sliding window to 4559/* 2008/01/22 MH We can not declare RSSI/EVM total value of sliding window to
4560 be a local static. Otherwise, it may increase when we return from S3/S4. The 4560 be a local static. Otherwise, it may increase when we return from S3/S4. The
4561 value will be kept in memory or disk. We must declare the value in adapter 4561 value will be kept in memory or disk. Declare the value in the adaptor
4562 and it will be reinitialized when return from S3/S4. */ 4562 and it will be reinitialized when returned from S3/S4. */
4563void rtl8192_process_phyinfo(struct r8192_priv * priv,u8* buffer, struct ieee80211_rx_stats * pprevious_stats, struct ieee80211_rx_stats * pcurrent_stats) 4563void rtl8192_process_phyinfo(struct r8192_priv * priv,u8* buffer, struct ieee80211_rx_stats * pprevious_stats, struct ieee80211_rx_stats * pcurrent_stats)
4564{ 4564{
4565 bool bcheck = false; 4565 bool bcheck = false;
@@ -5092,7 +5092,7 @@ static void rtl8192_query_rxphystatus(
5092 rx_evmX = (char)(tmp_rxevm); 5092 rx_evmX = (char)(tmp_rxevm);
5093 5093
5094 // Do not use shift operation like "rx_evmX >>= 1" because the compiler of free build environment 5094 // Do not use shift operation like "rx_evmX >>= 1" because the compiler of free build environment
5095 // fill most significant bit to "zero" when doing shifting operation which may change a negative 5095 // will set the most significant bit to "zero" when doing shifting operation which may change a negative
5096 // value to positive one, then the dbm value (which is supposed to be negative) is not correct anymore. 5096 // value to positive one, then the dbm value (which is supposed to be negative) is not correct anymore.
5097 rx_evmX /= 2; //dbm 5097 rx_evmX /= 2; //dbm
5098 5098
@@ -5211,7 +5211,7 @@ void TranslateRxSignalStuff819xUsb(struct sk_buff *skb,
5211 5211
5212/** 5212/**
5213* Function: UpdateReceivedRateHistogramStatistics 5213* Function: UpdateReceivedRateHistogramStatistics
5214* Overview: Record down the received data rate 5214* Overview: Record the received data rate
5215* 5215*
5216* Input: 5216* Input:
5217* struct net_device *dev 5217* struct net_device *dev
diff --git a/drivers/staging/rtl8192u/r8192U_dm.c b/drivers/staging/rtl8192u/r8192U_dm.c
index 3f79e61399e..996e6584396 100644
--- a/drivers/staging/rtl8192u/r8192U_dm.c
+++ b/drivers/staging/rtl8192u/r8192U_dm.c
@@ -1457,7 +1457,7 @@ static void dm_InitializeTXPowerTracking_ThermalMeter(struct net_device *dev)
1457{ 1457{
1458 struct r8192_priv *priv = ieee80211_priv(dev); 1458 struct r8192_priv *priv = ieee80211_priv(dev);
1459 1459
1460 // Tx Power tracking by Thermal Meter require Firmware R/W 3-wire. This mechanism 1460 // Tx Power tracking by Thermal Meter requires Firmware R/W 3-wire. This mechanism
1461 // can be enabled only when Firmware R/W 3-wire is enabled. Otherwise, frequent r/w 1461 // can be enabled only when Firmware R/W 3-wire is enabled. Otherwise, frequent r/w
1462 // 3-wire by driver causes RF to go into a wrong state. 1462 // 3-wire by driver causes RF to go into a wrong state.
1463 if(priv->ieee80211->FwRWRF) 1463 if(priv->ieee80211->FwRWRF)
@@ -1520,7 +1520,7 @@ static void dm_CheckTXPowerTracking_ThermalMeter(struct net_device *dev)
1520 1520
1521 if(!TM_Trigger) 1521 if(!TM_Trigger)
1522 { 1522 {
1523 //Attention!! You have to write all 12bits data to RF, or it may cause RF to crash 1523 //Attention!! You have to write all 12bits of data to RF, or it may cause RF to crash
1524 //actually write reg0x02 bit1=0, then bit1=1. 1524 //actually write reg0x02 bit1=0, then bit1=1.
1525 //DbgPrint("Trigger ThermalMeter, write RF reg0x2 = 0x4d to 0x4f\n"); 1525 //DbgPrint("Trigger ThermalMeter, write RF reg0x2 = 0x4d to 0x4f\n");
1526 rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4d); 1526 rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4d);
@@ -2161,7 +2161,7 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(
2161 pHalData->UndecoratedSmoothedPWDB, DM_DigTable.RssiLowThresh, 2161 pHalData->UndecoratedSmoothedPWDB, DM_DigTable.RssiLowThresh,
2162 DM_DigTable.RssiHighThresh, DM_DigTable.Dig_State);*/ 2162 DM_DigTable.RssiHighThresh, DM_DigTable.Dig_State);*/
2163 /* 1. When RSSI decrease, We have to judge if it is smaller than a threshold 2163 /* 1. When RSSI decrease, We have to judge if it is smaller than a threshold
2164 and then execute below step. */ 2164 and then execute the step below. */
2165 if ((priv->undecorated_smoothed_pwdb <= dm_digtable.rssi_low_thresh)) 2165 if ((priv->undecorated_smoothed_pwdb <= dm_digtable.rssi_low_thresh))
2166 { 2166 {
2167 /* 2008/02/05 MH When we execute silent reset, the DIG PHY parameters 2167 /* 2008/02/05 MH When we execute silent reset, the DIG PHY parameters
@@ -2221,7 +2221,7 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(
2221 } 2221 }
2222 2222
2223 /* 2. When RSSI increase, We have to judge if it is larger than a threshold 2223 /* 2. When RSSI increase, We have to judge if it is larger than a threshold
2224 and then execute below step. */ 2224 and then execute the step below. */
2225 if ((priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_thresh) ) 2225 if ((priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_thresh) )
2226 { 2226 {
2227 u8 reset_flag = 0; 2227 u8 reset_flag = 0;
@@ -2329,7 +2329,7 @@ static void dm_ctrl_initgain_byrssi_highpwr(
2329 } 2329 }
2330 2330
2331 /* 3. When RSSI >75% or <70%, it is a high power issue. We have to judge if 2331 /* 3. When RSSI >75% or <70%, it is a high power issue. We have to judge if
2332 it is larger than a threshold and then execute below step. */ 2332 it is larger than a threshold and then execute the step below. */
2333 // 2008/02/05 MH SD3-Jerry Modify PD_TH for high power issue. 2333 // 2008/02/05 MH SD3-Jerry Modify PD_TH for high power issue.
2334 if (priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_power_highthresh) 2334 if (priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_power_highthresh)
2335 { 2335 {
@@ -2842,7 +2842,7 @@ static void dm_check_rfctrl_gpio(struct net_device * dev)
2842 //struct r8192_priv *priv = ieee80211_priv(dev); 2842 //struct r8192_priv *priv = ieee80211_priv(dev);
2843 2843
2844 // Work around for DTM test, we will not enable HW - radio on/off because r/w 2844 // Work around for DTM test, we will not enable HW - radio on/off because r/w
2845 // page 1 register before extra bus is enabled causing system fails when resuming 2845 // page 1 register before extra bus is enabled causing system failures when resuming
2846 // from S4. 20080218, Emily 2846 // from S4. 20080218, Emily
2847 2847
2848 // Stop to execute workitem to prevent S3/S4 bug. 2848 // Stop to execute workitem to prevent S3/S4 bug.
@@ -3392,7 +3392,7 @@ extern void dm_fsync_timer_callback(unsigned long data)
3392 } 3392 }
3393 else 3393 else
3394 { 3394 {
3395 // Stop continue count 3395 // Stop the continued count
3396 priv->ContiuneDiffCount = 0; 3396 priv->ContiuneDiffCount = 0;
3397 } 3397 }
3398 3398
@@ -3523,7 +3523,7 @@ static void dm_StartSWFsync(struct net_device *dev)
3523 RT_TRACE(COMP_HALDM,"%s\n", __FUNCTION__); 3523 RT_TRACE(COMP_HALDM,"%s\n", __FUNCTION__);
3524 // Initial rate record to zero, start to record. 3524 // Initial rate record to zero, start to record.
3525 priv->rate_record = 0; 3525 priv->rate_record = 0;
3526 // Initial continue diff count to zero, start to record. 3526 // Initialize continue diff count to zero, start to record.
3527 priv->ContiuneDiffCount = 0; 3527 priv->ContiuneDiffCount = 0;
3528 priv->rateCountDiffRecord = 0; 3528 priv->rateCountDiffRecord = 0;
3529 priv->bswitch_fsync = false; 3529 priv->bswitch_fsync = false;
diff --git a/drivers/staging/rtl8192u/r819xU_cmdpkt.c b/drivers/staging/rtl8192u/r819xU_cmdpkt.c
index ec1eeb724b0..a8a6dc2c365 100644
--- a/drivers/staging/rtl8192u/r819xU_cmdpkt.c
+++ b/drivers/staging/rtl8192u/r819xU_cmdpkt.c
@@ -726,7 +726,7 @@ cmpk_message_handle_rx(
726 /* 4. Check every received command packet content according to different 726 /* 4. Check every received command packet content according to different
727 element type. Because FW may aggregate RX command packet to minimize 727 element type. Because FW may aggregate RX command packet to minimize
728 transmit time between DRV and FW.*/ 728 transmit time between DRV and FW.*/
729 // Add a counter to prevent the lock in the loop to be to long 729 // Add a counter to prevent the lock in the loop from being held too long
730 while (total_length > 0 || exe_cnt++ >100) 730 while (total_length > 0 || exe_cnt++ >100)
731 { 731 {
732 /* 2007/01/17 MH We support aggregation of different cmd in the same packet. */ 732 /* 2007/01/17 MH We support aggregation of different cmd in the same packet. */
diff --git a/drivers/staging/rtl8192u/r819xU_firmware.c b/drivers/staging/rtl8192u/r819xU_firmware.c
index fe5776d642f..b12d1907979 100644
--- a/drivers/staging/rtl8192u/r819xU_firmware.c
+++ b/drivers/staging/rtl8192u/r819xU_firmware.c
@@ -279,7 +279,7 @@ bool init_firmware(struct net_device *dev)
279 */ 279 */
280 for(init_step = starting_state; init_step <= FW_INIT_STEP2_DATA; init_step++) { 280 for(init_step = starting_state; init_step <= FW_INIT_STEP2_DATA; init_step++) {
281 /* 281 /*
282 * Open Image file, and map file to continuous memory if open file success. 282 * Open image file, and map file to continuous memory if open file success.
283 * or read image file from array. Default load from IMG file 283 * or read image file from array. Default load from IMG file
284 */ 284 */
285 if(rst_opt == OPT_SYSTEM_RESET) { 285 if(rst_opt == OPT_SYSTEM_RESET) {
diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8192u/r819xU_phy.c
index 636d6fd5b70..dd1954daea2 100644
--- a/drivers/staging/rtl8192u/r819xU_phy.c
+++ b/drivers/staging/rtl8192u/r819xU_phy.c
@@ -176,7 +176,7 @@ u32 rtl8192_phy_RFSerialRead(struct net_device* dev, RF90_RADIO_PATH_E eRFPath,
176 rtl8192_setBBreg(dev, pPhyReg->rfHSSIPara2, bLSSIReadEdge, 0x1); 176 rtl8192_setBBreg(dev, pPhyReg->rfHSSIPara2, bLSSIReadEdge, 0x1);
177 177
178 178
179 // TODO: we should not delay such a long time. Ask help from SD3 179 // TODO: we should not delay such a long time. Ask for help from SD3
180 msleep(1); 180 msleep(1);
181 181
182 ret = rtl8192_QueryBBReg(dev, pPhyReg->rfLSSIReadBack, bLSSIReadBackData); 182 ret = rtl8192_QueryBBReg(dev, pPhyReg->rfLSSIReadBack, bLSSIReadBackData);
@@ -1425,7 +1425,7 @@ void rtl8192_SwChnl_WorkItem(struct net_device *dev)
1425} 1425}
1426 1426
1427/****************************************************************************** 1427/******************************************************************************
1428 *function: This function scheduled actual workitem to set channel 1428 *function: This function scheduled actual work item to set channel
1429 * input: net_device dev 1429 * input: net_device dev
1430 * u8 channel //channel to set 1430 * u8 channel //channel to set
1431 * output: none 1431 * output: none