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

staging:rtl8192u Fix typos and comments 

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Justin P. Mattock 2012-04-30 14:39:21 -07:00 committed by Greg Kroah-Hartman
parent ffae3055d2
commit 8ef3a7ed35
6 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/rtl8192u/r8192U.h
View File

@ -98,7 +98,7 @@ do { if(rt_global_debug_component & component) \
#define COMP_INIT BIT2 // during driver initialization / halt / reset. #define COMP_INIT BIT2 // during driver initialization / halt / reset.
#define COMP_RECV BIT3 // Revive part data path. #define COMP_RECV BIT3 // Receive data path.
#define COMP_SEND BIT4 // Send part path. #define COMP_SEND BIT4 // Send part path.
#define COMP_IO BIT5 // I/O Related. Added by Annie, 2006-03-02. #define COMP_IO BIT5 // I/O Related. Added by Annie, 2006-03-02.
#define COMP_POWER BIT6 // 802.11 Power Save mode or System/Device Power state related. #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 {
u8 TxSubCarrier:2; // This is used for legacy OFDM rate only. u8 TxSubCarrier:2; // This is used for legacy OFDM rate only.
u8 STBC:2; u8 STBC:2;
u8 AllowAggregation:1; u8 AllowAggregation:1;
u8 RtsHT:1; //Interprete RtsRate field as high throughput data rate u8 RtsHT:1; //Interpret RtsRate field as high throughput data rate
u8 RtsShort:1; //Short PLCP for CCK, or short GI for 11n MCS u8 RtsShort:1; //Short PLCP for CCK, or short GI for 11n MCS
u8 RtsBandwidth:1; // This is used for HT MCS rate only. u8 RtsBandwidth:1; // This is used for HT MCS rate only.
u8 RtsSubcarrier:2; // This is used for legacy OFDM rate only. u8 RtsSubcarrier:2; // This is used for legacy OFDM rate only.

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

@ -203,7 +203,7 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv* priv)
{ {
Dot11d_Init(ieee); Dot11d_Init(ieee);
ieee->bGlobalDomain = false; ieee->bGlobalDomain = false;
//actually 8225 & 8256 rf chip only support B,G,24N mode //actually 8225 & 8256 rf chips only support B,G,24N mode
if ((priv->rf_chip == RF_8225) || (priv->rf_chip == RF_8256)) if ((priv->rf_chip == RF_8225) || (priv->rf_chip == RF_8256))
{ {
min_chan = 1; min_chan = 1;
@ -1476,7 +1476,7 @@ static void rtl8192_tx_isr(struct urb *tx_urb)
if(tcb_desc->queue_index != TXCMD_QUEUE) { if(tcb_desc->queue_index != TXCMD_QUEUE) {
if(tx_urb->status == 0) { if(tx_urb->status == 0) {
dev->trans_start = jiffies; dev->trans_start = jiffies;
// As act as station mode, destination shall be unicast address. // Act as station mode, destination shall be unicast address.
//priv->ieee80211->stats.tx_bytes+=(skb->len - priv->ieee80211->tx_headroom); //priv->ieee80211->stats.tx_bytes+=(skb->len - priv->ieee80211->tx_headroom);
//priv->ieee80211->stats.tx_packets++; //priv->ieee80211->stats.tx_packets++;
priv->stats.txoktotal++; priv->stats.txoktotal++;
@ -1527,8 +1527,8 @@ static void rtl8192_tx_isr(struct urb *tx_urb)
* function, it should contain enough tx irq; * function, it should contain enough tx irq;
* 2. check packet type; * 2. check packet type;
* 3. initialize sendlist, check whether the to-be send packet no greater than 1 * 3. initialize sendlist, check whether the to-be send packet no greater than 1
* 4. aggregates the packets, and fill firmware info and tx desc to it, etc. * 4. aggregates the packets, and fill firmware info and tx desc into it, etc.
* 5. check whether the packet could be sent, otherwise just insert to wait head * 5. check whether the packet could be sent, otherwise just insert into wait head
* */ * */
skb = skb_dequeue(&priv->ieee80211->skb_drv_aggQ[queue_index]); skb = skb_dequeue(&priv->ieee80211->skb_drv_aggQ[queue_index]);
if(!check_nic_enough_desc(dev, queue_index)) { if(!check_nic_enough_desc(dev, queue_index)) {
@ -2783,7 +2783,7 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
(TCR_MXDMA_2048<<TCR_MXDMA_OFFSET)| // Max DMA Burst Size per Tx DMA Burst, 7: reserved. (TCR_MXDMA_2048<<TCR_MXDMA_OFFSET)| // Max DMA Burst Size per Tx DMA Burst, 7: reserved.
(priv->ShortRetryLimit<<TCR_SRL_OFFSET)| // Short retry limit (priv->ShortRetryLimit<<TCR_SRL_OFFSET)| // Short retry limit
(priv->LongRetryLimit<<TCR_LRL_OFFSET) | // Long retry limit (priv->LongRetryLimit<<TCR_LRL_OFFSET) | // Long retry limit
(false ? TCR_SAT: 0); // FALSE: HW provides PLCP length and LENGEXT, TURE: SW provides them (false ? TCR_SAT: 0); // FALSE: HW provides PLCP length and LENGEXT, TRUE: SW provides them
#ifdef TO_DO_LIST #ifdef TO_DO_LIST
if(Adapter->bInHctTest) if(Adapter->bInHctTest)
pHalData->ReceiveConfig = pHalData->CSMethod | pHalData->ReceiveConfig = pHalData->CSMethod |
@ -3437,7 +3437,7 @@ if(Adapter->ResetProgress == RESET_TYPE_NORESET)
{ // User disable RF via registry. { // 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 action 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
for(eRFPath = 0; eRFPath <pHalData->NumTotalRFPath; eRFPath++) for(eRFPath = 0; eRFPath <pHalData->NumTotalRFPath; eRFPath++)
PHY_SetRFReg(Adapter, (RF90_RADIO_PATH_E)eRFPath, 0x4, 0xC00, 0x0); PHY_SetRFReg(Adapter, (RF90_RADIO_PATH_E)eRFPath, 0x4, 0xC00, 0x0);
} }
@ -3458,7 +3458,7 @@ if(Adapter->ResetProgress == RESET_TYPE_NORESET)
if(pHalData->eRFPowerState == eRfOff) if(pHalData->eRFPowerState == eRfOff)
{ {
MgntActSet_RF_State(Adapter, eRfOff, pMgntInfo->RfOffReason); MgntActSet_RF_State(Adapter, eRfOff, pMgntInfo->RfOffReason);
// Those action 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
for(eRFPath = 0; eRFPath <pHalData->NumTotalRFPath; eRFPath++) for(eRFPath = 0; eRFPath <pHalData->NumTotalRFPath; eRFPath++)
PHY_SetRFReg(Adapter, (RF90_RADIO_PATH_E)eRFPath, 0x4, 0xC00, 0x0); PHY_SetRFReg(Adapter, (RF90_RADIO_PATH_E)eRFPath, 0x4, 0xC00, 0x0);
} }
@ -4516,7 +4516,7 @@ u8 HwRateToMRate90(bool bIsHT, u8 rate)
/** /**
* Function: UpdateRxPktTimeStamp * Function: UpdateRxPktTimeStamp
* Overview: Record down the TSF time stamp when receiving a packet * Overview: Record the TSF time stamp when receiving a packet
* *
* Input: * Input:
* PADAPTER Adapter * PADAPTER Adapter
@ -4558,8 +4558,8 @@ long rtl819x_translate_todbm(u8 signal_strength_index )// 0-100 index.
/* 2008/01/22 MH We can not declare RSSI/EVM total value of sliding window to /* 2008/01/22 MH We can not declare RSSI/EVM total value of sliding window to
be a local static. Otherwise, it may increase when we return from S3/S4. The be a local static. Otherwise, it may increase when we return from S3/S4. The
value will be kept in memory or disk. We must declare the value in adapter value will be kept in memory or disk. Declare the value in the adaptor
and it will be reinitialized when return from S3/S4. */ and it will be reinitialized when returned from S3/S4. */
void rtl8192_process_phyinfo(struct r8192_priv * priv,u8* buffer, struct ieee80211_rx_stats * pprevious_stats, struct ieee80211_rx_stats * pcurrent_stats) void rtl8192_process_phyinfo(struct r8192_priv * priv,u8* buffer, struct ieee80211_rx_stats * pprevious_stats, struct ieee80211_rx_stats * pcurrent_stats)
{ {
bool bcheck = false; bool bcheck = false;
@ -5092,7 +5092,7 @@ static void rtl8192_query_rxphystatus(
rx_evmX = (char)(tmp_rxevm); rx_evmX = (char)(tmp_rxevm);
// Do not use shift operation like "rx_evmX >>= 1" because the compiler of free build environment // Do not use shift operation like "rx_evmX >>= 1" because the compiler of free build environment
// fill most significant bit to "zero" when doing shifting operation which may change a negative // will set the most significant bit to "zero" when doing shifting operation which may change a negative
// value to positive one, then the dbm value (which is supposed to be negative) is not correct anymore. // value to positive one, then the dbm value (which is supposed to be negative) is not correct anymore.
rx_evmX /= 2; //dbm rx_evmX /= 2; //dbm
@ -5211,7 +5211,7 @@ void TranslateRxSignalStuff819xUsb(struct sk_buff *skb,
/** /**
* Function: UpdateReceivedRateHistogramStatistics * Function: UpdateReceivedRateHistogramStatistics
* Overview: Record down the received data rate * Overview: Record the received data rate
* *
* Input: * Input:
* struct net_device *dev * struct net_device *dev

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

@ -1457,7 +1457,7 @@ static void dm_InitializeTXPowerTracking_ThermalMeter(struct net_device *dev)
{ {
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
// Tx Power tracking by Thermal Meter require Firmware R/W 3-wire. This mechanism // Tx Power tracking by Thermal Meter requires Firmware R/W 3-wire. This mechanism
// can be enabled only when Firmware R/W 3-wire is enabled. Otherwise, frequent r/w // can be enabled only when Firmware R/W 3-wire is enabled. Otherwise, frequent r/w
// 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)
@ -1520,7 +1520,7 @@ static void dm_CheckTXPowerTracking_ThermalMeter(struct net_device *dev)
if(!TM_Trigger) if(!TM_Trigger)
{ {
//Attention!! You have to write all 12bits data to RF, or it may cause RF to crash //Attention!! You have to write all 12bits of data to RF, or it may cause RF to crash
//actually write reg0x02 bit1=0, then bit1=1. //actually write reg0x02 bit1=0, then bit1=1.
//DbgPrint("Trigger ThermalMeter, write RF reg0x2 = 0x4d to 0x4f\n"); //DbgPrint("Trigger ThermalMeter, write RF reg0x2 = 0x4d to 0x4f\n");
rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4d); rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4d);
@ -2161,7 +2161,7 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(
pHalData->UndecoratedSmoothedPWDB, DM_DigTable.RssiLowThresh, pHalData->UndecoratedSmoothedPWDB, DM_DigTable.RssiLowThresh,
DM_DigTable.RssiHighThresh, DM_DigTable.Dig_State);*/ DM_DigTable.RssiHighThresh, DM_DigTable.Dig_State);*/
/* 1. When RSSI decrease, We have to judge if it is smaller than a threshold /* 1. When RSSI decrease, We have to judge if it is smaller than a threshold
and then execute below step. */ and then execute the step below. */
if ((priv->undecorated_smoothed_pwdb <= dm_digtable.rssi_low_thresh)) if ((priv->undecorated_smoothed_pwdb <= dm_digtable.rssi_low_thresh))
{ {
/* 2008/02/05 MH When we execute silent reset, the DIG PHY parameters /* 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(
} }
/* 2. When RSSI increase, We have to judge if it is larger than a threshold /* 2. When RSSI increase, We have to judge if it is larger than a threshold
and then execute below step. */ and then execute the step below. */
if ((priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_thresh) ) if ((priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_thresh) )
{ {
u8 reset_flag = 0; u8 reset_flag = 0;
@ -2329,7 +2329,7 @@ static void dm_ctrl_initgain_byrssi_highpwr(
} }
/* 3. When RSSI >75% or <70%, it is a high power issue. We have to judge if /* 3. When RSSI >75% or <70%, it is a high power issue. We have to judge if
it is larger than a threshold and then execute below step. */ it is larger than a threshold and then execute the step below. */
// 2008/02/05 MH SD3-Jerry Modify PD_TH for high power issue. // 2008/02/05 MH SD3-Jerry Modify PD_TH for high power issue.
if (priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_power_highthresh) if (priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_power_highthresh)
{ {
@ -2842,7 +2842,7 @@ static void dm_check_rfctrl_gpio(struct net_device * dev)
//struct r8192_priv *priv = ieee80211_priv(dev); //struct r8192_priv *priv = ieee80211_priv(dev);
// Work around for DTM test, we will not enable HW - radio on/off because r/w // Work around for DTM test, we will not enable HW - radio on/off because r/w
// page 1 register before extra bus is enabled causing system fails when resuming // page 1 register before extra bus is enabled causing system failures when resuming
// from S4. 20080218, Emily // from S4. 20080218, Emily
// Stop to execute workitem to prevent S3/S4 bug. // Stop to execute workitem to prevent S3/S4 bug.
@ -3392,7 +3392,7 @@ extern void dm_fsync_timer_callback(unsigned long data)
} }
else else
{ {
// Stop continue count // Stop the continued count
priv->ContiuneDiffCount = 0; priv->ContiuneDiffCount = 0;
} }
@ -3523,7 +3523,7 @@ static void dm_StartSWFsync(struct net_device *dev)
RT_TRACE(COMP_HALDM,"%s\n", __FUNCTION__); RT_TRACE(COMP_HALDM,"%s\n", __FUNCTION__);
// Initial rate record to zero, start to record. // Initial rate record to zero, start to record.
priv->rate_record = 0; priv->rate_record = 0;
// Initial continue diff count to zero, start to record. // Initialize continue diff count to zero, start to record.
priv->ContiuneDiffCount = 0; priv->ContiuneDiffCount = 0;
priv->rateCountDiffRecord = 0; priv->rateCountDiffRecord = 0;
priv->bswitch_fsync = false; priv->bswitch_fsync = false;

2
drivers/staging/rtl8192u/r819xU_cmdpkt.c
View File

@ -726,7 +726,7 @@ cmpk_message_handle_rx(
/* 4. Check every received command packet content according to different /* 4. Check every received command packet content according to different
element type. Because FW may aggregate RX command packet to minimize element type. Because FW may aggregate RX command packet to minimize
transmit time between DRV and FW.*/ transmit time between DRV and FW.*/
// Add a counter to prevent the lock in the loop to be to long // Add a counter to prevent the lock in the loop from being held too long
while (total_length > 0 || exe_cnt++ >100) while (total_length > 0 || exe_cnt++ >100)
{ {
/* 2007/01/17 MH We support aggregation of different cmd in the same packet. */ /* 2007/01/17 MH We support aggregation of different cmd in the same packet. */

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

@ -279,7 +279,7 @@ bool init_firmware(struct net_device *dev)
*/ */
for(init_step = starting_state; init_step <= FW_INIT_STEP2_DATA; init_step++) { for(init_step = starting_state; init_step <= FW_INIT_STEP2_DATA; init_step++) {
/* /*
* Open Image file, and map file to continuous memory if open file success. * Open image file, and map file to continuous memory if open file success.
* or read image file from array. Default load from IMG file * or read image file from array. Default load from IMG file
*/ */
if(rst_opt == OPT_SYSTEM_RESET) { if(rst_opt == OPT_SYSTEM_RESET) {

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

@ -176,7 +176,7 @@ u32 rtl8192_phy_RFSerialRead(struct net_device* dev, RF90_RADIO_PATH_E eRFPath,
rtl8192_setBBreg(dev, pPhyReg->rfHSSIPara2, bLSSIReadEdge, 0x1); rtl8192_setBBreg(dev, pPhyReg->rfHSSIPara2, bLSSIReadEdge, 0x1);
// TODO: we should not delay such a long time. Ask help from SD3 // TODO: we should not delay such a long time. Ask for help from SD3
msleep(1); msleep(1);
ret = rtl8192_QueryBBReg(dev, pPhyReg->rfLSSIReadBack, bLSSIReadBackData); ret = rtl8192_QueryBBReg(dev, pPhyReg->rfLSSIReadBack, bLSSIReadBackData);
@ -1425,7 +1425,7 @@ void rtl8192_SwChnl_WorkItem(struct net_device *dev)
} }
/****************************************************************************** /******************************************************************************
*function: This function scheduled actual workitem to set channel *function: This function scheduled actual work item to set channel
* input: net_device dev * input: net_device dev
* u8 channel //channel to set * u8 channel //channel to set
* output: none * output: none