Subject:checkpatch.pl issues the patch series
In-Reply-To:
All warnings appear to be about issues still in the file which I am now working on.
PATCH 1/12 Fixed checkpatch.pl issues to Line 172
From: Mike Gilks <[email protected]>
--- drivers/staging/rtl8192u/r8192U_core.c | 95 ++++++++++++++++--------------- 1 files changed, 49 insertions(+), 46 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +49 -46
@@ -25,12 +25,12 @@*/ #ifndef CONFIG_FORCE_HARD_FLOAT -double __floatsidf (int i) {return i; } -unsigned int __fixunsdfsi (double d) {return d; } -double __adddf3 (double a,double b) {return a+b; } -double __addsf3 (float a,float b) {return a+b; } -double __subdf3 (double a,double b) {return a-b; } -double __extendsfdf2 (float a) {return a;} +double __floatsidf (int i) {return i; } +unsigned int __fixunsdfsi (double d) {return d; } +double __adddf3 (double a,double b) {return a+b; } +double __addsf3 (float a,float b) {return a+b; } +double __subdf3 (double a,double b) {return a-b; } +double __extendsfdf2 (float a) {return a; }#endif #undef LOOP_TEST
@@ -58,20 +58,20 @@ double __extendsfdf2(float a) {return a;}#define CONFIG_RTL8192_IO_MAP -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "r8192U_hw.h" #include "r8192U.h" -#include "r8190_rtl8256.h" /* RTL8225 Radio frontend */ -#include "r8180_93cx6.h" /* Card EEPROM */ +#include "r8190_rtl8256.h" /* RTL8225 Radio frontend */ +#include "r8180_93cx6.h" /* Card EEPROM */ #include "r8192U_wx.h" -#include "r819xU_phy.h" //added by WB 4.30.2008 +#include "r819xU_phy.h" /* added by WB 4.30.2008 */ #include "r819xU_phyreg.h" #include "r819xU_cmdpkt.h" #include "r8192U_dm.h" -//#include "r8192xU_phyreg.h" +/*#include "r8192xU_phyreg.h" */ #include <linux/usb.h> #include <linux/slab.h> -// FIXME: check if 2.6.7 is ok +/* FIXME: check if 2.6.7 is ok */ #ifdef CONFIG_RTL8192_PM #include "r8192_pm.h"
@@ -80,27 +80,30 @@ double __extendsfdf2(float a) {return a;}#ifdef ENABLE_DOT11D #include "dot11d.h" #endif -//set here to open your trace code. //WB -u32 rt_global_debug_component = \ -// COMP_INIT | -// COMP_DBG | -// COMP_EPROM | -// COMP_PHY | -// COMP_RF | -// COMP_FIRMWARE | -// COMP_CH | -// COMP_POWER_TRACKING | -// COMP_RATE | -// COMP_TXAGC | -// COMP_TRACE | -COMP_DOWN | -// COMP_RECV | -// COMP_SWBW | -COMP_SEC | -// COMP_RESET | -// COMP_SEND | -// COMP_EVENTS | -COMP_ERR ;//always open err flags on +/* set here to open your trace code. //WB */ +u32 rt_global_debug_component = +/*COMP_INIT | +*COMP_DBG | +*COMP_EPROM | +*COMP_PHY | +*COMP_RF | +*COMP_FIRMWARE | +*COMP_CH | +*COMP_POWER_TRACKING | +*COMP_RATE | +*COMP_TXAGC | +*COMP_TRACE | +*/ +COMP_DOWN | +/*COMP_RECV | +*COMP_SWBW | +*/ +COMP_SEC | +/*COMP_RESET | +*COMP_SEND | +*COMP_EVENTS | +*/ +COMP_ERR ;/* always open err flags on */ #define TOTAL_CAM_ENTRY 32#define CAM_CONTENT_COUNT 8
@@ -129,21 +132,21 @@ MODULE_VERSION("V 1.1");MODULE_DEVICE_TABLE (usb, rtl8192_usb_id_tbl);MODULE_DESCRIPTION ("Linux driver for Realtek RTL8192 USB WiFi cards" ); -static char * ifname ="wlan%d" ; -static int hwwep =1 ;//default use hw. set 0 to use software security +static char *ifname ="wlan%d" ; +static int hwwep =1 ;/* default use hw. set 0 to use software security */ static int channels =0x3fff ; +module_param (ifname, charp,S_IRUGO |S_IWUSR ); +/*module_param(hwseqnum,int, S_IRUGO|S_IWUSR); */ +module_param (hwwep, int,S_IRUGO |S_IWUSR ); +module_param (channels, int,S_IRUGO |S_IWUSR ); - -module_param (ifname, charp,S_IRUGO |S_IWUSR ); -//module_param(hwseqnum,int, S_IRUGO|S_IWUSR); -module_param (hwwep,int,S_IRUGO |S_IWUSR ); -module_param (channels,int,S_IRUGO |S_IWUSR ); - -MODULE_PARM_DESC (ifname," Net interface name, wlan%d=default" ); -//MODULE_PARM_DESC(hwseqnum," Try to use hardware 802.11 header sequence numbers. Zero=default"); -MODULE_PARM_DESC (hwwep," Try to use hardware security support. " ); -MODULE_PARM_DESC (channels," Channel bitmask for specific locales. NYI" ); +MODULE_PARM_DESC (ifname," Net interface name, wlan%d=default" ); +/*MODULE_PARM_DESC(hwseqnum, " Try to use hardware 802.11 header sequence +* numbers. Zero=default"); +*/ +MODULE_PARM_DESC (hwwep," Try to use hardware security support. " ); +MODULE_PARM_DESC (channels," Channel bitmask for specific locales. NYI" );static int __devinit rtl8192_usb_probe (struct usb_interface *intf,const struct usb_device_id *id);
@@ -160,7 +163,7 @@ static struct usb_driver rtl8192_usb_driver = { .resume = rtl8192_resume, /* PM resume fn */ #else .suspend = NULL, /* PM suspend fn */ - .resume = NULL, /* PM resume fn */ + .resume = NULL, /* PM resume fn */#endif };
Signature · 1 line
1.6.3.3
PATCH 2/12 Remove checkpath.pl issues to line 200
From: Mike Gilks <[email protected]>
--- drivers/staging/rtl8192u/r8192U_core.c | 39 ++++++++++++++++++++----------- 1 files changed, 25 insertions(+), 14 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +25 -14
@@ -169,24 +169,35 @@ static struct usb_driver rtl8192_usb_driver = {#ifdef ENABLE_DOT11D -typedef struct _CHANNEL_LIST -{ +typedef struct _CHANNEL_LIST {u8 Channel[32 ];u8 Len; -}CHANNEL_LIST , *PCHANNEL_LIST ; +}CHANNEL_LIST , *PCHANNEL_LIST ;static CHANNEL_LIST ChannelPlan[] = { - {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,36 ,40 ,44 ,48 ,52 ,56 ,60 ,64 ,149 ,153 ,157 ,161 ,165 },24 },//FCC - {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 },11 },//IC - {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,36 ,40 ,44 ,48 ,52 ,56 ,60 ,64 },21 },//ETSI - {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 },13 },//Spain. Change to ETSI. - {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 },13 },//France. Change to ETSI. - {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,14 ,36 ,40 ,44 ,48 ,52 ,56 ,60 ,64 },22 },//MKK //MKK - {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,14 ,36 ,40 ,44 ,48 ,52 ,56 ,60 ,64 },22 },//MKK1 - {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 },13 },//Israel. - {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,14 ,36 ,40 ,44 ,48 ,52 ,56 ,60 ,64 },22 },// For 11a , TELEC - {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,14 ,36 ,40 ,44 ,48 ,52 ,56 ,60 ,64 },22 },//MIC - {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,14 },14 }//For Global Domain. 1-11:active scan, 12-14 passive scan. //+YJ, 080626 + {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,36 ,40 ,44 ,48 ,52 ,56 ,60 ,64 , +149 ,153 ,157 ,161 ,165 },24 },/* FCC */ + {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 },11 },/* IC */ + {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,36 ,40 ,44 ,48 ,52 ,56 , +60 ,64 },21 },/* ETSI */ + {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 },13 }, +/* Spain. Change to ETSI. */ + {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 },13 }, +/* France. Change to ETSI. */ + {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,14 ,36 ,40 ,44 ,48 ,52 , +56 ,60 ,64 },22 },/* MKK */ + {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,14 ,36 ,40 ,44 ,48 ,52 , +56 ,60 ,64 },22 },/* MKK1 */ + {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 },13 },/* Israel. */ + {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,14 ,36 ,40 ,44 ,48 ,52 , +56 ,60 ,64 },22 }, +/* For 11a , TELEC */ + {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,14 ,36 ,40 ,44 ,48 ,52 , +56 ,60 ,64 },22 },/* MIC */ + {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,14 },14 } +/* For Global Domain. 1-11:active scan, 12-14 passive scan. +* //+YJ, 080626 +*/ };static void rtl819x_set_channel_map (u8 channel_plan,struct r8192_priv * priv)
Signature · 1 line
1.6.3.3
PATCH 3/12 Remove references to __FUNCTION__ Checkpatch.pl issues to line 250 removed
From: Mike Gilks <[email protected]>
--- drivers/staging/rtl8192u/r8192U_core.c | 175 ++++++++++++++++---------------- 1 files changed, 89 insertions(+), 86 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +89 -86
@@ -200,57 +200,60 @@ static CHANNEL_LIST ChannelPlan[] = {*/ }; -static void rtl819x_set_channel_map (u8 channel_plan,struct r8192_priv * priv) +static void rtl819x_set_channel_map (u8 channel_plan,struct r8192_priv *priv) { -int i, max_chan=-1 , min_chan=-1 ; -struct ieee80211_device * ieee = priv->ieee80211; -switch (channel_plan) - { -case COUNTRY_CODE_FCC : -case COUNTRY_CODE_IC : -case COUNTRY_CODE_ETSI : -case COUNTRY_CODE_SPAIN : -case COUNTRY_CODE_FRANCE : -case COUNTRY_CODE_MKK : -case COUNTRY_CODE_MKK1 : -case COUNTRY_CODE_ISRAEL : -case COUNTRY_CODE_TELEC : -case COUNTRY_CODE_MIC : - { -Dot11d_Init (ieee); - ieee->bGlobalDomain = false; -//acturally 8225 & 8256 rf chip only support B,G,24N mode -if ((priv->rf_chip ==RF_8225 ) || (priv->rf_chip ==RF_8256 )) - { - min_chan =1 ; - max_chan =14 ; - } -else - { -RT_TRACE (COMP_ERR ,"unknown rf chip, can't set channel map in function:%s()\n" , __FUNCTION__); - } -if (ChannelPlan[channel_plan].Len !=0 ){ -// Clear old channel map -memset (GET_DOT11D_INFO (ieee)->channel_map,0 ,sizeof (GET_DOT11D_INFO (ieee)->channel_map)); -// Set new channel map -for (i=0 ;i<ChannelPlan[channel_plan].Len;i++) - { -if (ChannelPlan[channel_plan].Channel[i] < min_chan || ChannelPlan[channel_plan].Channel[i] > max_chan) -break ; -GET_DOT11D_INFO (ieee)->channel_map[ChannelPlan[channel_plan].Channel[i]] =1 ; - } +int i, max_chan =-1 , min_chan =-1 ; +struct ieee80211_device *ieee = priv->ieee80211; +switch (channel_plan) { +case COUNTRY_CODE_FCC : +case COUNTRY_CODE_IC : +case COUNTRY_CODE_ETSI : +case COUNTRY_CODE_SPAIN : +case COUNTRY_CODE_FRANCE : +case COUNTRY_CODE_MKK : +case COUNTRY_CODE_MKK1 : +case COUNTRY_CODE_ISRAEL : +case COUNTRY_CODE_TELEC : +case COUNTRY_CODE_MIC : { +Dot11d_Init (ieee); + ieee->bGlobalDomain = false; +/* acturally 8225 & 8256 rf chip +* only support B,G,24N mode +*/ +if ((priv->rf_chip ==RF_8225 ) || (priv->rf_chip ==RF_8256 )) { + min_chan =1 ; + max_chan =14 ; + }else { +RT_TRACE (COMP_ERR ,"unknown rf chip, can't set channel" +" map in function:%s()\n" , __func__); + } +if (ChannelPlan[channel_plan].Len !=0 ) { +/* Clear old channel map */ +memset (GET_DOT11D_INFO (ieee)->channel_map,0 , +sizeof (GET_DOT11D_INFO (ieee)->channel_map)); +/* Set new channel map */ +for (i =0 ;i<ChannelPlan[channel_plan].Len; i++) { +if (ChannelPlan[channel_plan].Channel[i] < + min_chan || ChannelPlan[channel_plan]. + Channel[i] > max_chan) +break ; +GET_DOT11D_INFO (ieee)->channel_map[ChannelPlan + [channel_plan].Channel[i]] =1 ; } -break ; } -case COUNTRY_CODE_GLOBAL_DOMAIN : - { -GET_DOT11D_INFO (ieee)->bEnabled =0 ;//this flag enabled to follow 11d country IE setting, otherwise, it shall follow global domain settings. -Dot11d_Reset (ieee); - ieee->bGlobalDomain = true; -break ; +break ; + } +case COUNTRY_CODE_GLOBAL_DOMAIN : { +GET_DOT11D_INFO (ieee)->bEnabled =0 ; +/* this flag enabled to follow 11d country IE setting, +* otherwise, it shall follow global domain settings. +*/ +Dot11d_Reset (ieee); + ieee->bGlobalDomain = true; +break ; } -default : -break ; +default : +break ; }return ; }
@@ -901,7 +904,7 @@ void rtl8192_set_chan(struct net_device *dev,short ch) {struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv (dev);// u32 tx; -RT_TRACE (COMP_CH ,"=====>%s()====ch:%d\n" , __FUNCTION__, ch); +RT_TRACE (COMP_CH ,"=====>%s()====ch:%d\n" , __func__, ch); priv->chan=ch;/* this hack should avoid frame TX during channel setting*/
@@ -1156,7 +1159,7 @@ static void rtl8192_rx_isr(struct urb *urb) priv->stats.rxstaterr++; priv->ieee80211->stats.rx_errors++;usb_free_urb (urb); -// printk("%s():rx status err\n",__FUNCTION__); +// printk("%s():rx status err\n",__func__); return ; }skb_unlink (skb, &priv->rx_queue);
@@ -1168,7 +1171,7 @@ static void rtl8192_rx_isr(struct urb *urb) skb =dev_alloc_skb (RX_URB_SIZE );if (unlikely (!skb)) {usb_free_urb (urb); -printk ("%s():can,t alloc skb\n" ,__FUNCTION__); +printk ("%s():can,t alloc skb\n" ,__func__);/* TODO check rx queue length and refill *somewhere* */ return ; }
@@ -1836,7 +1839,7 @@ unsigned int txqueue2outpipe(struct r8192_priv* priv,unsigned int tx_queue) {if (tx_queue >=9 ) { -RT_TRACE (COMP_ERR ,"%s():Unknown queue ID!!!\n" ,__FUNCTION__); +RT_TRACE (COMP_ERR ,"%s():Unknown queue ID!!!\n" ,__func__);return 0x04 ; }return priv->txqueue_to_outpipemap[tx_queue];
@@ -1854,7 +1857,7 @@ short rtl819xU_tx_cmd(struct net_device *dev, struct sk_buff *skb)cb_desc *tcb_desc = (cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE );u8 queue_index = tcb_desc->queue_index; -//printk("\n %s::queue_index = %d\n",__FUNCTION__, queue_index); +//printk("\n %s::queue_index = %d\n",__func__, queue_index); atomic_inc (&priv->tx_pending[queue_index]); tx_urb =usb_alloc_urb (0 ,GFP_ATOMIC );if (!tx_urb){
@@ -2032,7 +2035,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb)//int urb_len; unsigned int idx_pipe;// RT_DEBUG_DATA(COMP_SEND, tcb_desc, sizeof(cb_desc)); -// printk("=============> %s\n", __FUNCTION__); +// printk("=============> %s\n", __func__); pend =atomic_read (&priv->tx_pending[tcb_desc->queue_index]);/* we are locked here so the two atomic_read and inc are executed * without interleaves
@@ -2371,7 +2374,7 @@ void rtl8192_link_change(struct net_device *dev)EnableHWSecurityConfig8192 (dev); }/*update timing params*/ -// RT_TRACE(COMP_CH, "========>%s(), chan:%d\n", __FUNCTION__, priv->chan); +// RT_TRACE(COMP_CH, "========>%s(), chan:%d\n", __func__, priv->chan); // rtl8192_set_chan(dev, priv->chan); if (ieee->iw_mode ==IW_MODE_INFRA || ieee->iw_mode ==IW_MODE_ADHOC ) {
@@ -2551,7 +2554,7 @@ static int rtl8192_qos_association_resp(struct r8192_priv *priv,spin_unlock_irqrestore (&priv->ieee80211->lock, flags); -RT_TRACE (COMP_QOS ,"%s: network->flags = %d,%d\n" ,__FUNCTION__,network->flags ,priv->ieee80211->current_network.qos_data.active); +RT_TRACE (COMP_QOS ,"%s: network->flags = %d,%d\n" ,__func__,network->flags ,priv->ieee80211->current_network.qos_data.active);if (set_qos_param ==1 )queue_work (priv->priv_wq, &priv->qos_activate);
@@ -2730,7 +2733,7 @@ void rtl8192_SetWirelessMode(struct net_device* dev, u8 wireless_mode) wireless_mode =WIRELESS_MODE_B ; }else { -RT_TRACE (COMP_ERR ,"%s(), No valid wireless mode supported, SupportedWirelessMode(%x)!!!\n" , __FUNCTION__,bSupportMode); +RT_TRACE (COMP_ERR ,"%s(), No valid wireless mode supported, SupportedWirelessMode(%x)!!!\n" , __func__,bSupportMode); wireless_mode =WIRELESS_MODE_B ; } }
@@ -2922,12 +2925,12 @@ static void rtl8192_get_eeprom_size(struct net_device* dev) {u16 curCR =0 ;struct r8192_priv *priv =ieee80211_priv (dev); -RT_TRACE (COMP_EPROM ,"===========>%s()\n" , __FUNCTION__); +RT_TRACE (COMP_EPROM ,"===========>%s()\n" , __func__); curCR =read_nic_word_E (dev,EPROM_CMD );RT_TRACE (COMP_EPROM ,"read from Reg EPROM_CMD(%x):%x\n" ,EPROM_CMD , curCR);//whether need I consider BIT5? priv->epromtype = (curCR & Cmd9346CR_9356SEL) ? EPROM_93c56 : EPROM_93c46; -RT_TRACE (COMP_EPROM ,"<===========%s(), epromtype:%d\n" , __FUNCTION__, priv->epromtype); +RT_TRACE (COMP_EPROM ,"<===========%s(), epromtype:%d\n" , __func__, priv->epromtype); }//used to swap endian. as ntohl & htonl are not neccessary to swap endian, so use this instead.
@@ -2944,7 +2947,7 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)u8 bLoad_From_EEPOM = false;struct r8192_priv *priv =ieee80211_priv (dev);u16 tmpValue =0 ; -RT_TRACE (COMP_EPROM ,"===========>%s()\n" , __FUNCTION__); +RT_TRACE (COMP_EPROM ,"===========>%s()\n" , __func__); wEPROM_ID =eprom_read (dev,0 );//first read EEPROM ID out; RT_TRACE (COMP_EPROM ,"EEPROM ID is 0x%x\n" , wEPROM_ID);
@@ -3177,7 +3180,7 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)init_rate_adaptive (dev);//we need init DIG RATR table here again. -RT_TRACE (COMP_EPROM ,"<===========%s()\n" , __FUNCTION__); +RT_TRACE (COMP_EPROM ,"<===========%s()\n" , __func__);return ; }
@@ -3359,7 +3362,7 @@ bool rtl8192_adapter_start(struct net_device *dev)struct r8192_priv *priv =ieee80211_priv (dev);u32 dwRegRead =0 ;bool init_status = true; -RT_TRACE (COMP_INIT ,"====>%s()\n" , __FUNCTION__); +RT_TRACE (COMP_INIT ,"====>%s()\n" , __func__); priv->Rf_Mode = RF_OP_By_SW_3wire;//for ASIC power on sequence write_nic_byte_E (dev,0x5f ,0x80 );
@@ -3379,7 +3382,7 @@ bool rtl8192_adapter_start(struct net_device *dev)else if (priv->pFirmware->firmware_status ==FW_STATUS_5_READY ) dwRegRead |=CPU_GEN_FIRMWARE_RESET ;else -RT_TRACE (COMP_ERR ,"ERROR in %s(): undefined firmware state(%d)\n" , __FUNCTION__, priv->pFirmware->firmware_status); +RT_TRACE (COMP_ERR ,"ERROR in %s(): undefined firmware state(%d)\n" , __func__, priv->pFirmware->firmware_status);write_nic_dword (dev,CPU_GEN , dwRegRead);//mdelay(30);
@@ -3396,7 +3399,7 @@ bool rtl8192_adapter_start(struct net_device *dev)else if (priv->LoopbackMode == RTL819xU_MAC_LOOPBACK) dwRegRead |=CPU_CCK_LOOPBACK ;else -RT_TRACE (COMP_ERR ,"Serious error in %s(): wrong loopback mode setting(%d)\n" , __FUNCTION__, priv->LoopbackMode); +RT_TRACE (COMP_ERR ,"Serious error in %s(): wrong loopback mode setting(%d)\n" , __func__, priv->LoopbackMode);write_nic_dword (dev,CPU_GEN , dwRegRead);
@@ -3436,7 +3439,7 @@ bool rtl8192_adapter_start(struct net_device *dev)// TODO: (it value is only for FPGA version). need to be changed!!2006.12.18, by Emily write_nic_byte (dev,ACK_TIMEOUT ,0x30 ); -// RT_TRACE(COMP_INIT, "%s():priv->ResetProgress is %d\n", __FUNCTION__,priv->ResetProgress); +// RT_TRACE(COMP_INIT, "%s():priv->ResetProgress is %d\n", __func__,priv->ResetProgress); if (priv->ResetProgress ==RESET_TYPE_NORESET )rtl8192_SetWirelessMode (dev, priv->ieee80211->mode);if (priv->ResetProgress ==RESET_TYPE_NORESET ){
@@ -3490,10 +3493,10 @@ bool rtl8192_adapter_start(struct net_device *dev) init_status =init_firmware (dev);if (!init_status) { -RT_TRACE (COMP_ERR ,"ERR!!! %s(): Firmware download is failed\n" , __FUNCTION__); +RT_TRACE (COMP_ERR ,"ERR!!! %s(): Firmware download is failed\n" , __func__);return init_status; } -RT_TRACE (COMP_INIT ,"%s():after firmware download\n" , __FUNCTION__); +RT_TRACE (COMP_INIT ,"%s():after firmware download\n" , __func__);// #ifdef TO_DO_LIST if (Adapter->ResetProgress ==RESET_TYPE_NORESET )
@@ -3532,7 +3535,7 @@ if(Adapter->ResetProgress == RESET_TYPE_NORESET)//config RF. if (priv->ResetProgress ==RESET_TYPE_NORESET ){rtl8192_phy_RFConfig (dev); -RT_TRACE (COMP_INIT ,"%s():after phy RF config\n" , __FUNCTION__); +RT_TRACE (COMP_INIT ,"%s():after phy RF config\n" , __func__); }
@@ -3627,7 +3630,7 @@ HalTxCheckStuck819xUsb(struct r8192_priv *priv =ieee80211_priv (dev);u16 RegTxCounter =read_nic_word (dev,0x128 );bool bStuck = FALSE; -RT_TRACE (COMP_RESET ,"%s():RegTxCounter is %d,TxCounter is %d\n" ,__FUNCTION__,RegTxCounter,priv->TxCounter); +RT_TRACE (COMP_RESET ,"%s():RegTxCounter is %d,TxCounter is %d\n" ,__func__,RegTxCounter,priv->TxCounter);if (priv->TxCounter==RegTxCounter) bStuck = TRUE;
@@ -3691,7 +3694,7 @@ HalRxCheckStuck819xUsb(struct net_device *dev)struct r8192_priv *priv =ieee80211_priv (dev);bool bStuck = FALSE;static u8 rx_chk_cnt =0 ; -RT_TRACE (COMP_RESET ,"%s(): RegRxCounter is %d,RxCounter is %d\n" ,__FUNCTION__,RegRxCounter,priv->RxCounter); +RT_TRACE (COMP_RESET ,"%s(): RegRxCounter is %d,RxCounter is %d\n" ,__func__,RegRxCounter,priv->RxCounter);// If rssi is small, we should check rx for long time because of bad rx. // or maybe it will continuous silent reset every 2 seconds. rx_chk_cnt++;
@@ -3816,7 +3819,7 @@ rtl819x_ifcheck_resetornot(struct net_device *dev)if (TxResetType==RESET_TYPE_NORMAL || RxResetType==RESET_TYPE_NORMAL )return RESET_TYPE_NORMAL ;else if (TxResetType==RESET_TYPE_SILENT || RxResetType==RESET_TYPE_SILENT ){ -RT_TRACE (COMP_RESET ,"%s():silent reset\n" ,__FUNCTION__); +RT_TRACE (COMP_RESET ,"%s():silent reset\n" ,__func__);return RESET_TYPE_SILENT ; }else
@@ -3995,12 +3998,12 @@ RESET_START:down (&priv->wx_sem);if (priv->up ==0 ) { -RT_TRACE (COMP_ERR ,"%s():the driver is not up! return\n" ,__FUNCTION__); +RT_TRACE (COMP_ERR ,"%s():the driver is not up! return\n" ,__func__);up (&priv->wx_sem);return ; } priv->up =0 ; -RT_TRACE (COMP_RESET ,"%s():======>start to down the driver\n" ,__FUNCTION__); +RT_TRACE (COMP_RESET ,"%s():======>start to down the driver\n" ,__func__);// if(!netif_queue_stopped(dev)) // netif_stop_queue(dev);
@@ -4025,12 +4028,12 @@ RESET_START:printk ("ieee->state is NOT LINKED\n" );ieee80211_softmac_stop_protocol (priv->ieee80211); }up (&priv->wx_sem); -RT_TRACE (COMP_RESET ,"%s():<==========down process is finished\n" ,__FUNCTION__); +RT_TRACE (COMP_RESET ,"%s():<==========down process is finished\n" ,__func__);//rtl8192_irq_disable(dev); -RT_TRACE (COMP_RESET ,"%s():===========>start to up the driver\n" ,__FUNCTION__); +RT_TRACE (COMP_RESET ,"%s():===========>start to up the driver\n" ,__func__); reset_status =_rtl8192_up (dev); -RT_TRACE (COMP_RESET ,"%s():<===========up process is finished\n" ,__FUNCTION__); +RT_TRACE (COMP_RESET ,"%s():<===========up process is finished\n" ,__func__);if (reset_status == -EAGAIN ) {if (reset_times <3 )
@@ -4040,7 +4043,7 @@ RESET_START: }else { -RT_TRACE (COMP_ERR ," ERR!!! %s(): Reset Failed!!\n" , __FUNCTION__); +RT_TRACE (COMP_ERR ," ERR!!! %s(): Reset Failed!!\n" , __func__); } } ieee->is_silent_reset =1 ;
@@ -4179,9 +4182,9 @@ extern void rtl819x_watchdog_wqcallback(struct work_struct *work) {#ifdef TODO if (rfState == eRfOff) -RT_TRACE (COMP_ERR ,"========>%s()\n" ,__FUNCTION__); +RT_TRACE (COMP_ERR ,"========>%s()\n" ,__func__);#endif -printk ("===>%s(): AP is power off,connect another one\n" ,__FUNCTION__); +printk ("===>%s(): AP is power off,connect another one\n" ,__func__);// Dot11d_Reset(dev); priv->ieee80211->state =IEEE80211_ASSOCIATING ;notify_wx_assoc_event (priv->ieee80211);
@@ -4202,12 +4205,12 @@ extern void rtl819x_watchdog_wqcallback(struct work_struct *work) check_reset_cnt =3 ;//DbgPrint("Start to check silent reset\n"); } -// RT_TRACE(COMP_RESET,"%s():priv->force_reset is %d,priv->ResetProgress is %d, priv->bForcedSilentReset is %d,priv->bDisableNormalResetCheck is %d,ResetType is %d\n",__FUNCTION__,priv->force_reset,priv->ResetProgress,priv->bForcedSilentReset,priv->bDisableNormalResetCheck,ResetType); +// RT_TRACE(COMP_RESET,"%s():priv->force_reset is %d,priv->ResetProgress is %d, priv->bForcedSilentReset is %d,priv->bDisableNormalResetCheck is %d,ResetType is %d\n",__func__,priv->force_reset,priv->ResetProgress,priv->bForcedSilentReset,priv->bDisableNormalResetCheck,ResetType); if ( (priv->force_reset) || (priv->ResetProgress==RESET_TYPE_NORESET && (priv->bForcedSilentReset || (!priv->bDisableNormalResetCheck && ResetType==RESET_TYPE_SILENT ))))// This is control by OID set in Pomelo { -RT_TRACE (COMP_RESET ,"%s():priv->force_reset is %d,priv->ResetProgress is %d, priv->bForcedSilentReset is %d,priv->bDisableNormalResetCheck is %d,ResetType is %d\n" ,__FUNCTION__,priv->force_reset,priv->ResetProgress,priv->bForcedSilentReset,priv->bDisableNormalResetCheck,ResetType); +RT_TRACE (COMP_RESET ,"%s():priv->force_reset is %d,priv->ResetProgress is %d, priv->bForcedSilentReset is %d,priv->bDisableNormalResetCheck is %d,ResetType is %d\n" ,__func__,priv->force_reset,priv->ResetProgress,priv->bForcedSilentReset,priv->bDisableNormalResetCheck,ResetType);rtl819x_ifsilentreset (dev); } priv->force_reset = false;
@@ -4235,7 +4238,7 @@ int _rtl8192_up(struct net_device *dev) init_status =rtl8192_adapter_start (dev);if (!init_status) { -RT_TRACE (COMP_ERR ,"ERR!!! %s(): initialization is failed!\n" , __FUNCTION__); +RT_TRACE (COMP_ERR ,"ERR!!! %s(): initialization is failed!\n" , __func__); priv->up=priv->ieee80211->ieee_up =0 ;return -EAGAIN ; }
@@ -4301,7 +4304,7 @@ int rtl8192_down(struct net_device *dev) priv->up=0 ; priv->ieee80211->ieee_up =0 ; -RT_TRACE (COMP_DOWN ,"==========>%s()\n" , __FUNCTION__); +RT_TRACE (COMP_DOWN ,"==========>%s()\n" , __func__);/* FIXME */ if (!netif_queue_stopped (dev))netif_stop_queue (dev);
@@ -4330,7 +4333,7 @@ int rtl8192_down(struct net_device *dev)ieee80211_softmac_stop_protocol (priv->ieee80211);memset (&priv->ieee80211->current_network,0 , offsetof(struct ieee80211_network , list)); -RT_TRACE (COMP_DOWN ,"<==========%s()\n" , __FUNCTION__); +RT_TRACE (COMP_DOWN ,"<==========%s()\n" , __func__);return 0 ; }
@@ -5536,7 +5539,7 @@ void rtl8192_rx_nomal(struct sk_buff* skb) agg_skb = skb;//TotalLength = agg_skb->len - 4; /*sCrcLng*/ TotalLength = stats.Length -4 ;/*sCrcLng*/ -//RT_TRACE(COMP_RECV, "%s:first aggregated packet!Length=%d\n",__FUNCTION__,TotalLength); +//RT_TRACE(COMP_RECV, "%s:first aggregated packet!Length=%d\n",__func__,TotalLength); /* though the head pointer has passed this position */ TempDWord = *(u32 *)(agg_skb->data -4 ); PacketLength = (u16)(TempDWord &0x3FFF );/*sCrcLng*/
@@ -5584,7 +5587,7 @@ void rtl8192_rx_nomal(struct sk_buff* skb)while (agg_skb->len>=GetRxPacketShiftBytes819xUsb (&stats, true)) {u8 tmpCRC =0 , tmpICV =0 ; -//RT_TRACE(COMP_RECV,"%s:aggred pkt,total_len = %d\n",__FUNCTION__,agg_skb->len); +//RT_TRACE(COMP_RECV,"%s:aggred pkt,total_len = %d\n",__func__,agg_skb->len); RxDescr = (rx_desc_819x_usb_aggr_subframe *)(agg_skb->data); tmpCRC = RxDescr->CRC32; tmpICV = RxDescr->ICV;
@@ -6029,7 +6032,7 @@ void EnableHWSecurityConfig8192(struct net_device *dev) ieee->hwsec_active =0 ; SECR_value &= ~SCR_RxDecEnable; } -RT_TRACE (COMP_SEC ,"%s:, hwsec:%d, pairwise_key:%d, SECR_value:%x\n" , __FUNCTION__, \ +RT_TRACE (COMP_SEC ,"%s:, hwsec:%d, pairwise_key:%d, SECR_value:%x\n" , __func__, \ ieee->hwsec_active, ieee->pairwise_key_type, SECR_value); {write_nic_byte (dev,SECR , SECR_value);//SECR_value | SCR_UseDK );
Signature · 1 line
1.6.3.3
PATCH 4/12 checkpatch.pl issues removed to line 296
From: Mike Gilks <[email protected]>
--- drivers/staging/rtl8192u/r8192U_core.c | 47 ++++++++++++++++++------------- 1 files changed, 27 insertions(+), 20 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +27 -20
@@ -202,7 +202,7 @@ static CHANNEL_LIST ChannelPlan[] = {static void rtl819x_set_channel_map (u8 channel_plan,struct r8192_priv *priv) { -int i, max_chan =-1 , min_chan =-1 ; +int i, max_chan =-1 , min_chan =-1 ;struct ieee80211_device *ieee = priv->ieee80211;switch (channel_plan) {case COUNTRY_CODE_FCC :
@@ -232,12 +232,12 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv *priv)memset (GET_DOT11D_INFO (ieee)->channel_map,0 ,sizeof (GET_DOT11D_INFO (ieee)->channel_map));/* Set new channel map */ -for (i =0 ;i<ChannelPlan[channel_plan].Len; i++) { +for (i =0 ; i < ChannelPlan[channel_plan].Len; i++) {if (ChannelPlan[channel_plan].Channel[i] < min_chan || ChannelPlan[channel_plan]. Channel[i] > max_chan)break ; -GET_DOT11D_INFO (ieee)->channel_map[ChannelPlan +GET_DOT11D_INFO (ieee)->channel_map[ChannelPlan [channel_plan].Channel[i]] =1 ; } }
@@ -259,34 +259,41 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv *priv) }#endif -#define eqMacAddr (a,b) ( ((a)[0]==(b)[0] && (a)[1]==(b)[1] && (a)[2]==(b)[2] && (a)[3]==(b)[3] && (a)[4]==(b)[4] && (a)[5]==(b)[5]) ? 1:0 ) +#define eqMacAddr (a, b)(((a)[0] == (b)[0] && (a)[1] == (b)[1] && (a)[2] ==\ + (b)[2] && (a)[3] == (b)[3] && (a)[4] == (b)[4] && (a)[5] == (b)[5])\ + ? 1 : 0) -#define rx_hal_is_cck_rate (_pdrvinfo)\ - (_pdrvinfo->RxRate == DESC90_RATE1M ||\ - _pdrvinfo->RxRate == DESC90_RATE2M ||\ - _pdrvinfo->RxRate == DESC90_RATE5_5M ||\ - _pdrvinfo->RxRate == DESC90_RATE11M) &&\ - !_pdrvinfo->RxHT\ +#define rx_hal_is_cck_rate (_pdrvinfo)\ + (_pdrvinfo->RxRate == DESC90_RATE1M ||\ + _pdrvinfo->RxRate == DESC90_RATE2M ||\ + _pdrvinfo->RxRate == DESC90_RATE5_5M ||\ + _pdrvinfo->RxRate == DESC90_RATE11M) &&\ + !_pdrvinfo->RxHT\void CamResetAllEntry (struct net_device *dev) {u32 ulcommand =0 ; -//2004/02/11 In static WEP, OID_ADD_KEY or OID_ADD_WEP are set before STA associate to AP. -// However, ResetKey is called on OID_802_11_INFRASTRUCTURE_MODE and MlmeAssociateRequest -// In this condition, Cam can not be reset because upper layer will not set this static key again. -//if(Adapter->EncAlgorithm == WEP_Encryption) -// return; -//debug -//DbgPrint("========================================\n"); -//DbgPrint(" Call ResetAllEntry \n"); -//DbgPrint("========================================\n\n"); +/* 2004/02/11 In static WEP, OID_ADD_KEY or OID_ADD_WEP are set before +* STA associate to AP. +* However, ResetKey is called on OID_802_11_INFRASTRUCTURE_MODE and +* MlmeAssociateRequest +* In this condition, Cam can not be reset because upper layer will not +* set this static key again. +*if(Adapter->EncAlgorithm == WEP_Encryption) +* return; +*/ +/* debug +*DbgPrint("========================================\n"); +*DbgPrint(" Call ResetAllEntry" +* " \n"); +*DbgPrint("========================================\n\n"); +*/ ulcommand |=BIT31 |BIT30 ;write_nic_dword (dev,RWCAM , ulcommand); } -void write_cam (struct net_device *dev,u8 addr,u32 data) {write_nic_dword (dev,WCAMI , data);
Signature · 1 line
1.6.3.3
PATCH 5/12 fixed checkpatch.pl issues to line 300
From: Mike Gilks <[email protected]>
--- drivers/staging/rtl8192u/r8192U_core.c | 56 +++++++++++++------------------- 1 files changed, 23 insertions(+), 33 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +23 -33
@@ -236,7 +236,7 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv *priv)if (ChannelPlan[channel_plan].Channel[i] < min_chan || ChannelPlan[channel_plan]. Channel[i] > max_chan) -break ; +break ;GET_DOT11D_INFO (ieee)->channel_map[ChannelPlan [channel_plan].Channel[i]] =1 ; }
@@ -268,7 +268,7 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv *priv) _pdrvinfo->RxRate ==DESC90_RATE2M ||\ _pdrvinfo->RxRate ==DESC90_RATE5_5M ||\ _pdrvinfo->RxRate == DESC90_RATE11M) &&\ - !_pdrvinfo->RxHT\ + !_pdrvinfo->RxHTvoid CamResetAllEntry (struct net_device *dev)
@@ -285,8 +285,7 @@ void CamResetAllEntry(struct net_device *dev)*/ /* debug *DbgPrint("========================================\n"); -*DbgPrint(" Call ResetAllEntry" -* " \n"); +*DbgPrint(" Call ResetAllEntry\n"); *DbgPrint("========================================\n\n"); */ ulcommand |=BIT31 |BIT30 ;
@@ -297,12 +296,12 @@ void CamResetAllEntry(struct net_device *dev)void write_cam (struct net_device *dev,u8 addr,u32 data) {write_nic_dword (dev,WCAMI , data); -write_nic_dword (dev,RWCAM ,BIT31 |BIT16 |(addr&0xff ) ); +write_nic_dword (dev,RWCAM ,BIT31 |BIT16 |(addr&0xff )); }u32 read_cam (struct net_device *dev,u8 addr) { -write_nic_dword (dev,RWCAM ,0x80000000 |(addr&0xff ) ); +write_nic_dword (dev,RWCAM ,0x80000000 |(addr&0xff ));return read_nic_dword (dev,0xa8 ); }
@@ -316,8 +315,7 @@ void write_nic_byte_E(struct net_device *dev, int indx, u8 data)RTL8187_REQ_SET_REGS ,RTL8187_REQT_WRITE , indx|0xfe00, 0, &data, 1, HZ / 2); -if (status <0 ) - { +if (status <0 ) {printk ("write_nic_byte_E TimeOut! status:%d\n" , status); } }
@@ -333,14 +331,14 @@ u8 read_nic_byte_E(struct net_device *dev, int indx)RTL8187_REQ_GET_REGS ,RTL8187_REQT_READ , indx|0xfe00, 0, &data, 1, HZ / 2); -if (status <0 ) - { +if (status <0 ) {printk ("read_nic_byte_E TimeOut! status:%d\n" , status); }return data; } -//as 92U has extend page from 4 to 16, so modify functions below. + +/* as 92U has extend page from 4 to 16, so modify functions below. */ void write_nic_byte (struct net_device *dev,int indx,u8 data) {int status;
@@ -350,20 +348,18 @@ void write_nic_byte(struct net_device *dev, int indx, u8 data) status =usb_control_msg (udev,usb_sndctrlpipe (udev,0 ),RTL8187_REQ_SET_REGS ,RTL8187_REQT_WRITE , - (indx&0xff )|0xff00 , (indx>>8 )&0x0f , &data,1 ,HZ /2 ); + (indx&0xff )|0xff00 , (indx>>8 )&0x0f , + &data,1 ,HZ /2 ); -if (status <0 ) - { +if (status <0 ) {printk ("write_nic_byte TimeOut! status:%d\n" , status); } } -void write_nic_word (struct net_device *dev,int indx,u16 data) { -int status;struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv (dev);
@@ -371,34 +367,30 @@ void write_nic_word(struct net_device *dev, int indx, u16 data) status =usb_control_msg (udev,usb_sndctrlpipe (udev,0 ),RTL8187_REQ_SET_REGS ,RTL8187_REQT_WRITE , - (indx&0xff )|0xff00 , (indx>>8 )&0x0f , &data,2 ,HZ /2 ); + (indx&0xff )|0xff00 , (indx>>8 )&0x0f , + &data,2 ,HZ /2 ); -if (status <0 ) - { +if (status <0 ) {printk ("write_nic_word TimeOut! status:%d\n" , status); } } -void write_nic_dword (struct net_device *dev,int indx,u32 data) { -int status;struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv (dev);struct usb_device *udev = priv->udev; status =usb_control_msg (udev,usb_sndctrlpipe (udev,0 ), -RTL8187_REQ_SET_REGS ,RTL8187_REQT_WRITE , - (indx&0xff )|0xff00 , (indx>>8 )&0x0f , &data,4 ,HZ /2 ); +RTL8187_REQ_SET_REGS ,RTL8187_REQT_WRITE , + (indx&0xff )|0xff00 , (indx>>8 )&0x0f , + &data,4 ,HZ /2 ); - -if (status <0 ) - { +if (status <0 ) {printk ("write_nic_dword TimeOut! status:%d\n" , status); } - }
@@ -411,19 +403,17 @@ u8 read_nic_byte(struct net_device *dev, int indx)struct usb_device *udev = priv->udev; status =usb_control_msg (udev,usb_rcvctrlpipe (udev,0 ), -RTL8187_REQ_GET_REGS ,RTL8187_REQT_READ , - (indx&0xff )|0xff00 , (indx>>8 )&0x0f , &data,1 ,HZ /2 ); +RTL8187_REQ_GET_REGS ,RTL8187_REQT_READ , + (indx&0xff )|0xff00 , (indx>>8 )&0x0f , + &data,1 ,HZ /2 ); -if (status <0 ) - { +if (status <0 ) {printk ("read_nic_byte TimeOut! status:%d\n" , status); }return data; } - -u16 read_nic_word (struct net_device *dev,int indx) {u16 data;
Signature · 1 line
1.6.3.3
PATCH 6/12 fix most checkpatch.pl issues to line 400
From: Mike Gilks <[email protected]>
--- drivers/staging/rtl8192u/r8192U_core.c | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +6 -15
@@ -315,9 +315,8 @@ void write_nic_byte_E(struct net_device *dev, int indx, u8 data)RTL8187_REQ_SET_REGS ,RTL8187_REQT_WRITE , indx|0xfe00, 0, &data, 1, HZ / 2); -if (status <0 ) { +if (status <0 )printk ("write_nic_byte_E TimeOut! status:%d\n" , status); - } }u8 read_nic_byte_E (struct net_device *dev,int indx)
@@ -331,9 +330,8 @@ u8 read_nic_byte_E(struct net_device *dev, int indx)RTL8187_REQ_GET_REGS ,RTL8187_REQT_READ , indx|0xfe00, 0, &data, 1, HZ / 2); -if (status <0 ) { +if (status <0 )printk ("read_nic_byte_E TimeOut! status:%d\n" , status); - }return data; }
@@ -351,10 +349,8 @@ void write_nic_byte(struct net_device *dev, int indx, u8 data) (indx&0xff )|0xff00 , (indx>>8 )&0x0f , &data, 1, HZ / 2); -if (status <0 ) { +if (status <0 )printk ("write_nic_byte TimeOut! status:%d\n" , status); - } - }
@@ -370,9 +366,8 @@ void write_nic_word(struct net_device *dev, int indx, u16 data) (indx&0xff )|0xff00 , (indx>>8 )&0x0f , &data, 2, HZ / 2); -if (status <0 ) { +if (status <0 )printk ("write_nic_word TimeOut! status:%d\n" , status); - } }
@@ -388,13 +383,10 @@ void write_nic_dword(struct net_device *dev, int indx, u32 data) (indx&0xff )|0xff00 , (indx>>8 )&0x0f , &data, 4, HZ / 2); -if (status <0 ) { +if (status <0 )printk ("write_nic_dword TimeOut! status:%d\n" , status); - } } - -u8 read_nic_byte (struct net_device *dev,int indx) {u8 data;
@@ -407,9 +399,8 @@ u8 read_nic_byte(struct net_device *dev, int indx) (indx&0xff )|0xff00 , (indx>>8 )&0x0f , &data, 1, HZ / 2); -if (status <0 ) { +if (status <0 )printk ("read_nic_byte TimeOut! status:%d\n" , status); - }return data; }
Signature · 1 line
1.6.3.3
PATCH 7/12 staging: rtl8192u: fix checkpatch.pl issues to line 514
Fixed most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 500
--- drivers/staging/rtl8192u/r8192U_core.c | 73 ++++++++++++------------------- 1 files changed, 28 insertions(+), 45 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +28 -45
@@ -413,14 +413,12 @@ u16 read_nic_word(struct net_device *dev, int indx)struct usb_device *udev = priv->udev; status =usb_control_msg (udev,usb_rcvctrlpipe (udev,0 ), -RTL8187_REQ_GET_REGS ,RTL8187_REQT_READ , - (indx&0xff )|0xff00 , (indx>>8 )&0x0f , &data,2 ,HZ /2 ); +RTL8187_REQ_GET_REGS ,RTL8187_REQT_READ , + (indx&0xff )|0xff00 , (indx>>8 )&0x0f , + &data,2 ,HZ /2 );if (status <0 ) - {printk ("read_nic_word TimeOut! status:%d\n" , status); - } -return data; }
@@ -434,13 +432,10 @@ u16 read_nic_word_E(struct net_device *dev, int indx) status =usb_control_msg (udev,usb_rcvctrlpipe (udev,0 ),RTL8187_REQ_GET_REGS ,RTL8187_REQT_READ , - indx|0xfe00 ,0 , &data,2 ,HZ /2 ); + indx|0xfe00 ,0 , &data,2 ,HZ /2 );if (status <0 ) - {printk ("read_nic_word TimeOut! status:%d\n" , status); - } -return data; }
@@ -449,31 +444,29 @@ u32 read_nic_dword(struct net_device *dev, int indx) {u32 data;int status; -// int result; +/* int result; */ struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv (dev);struct usb_device *udev = priv->udev; status =usb_control_msg (udev,usb_rcvctrlpipe (udev,0 ), -RTL8187_REQ_GET_REGS ,RTL8187_REQT_READ , - (indx&0xff )|0xff00 , (indx>>8 )&0x0f , &data,4 ,HZ /2 ); -// if(0 != result) { -// printk(KERN_WARNING "read size of data = %d\, date = %d\n", result, data); -// } +RTL8187_REQ_GET_REGS ,RTL8187_REQT_READ , + (indx&0xff )|0xff00 , (indx>>8 )&0x0f , + &data,4 ,HZ /2 ); +/* if(0 != result) { +* printk(KERN_WARNING "read size of data = %d\, date = %d\n", +* result, data); +* } +*/ if (status <0 ) - {printk ("read_nic_dword TimeOut! status:%d\n" , status); - } - -return data; } - -//u8 read_phy_cck(struct net_device *dev, u8 adr); -//u8 read_phy_ofdm(struct net_device *dev, u8 adr); +/* u8 read_phy_cck(struct net_device *dev, u8 adr); */ +/* u8 read_phy_ofdm(struct net_device *dev, u8 adr); */ /* this might still called in what was the PHY rtl8185/rtl8192 common code * plans are to possibilty turn it again in one common code... */
@@ -481,26 +474,22 @@ inline void force_pci_posting(struct net_device *dev) { } -static struct net_device_stats *rtl8192_stats (struct net_device *dev);void rtl8192_commit (struct net_device *dev); -//void rtl8192_restart(struct net_device *dev); +/* void rtl8192_restart(struct net_device *dev); */ void rtl8192_restart (struct work_struct *work); -//void rtl8192_rq_tx_ack(struct work_struct *work); - +/* void rtl8192_rq_tx_ack(struct work_struct *work); */ void watch_dog_timer_callback (unsigned long data);/**************************************************************************** ------------------------------PROCFS STUFF------------------------- -*****************************************************************************/ - -static struct proc_dir_entry *rtl8192_proc =NULL ; - +* -----------------------------PROCFS STUFF------------------------- +***************************************************************************** +*/ +static struct proc_dir_entry *rtl8192_proc; -static int proc_get_stats_ap (char *page,char **start, -off_t offset,int count, -int *eof,void *data) +static int proc_get_stats_ap (char *page,char **start,off_t offset,int count, +int *eof,void *data) {struct net_device *dev = data;struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv (dev);
@@ -511,18 +500,12 @@ static int proc_get_stats_ap(char *page, char **start,list_for_each_entry (target, &ieee->network_list, list) { - len +=snprintf (page + len, count - len, -"%s " , target->ssid); - -if (target->wpa_ie_len>0 || target->rsn_ie_len>0 ){ - len +=snprintf (page + len, count - len, -"WPA\n" ); - } -else { - len +=snprintf (page + len, count - len, -"non_WPA\n" ); - } + len +=snprintf (page + len, count - len,"%s " , target->ssid); +if (target->wpa_ie_len >0 || target->rsn_ie_len >0 ) + len +=snprintf (page + len, count - len,"WPA\n" ); +else + len +=snprintf (page + len, count - len,"non_WPA\n" ); } *eof =1 ;
Signature · 1 line
1.6.3.3
PATCH 8/12 staging: rtl8192u: fix checkpatch.pl issues to line 800 Fixed most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 800
--- drivers/staging/rtl8192u/r8192U_core.c | 186 ++++++++++++++------------------ 1 files changed, 83 insertions(+), 103 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +81 -101
@@ -517,72 +517,58 @@ static int proc_get_registers(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; -// struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); +/* struct r8192_priv *priv = +*(struct r8192_priv *)ieee80211_priv(dev); +*/ int len =0 ; -int i,n; +int i, n; -int max=0xff ; +int max =0xff ;/* This dump the current register page */ len +=snprintf (page + len, count - len,"\n####################page 0##################\n " ); -for (n=0 ;n<=max;) - { -//printk( "\nD: %2x> ", n); - len +=snprintf (page + len, count - len, -"\nD: %2x > " ,n); - -for (i=0 ;i<16 && n<=max;i++,n++) - len +=snprintf (page + len, count - len, -"%2x " ,read_nic_byte (dev,0x000 |n)); +for (n =0 ; n <= max; ) { +/* printk( "\nD: %2x> ", n); */ + len +=snprintf (page + len, count - len,"\nD: %2x > " , n); -// printk("%2x ",read_nic_byte(dev,n)); +for (i =0 ; i <16 && n <= max; i++, n++) + len +=snprintf (page + len, count - len,"%2x " , +read_nic_byte (dev,0x000 |n)); +/* printk("%2x ",read_nic_byte(dev,n)); */ } len +=snprintf (page + len, count - len,"\n####################page 1##################\n " ); -for (n=0 ;n<=max;) - { -//printk( "\nD: %2x> ", n); - len +=snprintf (page + len, count - len, -"\nD: %2x > " ,n); - -for (i=0 ;i<16 && n<=max;i++,n++) - len +=snprintf (page + len, count - len, -"%2x " ,read_nic_byte (dev,0x100 |n)); +for (n =0 ; n <= max; ) { +/* printk( "\nD: %2x> ", n); */ + len +=snprintf (page + len, count - len,"\nD: %2x > " , n); -// printk("%2x ",read_nic_byte(dev,n)); +for (i =0 ; i <16 && n <= max; i++, n++) + len +=snprintf (page + len, count - len,"%2x " , +read_nic_byte (dev,0x100 |n)); +/* printk("%2x ",read_nic_byte(dev,n)); */ } len +=snprintf (page + len, count - len,"\n####################page 3##################\n " ); -for (n=0 ;n<=max;) - { -//printk( "\nD: %2x> ", n); - len +=snprintf (page + len, count - len, -"\nD: %2x > " ,n); - -for (i=0 ;i<16 && n<=max;i++,n++) - len +=snprintf (page + len, count - len, -"%2x " ,read_nic_byte (dev,0x300 |n)); +for (n =0 ; n <= max; ) { +/* printk( "\nD: %2x> ", n); */ + len +=snprintf (page + len, count - len,"\nD: %2x > " , n); -// printk("%2x ",read_nic_byte(dev,n)); +for (i =0 ; i <16 && n <= max; i++, n++) + len +=snprintf (page + len, count - len,"%2x " , +read_nic_byte (dev,0x300 |n)); +/* printk("%2x ",read_nic_byte(dev,n)); */ } - - len +=snprintf (page + len, count - len,"\n" ); + len +=snprintf (page + len, count - len,"\n" ); *eof =1 ;return len; - } - - - - -static int proc_get_stats_tx (char *page,char **start, -off_t offset,int count, -int *eof,void *data) +static int proc_get_stats_tx (char *page,char **start,off_t offset,int count, +int *eof,void *data) {struct net_device *dev = data;struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv (dev);
@@ -602,23 +588,23 @@ static int proc_get_stats_tx(char *page, char **start,"TX MANAGE priority error int: %lu\n" "TX BEACON priority ok int: %lu\n" "TX BEACON priority error int: %lu\n" -// "TX high priority ok int: %lu\n" -// "TX high priority failed error int: %lu\n" +/* "TX high priority ok int: %lu\n" */ +/* "TX high priority failed error int: %lu\n" */ "TX queue resume: %lu\n" "TX queue stopped?: %d\n" "TX fifo overflow: %lu\n" -// "TX beacon: %lu\n" +/* "TX beacon: %lu\n" */ "TX VI queue: %d\n" "TX VO queue: %d\n" "TX BE queue: %d\n" "TX BK queue: %d\n" -// "TX HW queue: %d\n" +/* "TX HW queue: %d\n" */ "TX VI dropped: %lu\n" "TX VO dropped: %lu\n" "TX BE dropped: %lu\n" "TX BK dropped: %lu\n" "TX total data packets %lu\n" , -// "TX beacon aborted: %lu\n", +/* "TX beacon aborted: %lu\n", */ priv->stats.txviokint, priv->stats.txvierr, priv->stats.txvookint,
@@ -631,23 +617,23 @@ static int proc_get_stats_tx(char *page, char **start, priv->stats.txmanageerr, priv->stats.txbeaconokint, priv->stats.txbeaconerr, -// priv->stats.txhpokint, -// priv->stats.txhperr, +/* priv->stats.txhpokint, */ +/* priv->stats.txhperr, */ priv->stats.txresumed,netif_queue_stopped (dev), priv->stats.txoverflow, -// priv->stats.txbeacon, +/* priv->stats.txbeacon, */ atomic_read (&(priv->tx_pending[VI_PRIORITY ])),atomic_read (&(priv->tx_pending[VO_PRIORITY ])),atomic_read (&(priv->tx_pending[BE_PRIORITY ])),atomic_read (&(priv->tx_pending[BK_PRIORITY ])), -// read_nic_byte(dev, TXFIFOCOUNT), +/* read_nic_byte(dev, TXFIFOCOUNT), */ priv->stats.txvidrop, priv->stats.txvodrop, priv->stats.txbedrop, priv->stats.txbkdrop, priv->stats.txdatapkt -// priv->stats.txbeaconerr +/* priv->stats.txbeaconerr */ ); *eof =1 ;
@@ -656,9 +642,8 @@ static int proc_get_stats_tx(char *page, char **start, -static int proc_get_stats_rx (char *page,char **start, -off_t offset,int count, -int *eof,void *data) +static int proc_get_stats_rx (char *page,char **start,off_t offset,int count, +int *eof,void *data) {struct net_device *dev = data;struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv (dev);
@@ -676,13 +661,14 @@ static int proc_get_stats_rx(char *page, char **start, *eof =1 ;return len; } +void rtl8192_proc_module_init (void ) {RT_TRACE (COMP_INIT ,"Initializing proc filesystem" ); - rtl8192_proc=create_proc_entry (RTL819xU_MODULE_NAME,S_IFDIR , init_net.proc_net); + rtl8192_proc =create_proc_entry (RTL819xU_MODULE_NAME,S_IFDIR , + init_net.proc_net); } -void rtl8192_proc_module_remove (void ) {remove_proc_entry (RTL819xU_MODULE_NAME, init_net.proc_net);
@@ -695,21 +681,20 @@ void rtl8192_proc_remove_one(struct net_device *dev)if (priv->dir_dev) { -// remove_proc_entry("stats-hw", priv->dir_dev); +/* remove_proc_entry("stats-hw", priv->dir_dev); */ remove_proc_entry ("stats-tx" , priv->dir_dev);remove_proc_entry ("stats-rx" , priv->dir_dev); -// remove_proc_entry("stats-ieee", priv->dir_dev); +/* remove_proc_entry("stats-ieee", priv->dir_dev); */ remove_proc_entry ("stats-ap" , priv->dir_dev);remove_proc_entry ("registers" , priv->dir_dev); -// remove_proc_entry("cck-registers",priv->dir_dev); -// remove_proc_entry("ofdm-registers",priv->dir_dev); -//remove_proc_entry(dev->name, rtl8192_proc); +/* remove_proc_entry("cck-registers",priv->dir_dev); */ +/* remove_proc_entry("ofdm-registers",priv->dir_dev); */ +/* remove_proc_entry(dev->name, rtl8192_proc); */ remove_proc_entry ("wlan0" , rtl8192_proc); priv->dir_dev =NULL ; } } -void rtl8192_proc_init_one (struct net_device *dev) {struct proc_dir_entry *e;
@@ -718,27 +703,24 @@ void rtl8192_proc_init_one(struct net_device *dev)S_IFDIR |S_IRUGO |S_IXUGO , rtl8192_proc);if (!priv->dir_dev) { -RT_TRACE (COMP_ERR ,"Unable to initialize /proc/net/rtl8192/%s\n" , - dev->name); +RT_TRACE (COMP_ERR ,"Unable to initialize " +"/proc/net/rtl8192/%s\n" , dev->name);return ; } e =create_proc_read_entry ("stats-rx" ,S_IFREG |S_IRUGO , priv->dir_dev, proc_get_stats_rx, dev);if (!e) { -RT_TRACE (COMP_ERR ,"Unable to initialize " -"/proc/net/rtl8192/%s/stats-rx\n" , - dev->name); +RT_TRACE (COMP_ERR ,"Unable to initialize " +"/proc/net/rtl8192/%s/stats-rx\n" , dev->name); } - e =create_proc_read_entry ("stats-tx" ,S_IFREG |S_IRUGO , priv->dir_dev, proc_get_stats_tx, dev);if (!e) {RT_TRACE (COMP_ERR ,"Unable to initialize " -"/proc/net/rtl8192/%s/stats-tx\n" , - dev->name); +"/proc/net/rtl8192/%s/stats-tx\n" , dev->name); } e = create_proc_read_entry("stats-ap", S_IFREG | S_IRUGO,
@@ -746,43 +728,42 @@ void rtl8192_proc_init_one(struct net_device *dev)if (!e) {RT_TRACE (COMP_ERR ,"Unable to initialize " -"/proc/net/rtl8192/%s/stats-ap\n" , - dev->name); +"/proc/net/rtl8192/%s/stats-ap\n" , dev->name); } e =create_proc_read_entry ("registers" ,S_IFREG |S_IRUGO , priv->dir_dev, proc_get_registers, dev);if (!e) {RT_TRACE (COMP_ERR ,"Unable to initialize " -"/proc/net/rtl8192/%s/registers\n" , - dev->name); +"/proc/net/rtl8192/%s/registers\n" , dev->name); } }/**************************************************************************** ------------------------------MISC STUFF------------------------- -*****************************************************************************/ +* -----------------------------MISC STUFF------------------------- +**************************************************************************** +*/ /* this is only for debugging */ void print_buffer (u32 *buffer,int len) {int i; -u8 *buf =(u8 *)buffer; +u8 *buf = (u8 *)buffer; -printk ("ASCII BUFFER DUMP (len: %x):\n" ,len); +printk ("ASCII BUFFER DUMP (len: %x):\n" , len); -for (i=0 ;i<len;i++) -printk ("%c" ,buf[i]); +for (i =0 ; i < len; i++) +printk ("%c" , buf[i]); -printk ("\nBINARY BUFFER DUMP (len: %x):\n" ,len); +printk ("\nBINARY BUFFER DUMP (len: %x):\n" , len); -for (i=0 ;i<len;i++) -printk ("%x" ,buf[i]); +for (i =0 ; i < len; i++) +printk ("%x" , buf[i]);printk ("\n" ); } -//short check_nic_enough_desc(struct net_device *dev, priority_t priority) -short check_nic_enough_desc (struct net_device *dev,int queue_index) +/* short check_nic_enough_desc(struct net_device *dev, priority_t priority) */ +short check_nic_enough_desc (struct net_device *dev,int queue_index) {struct r8192_priv *priv =ieee80211_priv (dev);int used =atomic_read (&priv->tx_pending[queue_index]);
@@ -793,19 +774,19 @@ short check_nic_enough_desc(struct net_device *dev,int queue_index)void tx_timeout (struct net_device *dev) {struct r8192_priv *priv =ieee80211_priv (dev); -//rtl8192_commit(dev); +/* rtl8192_commit(dev); */ schedule_work (&priv->reset_wq); -//DMESG("TXTIMEOUT"); +/* DMESG("TXTIMEOUT"); */ } -/* this is only for debug */ void dump_eprom (struct net_device *dev) {int i; -for (i=0 ; i<63 ; i++) -RT_TRACE (COMP_EPROM ,"EEPROM addr %x : %x" , i,eprom_read (dev,i)); +for (i =0 ; i <63 ; i++) +RT_TRACE (COMP_EPROM ,"EEPROM addr %x : %x" , i, +eprom_read (dev, i)); }/* this is only for debug */
@@ -813,23 +794,22 @@ void rtl8192_dump_reg(struct net_device *dev) {int i;int n; -int max=0x1ff ; +int max =0x1ff ;RT_TRACE (COMP_PHY ,"Dumping NIC register map" ); -for (n=0 ;n<=max;) - { -printk ("\nD: %2x> " , n); -for (i=0 ;i<16 && n<=max;i++,n++) -printk ("%2x " ,read_nic_byte (dev,n)); +for (n =0 ; n <= max; ) { +printk ("\nD: %2x> " , n); +for (i =0 ; i <16 && n <= max; i++, n++) +printk ("%2x " ,read_nic_byte (dev, n)); }printk ("\n" ); }/**************************************************************************** -------------------------------HW STUFF--------------------------- -*****************************************************************************/ - +* ------------------------------HW STUFF--------------------------- +**************************************************************************** +*/ void rtl8192_set_mode (struct net_device *dev,int mode) {
Signature · 1 line
1.6.3.3
PATCH 9/12 staging: rtl8192u: fix c99 issues in file r8192U_core.c to line 3000 This is a patch to r8192U_core.c file to begin to rid the file of c99 style comments
--- drivers/staging/rtl8192u/r8192U_core.c | 583 ++++++++++++++++++-------------- 1 files changed, 335 insertions(+), 248 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +335 -248
@@ -854,30 +854,34 @@ void rtl8192_update_msr(struct net_device *dev)void rtl8192_set_chan (struct net_device *dev,short ch) {struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv (dev); -// u32 tx; +/* u32 tx; */ RT_TRACE (COMP_CH ,"=====>%s()====ch:%d\n" , __func__, ch); priv->chan=ch; -/* this hack should avoid frame TX during channel setting*/ +/* this hack should avoid frame TX during channel setting */ -// tx = read_nic_dword(dev,TX_CONF); -// tx &= ~TX_LOOPBACK_MASK; +/* tx = read_nic_dword(dev,TX_CONF); */ +/* tx &= ~TX_LOOPBACK_MASK; */ #ifndef LOOP_TEST -// write_nic_dword(dev,TX_CONF, tx |( TX_LOOPBACK_MAC<<TX_LOOPBACK_SHIFT)); +/* write_nic_dword(dev, TX_CONF, tx | +* ( TX_LOOPBACK_MAC<<TX_LOOPBACK_SHIFT)); +*/ -//need to implement rf set channel here WB +/* need to implement rf set channel here WB */ if (priv->rf_set_chan) - priv->rf_set_chan (dev,priv->chan); + priv->rf_set_chan (dev, priv->chan);mdelay (10 ); -// write_nic_dword(dev,TX_CONF,tx | (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT)); +/* write_nic_dword(dev, TX_CONF, tx | +* (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT)); +*/ #endif }static void rtl8192_rx_isr (struct urb *urb); -//static void rtl8192_rx_isr(struct urb *rx_urb); +/* static void rtl8192_rx_isr(struct urb *rx_urb); */ u32 get_rxpacket_shiftbytes_819xusb (struct ieee80211_rx_stats *pstats) {
@@ -909,21 +913,21 @@ static int rtl8192_rx_initiate(struct net_device*dev)kfree_skb (skb);break ; } -// printk("nomal packet IN request!\n"); +/* printk("nomal packet IN request!\n"); */ usb_fill_bulk_urb (entry, priv->udev,usb_rcvbulkpipe (priv->udev,3 ),skb_tail_pointer (skb),RX_URB_SIZE , rtl8192_rx_isr, skb); info = (struct rtl8192_rx_info *) skb->cb; info->urb = entry; info->dev = dev; - info->out_pipe =3 ;//denote rx normal packet queue + info->out_pipe =3 ;/* denote rx normal packet queue */ skb_queue_tail (&priv->rx_queue, skb);usb_submit_urb (entry,GFP_KERNEL ); }/* command packet rx procedure */ while (skb_queue_len (&priv->rx_queue) <MAX_RX_URB +3 ) { -// printk("command packet IN request!\n"); +/* printk("command packet IN request!\n"); */ skb =__dev_alloc_skb (RX_URB_SIZE ,GFP_KERNEL );if (!skb)break ;
@@ -938,7 +942,7 @@ static int rtl8192_rx_initiate(struct net_device*dev) info = (struct rtl8192_rx_info *) skb->cb; info->urb = entry; info->dev = dev; - info->out_pipe =9 ;//denote rx cmd packet queue + info->out_pipe =9 ;/* denote rx cmd packet queue */ skb_queue_tail (&priv->rx_queue, skb);usb_submit_urb (entry,GFP_KERNEL ); }
@@ -957,7 +961,7 @@ void rtl8192_set_rxconf(struct net_device *dev) rxconf = rxconf |RCR_ADF ; rxconf = rxconf |RCR_AB ; rxconf = rxconf |RCR_AM ; -//rxconf = rxconf | RCR_ACF; +/* rxconf = rxconf | RCR_ACF; */ if (dev->flags &IFF_PROMISC ) {DMESG ("NIC in promisc mode" );}
@@ -987,11 +991,11 @@ void rtl8192_set_rxconf(struct net_device *dev) rxconf = rxconf &~MAX_RX_DMA_MASK ; rxconf = rxconf | ((u32 )7 <<RCR_MXDMA_OFFSET ); -// rxconf = rxconf | (1<<RX_AUTORESETPHY_SHIFT); +/* rxconf = rxconf | (1<<RX_AUTORESETPHY_SHIFT); */ rxconf = rxconf |RCR_ONLYERLPKT ; -// rxconf = rxconf &~ RCR_CS_MASK; -// rxconf = rxconf | (1<<RCR_CS_SHIFT); +/* rxconf = rxconf &~ RCR_CS_MASK; */ +/* rxconf = rxconf | (1<<RCR_CS_SHIFT); */ write_nic_dword (dev,RCR , rxconf);
@@ -999,16 +1003,19 @@ void rtl8192_set_rxconf(struct net_device *dev)DMESG ("rxconf: %x %x" ,rxconf ,read_nic_dword (dev,RCR ));#endif } -//wait to be removed + +/* wait to be removed */ void rtl8192_rx_enable (struct net_device *dev) { -//u8 cmd; +/* u8 cmd; */ -//struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); +/* struct r8192_priv *priv = +* (struct r8192_priv *)ieee80211_priv(dev); +*/ rtl8192_rx_initiate (dev); -// rtl8192_set_rxconf(dev); +/* rtl8192_set_rxconf(dev); */ }
@@ -1110,7 +1117,7 @@ static void rtl8192_rx_isr(struct urb *urb) priv->stats.rxstaterr++; priv->ieee80211->stats.rx_errors++;usb_free_urb (urb); -// printk("%s():rx status err\n",__func__); +/* printk("%s():rx status err\n", __func__); */ return ; }skb_unlink (skb, &priv->rx_queue);
@@ -1122,7 +1129,7 @@ static void rtl8192_rx_isr(struct urb *urb) skb =dev_alloc_skb (RX_URB_SIZE );if (unlikely (!skb)) {usb_free_urb (urb); -printk ("%s():can,t alloc skb\n" ,__func__); +printk ("%s():can,t alloc skb\n" , __func__);/* TODO check rx queue length and refill *somewhere* */ return ; }
@@ -1152,7 +1159,9 @@ rtl819xusb_rx_command_packet( {u32 status; -//RT_TRACE(COMP_RECV, DBG_TRACE, ("---> RxCommandPacketHandle819xUsb()\n")); +/* RT_TRACE(COMP_RECV, DBG_TRACE, +* ("---> RxCommandPacketHandle819xUsb()\n")); +*/ status =cmpk_message_handle_rx (dev, pstats);if (status)
@@ -1161,23 +1170,27 @@ rtl819xusb_rx_command_packet( }else { -//RT_TRACE(COMP_RECV, DBG_TRACE, ("RxCommandPacketHandle819xUsb: It is not a command packet\n")); +/* RT_TRACE(COMP_RECV, DBG_TRACE, +* ("RxCommandPacketHandle819xUsb: +* It is not a command packet\n")); +*/ } -//RT_TRACE(COMP_RECV, DBG_TRACE, ("<--- RxCommandPacketHandle819xUsb()\n")); +/* RT_TRACE(COMP_RECV, DBG_TRACE, +* ("<--- RxCommandPacketHandle819xUsb()\n")); +*/ return status; } -void rtl8192_data_hard_stop (struct net_device *dev) { -//FIXME !! +/* FIXME !! */ }void rtl8192_data_hard_resume (struct net_device *dev) { -// FIXME !! +/* FIXME !! */ }/* this function TX data frames when the ieee80211 stack requires this.
@@ -1197,19 +1210,21 @@ void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, int ratspin_lock_irqsave (&priv->tx_lock,flags);memcpy ((unsigned char *)(skb->cb),&dev,sizeof (dev)); -// tcb_desc->RATRIndex = 7; -// tcb_desc->bTxDisableRateFallBack = 1; -// tcb_desc->bTxUseDriverAssingedRate = 1; +/* tcb_desc->RATRIndex = 7; */ +/* tcb_desc->bTxDisableRateFallBack = 1; */ +/* tcb_desc->bTxUseDriverAssingedRate = 1; */ tcb_desc->bTxEnableFwCalcDur =1 ;skb_push (skb, priv->ieee80211->tx_headroom); ret =rtl8192_tx (dev, skb); -//priv->ieee80211->stats.tx_bytes+=(skb->len - priv->ieee80211->tx_headroom); -//priv->ieee80211->stats.tx_packets++; +/* priv->ieee80211->stats.tx_bytes += +* (skb->len - priv->ieee80211->tx_headroom); +*/ +/* priv->ieee80211->stats.tx_packets++; */ spin_unlock_irqrestore (&priv->tx_lock,flags); -// return ret; +/* return ret; */ return ; }
@@ -1271,9 +1286,8 @@ struct sk_buff *DrvAggr_Aggregation(struct net_device *dev, struct ieee80211_drvtx_desc_819x_usb_aggr_subframe *tx_agg_desc =NULL ;tx_fwinfo_819x_usb *tx_fwinfo =NULL ; -// -// Local variable initialization. -// +/* Local variable initialization. */ +/* first skb initialization */ skb = pSendList->tx_agg_frames[0 ]; TotalLength = skb->len;
@@ -1292,17 +1306,19 @@ struct sk_buff *DrvAggr_Aggregation(struct net_device *dev, struct ieee80211_drvmemset (agg_skb->data,0 , agg_skb->len);skb_reserve (agg_skb, ieee->tx_headroom); -// RT_DEBUG_DATA(COMP_SEND, skb->cb, sizeof(skb->cb)); -/* reserve info for first subframe Tx descriptor to be set in the tx function */ +/* RT_DEBUG_DATA(COMP_SEND, skb->cb, sizeof(skb->cb)); */ +/* reserve info for first subframe Tx descriptor to be set +* in the tx function +*/ skb = pSendList->tx_agg_frames[0 ]; tcb_desc = (cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE ); tcb_desc->drv_agg_enable =1 ; tcb_desc->pkt_size = skb->len; tcb_desc->DrvAggrNum = pSendList->nr_drv_agg_frames;printk ("DrvAggNum = %d\n" , tcb_desc->DrvAggrNum); -// RT_DEBUG_DATA(COMP_SEND, skb->cb, sizeof(skb->cb)); -// printk("========>skb->data ======> \n"); -// RT_DEBUG_DATA(COMP_SEND, skb->data, skb->len); +/* RT_DEBUG_DATA(COMP_SEND, skb->cb, sizeof(skb->cb)); */ +/* printk("========>skb->data ======> \n"); */ +/* RT_DEBUG_DATA(COMP_SEND, skb->data, skb->len); */ memcpy (agg_skb->cb, skb->cb,sizeof (skb->cb));memcpy (skb_put (agg_skb,skb->len),skb->data,skb->len);
@@ -1322,11 +1338,12 @@ struct sk_buff *DrvAggr_Aggregation(struct net_device *dev, struct ieee80211_drv tx_fwinfo->TxRate =MRateToHwRate8190Pci (tcb_desc->data_rate); tx_fwinfo->EnableCPUDur = tcb_desc->bTxEnableFwCalcDur; tx_fwinfo->Short =QueryIsShort (tx_fwinfo->TxHT, tx_fwinfo->TxRate, tcb_desc); -if (tcb_desc->bAMPDUEnable) {//AMPDU enabled +if (tcb_desc->bAMPDUEnable) {/* AMPDU enabled */ tx_fwinfo->AllowAggregation =1 ;/* DWORD 1 */ tx_fwinfo->RxMF = tcb_desc->ampdu_factor; - tx_fwinfo->RxAMD = tcb_desc->ampdu_density&0x07 ;//ampdudensity + tx_fwinfo->RxAMD = tcb_desc->ampdu_density&0x07 ; +/* ampdudensity */ }else { tx_fwinfo->AllowAggregation =0 ;/* DWORD 1 */
@@ -1350,7 +1367,10 @@ struct sk_buff *DrvAggr_Aggregation(struct net_device *dev, struct ieee80211_drv {if (tcb_desc->bPacketBW) { tx_fwinfo->TxBandwidth =1 ; - tx_fwinfo->TxSubCarrier =0 ;//By SD3's Jerry suggestion, use duplicated mode + tx_fwinfo->TxSubCarrier =0 ; +/* By SD3's Jerry suggestion, +* use duplicated mode +*/ }else { tx_fwinfo->TxBandwidth =0 ; tx_fwinfo->TxSubCarrier = priv->nCur40MhzPrimeSC;
@@ -1363,8 +1383,8 @@ struct sk_buff *DrvAggr_Aggregation(struct net_device *dev, struct ieee80211_drv/* Fill Tx descriptor */ memset (tx_agg_desc,0 ,sizeof (tx_desc_819x_usb_aggr_subframe));/* DWORD 0 */ -//tx_agg_desc->LINIP = 0; -//tx_agg_desc->CmdInit = 1; +/* tx_agg_desc->LINIP = 0; */ +/* tx_agg_desc->CmdInit = 1; */ tx_agg_desc->Offset =sizeof (tx_fwinfo_819x_usb) +8 ;/* already raw data, need not to substract header length */ tx_agg_desc->PktSize = skb->len &0xffff ;
@@ -1373,7 +1393,7 @@ struct sk_buff *DrvAggr_Aggregation(struct net_device *dev, struct ieee80211_drv tx_agg_desc->SecCAMID=0 ; tx_agg_desc->RATid = tcb_desc->RATRIndex; { -//MPDUOverhead = 0; +/* MPDUOverhead = 0; */ tx_agg_desc->NoEnc =1 ; } tx_agg_desc->SecType =0x0 ;
@@ -1409,9 +1429,13 @@ struct sk_buff *DrvAggr_Aggregation(struct net_device *dev, struct ieee80211_drv tx_agg_desc->OWN =1 ; -//DWORD 2 -/* According windows driver, it seems that there no need to fill this field */ -//tx_agg_desc->TxBufferSize= (u32)(skb->len - USB_HWDESC_HEADER_LEN); +/* DWORD 2 */ +/* According windows driver, +* it seems that there no need to fill this field +*/ +/* tx_agg_desc->TxBufferSize= (u32) +* (skb->len - USB_HWDESC_HEADER_LEN); +*/ /* to fill next packet */ skb_put (agg_skb,TX_PACKET_DRVAGGR_SUBFRAME_SHIFT_BYTES );
@@ -1426,9 +1450,11 @@ struct sk_buff *DrvAggr_Aggregation(struct net_device *dev, struct ieee80211_drv }/* NOTE: -This function return a list of PTCB which is proper to be aggregate with the input TCB. -If no proper TCB is found to do aggregation, SendList will only contain the input TCB. -*/ +* This function return a list of PTCB which is proper to be +* aggregate with the input TCB. +* If no proper TCB is found to do aggregation, +* SendList will only contain the input TCB. +*/ u8 DrvAggr_GetAggregatibleList (struct net_device *dev,struct sk_buff *skb,struct ieee80211_drv_agg_txb *pSendList) {
@@ -1458,8 +1484,8 @@ static void rtl8192_tx_isr(struct urb *tx_urb)struct r8192_priv *priv =NULL ;cb_desc *tcb_desc = (cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE );u8 queue_index = tcb_desc->queue_index; -// bool bToSend0Byte; -// u16 BufLen = skb->len; +/* bool bToSend0Byte; */ +/* u16 BufLen = skb->len; */ memcpy (&dev,(struct net_device *)(skb->cb),sizeof (struct net_device *)); priv =ieee80211_priv (dev);
@@ -1467,15 +1493,20 @@ static void rtl8192_tx_isr(struct urb *tx_urb)if (tcb_desc->queue_index !=TXCMD_QUEUE ) {if (tx_urb->status ==0 ) { dev->trans_start = jiffies; -// As act as station mode, destion shall be unicast address. -//priv->ieee80211->stats.tx_bytes+=(skb->len - priv->ieee80211->tx_headroom); -//priv->ieee80211->stats.tx_packets++; +/* As act as station mode, destion shall be +* unicast address. +*/ +/* priv->ieee80211->stats.tx_bytes += +* (skb->len - priv->ieee80211->tx_headroom); +*/ +/* priv->ieee80211->stats.tx_packets++; */ priv->stats.txoktotal++; priv->ieee80211->LinkDetectInfo.NumTxOkInPeriod++; - priv->stats.txbytesunicast += (skb->len - priv->ieee80211->tx_headroom); + priv->stats.txbytesunicast += + (skb->len - priv->ieee80211->tx_headroom); }else { priv->ieee80211->stats.tx_errors++; -//priv->stats.txmanageerr++; +/* priv->stats.txmanageerr++; */ /* TODO */ } }
@@ -1488,16 +1519,18 @@ static void rtl8192_tx_isr(struct urb *tx_urb) } { -// -// Handle HW Beacon: -// We had transfer our beacon frame to host controler at this moment. -// -// -// Caution: -// Handling the wait queue of command packets. -// For Tx command packets, we must not do TCB fragment because it is not handled right now. -// We must cut the packets to match the size of TX_CMD_PKT before we send it. -// + +/* Handle HW Beacon: +* We had transfer our beacon frame to host controler +* at this moment. +* +* Caution: +* Handling the wait queue of command packets. +* For Tx command packets, we must not do TCB fragment +* because it is not handled right now. +* We must cut the packets to match the size of TX_CMD_PKT +* before we send it. +*/ /* Handle MPDU in wait queue. */ if (queue_index !=BEACON_QUEUE ) {
@@ -1507,12 +1540,13 @@ static void rtl8192_tx_isr(struct urb *tx_urb)if (NULL != (skb =skb_dequeue (&(priv->ieee80211->skb_waitQ[queue_index])))) priv->ieee80211->softmac_hard_start_xmit (skb, dev); -return ;//modified by david to avoid further processing AMSDU +return ; +/* modified by david to avoid further processing AMSDU */ }#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE else if ((skb_queue_len(&priv->ieee80211->skb_drv_aggQ[queue_index])!= 0)&&\ (!(priv->ieee80211->queue_stop))) { -// Tx Driver Aggregation process +/* Tx Driver Aggregation process */ /* The driver will aggregation the packets according to the following stets * 1. check whether there's tx irq available, for it's a completion return * function, it should contain enough tx irq;
@@ -1520,7 +1554,7 @@ static void rtl8192_tx_isr(struct urb *tx_urb)* 3. intialize sendlist, check whether the to-be send packet no greater than 1 * 4. aggregation the packets, and fill firmware info and tx desc to it, etc. * 5. check whehter the packet could be sent, otherwise just insert to wait head -* */ +*/ skb =skb_dequeue (&priv->ieee80211->skb_drv_aggQ[queue_index]);if (!check_nic_enough_desc (dev, queue_index)) {skb_queue_head (&(priv->ieee80211->skb_drv_aggQ[queue_index]), skb);
@@ -1637,14 +1671,14 @@ void rtl8192_update_cap(struct net_device* dev, u16 cap) tmp |= BRSR_AckShortPmb;write_nic_dword (dev,RRSR , tmp); -if (net->mode & (IEEE_G |IEEE_N_24G )) - { +if (net->mode & (IEEE_G |IEEE_N_24G )) {u8 slot_time =0 ; -if ((cap &WLAN_CAPABILITY_SHORT_SLOT )&&(!priv->ieee80211->pHTInfo->bCurrentRT2RTLongSlotTime)) - {//short slot time +if ((cap &WLAN_CAPABILITY_SHORT_SLOT ) && (!priv->ieee80211->pHTInfo->bCurrentRT2RTLongSlotTime)) { +/* short slot time */ slot_time =SHORT_SLOT_TIME ; } -else //long slot time +else +/* long slot time */ slot_time =NON_SHORT_SLOT_TIME ; priv->slot_time = slot_time;write_nic_byte (dev,SLOT_TIME , slot_time);
@@ -1665,32 +1699,30 @@ void rtl8192_net_update(struct net_device *dev)write_nic_dword (dev,BSSIDR ,((u32 *)net->bssid)[0 ]);write_nic_word (dev,BSSIDR +4 ,((u16 *)net->bssid)[2 ]); -//for(i=0;i<ETH_ALEN;i++) -// write_nic_byte(dev,BSSID+i,net->bssid[i]); +/* for(i = 0; i < ETH_ALEN; i++) +* write_nic_byte(dev, BSSID + i, net->bssid[i]); +*/ rtl8192_update_msr (dev); -// rtl8192_update_cap(dev, net->capability); -if (priv->ieee80211->iw_mode ==IW_MODE_ADHOC ) - { -write_nic_word (dev,ATIMWND ,2 ); -write_nic_word (dev,BCN_DMATIME ,1023 ); -write_nic_word (dev,BCN_INTERVAL , net->beacon_interval); -// write_nic_word(dev, BcnIntTime, 100); -write_nic_word (dev,BCN_DRV_EARLY_INT ,1 ); -write_nic_byte (dev,BCN_ERR_THRESH ,100 ); +/* rtl8192_update_cap(dev, net->capability); */ +if (priv->ieee80211->iw_mode ==IW_MODE_ADHOC ) { +write_nic_word (dev,ATIMWND ,2 ); +write_nic_word (dev,BCN_DMATIME ,1023 ); +write_nic_word (dev,BCN_INTERVAL , net->beacon_interval); +/* write_nic_word(dev, BcnIntTime, 100); */ +write_nic_word (dev,BCN_DRV_EARLY_INT ,1 ); +write_nic_byte (dev,BCN_ERR_THRESH ,100 ); BcnTimeCfg |= (BcnCW<<BCN_TCFG_CW_SHIFT ); -// TODO: BcnIFS may required to be changed on ASIC +/* TODO: BcnIFS may required to be changed on ASIC */ BcnTimeCfg |= BcnIFS<<BCN_TCFG_IFS ; -write_nic_word (dev,BCN_TCFG , BcnTimeCfg); +write_nic_word (dev,BCN_TCFG , BcnTimeCfg); } - - } -//temporary hw beacon is not used any more. -//open it when necessary +/* temporary hw beacon is not used any more. */ +/* open it when necessary */ void rtl819xusb_beacon_tx (struct net_device *dev,u16 tx_rate) {
@@ -1715,23 +1747,22 @@ u16 ComputeTxTime(u16 N_DBPS ;u16 Ceiling; -if (rtl8192_IsWirelessBMode (DataRate) ) +if (rtl8192_IsWirelessBMode (DataRate) ) { -if ( bManagementFrame || !bShortPreamble || DataRate ==10 ) - {// long preamble - FrameTime = (u16)(144 +48 +(FrameLength*8 /(DataRate/10 ))); - } -else - {// Short preamble - FrameTime = (u16)(72 +24 +(FrameLength*8 /(DataRate/10 ))); +if (bManagementFrame || !bShortPreamble || DataRate ==10 ) { +/* long preamble */ + FrameTime = (u16)(144 +48 + (FrameLength *8 / (DataRate /10 ))); + }else { +/* Short preamble */ + FrameTime = (u16)(72 +24 + (FrameLength *8 / (DataRate /10 ))); } -if ( ( FrameLength*8 % (DataRate/10 ) ) !=0 )//Get the Ceilling +if ((FrameLength *8 % (DataRate /10 )) !=0 )/* Get the Ceilling */ FrameTime ++; - }else {//802.11g DSSS-OFDM PLCP length field calculation. + }else {/* 802.11g DSSS-OFDM PLCP length field calculation. */ N_DBPS =N_DBPSOfRate (DataRate); - Ceiling = (16 +8 *FrameLength +6 ) /N_DBPS - + (((16 +8 *FrameLength +6 ) %N_DBPS ) ?1 :0 ); - FrameTime = (u16)(16 +4 +4 *Ceiling +6 ); + Ceiling = (16 +8 * FrameLength +6 ) /N_DBPS + + (((16 +8 * FrameLength +6 ) %N_DBPS ) ?1 :0 ); + FrameTime = (u16)(16 +4 +4 * Ceiling +6 ); }return FrameTime; }
@@ -1799,16 +1830,16 @@ unsigned int txqueue2outpipe(struct r8192_priv* priv,unsigned int tx_queue) {short rtl819xU_tx_cmd (struct net_device *dev,struct sk_buff *skb) {struct r8192_priv *priv =ieee80211_priv (dev); -//u8 *tx; +/* u8 *tx; */ int status;struct urb *tx_urb; -//int urb_buf_len; +/* int urb_buf_len; */ unsigned int idx_pipe;tx_desc_cmd_819x_usb *pdesc = (tx_desc_cmd_819x_usb *)skb->data;cb_desc *tcb_desc = (cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE );u8 queue_index = tcb_desc->queue_index; -//printk("\n %s::queue_index = %d\n",__func__, queue_index); +/* printk("\n %s::queue_index = %d\n", __func__, queue_index); */ atomic_inc (&priv->tx_pending[queue_index]); tx_urb =usb_alloc_urb (0 ,GFP_ATOMIC );if (!tx_urb){
@@ -1818,17 +1849,18 @@ short rtl819xU_tx_cmd(struct net_device *dev, struct sk_buff *skb)memset (pdesc,0 ,USB_HWDESC_HEADER_LEN );/* Tx descriptor ought to be set according to the skb->cb */ - pdesc->FirstSeg =1 ;//bFirstSeg; - pdesc->LastSeg =1 ;//bLastSeg; + pdesc->FirstSeg =1 ;/* bFirstSeg; */ + pdesc->LastSeg =1 ;/* bLastSeg; */ pdesc->CmdInit = tcb_desc->bCmdOrInit; pdesc->TxBufferSize = tcb_desc->txbuf_size; pdesc->OWN =1 ; pdesc->LINIP = tcb_desc->bLastIniPkt; -//---------------------------------------------------------------------------- -// Fill up USB_OUT_CONTEXT. -//---------------------------------------------------------------------------- -// Get index to out pipe from specified QueueID. +/* ---------------------------------------------------------------------------- +* Fill up USB_OUT_CONTEXT. +* ---------------------------------------------------------------------------- +* Get index to out pipe from specified QueueID. +*/ #ifndef USE_ONE_PIPE idx_pipe =txqueue2outpipe (priv,queue_index);#else
@@ -1864,46 +1896,44 @@ short rtl819xU_tx_cmd(struct net_device *dev, struct sk_buff *skb)*/ u8 MapHwQueueToFirmwareQueue (u8 QueueID) { -u8 QueueSelect =0x0 ;//defualt set to +u8 QueueSelect =0x0 ;/* defualt set to */ switch (QueueID) { -case BE_QUEUE : - QueueSelect =QSLT_BE ;//or QSelect = pTcb->priority; -break ; - -case BK_QUEUE : - QueueSelect =QSLT_BK ;//or QSelect = pTcb->priority; -break ; - -case VO_QUEUE : - QueueSelect =QSLT_VO ;//or QSelect = pTcb->priority; -break ; - -case VI_QUEUE : - QueueSelect =QSLT_VI ;//or QSelect = pTcb->priority; -break ; -case MGNT_QUEUE : - QueueSelect =QSLT_MGNT ; -break ; - +case BE_QUEUE : + QueueSelect =QSLT_BE ;/* or QSelect = pTcb->priority; */ +break ; +case BK_QUEUE : + QueueSelect =QSLT_BK ;/*or QSelect = pTcb->priority; */ +break ; +case VO_QUEUE : + QueueSelect =QSLT_VO ;/* or QSelect = pTcb->priority; */ +break ; +case VI_QUEUE : + QueueSelect =QSLT_VI ;/* or QSelect = pTcb->priority; */ +break ; +case MGNT_QUEUE : + QueueSelect =QSLT_MGNT ; +break ;case BEACON_QUEUE : - QueueSelect =QSLT_BEACON ; -break ; - -// TODO: 2006.10.30 mark other queue selection until we verify it is OK -// TODO: Remove Assertions -//#if (RTL819X_FPGA_VER & RTL819X_FPGA_GUANGAN_070502) -case TXCMD_QUEUE : - QueueSelect =QSLT_CMD ; -break ; -//#endif -case HIGH_QUEUE : - QueueSelect =QSLT_HIGH ; -break ; + QueueSelect =QSLT_BEACON ; +break ; -default : -RT_TRACE (COMP_ERR ,"TransmitTCB(): Impossible Queue Selection: %d \n" , QueueID); -break ; +/* TODO: 2006.10.30 mark other queue selection +* until we verify it is OK +*/ +/* TODO: Remove Assertions */ +/* #if (RTL819X_FPGA_VER & RTL819X_FPGA_GUANGAN_070502) */ +case TXCMD_QUEUE : + QueueSelect =QSLT_CMD ; +break ; +/* #endif */ +case HIGH_QUEUE : + QueueSelect =QSLT_HIGH ; +break ; +default : +RT_TRACE (COMP_ERR ,"TransmitTCB(): Impossible Queue Selection:" +" %d \n" , QueueID); +break ; }return QueueSelect; }
@@ -1926,7 +1956,7 @@ u8 MRateToHwRate8190Pci(u8 rate)case MGN_48M : ret =DESC90_RATE48M ;break ;case MGN_54M : ret =DESC90_RATE54M ;break ; -// HT rate since here +/* HT rate since here */ case MGN_MCS0 : ret =DESC90_RATEMCS0 ;break ;case MGN_MCS1 : ret =DESC90_RATEMCS1 ;break ;case MGN_MCS2 : ret =DESC90_RATEMCS2 ;break ;
@@ -1983,10 +2013,10 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb)int pend;int status;struct urb *tx_urb =NULL , *tx_urb_zero =NULL ; -//int urb_len; +/* int urb_len; */ unsigned int idx_pipe; -// RT_DEBUG_DATA(COMP_SEND, tcb_desc, sizeof(cb_desc)); -// printk("=============> %s\n", __func__); +/* RT_DEBUG_DATA(COMP_SEND, tcb_desc, sizeof(cb_desc)); */ +/* printk("=============> %s\n", __func__); */ pend =atomic_read (&priv->tx_pending[tcb_desc->queue_index]);/* we are locked here so the two atomic_read and inc are executed * without interleaves
@@ -2011,11 +2041,12 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb) tx_fwinfo->TxRate =MRateToHwRate8190Pci (tcb_desc->data_rate); tx_fwinfo->EnableCPUDur = tcb_desc->bTxEnableFwCalcDur; tx_fwinfo->Short =QueryIsShort (tx_fwinfo->TxHT, tx_fwinfo->TxRate, tcb_desc); -if (tcb_desc->bAMPDUEnable) {//AMPDU enabled +if (tcb_desc->bAMPDUEnable) {/* AMPDU enabled */ tx_fwinfo->AllowAggregation =1 ;/* DWORD 1 */ tx_fwinfo->RxMF = tcb_desc->ampdu_factor; - tx_fwinfo->RxAMD = tcb_desc->ampdu_density&0x07 ;//ampdudensity + tx_fwinfo->RxAMD = tcb_desc->ampdu_density&0x07 ; +/* ampdudensity */ }else { tx_fwinfo->AllowAggregation =0 ;/* DWORD 1 */
@@ -2039,7 +2070,8 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb) {if (tcb_desc->bPacketBW) { tx_fwinfo->TxBandwidth =1 ; - tx_fwinfo->TxSubCarrier =0 ;//By SD3's Jerry suggestion, use duplicated mode + tx_fwinfo->TxSubCarrier =0 ; +/* By SD3's Jerry suggestion, use duplicated mode */ }else { tx_fwinfo->TxBandwidth =0 ; tx_fwinfo->TxSubCarrier = priv->nCur40MhzPrimeSC;
@@ -2075,7 +2107,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb) tx_desc->SecCAMID=0 ; tx_desc->RATid = tcb_desc->RATRIndex; { -//MPDUOverhead = 0; +/* MPDUOverhead = 0; */ tx_desc->NoEnc =1 ; } tx_desc->SecType =0x0 ;
@@ -2110,7 +2142,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb) tx_desc->USERATE = tcb_desc->bTxUseDriverAssingedRate;/* Fill fields that are required to be initialized in all of the descriptors */ -//DWORD 0 +/* DWORD 0 */ tx_desc->FirstSeg =1 ; tx_desc->LastSeg =1 ; tx_desc->OWN =1 ;
@@ -2121,7 +2153,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb) } else#endif { -//DWORD 2 +/* DWORD 2 */ tx_desc->TxBufferSize = (u32)(skb->len -USB_HWDESC_HEADER_LEN ); }/* Get index to out pipe from specified QueueID */
@@ -2131,8 +2163,8 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb) idx_pipe =0x5 ;#endif -//RT_DEBUG_DATA(COMP_SEND,tx_fwinfo,sizeof(tx_fwinfo_819x_usb)); -//RT_DEBUG_DATA(COMP_SEND,tx_desc,sizeof(tx_desc_819x_usb)); +/* RT_DEBUG_DATA(COMP_SEND, tx_fwinfo, sizeof(tx_fwinfo_819x_usb)); */ +/* RT_DEBUG_DATA(COMP_SEND, tx_desc, sizeof(tx_desc_819x_usb)); */ /* To submit bulk urb */ usb_fill_bulk_urb(tx_urb,udev,
@@ -2141,7 +2173,10 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb) status =usb_submit_urb (tx_urb,GFP_ATOMIC );if (!status){ -//we need to send 0 byte packet whenever 512N bytes/64N(HIGN SPEED/NORMAL SPEED) bytes packet has been transmitted. Otherwise, it will be halt to wait for another packet. WB. 2008.08.27 +/* we need to send 0 byte packet whenever 512N bytes/64N +* (HIGN SPEED/NORMAL SPEED) bytes packet has been transmitted. +* Otherwise, it will be halt to wait for another packet. WB. 2008.08.27 +*/ bool bSend0Byte = false;u8 zero =0 ;if (udev->speed ==USB_SPEED_HIGH )
@@ -2311,22 +2346,25 @@ void rtl8192_usb_deleteendpoints(struct net_device *dev)extern void rtl8192_update_ratr_table (struct net_device * dev);void rtl8192_link_change (struct net_device *dev) { -// int i; +/* int i; */ struct r8192_priv *priv =ieee80211_priv (dev);struct ieee80211_device * ieee = priv->ieee80211; -//write_nic_word(dev, BCN_INTR_ITV, net->beacon_interval); +/* write_nic_word(dev, BCN_INTR_ITV, net->beacon_interval); */ if (ieee->state ==IEEE80211_LINKED ) {rtl8192_net_update (dev);rtl8192_update_ratr_table (dev); -//add this as in pure N mode, wep encryption will use software way, but there is no chance to set this as wep will not set group key in wext. WB.2008.07.08 +/* add this as in pure N mode, wep encryption will use software +* way, but there is no chance to set this as wep will not set +* group key in wext. WB.2008.07.08 +*/ if ((KEY_TYPE_WEP40 == ieee->pairwise_key_type) || (KEY_TYPE_WEP104 == ieee->pairwise_key_type))EnableHWSecurityConfig8192 (dev); }/*update timing params*/ -// RT_TRACE(COMP_CH, "========>%s(), chan:%d\n", __func__, priv->chan); -// rtl8192_set_chan(dev, priv->chan); +/* RT_TRACE(COMP_CH, "========>%s(), chan:%d\n", __func__, priv->chan); */ +/* rtl8192_set_chan(dev, priv->chan); */ if (ieee->iw_mode ==IW_MODE_INFRA || ieee->iw_mode ==IW_MODE_ADHOC ) {u32 reg =0 ;
@@ -2338,15 +2376,15 @@ void rtl8192_link_change(struct net_device *dev)write_nic_dword (dev,RCR , reg); } -// rtl8192_set_rxconf(dev); +/* rtl8192_set_rxconf(dev); */ }static struct ieee80211_qos_parameters def_qos_parameters = { - {3 ,3 ,3 ,3 },/* cw_min */ - {7 ,7 ,7 ,7 },/* cw_max */ - {2 ,2 ,2 ,2 },/* aifs */ - {0 ,0 ,0 ,0 },/* flags */ - {0 ,0 ,0 ,0 }/* tx_op_limit */ + {3 ,3 ,3 ,3 },/* cw_min */ + {7 ,7 ,7 ,7 },/* cw_max */ + {2 ,2 ,2 ,2 },/* aifs */ + {0 ,0 ,0 ,0 },/* flags */ + {0 ,0 ,0 ,0 }/* tx_op_limit */ };
@@ -2372,7 +2410,7 @@ void rtl8192_qos_activate(struct work_struct * work)struct net_device *dev = priv->ieee80211->dev;struct ieee80211_qos_parameters *qos_parameters = &priv->ieee80211->current_network.qos_data.parameters;u8 mode = priv->ieee80211->current_network.mode; -//u32 size = sizeof(struct ieee80211_qos_parameters); +/* u32 size = sizeof(struct ieee80211_qos_parameters); */ u8 u1bAIFS;u32 u4bAcParam;int i;
@@ -2388,7 +2426,7 @@ void rtl8192_qos_activate(struct work_struct * work)/* For we just support b/g mode at present, let the slot time at 9/20 selection */ /* update the ac parameter to related registers */ for (i =0 ; i <QOS_QUEUE_NUM ; i++) { -//Mode G/A: slotTimeTimer = 9; Mode B: 20 +/* Mode G/A: slotTimeTimer = 9; Mode B: 20 */ u1bAIFS = qos_parameters->aifs[i] * ((mode&(IEEE_G |IEEE_N_24G )) ?9 :20 ) + aSifsTime; u4bAcParam = ((((u32)(qos_parameters->tx_op_limit[i]))<< AC_PARAM_TXOP_LIMIT_OFFSET)| (((u32)(qos_parameters->cw_max[i]))<< AC_PARAM_ECW_MAX_OFFSET)|
@@ -2396,7 +2434,7 @@ void rtl8192_qos_activate(struct work_struct * work) ((u32)u1bAIFS << AC_PARAM_AIFS_OFFSET));write_nic_dword (dev,WDCAPARA_ADD [i], u4bAcParam); -//write_nic_dword(dev, WDCAPARA_ADD[i], 0x005e4332); +/* write_nic_dword(dev, WDCAPARA_ADD[i], 0x005e4332); */ } success:
@@ -2525,19 +2563,19 @@ static int rtl8192_handle_assoc_response(struct net_device *dev,void rtl8192_update_ratr_table (struct net_device * dev) -// POCTET_STRING posLegacyRate, -// u8* pMcsRate) -// PRT_WLAN_STA pEntry) +/* POCTET_STRING posLegacyRate, */ +/* u8* pMcsRate) */ +/* PRT_WLAN_STA pEntry) */ {struct r8192_priv * priv =ieee80211_priv (dev);struct ieee80211_device * ieee = priv->ieee80211;u8 * pMcsRate = ieee->dot11HTOperationalRateSet; -//struct ieee80211_network *net = &ieee->current_network; +/* struct ieee80211_network *net = &ieee->current_network; */ u32 ratr_value =0 ;u8 rate_index =0 ;rtl8192_config_rate (dev, (u16 *)(&ratr_value)); ratr_value |= (*(u16 *)(pMcsRate)) <<12 ; -// switch (net->mode) +/* switch (net->mode) */ switch (ieee->mode) {case IEEE_A :
@@ -2551,7 +2589,8 @@ void rtl8192_update_ratr_table(struct net_device* dev)break ;case IEEE_N_24G :case IEEE_N_5G : -if (ieee->pHTInfo->PeerMimoPs ==0 )//MIMO_PS_STATIC +if (ieee->pHTInfo->PeerMimoPs ==0 ) +/* MIMO_PS_STATIC */ ratr_value &=0x0007F007 ;else {if (priv->rf_type ==RF_1T2R )
@@ -2585,17 +2624,23 @@ bool GetNmodeSupportBySecCfg8192(struct net_device*dev)int encrypt; crypt = ieee->crypt[ieee->tx_keyidx]; -//we use connecting AP's capability instead of only security config on our driver to distinguish whether it should use N mode or G mode +/* we use connecting AP's capability instead of only security config +* on our driver to distinguish whether it should use N mode or G mode +*/ encrypt = (network->capability &WLAN_CAPABILITY_PRIVACY ) || (ieee->host_encrypt && crypt && crypt->ops && (0 ==strcmp (crypt->ops->name,"WEP" )));/* simply judge */ if (encrypt && (wpa_ie_len ==0 )) {/* wep encryption, no N mode setting */ return false; -// } else if((wpa_ie_len != 0)&&(memcmp(&(ieee->wpa_ie[14]),ccmp_ie,4))) { +/* } else if((wpa_ie_len != 0)&&(memcmp(&(ieee->wpa_ie[14]), +* ccmp_ie,4))) { +*/ }else if ((wpa_ie_len !=0 )) {/* parse pairwise key type */ -//if((pairwisekey = WEP40)||(pairwisekey = WEP104)||(pairwisekey = TKIP)) +/* if((pairwisekey = WEP40) || (pairwisekey = WEP104) || +* (pairwisekey = TKIP)) +*/ if (((ieee->wpa_ie[0 ] ==0xdd ) && (!memcmp (&(ieee->wpa_ie[14 ]),ccmp_ie,4 ))) || ((ieee->wpa_ie[0 ] ==0x30 ) && (!memcmp (&ieee->wpa_ie[10 ],ccmp_rsn_ie,4 ))))return true;else
@@ -2624,12 +2669,16 @@ bool GetHalfNmodeSupportByAPs819xUsb(struct net_device* dev)void rtl8192_refresh_supportrate (struct r8192_priv * priv) {struct ieee80211_device * ieee = priv->ieee80211; -//we donot consider set support rate for ABG mode, only HT MCS rate is set here. +/* we donot consider set support rate for ABG mode, +* only HT MCS rate is set here. +*/ if (ieee->mode ==WIRELESS_MODE_N_24G || ieee->mode ==WIRELESS_MODE_N_5G ) {memcpy (ieee->Regdot11HTOperationalRateSet, ieee->RegHTSuppRateSet,16 ); -//RT_DEBUG_DATA(COMP_INIT, ieee->RegHTSuppRateSet, 16); -//RT_DEBUG_DATA(COMP_INIT, ieee->Regdot11HTOperationalRateSet, 16); +/* RT_DEBUG_DATA(COMP_INIT, ieee->RegHTSuppRateSet, 16); */ +/* RT_DEBUG_DATA(COMP_INIT, +* ieee->Regdot11HTOperationalRateSet, 16); +*/ }else memset (ieee->Regdot11HTOperationalRateSet,0 ,16 );
@@ -2688,7 +2737,10 @@ void rtl8192_SetWirelessMode(struct net_device* dev, u8 wireless_mode) wireless_mode =WIRELESS_MODE_B ; } } -#ifdef TO_DO_LIST //// TODO: this function doesn't work well at this time, we should wait for FPGA +#ifdef TO_DO_LIST +/* TODO: this function doesn't work well at this time, +* we should wait for FPGA +*/ ActUpdateChannelAccessSetting ( pAdapter, pHalData->CurrentWirelessMode, &pAdapter->MgntInfo.Info8185.ChannelAccessSetting );#endif priv->ieee80211->mode = wireless_mode;
@@ -2701,44 +2753,47 @@ void rtl8192_SetWirelessMode(struct net_device* dev, u8 wireless_mode)rtl8192_refresh_supportrate (priv); } -//init priv variables here. only non_zero value should be initialized here. +/* init priv variables here. only non_zero value should be initialized here. */ static void rtl8192_init_priv_variable (struct net_device * dev) {struct r8192_priv *priv =ieee80211_priv (dev);u8 i; priv->card_8192 =NIC_8192U ; - priv->chan =1 ;//set to channel 1 - priv->ieee80211->mode =WIRELESS_MODE_AUTO ;//SET AUTO + priv->chan =1 ;/* set to channel 1 */ + priv->ieee80211->mode =WIRELESS_MODE_AUTO ;/* SET AUTO */ priv->ieee80211->iw_mode =IW_MODE_INFRA ; priv->ieee80211->ieee_up=0 ; priv->retry_rts =DEFAULT_RETRY_RTS ; priv->retry_data =DEFAULT_RETRY_DATA ; priv->ieee80211->rts =DEFAULT_RTS_THRESHOLD ; - priv->ieee80211->rate =110 ;//11 mbps + priv->ieee80211->rate =110 ;/* 11 mbps */ priv->ieee80211->short_slot =1 ; priv->promisc = (dev->flags &IFF_PROMISC ) ?1 :0 ; priv->CckPwEnl =6 ; -//for silent reset +/* for silent reset */ priv->IrpPendingCount =1 ; priv->ResetProgress =RESET_TYPE_NORESET ; priv->bForcedSilentReset =0 ; priv->bDisableNormalResetCheck = false; priv->force_reset = false; - priv->ieee80211->FwRWRF =0 ;//we don't use FW read/write RF until stable firmware is available. + priv->ieee80211->FwRWRF =0 ; +/* we don't use FW read/write RF until stable firmware is available. */ priv->ieee80211->current_network.beacon_interval =DEFAULT_BEACONINTERVAL ; priv->ieee80211->iw_mode =IW_MODE_INFRA ; priv->ieee80211->softmac_features =IEEE_SOFTMAC_SCAN |IEEE_SOFTMAC_ASSOCIATE |IEEE_SOFTMAC_PROBERQ |IEEE_SOFTMAC_PROBERS |IEEE_SOFTMAC_TX_QUEUE | -IEEE_SOFTMAC_BEACONS ;//added by amy 080604 //| //IEEE_SOFTMAC_SINGLE_QUEUE; - +IEEE_SOFTMAC_BEACONS ; +/* added by amy 080604 //| //IEEE_SOFTMAC_SINGLE_QUEUE; */ priv->ieee80211->active_scan =1 ; priv->ieee80211->modulation =IEEE80211_CCK_MODULATION |IEEE80211_OFDM_MODULATION ; priv->ieee80211->host_encrypt =1 ; priv->ieee80211->host_decrypt =1 ; - priv->ieee80211->start_send_beacons =NULL ;//rtl819xusb_beacon_tx;//-by amy 080604 - priv->ieee80211->stop_send_beacons =NULL ;//rtl8192_beacon_stop;//-by amy 080604 + priv->ieee80211->start_send_beacons =NULL ; +/* rtl819xusb_beacon_tx;//-by amy 080604 */ + priv->ieee80211->stop_send_beacons =NULL ; +/* rtl8192_beacon_stop;//-by amy 080604 */ priv->ieee80211->softmac_hard_start_xmit = rtl8192_hard_start_xmit; priv->ieee80211->set_chan = rtl8192_set_chan; priv->ieee80211->link_change = rtl8192_link_change;
@@ -2751,16 +2806,16 @@ static void rtl8192_init_priv_variable(struct net_device* dev) priv->ieee80211->tx_headroom =TX_PACKET_SHIFT_BYTES ; priv->ieee80211->qos_support =1 ; -//added by WB -// priv->ieee80211->SwChnlByTimerHandler = rtl8192_phy_SwChnl; +/* added by WB */ +/* priv->ieee80211->SwChnlByTimerHandler = rtl8192_phy_SwChnl; */ priv->ieee80211->SetBWModeHandler = rtl8192_SetBWMode; priv->ieee80211->handle_assoc_response = rtl8192_handle_assoc_response; priv->ieee80211->handle_beacon = rtl8192_handle_beacon; -//added by david +/* added by david */ priv->ieee80211->GetNmodeSupportBySecCfg = GetNmodeSupportBySecCfg8192; priv->ieee80211->GetHalfNmodeSupportByAPsHandler = GetHalfNmodeSupportByAPs819xUsb; priv->ieee80211->SetWirelessMode = rtl8192_SetWirelessMode; -//added by amy +/* added by amy */ priv->ieee80211->InitialGainHandler = InitialGain819xUsb; priv->card_type =USB ;#ifdef TO_DO_LIST
@@ -2777,33 +2832,61 @@ static void rtl8192_init_priv_variable(struct net_device* dev) priv->EarlyRxThreshold =7 ; priv->enable_gpio0 =0 ; priv->TransmitConfig = -// TCR_DurProcMode | //for RTL8185B, duration setting by HW -//? TCR_DISReqQsize | - (TCR_MXDMA_2048 <<TCR_MXDMA_OFFSET )|// Max DMA Burst Size per Tx DMA Burst, 7: reservied. - (priv->ShortRetryLimit<<TCR_SRL_OFFSET )|// Short retry limit - (priv->LongRetryLimit<<TCR_LRL_OFFSET ) |// Long retry limit - (false ?TCR_SAT :0 );// FALSE: HW provies PLCP length and LENGEXT, TURE: SW proiveds them +/* TCR_DurProcMode | */ +/* for RTL8185B, duration setting by HW */ +/* ? TCR_DISReqQsize | */ + (TCR_MXDMA_2048 <<TCR_MXDMA_OFFSET )| +/* Max DMA Burst Size per Tx DMA Burst, 7: reservied. */ + (priv->ShortRetryLimit<<TCR_SRL_OFFSET )| +/* Short retry limit */ + (priv->LongRetryLimit<<TCR_LRL_OFFSET ) | +/* Long retry limit */ + (false ?TCR_SAT :0 ); +/* FALSE: HW provies PLCP length and LENGEXT, TURE: +* SW proiveds them +*/ #ifdef TO_DO_LIST if (Adapter->bInHctTest) pHalData->ReceiveConfig = pHalData->CSMethod | -RCR_AMF |RCR_ADF |//RCR_AAP | //accept management/data -//guangan200710 -RCR_ACF |//accept control frame for SW AP needs PS-poll, 2005.07.07, by rcnjko. -RCR_AB |RCR_AM |RCR_APM |//accept BC/MC/UC -RCR_AICV |RCR_ACRC32 |//accept ICV/CRC error packet - ((u32 )7 <<RCR_MXDMA_OFFSET ) |// Max DMA Burst Size per Rx DMA Burst, 7: unlimited. - (pHalData->EarlyRxThreshold<<RCR_FIFO_OFFSET ) |// Rx FIFO Threshold, 7: No Rx threshold. +RCR_AMF |RCR_ADF | +/* RCR_AAP | */ +/* accept management/data */ +/* guangan200710 */ +RCR_ACF | +/* accept control frame for SW +* AP needs PS-poll, 2005.07.07 +*, by rcnjko. +*/ +RCR_AB |RCR_AM |RCR_APM | +/* accept BC/MC/UC */ +RCR_AICV |RCR_ACRC32 | +/* accept ICV/CRC error +* packet +*/ + ((u32 )7 <<RCR_MXDMA_OFFSET ) | +/* Max DMA Burst Size per Rx +* DMA Burst, 7: unlimited. +*/ + (pHalData->EarlyRxThreshold<<RCR_FIFO_OFFSET ) | +/* Rx FIFO Threshold, 7: +* No Rx threshold. +*/ (pHalData->EarlyRxThreshold ==7 ? RCR_OnlyErlPkt:0 ); else#endif priv->ReceiveConfig = -RCR_AMF |RCR_ADF |//accept management/data -RCR_ACF |//accept control frame for SW AP needs PS-poll, 2005.07.07, by rcnjko. -RCR_AB |RCR_AM |RCR_APM |//accept BC/MC/UC -//RCR_AICV | RCR_ACRC32 | //accept ICV/CRC error packet - ((u32 )7 <<RCR_MXDMA_OFFSET )|// Max DMA Burst Size per Rx DMA Burst, 7: unlimited. - (priv->EarlyRxThreshold<<RX_FIFO_THRESHOLD_SHIFT ) |// Rx FIFO Threshold, 7: No Rx threshold. +RCR_AMF |RCR_ADF |/* accept management/data */ +RCR_ACF | +/* accept control frame for SW AP needs PS-poll, +* 2005.07.07, by rcnjko. +*/ +RCR_AB |RCR_AM |RCR_APM |/* accept BC/MC/UC */ +/* RCR_AICV | RCR_ACRC32 | //accept ICV/CRC error packet */ + ((u32 )7 <<RCR_MXDMA_OFFSET )| +/* Max DMA Burst Size per Rx DMA Burst, 7: unlimited. */ + (priv->EarlyRxThreshold<<RX_FIFO_THRESHOLD_SHIFT ) | +/* Rx FIFO Threshold, 7: No Rx threshold. */ (priv->EarlyRxThreshold ==7 ?RCR_ONLYERLPKT :0 ); priv->AcmControl =0 ;
@@ -2828,12 +2911,12 @@ static void rtl8192_init_priv_variable(struct net_device* dev) priv->rf_set_chan = rtl8192_phy_SwChnl; } -//init lock here +/* init lock here */ static void rtl8192_init_priv_lock (struct r8192_priv * priv) {spin_lock_init (&priv->tx_lock); -spin_lock_init (&priv->irq_lock);//added by thomas -//spin_lock_init(&priv->rf_lock); +spin_lock_init (&priv->irq_lock);/* added by thomas */ +/* spin_lock_init(&priv->rf_lock); */ sema_init (&priv->wx_sem,1 );sema_init (&priv->rf_sem,1 );mutex_init (&priv->mutex);
@@ -2842,7 +2925,7 @@ static void rtl8192_init_priv_lock(struct r8192_priv* priv)extern void rtl819x_watchdog_wqcallback (struct work_struct *work);void rtl8192_irq_rx_tasklet (struct r8192_priv *priv); -//init tasklet and wait_queue here. only 2.6 above kernel is considered +/* init tasklet and wait_queue here. only 2.6 above kernel is considered */ #define DRV_NAME "wlan0"static void rtl8192_init_priv_task (struct net_device * dev) {
@@ -2856,15 +2939,17 @@ static void rtl8192_init_priv_task(struct net_device* dev)INIT_WORK (&priv->reset_wq, rtl8192_restart); -//INIT_DELAYED_WORK(&priv->watch_dog_wq, hal_dm_watchdog); +/* INIT_DELAYED_WORK(&priv->watch_dog_wq, hal_dm_watchdog); */ INIT_DELAYED_WORK (&priv->watch_dog_wq, rtl819x_watchdog_wqcallback); -INIT_DELAYED_WORK (&priv->txpower_tracking_wq, dm_txpower_trackingcallback); -// INIT_DELAYED_WORK(&priv->gpio_change_rf_wq, dm_gpio_change_rf_callback); +INIT_DELAYED_WORK (&priv->txpower_tracking_wq, dm_txpower_trackingcallback); +/* INIT_DELAYED_WORK(&priv->gpio_change_rf_wq, +* dm_gpio_change_rf_callback); +*/ INIT_DELAYED_WORK (&priv->rfpath_check_wq, dm_rf_pathcheck_workitemcallback);INIT_DELAYED_WORK (&priv->update_beacon_wq, rtl8192_update_beacon);INIT_DELAYED_WORK (&priv->initialgain_operate_wq, InitialGainOperateWorkItemCallBack); -//INIT_WORK(&priv->SwChnlWorkItem, rtl8192_SwChnl_WorkItem); -//INIT_WORK(&priv->SetBWModeWorkItem, rtl8192_SetBWModeWorkItem); +/* INIT_WORK(&priv->SwChnlWorkItem, rtl8192_SwChnl_WorkItem); */ +/* INIT_WORK(&priv->SetBWModeWorkItem, rtl8192_SetBWModeWorkItem); */ INIT_WORK (&priv->qos_activate, rtl8192_qos_activate); tasklet_init(&priv->irq_rx_tasklet,
@@ -2879,12 +2964,14 @@ static void rtl8192_get_eeprom_size(struct net_device* dev)RT_TRACE (COMP_EPROM ,"===========>%s()\n" , __func__); curCR =read_nic_word_E (dev,EPROM_CMD );RT_TRACE (COMP_EPROM ,"read from Reg EPROM_CMD(%x):%x\n" ,EPROM_CMD , curCR); -//whether need I consider BIT5? +/* whether need I consider BIT5? */ priv->epromtype = (curCR & Cmd9346CR_9356SEL) ? EPROM_93c56 : EPROM_93c46;RT_TRACE (COMP_EPROM ,"<===========%s(), epromtype:%d\n" , __func__, priv->epromtype); } -//used to swap endian. as ntohl & htonl are not neccessary to swap endian, so use this instead. +/* used to swap endian. as ntohl & htonl are not neccessary to swap endian, +* so use this instead. +*/ static inline u16 endian_swap (u16 * data) {u16 tmp = *data;
@@ -2899,7 +2986,7 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)struct r8192_priv *priv =ieee80211_priv (dev);u16 tmpValue =0 ;RT_TRACE (COMP_EPROM ,"===========>%s()\n" , __func__); - wEPROM_ID =eprom_read (dev,0 );//first read EEPROM ID out; + wEPROM_ID =eprom_read (dev,0 );/* first read EEPROM ID out; */ RT_TRACE (COMP_EPROM ,"EEPROM ID is 0x%x\n" , wEPROM_ID);if (wEPROM_ID !=RTL8190_EEPROM_ID )
@@ -2928,7 +3015,7 @@ static void rtl8192_read_eeprom_info(struct net_device* dev) priv->eeprom_CustomerID =0 ; }RT_TRACE (COMP_EPROM ,"vid:0x%4x, pid:0x%4x, CustomID:0x%2x, ChanPlan:0x%x\n" , priv->eeprom_vid, priv->eeprom_pid, priv->eeprom_CustomerID, priv->eeprom_ChannelPlan); -//set channelplan from eeprom +/* set channelplan from eeprom */ priv->ChannelPlan = priv->eeprom_ChannelPlan;if (bLoad_From_EEPOM) {
@@ -2943,35 +3030,35 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)else {memcpy (dev->dev_addr, bMac_Tmp_Addr,6 ); -//should I set IDR0 here? +/* should I set IDR0 here? */ }RT_TRACE (COMP_EPROM ,"MAC addr:%pM\n" , dev->dev_addr); - priv->rf_type =RTL819X_DEFAULT_RF_TYPE ;//default 1T2R + priv->rf_type =RTL819X_DEFAULT_RF_TYPE ;/* default 1T2R */ priv->rf_chip =RF_8256 ;if (priv->card_8192_version == (u8 )VERSION_819xU_A) { -//read Tx power gain offset of legacy OFDM to HT rate +/* read Tx power gain offset of legacy OFDM to HT rate */ if (bLoad_From_EEPOM) priv->EEPROMTxPowerDiff = (eprom_read (dev, (EEPROM_TxPowerDiff>>1 ))&0xff00 ) >>8 ;else priv->EEPROMTxPowerDiff = EEPROM_Default_TxPower;RT_TRACE (COMP_EPROM ,"TxPowerDiff:%d\n" , priv->EEPROMTxPowerDiff); -//read ThermalMeter from EEPROM +/* read ThermalMeter from EEPROM */ if (bLoad_From_EEPOM) priv->EEPROMThermalMeter = (u8)(eprom_read (dev, (EEPROM_ThermalMeter>>1 ))&0x00ff );else priv->EEPROMThermalMeter = EEPROM_Default_ThermalMeter;RT_TRACE (COMP_EPROM ,"ThermalMeter:%d\n" , priv->EEPROMThermalMeter); -//vivi, for tx power track +/* vivi, for tx power track */ priv->TSSI_13dBm = priv->EEPROMThermalMeter *100 ; -//read antenna tx power offset of B/C/D to A from EEPROM +/* read antenna tx power offset of B/C/D to A from EEPROM */ if (bLoad_From_EEPOM) priv->EEPROMPwDiff = (eprom_read (dev, (EEPROM_PwDiff>>1 ))&0x0f00 )>>8 ;else priv->EEPROMPwDiff = EEPROM_Default_PwDiff;RT_TRACE (COMP_EPROM ,"TxPwDiff:%d\n" , priv->EEPROMPwDiff); -// Read CrystalCap from EEPROM +/* Read CrystalCap from EEPROM */ if (bLoad_From_EEPOM) priv->EEPROMCrystalCap = (eprom_read (dev, (EEPROM_CrystalCap>>1 ))&0x0f );else
Signature · 1 line
1.6.3.3
PATCH 10/12 staging: rtl8192u: remove C99 comments to line 4500 in file rtl8192U_core.c Patch to continue removal of all C99 style comments in file rtl8192U_core.c Fixed up until line 4588
--- drivers/staging/rtl8192u/r8192U_core.c | 461 +++++++++++++++++--------------- 1 files changed, 248 insertions(+), 213 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +248 -213
@@ -3064,13 +3064,13 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)else priv->EEPROMCrystalCap = EEPROM_Default_CrystalCap;RT_TRACE (COMP_EPROM ,"CrystalCap = %d\n" , priv->EEPROMCrystalCap); -//get per-channel Tx power level +/* get per-channel Tx power level */ if (bLoad_From_EEPOM) priv->EEPROM_Def_Ver = (eprom_read (dev, (EEPROM_TxPwIndex_Ver>>1 ))&0xff00 )>>8 ;else priv->EEPROM_Def_Ver =1 ;RT_TRACE (COMP_EPROM ,"EEPROM_DEF_VER:%d\n" , priv->EEPROM_Def_Ver); -if (priv->EEPROM_Def_Ver ==0 )//old eeprom definition +if (priv->EEPROM_Def_Ver ==0 )/* old eeprom definition */ {int i;if (bLoad_From_EEPOM)
@@ -3093,7 +3093,7 @@ static void rtl8192_read_eeprom_info(struct net_device* dev) priv->EEPROMTxPowerLevelOFDM24G[i] = (u8 ) tmpValue;RT_TRACE (COMP_EPROM ,"OFDM 2.4G Tx Power Level, Index %d = 0x%02x\n" , i, priv->EEPROMTxPowerLevelCCK); } - }//end if EEPROM_DEF_VER == 0 + }/* end if EEPROM_DEF_VER == 0 */ else if (priv->EEPROM_Def_Ver ==1 ) {if (bLoad_From_EEPOM)
@@ -3120,29 +3120,24 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)else tmpValue =0x10 ; priv->EEPROMTxPowerLevelOFDM24G[2 ] = (u8 )tmpValue; - }//endif EEPROM_Def_Ver == 1 + }/* endif EEPROM_Def_Ver == 1 */ -//update HAL variables -// +/* update HAL variables */ {int i; -for (i=0 ; i<14 ; i++) - { -if (i<=3 ) +for (i =0 ; i <14 ; i++) { +if (i <=3 ) priv->TxPowerLevelOFDM24G[i] = priv->EEPROMTxPowerLevelOFDM24G[0 ]; -else if (i>=4 && i<=9 ) +else if (i >=4 && i <=9 ) priv->TxPowerLevelOFDM24G[i] = priv->EEPROMTxPowerLevelOFDM24G[1 ];else priv->TxPowerLevelOFDM24G[i] = priv->EEPROMTxPowerLevelOFDM24G[2 ]; } - -for (i=0 ; i<14 ; i++) - { -if (priv->EEPROM_Def_Ver ==0 ) - { -if (i<=3 ) +for (i =0 ; i <14 ; i++) { +if (priv->EEPROM_Def_Ver ==0 ) { +if (i <=3 ) priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelOFDM24G[0 ] + (priv->EEPROMTxPowerLevelCCK - priv->EEPROMTxPowerLevelOFDM24G[1 ]); -else if (i>=4 && i<=9 ) +else if (i >=4 && i <=9 ) priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelCCK;else priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelOFDM24G[2 ] + (priv->EEPROMTxPowerLevelCCK - priv->EEPROMTxPowerLevelOFDM24G[1 ]);
@@ -3157,20 +3152,20 @@ static void rtl8192_read_eeprom_info(struct net_device* dev) priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelCCK_V1[2 ]; } } - }//end update HAL variables + }/* end update HAL variables */ priv->TxPowerDiff = priv->EEPROMPwDiff; -// Antenna B gain offset to antenna A, bit0~3 +/* Antenna B gain offset to antenna A, bit0~3 */ priv->AntennaTxPwDiff[0 ] = (priv->EEPROMTxPowerDiff &0xf ); -// Antenna C gain offset to antenna A, bit4~7 +/* Antenna C gain offset to antenna A, bit4~7 */ priv->AntennaTxPwDiff[1 ] = ((priv->EEPROMTxPowerDiff &0xf0 )>>4 ); -// CrystalCap, bit12~15 +/* CrystalCap, bit12~15 */ priv->CrystalCap = priv->EEPROMCrystalCap; -// ThermalMeter, bit0~3 for RFIC1, bit4~7 for RFIC2 -// 92U does not enable TX power tracking. +/* ThermalMeter, bit0~3 for RFIC1, bit4~7 for RFIC2 */ +/* 92U does not enable TX power tracking. */ priv->ThermalMeter[0 ] = priv->EEPROMThermalMeter; - }//end if VersionID == VERSION_819xU_A + }/* end if VersionID == VERSION_819xU_A */ -//added by vivi, for dlink led, 20080416 +/* added by vivi, for dlink led, 20080416 */ switch (priv->eeprom_CustomerID) {case EEPROM_CID_RUNTOP :
@@ -3213,10 +3208,11 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)RT_TRACE (COMP_EPROM ,"\n2T4R config\n" ); } -// 2008/01/16 MH We can only know RF type in the function. So we have to init -// DIG RATR table again. +/* 2008/01/16 MH We can only know RF type in the function. +* So we have to init DIG RATR table again. +*/ init_rate_adaptive (dev); -//we need init DIG RATR table here again. +/* we need init DIG RATR table here again. */ RT_TRACE (COMP_EPROM ,"<===========%s()\n" , __func__);return ;
@@ -3235,14 +3231,14 @@ short rtl8192_get_channel_map(struct net_device * dev)rtl819x_set_channel_map (priv->ChannelPlan, priv);#else int ch,i; -//Set Default Channel Plan +/* Set Default Channel Plan */ if (!channels){DMESG ("No channels, aborting" );return -1 ; } ch=channels; - priv->ChannelPlan=0 ;//hikaru -// set channels 1..14 allowed in given locale + priv->ChannelPlan=0 ;/* hikaru */ +/* set channels 1..14 allowed in given locale */ for (i=1 ; i<=14 ; i++) { (priv->ieee80211->channel_map)[i] = (u8)(ch &0x01 ); ch >>=1 ;
@@ -3260,20 +3256,22 @@ short rtl8192_init(struct net_device *dev)memset (priv->txqueue_to_outpipemap,0 ,9 );#ifdef PIPE12 { -int i=0 ; -u8 queuetopipe[]={3 ,2 ,1 ,0 ,4 ,8 ,7 ,6 ,5 }; -memcpy (priv->txqueue_to_outpipemap,queuetopipe,9 ); -/* for(i=0;i<9;i++) -printk("%d ",priv->txqueue_to_outpipemap[i]); -printk("\n");*/ +int i =0 ; +u8 queuetopipe[]={3 ,2 ,1 ,0 ,4 ,8 ,7 ,6 ,5 }; +memcpy (priv->txqueue_to_outpipemap,queuetopipe,9 ); +/* for(i = 0; i < 9; i++) +* printk("%d ", priv->txqueue_to_outpipemap[i]); +*printk("\n"); +*/ }#else { -u8 queuetopipe[]={3 ,2 ,1 ,0 ,4 ,4 ,0 ,4 ,4 }; -memcpy (priv->txqueue_to_outpipemap,queuetopipe,9 ); -/* for(i=0;i<9;i++) -printk("%d ",priv->txqueue_to_outpipemap[i]); -printk("\n");*/ +u8 queuetopipe[]={3 ,2 ,1 ,0 ,4 ,4 ,0 ,4 ,4 }; +memcpy (priv->txqueue_to_outpipemap,queuetopipe,9 ); +/* for(i = 0; i < 9; i++) +* printk("%d ", priv->txqueue_to_outpipemap[i]); +*printk("\n"); +*/ }#endif rtl8192_init_priv_variable (dev);
@@ -3291,7 +3289,7 @@ short rtl8192_init(struct net_device *dev)return -ENOMEM ; } -//rtl8192_adapter_start(dev); +/* rtl8192_adapter_start(dev); */ #ifdef DEBUG_EPROM dump_eprom (dev);#endif
@@ -3312,8 +3310,7 @@ void rtl8192_hwconfig(struct net_device* dev)u8 regBwOpMode =0 , regTmp =0 ;struct r8192_priv *priv =ieee80211_priv (dev); -// Set RRSR, RATR, and BW_OPMODE registers -// +/* Set RRSR, RATR, and BW_OPMODE registers */ switch (priv->ieee80211->mode) {case WIRELESS_MODE_B :
@@ -3348,8 +3345,8 @@ void rtl8192_hwconfig(struct net_device* dev) }break ;case WIRELESS_MODE_N_24G : -// It support CCK rate by default. -// CCK rate will be filtered out only when associated AP does not support it. +/* It support CCK rate by default. */ +/* CCK rate will be filtered out only when associated AP does not support it. */ regBwOpMode =BW_OPMODE_20MHZ ; regRATR =RATE_ALL_CCK |RATE_ALL_OFDM_AG |RATE_ALL_OFDM_1SS |RATE_ALL_OFDM_2SS ; regRRSR =RATE_ALL_CCK |RATE_ALL_OFDM_AG ;
@@ -3376,25 +3373,17 @@ void rtl8192_hwconfig(struct net_device* dev) regRRSR = ((regTmp) <<24 ) | (regRRSR &0x00ffffff );write_nic_dword (dev,RRSR , regRRSR); -// -// Set Retry Limit here -// +/* Set Retry Limit here */ write_nic_word (dev,RETRY_LIMIT , priv->ShortRetryLimit <<RETRY_LIMIT_SHORT_SHIFT | \ priv->LongRetryLimit <<RETRY_LIMIT_LONG_SHIFT ); -// Set Contention Window here - -// Set Tx AGC - -// Set Tx Antenna including Feedback control - -// Set Auto Rate fallback control - - +/* Set Contention Window here */ +/* Set Tx AGC */ +/* Set Tx Antenna including Feedback control */ +/* Set Auto Rate fallback control */ } - -//InitializeAdapter and PhyCfg +/*InitializeAdapter and PhyCfg */ bool rtl8192_adapter_start (struct net_device *dev) {struct r8192_priv *priv =ieee80211_priv (dev);
@@ -3402,7 +3391,7 @@ bool rtl8192_adapter_start(struct net_device *dev)bool init_status = true;RT_TRACE (COMP_INIT ,"====>%s()\n" , __func__); priv->Rf_Mode = RF_OP_By_SW_3wire; -//for ASIC power on sequence +/* for ASIC power on sequence */ write_nic_byte_E (dev,0x5f ,0x80 );mdelay (50 );write_nic_byte_E (dev,0x5f ,0xf0 );
@@ -3410,26 +3399,26 @@ bool rtl8192_adapter_start(struct net_device *dev)write_nic_byte_E (dev,0x5e ,0x80 );write_nic_byte (dev,0x17 ,0x37 );mdelay (10 ); -//#ifdef TO_DO_LIST +/* #ifdef TO_DO_LIST */ priv->pFirmware->firmware_status =FW_STATUS_0_INIT ; -//config CPUReset Register -//Firmware Reset or not? +/* config CPUReset Register */ +/* Firmware Reset or not? */ dwRegRead =read_nic_dword (dev,CPU_GEN );if (priv->pFirmware->firmware_status ==FW_STATUS_0_INIT ) - dwRegRead |=CPU_GEN_SYSTEM_RESET ;//do nothing here? + dwRegRead |=CPU_GEN_SYSTEM_RESET ;/* do nothing here? */ else if (priv->pFirmware->firmware_status ==FW_STATUS_5_READY ) dwRegRead |=CPU_GEN_FIRMWARE_RESET ;else RT_TRACE (COMP_ERR ,"ERROR in %s(): undefined firmware state(%d)\n" , __func__, priv->pFirmware->firmware_status);write_nic_dword (dev,CPU_GEN , dwRegRead); -//mdelay(30); -//config BB. +/* mdelay(30); */ +/* config BB. */ rtl8192_BBConfig (dev); -//Loopback mode or not +/* Loopback mode or not */ priv->LoopbackMode = RTL819xU_NO_LOOPBACK; -// priv->LoopbackMode = RTL819xU_MAC_LOOPBACK; +/* priv->LoopbackMode = RTL819xU_MAC_LOOPBACK; */ dwRegRead =read_nic_dword (dev,CPU_GEN );if (priv->LoopbackMode == RTL819xU_NO_LOOPBACK)
@@ -3441,26 +3430,28 @@ bool rtl8192_adapter_start(struct net_device *dev)write_nic_dword (dev,CPU_GEN , dwRegRead); -//after reset cpu, we need wait for a seconds to write in register. +/* after reset cpu, we need wait for a seconds to write in register. */ udelay (500 ); -//xiong add for new bitfile:usb suspend reset pin set to 1. //do we need? +/* xiong add for new bitfile:usb suspend reset pin set to 1. +* do we need? +*/ write_nic_byte_E (dev,0x5f , (read_nic_byte_E (dev,0x5f )|0x20 )); -//Set Hardware +/* Set Hardware */ rtl8192_hwconfig (dev); -//turn on Tx/Rx +/* turn on Tx/Rx */ write_nic_byte (dev,CMDR ,CR_RE |CR_TE ); -//set IDR0 here +/* set IDR0 here */ write_nic_dword (dev,MAC0 , ((u32 *)dev->dev_addr)[0 ]);write_nic_word (dev,MAC4 , ((u16 *)(dev->dev_addr +4 ))[0 ]); -//set RCR +/* set RCR */ write_nic_dword (dev,RCR , priv->ReceiveConfig); -//Initialize Number of Reserved Pages in Firmware Queue +/* Initialize Number of Reserved Pages in Firmware Queue */ write_nic_dword(dev, RQPN1, NUM_OF_PAGE_IN_FW_QUEUE_BK << RSVD_FW_QUEUE_PAGE_BK_SHIFT |\ NUM_OF_PAGE_IN_FW_QUEUE_BE << RSVD_FW_QUEUE_PAGE_BE_SHIFT | \ NUM_OF_PAGE_IN_FW_QUEUE_VI << RSVD_FW_QUEUE_PAGE_VI_SHIFT | \
@@ -3469,15 +3460,22 @@ bool rtl8192_adapter_start(struct net_device *dev) NUM_OF_PAGE_IN_FW_QUEUE_CMD << RSVD_FW_QUEUE_PAGE_CMD_SHIFT);write_nic_dword (dev,RQPN3 ,APPLIED_RESERVED_QUEUE_IN_FW | \NUM_OF_PAGE_IN_FW_QUEUE_BCN <<RSVD_FW_QUEUE_PAGE_BCN_SHIFT -// | NUM_OF_PAGE_IN_FW_QUEUE_PUB<<RSVD_FW_QUEUE_PAGE_PUB_SHIFT +/* | NUM_OF_PAGE_IN_FW_QUEUE_ +*PUB<<RSVD_FW_QUEUE_PAGE_ +*PUB_SHIFT +*/ );write_nic_dword (dev,RATR0 +4 *7 , (RATE_ALL_OFDM_AG |RATE_ALL_CCK )); -//Set AckTimeout -// TODO: (it value is only for FPGA version). need to be changed!!2006.12.18, by Emily +/* Set AckTimeout */ +/* TODO: (it value is only for FPGA version). +* need to be changed!!2006.12.18, by Emily +*/ write_nic_byte (dev,ACK_TIMEOUT ,0x30 ); -// RT_TRACE(COMP_INIT, "%s():priv->ResetProgress is %d\n", __func__,priv->ResetProgress); +/* RT_TRACE(COMP_INIT, "%s():priv->ResetProgress is %d\n", __func__, +*priv->ResetProgress); +*/ if (priv->ResetProgress ==RESET_TYPE_NORESET )rtl8192_SetWirelessMode (dev, priv->ieee80211->mode);if (priv->ResetProgress ==RESET_TYPE_NORESET ){
@@ -3491,7 +3489,7 @@ bool rtl8192_adapter_start(struct net_device *dev) } } -//Beacon related +/* Beacon related */ write_nic_word (dev,ATIMWND ,2 );write_nic_word (dev,BCN_INTERVAL ,100 );
@@ -3502,7 +3500,7 @@ bool rtl8192_adapter_start(struct net_device *dev)write_nic_dword (dev,WDCAPARA_ADD [i],DEFAULT_EDCA ); }#ifdef USB_RX_AGGREGATION_SUPPORT -//3 For usb rx firmware aggregation control +/* 3 For usb rx firmware aggregation control */ if (priv->ResetProgress ==RESET_TYPE_NORESET ) {u32 ulValue;
@@ -3527,7 +3525,7 @@ bool rtl8192_adapter_start(struct net_device *dev)rtl8192_phy_setTxPower (dev, priv->chan); } -//Firmware download +/* Firmware download */ init_status =init_firmware (dev);if (!init_status) {
@@ -3535,20 +3533,22 @@ bool rtl8192_adapter_start(struct net_device *dev)return init_status; }RT_TRACE (COMP_INIT ,"%s():after firmware download\n" , __func__); -// +#ifdef TO_DO_LIST 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" ));MgntActSet_RF_State (Adapter, eRfOff,RF_CHANGE_BY_SW ); -// Those action will be discard in MgntActSet_RF_State because off the same state +/* Those action will be discard in MgntActSet_RF_State +* because off the same state +*/ for (eRFPath =0 ; eRFPath <pHalData->NumTotalRFPath; eRFPath++)PHY_SetRFReg (Adapter, (RF90_RADIO_PATH_E )eRFPath,0x4 ,0xC00 ,0x0 ); } -else if (pMgntInfo->RfOffReason >RF_CHANGE_BY_PS ) - {// H/W or S/W RF OFF before sleep. +else if (pMgntInfo->RfOffReason >RF_CHANGE_BY_PS ) { +/* H/W or S/W RF OFF before sleep. */ RT_TRACE ((COMP_INIT |COMP_RF ),DBG_LOUD , ("InitializeAdapter819xUsb(): Turn off RF for RfOffReason(%d) ----------\n" , pMgntInfo->RfOffReason));MgntActSet_RF_State (Adapter, eRfOff, pMgntInfo->RfOffReason); }
@@ -3564,13 +3564,15 @@ if(Adapter->ResetProgress == RESET_TYPE_NORESET)if (pHalData->eRFPowerState == eRfOff) {MgntActSet_RF_State (Adapter, eRfOff, pMgntInfo->RfOffReason); -// Those action will be discard in MgntActSet_RF_State because off the same state +/* Those action will be discard in MgntActSet_RF_State +* because off the same state +*/ for (eRFPath =0 ; eRFPath <pHalData->NumTotalRFPath; eRFPath++)PHY_SetRFReg (Adapter, (RF90_RADIO_PATH_E )eRFPath,0x4 ,0xC00 ,0x0 ); } }#endif -//config RF. +/* config RF. */ if (priv->ResetProgress ==RESET_TYPE_NORESET ){rtl8192_phy_RFConfig (dev);RT_TRACE (COMP_INIT ,"%s():after phy RF config\n" , __func__);
@@ -3578,20 +3580,20 @@ if(Adapter->ResetProgress == RESET_TYPE_NORESET)if (priv->ieee80211->FwRWRF) -// We can force firmware to do RF-R/W +/* We can force firmware to do RF-R/W */ priv->Rf_Mode = RF_OP_By_FW;else priv->Rf_Mode = RF_OP_By_SW_3wire;rtl8192_phy_updateInitGain (dev); -/*--set CCK and OFDM Block "ON"--*/ +/* --set CCK and OFDM Block "ON"-- */ rtl8192_setBBreg (dev, rFPGA0_RFMOD, bCCKEn,0x1 );rtl8192_setBBreg (dev, rFPGA0_RFMOD, bOFDMEn,0x1 );if (priv->ResetProgress ==RESET_TYPE_NORESET ) { -//if D or C cut +/* if D or C cut */ u8 tmpvalue =read_nic_byte (dev,0x301 );if (tmpvalue ==0x03 ) {
@@ -3609,7 +3611,9 @@ if(Adapter->ResetProgress == RESET_TYPE_NORESET) {u32 i, TempCCk;u32 tmpRegA=rtl8192_QueryBBReg (dev,rOFDM0_XATxIQImbalance,bMaskDWord); -// u32 tmpRegC= rtl8192_QueryBBReg(dev,rOFDM0_XCTxIQImbalance,bMaskDWord); +/* u32 tmpRegC= rtl8192_QueryBBReg(dev, +* rOFDM0_XCTxIQImbalance,bMaskDWord); +*/ for (i =0 ; i<TxBBGainTableLength; i++) {if (tmpRegA == priv->txbbgain_table[i].txbbgain_value)
@@ -3636,7 +3640,8 @@ if(Adapter->ResetProgress == RESET_TYPE_NORESET) priv->cck_present_attentuation_difference=0 ; priv->cck_present_attentuation = priv->cck_present_attentuation_20Mdefault; -// pMgntInfo->bTXPowerTracking = FALSE;//TEMPLY DISABLE +/* pMgntInfo->bTXPowerTracking = FALSE; */ +/* TEMPLY DISABLE */ } }write_nic_byte (dev,0x87 ,0x0 );
@@ -3650,8 +3655,9 @@ if(Adapter->ResetProgress == RESET_TYPE_NORESET)* be used to stop beacon transmission */ /*************************************************************************** --------------------------------NET STUFF--------------------------- -***************************************************************************/ +* -------------------------------NET STUFF--------------------------- +*************************************************************************** +*/ static struct net_device_stats *rtl8192_stats (struct net_device *dev) {
@@ -3686,18 +3692,16 @@ TxCheckStuck(struct net_device *dev) {struct r8192_priv *priv =ieee80211_priv (dev);u8 QueueID; -// PRT_TCB pTcb; -// u8 ResetThreshold; +/* PRT_TCB pTcb; */ +/* u8 ResetThreshold; */ bool bCheckFwTxCnt = false; -//unsigned long flags; +/* unsigned long flags; */ -// -// Decide Stuch threshold according to current power save mode -// +/* Decide Stuch threshold according to current power save mode */ -// RT_TRACE(COMP_RESET, " ==> TxCheckStuck()\n"); -// PlatformAcquireSpinLock(Adapter, RT_TX_SPINLOCK); -// spin_lock_irqsave(&priv->ieee80211->lock,flags); +/* RT_TRACE(COMP_RESET, " ==> TxCheckStuck()\n"); */ +/* PlatformAcquireSpinLock(Adapter, RT_TX_SPINLOCK); */ +/* spin_lock_irqsave(&priv->ieee80211->lock,flags); */ for (QueueID =0 ; QueueID<=BEACON_QUEUE ;QueueID ++) {if (QueueID ==TXCMD_QUEUE )
@@ -3711,9 +3715,9 @@ TxCheckStuck(struct net_device *dev) bCheckFwTxCnt = true; } -// PlatformReleaseSpinLock(Adapter, RT_TX_SPINLOCK); -// spin_unlock_irqrestore(&priv->ieee80211->lock,flags); -// RT_TRACE(COMP_RESET,"bCheckFwTxCnt is %d\n",bCheckFwTxCnt); +/* PlatformReleaseSpinLock(Adapter, RT_TX_SPINLOCK); */ +/* spin_unlock_irqrestore(&priv->ieee80211->lock,flags); */ +/* RT_TRACE(COMP_RESET,"bCheckFwTxCnt is %d\n",bCheckFwTxCnt); */ if (bCheckFwTxCnt) {if (HalTxCheckStuck819xUsb (dev))
@@ -3733,12 +3737,13 @@ HalRxCheckStuck819xUsb(struct net_device *dev)bool bStuck = FALSE;static u8 rx_chk_cnt =0 ;RT_TRACE (COMP_RESET ,"%s(): RegRxCounter is %d,RxCounter is %d\n" ,__func__,RegRxCounter,priv->RxCounter); -// If rssi is small, we should check rx for long time because of bad rx. -// or maybe it will continuous silent reset every 2 seconds. +/* If rssi is small, we should check rx for long time because of bad rx. +* or maybe it will continuous silent reset every 2 seconds. +*/ rx_chk_cnt++;if (priv->undecorated_smoothed_pwdb >= (RateAdaptiveTH_High+5 )) { - rx_chk_cnt =0 ;//high rssi, check rx stuck right now. + rx_chk_cnt =0 ;/* high rssi, check rx stuck right now. */ } else if(priv->undecorated_smoothed_pwdb < (RateAdaptiveTH_High+5) && ((priv->CurrentChannelBW!=HT_CHANNEL_WIDTH_20&&priv->undecorated_smoothed_pwdb>=RateAdaptiveTH_Low_40M) ||
@@ -3759,26 +3764,35 @@ HalRxCheckStuck819xUsb(struct net_device *dev) {if (rx_chk_cnt <4 ) { -//DbgPrint("RSSI < %d && RSSI >= %d, no check this time \n", RateAdaptiveTH_Low, VeryLowRSSI); +/* DbgPrint("RSSI < %d && RSSI >= %d," +* " no check this time \n", RateAdaptiveTH_Low, +* VeryLowRSSI); +*/ return bStuck; }else { rx_chk_cnt =0 ; -//DbgPrint("RSSI < %d && RSSI >= %d, check this time \n", RateAdaptiveTH_Low, VeryLowRSSI); +/* DbgPrint("RSSI < %d && RSSI >= %d, check this time" +* "\n", RateAdaptiveTH_Low, VeryLowRSSI); +*/ } } else {if (rx_chk_cnt <8 ) { -//DbgPrint("RSSI <= %d, no check this time \n", VeryLowRSSI); +/* DbgPrint("RSSI <= %d, no check this time \n", +* VeryLowRSSI); +*/ return bStuck; }else { rx_chk_cnt =0 ; -//DbgPrint("RSSI <= %d, check this time \n", VeryLowRSSI); +/* DbgPrint("RSSI <= %d, check this time \n", +* VeryLowRSSI); +*/ } }
@@ -3794,17 +3808,17 @@ RESET_TYPE RxCheckStuck(struct net_device *dev) {struct r8192_priv *priv =ieee80211_priv (dev); -//int i; +/* int i; */ bool bRxCheck = FALSE; -// RT_TRACE(COMP_RESET," ==> RxCheckStuck()\n"); -//PlatformAcquireSpinLock(Adapter, RT_RX_SPINLOCK); +/* RT_TRACE(COMP_RESET," ==> RxCheckStuck()\n"); */ +/* PlatformAcquireSpinLock(Adapter, RT_RX_SPINLOCK); */ if (priv->IrpPendingCount >1 ) bRxCheck = TRUE; -//PlatformReleaseSpinLock(Adapter, RT_RX_SPINLOCK); +/* PlatformReleaseSpinLock(Adapter, RT_RX_SPINLOCK); */ -// RT_TRACE(COMP_RESET,"bRxCheck is %d \n",bRxCheck); +/* RT_TRACE(COMP_RESET,"bRxCheck is %d \n",bRxCheck); */ if (bRxCheck) {if (HalRxCheckStuck819xUsb (dev))
@@ -3816,19 +3830,17 @@ RxCheckStuck(struct net_device *dev)return RESET_TYPE_NORESET ; } - -/** -* This function is called by Checkforhang to check whether we should ask OS to reset driver -* -* \param pAdapter The adapter context for this miniport -* -* Note:NIC with USB interface sholud not call this function because we cannot scan descriptor -* to judge whether there is tx stuck. -* Note: This function may be required to be rewrite for Vista OS. -* <<<Assumption: Tx spinlock has been acquired >>> -* -* 8185 and 8185b does not implement this function. This is added by Emily at 2006.11.24 -*/ +/* This function is called by Checkforhang to check whether we should ask OS to reset driver +* +* \param pAdapter The adapter context for this miniport +* +* Note:NIC with USB interface sholud not call this function because we cannot scan descriptor +* to judge whether there is tx stuck. +* Note: This function may be required to be rewrite for Vista OS. +* <<<Assumption: Tx spinlock has been acquired >>> +* +* 8185 and 8185b does not implement this function. This is added by Emily at 2006.11.24 +*/ RESET_TYPE rtl819x_ifcheck_resetornot (struct net_device *dev) {
@@ -3841,17 +3853,22 @@ rtl819x_ifcheck_resetornot(struct net_device *dev) TxResetType =TxCheckStuck (dev);if ( rfState != eRfOff || -/*ADAPTER_TEST_STATUS_FLAG(Adapter, ADAPTER_STATUS_FW_DOWNLOAD_FAILURE)) &&*/ +/* ADAPTER_TEST_STATUS_FLAG(Adapter, ADAPTER_STATUS_FW_DOWNLOAD_FAILURE)) && */ (priv->ieee80211->iw_mode !=IW_MODE_ADHOC )) { -// If driver is in the status of firmware download failure , driver skips RF initialization and RF is -// in turned off state. Driver should check whether Rx stuck and do silent reset. And -// if driver is in firmware download failure status, driver should initialize RF in the following -// silent reset procedure Emily, 2008.01.21 - -// Driver should not check RX stuck in IBSS mode because it is required to -// set Check BSSID in order to send beacon, however, if check BSSID is -// set, STA cannot hear any packet a all. Emily, 2008.04.12 +/* If driver is in the status of firmware download failure, +* driver skips RF initialization and RF is in turned off state +*. Driver should check whether Rx stuck and do silent reset. +* And if driver is in firmware download failure status, driver +* should initialize RF in the following silent reset procedure +* Emily, 2008.01.21 +* +* Driver should not check RX stuck in IBSS mode because it is +* required to set Check BSSID in order to send beacon, +* however, if check BSSID is set, STA cannot hear any packet +* at all. +* Emily, 2008.04.12 +*/ RxResetType =RxCheckStuck (dev); }if (TxResetType==RESET_TYPE_NORMAL || RxResetType==RESET_TYPE_NORMAL )
@@ -4005,24 +4022,24 @@ CamRestoreAllEntry( struct net_device *dev) NULL); } } -////////////////////////////////////////////////////////////// -// This function is used to fix Tx/Rx stop bug temporarily. -// This function will do "system reset" to NIC when Tx or Rx is stuck. -// The method checking Tx/Rx stuck of this function is supported by FW, -// which reports Tx and Rx counter to register 0x128 and 0x130. -////////////////////////////////////////////////////////////// + +/* This function is used to fix Tx/Rx stop bug temporarily. +* This function will do "system reset" to NIC when Tx or Rx is stuck. +* The method checking Tx/Rx stuck of this function is supported by FW, +* which reports Tx and Rx counter to register 0x128 and 0x130. +*/ void rtl819x_ifsilentreset (struct net_device *dev) { -//OCTET_STRING asocpdu; +/* OCTET_STRING asocpdu; */ struct r8192_priv *priv =ieee80211_priv (dev);u8 reset_times =0 ;int reset_status =0 ;struct ieee80211_device *ieee = priv->ieee80211; -// 2007.07.20. If we need to check CCK stop, please uncomment this line. -//bStuck = Adapter->HalFunc.CheckHWStopHandler(Adapter); +/* 2007.07.20. If we need to check CCK stop, uncomment this line. */ +/* bStuck = Adapter->HalFunc.CheckHWStopHandler(Adapter); */ if (priv->ResetProgress==RESET_TYPE_NORESET ) {
@@ -4030,9 +4047,9 @@ RESET_START:RT_TRACE (COMP_RESET ,"=========>Reset progress!! \n" ); -// Set the variable for reset. +/* Set the variable for reset. */ priv->ResetProgress =RESET_TYPE_SILENT ; -// rtl8192_close(dev); +/* rtl8192_close(dev); */ down (&priv->wx_sem);if (priv->up ==0 ) {
@@ -4042,8 +4059,9 @@ RESET_START: } priv->up =0 ;RT_TRACE (COMP_RESET ,"%s():======>start to down the driver\n" ,__func__); -// if(!netif_queue_stopped(dev)) -// netif_stop_queue(dev); +/* if(!netif_queue_stopped(dev)) +* netif_stop_queue(dev); +*/ rtl8192_rtx_disable (dev);rtl8192_cancel_deferred_work (priv);
@@ -4067,7 +4085,7 @@ RESET_START:ieee80211_softmac_stop_protocol (priv->ieee80211); }up (&priv->wx_sem);RT_TRACE (COMP_RESET ,"%s():<==========down process is finished\n" ,__func__); -//rtl8192_irq_disable(dev); +/* rtl8192_irq_disable(dev); */ RT_TRACE (COMP_RESET ,"%s():===========>start to up the driver\n" ,__func__); reset_status =_rtl8192_up (dev);
@@ -4098,7 +4116,7 @@ RESET_START: ieee->set_chan (ieee->dev, ieee->current_network.channel); ieee->link_change (ieee->dev); -// notify_wx_assoc_event(ieee); +/* notify_wx_assoc_event(ieee); */ ieee80211_start_send_beacons (ieee);
@@ -4115,7 +4133,7 @@ RESET_START: priv->bForcedSilentReset =false; priv->bResetInProgress = false; -// For test --> force write UFWP. +/* For test --> force write UFWP. */ write_nic_byte (dev,UFWP ,1 );RT_TRACE (COMP_RESET ,"Reset finished!! ====>[%d]\n" , priv->reset_count); }
@@ -4131,17 +4149,16 @@ void CAM_read_entry(u8 entry_i=0 ;u32 ulStatus;s32 i=100 ; -// printk("=======>start read CAM\n"); +/* printk("=======>start read CAM\n"); */ for (entry_i=0 ;entry_i<CAM_CONTENT_COUNT ;entry_i++) { -// polling bit, and No Write enable, and address - target_command= entry_i+CAM_CONTENT_COUNT *iIndex; +/* polling bit, and No Write enable, and address */ + target_command= entry_i +CAM_CONTENT_COUNT * iIndex; target_command= target_command |BIT31 ; -//Check polling bit is clear -// mdelay(1); -while ((i--)>=0 ) - { +/* Check polling bit is clear */ +/* mdelay(1); */ +while ((i--) >=0 ) { ulStatus =read_nic_dword (dev,RWCAM );if (ulStatus &BIT31 ){continue ;
@@ -4152,10 +4169,10 @@ void CAM_read_entry( }write_nic_dword (dev,RWCAM , target_command);RT_TRACE (COMP_SEC ,"CAM_read_entry(): WRITE A0: %x \n" ,target_command); -// printk("CAM_read_entry(): WRITE A0: %lx \n",target_command); +/* printk("CAM_read_entry(): WRITE A0: %lx \n",target_command); */ target_content =read_nic_dword (dev,RCAMO );RT_TRACE (COMP_SEC ,"CAM_read_entry(): WRITE A8: %x \n" ,target_content); -// printk("CAM_read_entry(): WRITE A8: %lx \n",target_content); +/* printk("CAM_read_entry(): WRITE A8: %lx \n",target_content); */ }printk ("\n" ); }
@@ -4196,9 +4213,8 @@ extern void rtl819x_watchdog_wqcallback(struct work_struct *work)return ;hal_dm_watchdog (dev); - {//to get busy traffic condition -if (ieee->state ==IEEE80211_LINKED ) - { +/* to get busy traffic condition */ + {if (ieee->state ==IEEE80211_LINKED ) {if ( ieee->LinkDetectInfo.NumRxOkInPeriod>666 || ieee->LinkDetectInfo.NumTxOkInPeriod>666 ) { bBusyTraffic = true;
@@ -4208,7 +4224,7 @@ extern void rtl819x_watchdog_wqcallback(struct work_struct *work) ieee->LinkDetectInfo.bBusyTraffic = bBusyTraffic; } } -//added by amy for AP roaming +/* added by amy for AP roaming */ {if (priv->ieee80211->state ==IEEE80211_LINKED && priv->ieee80211->iw_mode ==IW_MODE_INFRA ) {
@@ -4223,7 +4239,7 @@ extern void rtl819x_watchdog_wqcallback(struct work_struct *work)RT_TRACE (COMP_ERR ,"========>%s()\n" ,__func__);#endif printk ("===>%s(): AP is power off,connect another one\n" ,__func__); -// Dot11d_Reset(dev); +/* Dot11d_Reset(dev); */ priv->ieee80211->state =IEEE80211_ASSOCIATING ;notify_wx_assoc_event (priv->ieee80211);RemovePeerTS (priv->ieee80211,priv->ieee80211->current_network.bssid);
@@ -4235,18 +4251,24 @@ extern void rtl819x_watchdog_wqcallback(struct work_struct *work) priv->ieee80211->LinkDetectInfo.NumRecvBcnInPeriod=0 ; priv->ieee80211->LinkDetectInfo.NumRecvDataInPeriod=0 ; } -// CAM_read_entry(dev,4); -//check if reset the driver +/* CAM_read_entry(dev,4); */ +/* check if reset the driver */ if (check_reset_cnt++ >=3 ) { ResetType =rtl819x_ifcheck_resetornot (dev); check_reset_cnt =3 ; -//DbgPrint("Start to check silent reset\n"); +/* DbgPrint("Start to check silent reset\n"); */ } -// RT_TRACE(COMP_RESET,"%s():priv->force_reset is %d,priv->ResetProgress is %d, priv->bForcedSilentReset is %d,priv->bDisableNormalResetCheck is %d,ResetType is %d\n",__func__,priv->force_reset,priv->ResetProgress,priv->bForcedSilentReset,priv->bDisableNormalResetCheck,ResetType); +/* RT_TRACE(COMP_RESET,"%s():priv->force_reset is %d," +* "priv->ResetProgress is %d, priv->bForcedSilentReset is %d," +* "priv->bDisableNormalResetCheck is %d,ResetType is %d\n", __func__, +* priv->force_reset, priv->ResetProgress, priv->bForcedSilentReset, +* priv->bDisableNormalResetCheck,ResetType); +*/ if ( (priv->force_reset) || (priv->ResetProgress==RESET_TYPE_NORESET && (priv->bForcedSilentReset || - (!priv->bDisableNormalResetCheck && ResetType==RESET_TYPE_SILENT ))))// This is control by OID set in Pomelo + (!priv->bDisableNormalResetCheck && ResetType==RESET_TYPE_SILENT )))) +/* This is control by OID set in Pomelo */ {RT_TRACE (COMP_RESET ,"%s():priv->force_reset is %d,priv->ResetProgress is %d, priv->bForcedSilentReset is %d,priv->bDisableNormalResetCheck is %d,ResetType is %d\n" ,__func__,priv->force_reset,priv->ResetProgress,priv->bForcedSilentReset,priv->bDisableNormalResetCheck,ResetType);rtl819x_ifsilentreset (dev);
@@ -4261,14 +4283,14 @@ extern void rtl819x_watchdog_wqcallback(struct work_struct *work)void watch_dog_timer_callback (unsigned long data) {struct r8192_priv *priv =ieee80211_priv ((struct net_device *) data); -//printk("===============>watch_dog timer\n"); +/* printk("===============>watch_dog timer\n"); */ queue_delayed_work (priv->priv_wq,&priv->watch_dog_wq,0 );mod_timer (&priv->watch_dog_timer, jiffies +MSECS (IEEE80211_WATCH_DOG_TIME )); }int _rtl8192_up (struct net_device *dev) {struct r8192_priv *priv =ieee80211_priv (dev); -//int i; +/* int i; */ int init_status =0 ; priv->up=1 ; priv->ieee80211->ieee_up=1 ;
@@ -4282,7 +4304,7 @@ int _rtl8192_up(struct net_device *dev) }RT_TRACE (COMP_INIT ,"start adapter finished\n" );rtl8192_rx_enable (dev); -// rtl8192_tx_enable(dev); +/* rtl8192_tx_enable(dev); */ if (priv->ieee80211->state !=IEEE80211_LINKED )ieee80211_softmac_start_protocol (priv->ieee80211);ieee80211_reset_queue (priv->ieee80211);
@@ -4343,14 +4365,14 @@ int rtl8192_down(struct net_device *dev) priv->up=0 ; priv->ieee80211->ieee_up =0 ;RT_TRACE (COMP_DOWN ,"==========>%s()\n" , __func__); -/* FIXME */ +/* FIXME */ if (!netif_queue_stopped (dev))netif_stop_queue (dev);rtl8192_rtx_disable (dev); -//rtl8192_irq_disable(dev); +/* rtl8192_irq_disable(dev); */ -/* Tx related queue release */ +/* Tx related queue release */ for (i =0 ; i <MAX_QUEUE_SIZE ; i++) {skb_queue_purge (&priv->ieee80211->skb_waitQ [i]); }
@@ -4362,8 +4384,10 @@ int rtl8192_down(struct net_device *dev)skb_queue_purge (&priv->ieee80211->skb_drv_aggQ [i]); } -//as cancel_delayed_work will del work->timer, so if work is not definedas struct delayed_work, it will corrupt -// flush_scheduled_work(); +/* as cancel_delayed_work will del work->timer, so if work is not +* defined as struct delayed_work, it will corrupt +*/ +/* flush_scheduled_work(); evvl */ rtl8192_cancel_deferred_work (priv);deinit_hal_dm (dev);del_timer_sync (&priv->watch_dog_timer);
@@ -4381,27 +4405,26 @@ void rtl8192_commit(struct net_device *dev) {struct r8192_priv *priv =ieee80211_priv (dev);int reset_status =0 ; -//u8 reset_times = 0; +/* u8 reset_times = 0; */ if (priv->up ==0 )return ; priv->up =0 ;rtl8192_cancel_deferred_work (priv);del_timer_sync (&priv->watch_dog_timer); -//cancel_delayed_work(&priv->SwChnlWorkItem); +/* cancel_delayed_work(&priv->SwChnlWorkItem); */ ieee80211_softmac_stop_protocol (priv->ieee80211); -//rtl8192_irq_disable(dev); +/* rtl8192_irq_disable(dev); */ rtl8192_rtx_disable (dev); reset_status =_rtl8192_up (dev); } -/* -void rtl8192_restart(struct net_device *dev) -{ -struct r8192_priv *priv = ieee80211_priv(dev); -*/ +/* void rtl8192_restart(struct net_device *dev) +* { +* struct r8192_priv *priv = ieee80211_priv(dev); +*/ void rtl8192_restart (struct work_struct *work) { struct r8192_priv *priv = container_of(work, struct r8192_priv, reset_wq);
@@ -4419,19 +4442,19 @@ static void r8192_set_multicast(struct net_device *dev)struct r8192_priv *priv =ieee80211_priv (dev);short promisc; -//down(&priv->wx_sem); +/* down(&priv->wx_sem); */ /* FIXME FIXME */ promisc = (dev->flags &IFF_PROMISC ) ?1 :0 ;if (promisc != priv->promisc) -// rtl8192_commit(dev); +/* rtl8192_commit(dev); */ priv->promisc = promisc; -//schedule_work(&priv->reset_wq); -//up(&priv->wx_sem); +/* schedule_work(&priv->reset_wq); */ +/* up(&priv->wx_sem); */ }
@@ -4460,7 +4483,8 @@ int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)u32 key[4 ];u8 broadcast_addr[6 ] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff };struct iw_point *p = &wrq->u.data; -struct ieee_param *ipw =NULL ;//(struct ieee_param *)wrq->u.data.pointer; +struct ieee_param *ipw =NULL ; +/* (struct ieee_param *)wrq->u.data.pointer; */ down (&priv->wx_sem);
@@ -4483,7 +4507,7 @@ int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)switch (cmd) {case RTL_IOCTL_WPA_SUPPLICANT : -//parse here for HW security +/* parse here for HW security */ if (ipw->cmd ==IEEE_CMD_SET_ENCRYPTION ) {if (ipw->u.crypt.set_tx)
@@ -4506,15 +4530,21 @@ int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {memcpy ((u8 *)key, ipw->u.crypt.key,16 );EnableHWSecurityConfig8192 (dev); -//we fill both index entry and 4th entry for pairwise key as in IPW interface, adhoc will only get here, so we need index entry for its default key serching! -//added by WB. +/* we fill both index entry and 4th +* entry for pairwise key as in IPW +* interface, adhoc will only get here, +* so we need index entry for its +* default key serching! +*/ +/* added by WB. */ setKey (dev,4 , ipw->u.crypt.idx, ieee->pairwise_key_type, (u8 *)ieee->ap_mac_addr,0 , key);if (ieee->auth_mode !=2 )setKey (dev, ipw->u.crypt.idx, ipw->u.crypt.idx, ieee->pairwise_key_type, (u8 *)ieee->ap_mac_addr,0 , key); } } -else //if (ipw->u.crypt.idx) //group key use idx > 0 - { +else { +/* if (ipw->u.crypt.idx) */ +/* group key use idx > 0 */ memcpy ((u8 *)key, ipw->u.crypt.key,16 );if (strcmp (ipw->u.crypt.alg,"CCMP" ) ==0 ) ieee->group_key_type=KEY_TYPE_CCMP ;
@@ -4534,23 +4564,28 @@ int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {setKey ( dev, ipw->u.crypt.idx, - ipw->u.crypt.idx,//KeyIndex - ieee->group_key_type,//KeyType - broadcast_addr,//MacAddr -0 ,//DefaultKey - key);//KeyContent + ipw->u.crypt.idx, +/* KeyIndex */ + ieee->group_key_type, +/* KeyType */ + broadcast_addr, +/* MacAddr */ +0 , +/* DefaultKey */ + key); +/* KeyContent */ } } }#ifdef JOHN_HWSEC_DEBUG -//john's test 0711 +/* john's test 0711 */ printk ("@@ wrq->u pointer = " );for (i=0 ;i<wrq->u.data.length;i++){if (i%10 ==0 )printk ("\n" );printk ("%8x|" , ((u32 *)wrq->u.data.pointer)[i] ); }printk ("\n" ); -#endif /*JOHN_HWSEC_DEBUG*/ +#endif /* JOHN_HWSEC_DEBUG */ ret =ieee80211_wpa_supplicant_ioctl (priv->ieee80211, &wrq->u.data);break ;
Signature · 1 line
1.6.3.3
PATCH 11/12 staging: rtl8192u: remove C99 comments in file r8192U_core.c Patch to remove C99 style comments from file r8192U_core.c Completed until line 5072
--- drivers/staging/rtl8192u/r8192U_core.c | 116 +++++++++++++++++-------------- 1 files changed, 64 insertions(+), 52 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +64 -52
@@ -4683,13 +4683,13 @@ void UpdateRxPktTimeStamp8190 (struct net_device *dev, struct ieee80211_rx_stats } } -//by amy 080606 +/* by amy 080606 */ -long rtl819x_translate_todbm (u8 signal_strength_index )// 0-100 index. +long rtl819x_translate_todbm (u8 signal_strength_index )/* 0-100 index. */ {long signal_power;// in dBm. -// Translate to dBm (x=0.5y-95). +/* Translate to dBm (x=0.5y-95). */ signal_power = (long )((signal_strength_index +1 ) >>1 ); signal_power -=95 ;
@@ -4698,15 +4698,16 @@ long rtl819x_translate_todbm(u8 signal_strength_index )// 0-100 index./* 2008/01/22 MH We can not delcare RSSI/EVM total value of sliding window to -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 delcare the value in adapter -and it will be reinitialized when return from S3/S4. */ +* 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 delcare the value in adapter +* and it will be reinitialized when return 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) {bool bcheck = false;u8 rfpath;u32 nspatial_stream, tmp_val; -//u8 i; +/* u8 i; */ static u32 slide_rssi_index=0 , slide_rssi_statistics=0 ;static u32 slide_evm_index=0 , slide_evm_statistics=0 ;static u32 last_rssi=0 , last_evm=0 ;
@@ -4721,14 +4722,14 @@ void rtl8192_process_phyinfo(struct r8192_priv * priv,u8* buffer, struct ieee802 sc =le16_to_cpu (hdr->seq_ctl); frag =WLAN_GET_SEQ_FRAG (sc); seq =WLAN_GET_SEQ_SEQ (sc); -//cosa add 04292008 to record the sequence number +/* cosa add 04292008 to record the sequence number */ pcurrent_stats->Seq_Num = seq; -// -// Check whether we should take the previous packet into accounting -// + +/* Check whether we should take the previous packet into accounting */ +if (!pprevious_stats->bIsAMPDU) { -// if previous packet is not aggregated packet +/* if previous packet is not aggregated packet */ bcheck = true; }else {
@@ -4747,13 +4748,13 @@ void rtl8192_process_phyinfo(struct r8192_priv * priv,u8* buffer, struct ieee802if (slide_rssi_index >=PHY_RSSI_SLID_WIN_MAX ) slide_rssi_index =0 ; -// <1> Showed on UI for user, in dbm +/* <1> Showed on UI for user, in dbm */ tmp_val = priv->stats.slide_rssi_total/slide_rssi_statistics; priv->stats.signal_strength =rtl819x_translate_todbm ((u8 )tmp_val); pcurrent_stats->rssi = priv->stats.signal_strength; -// -// If the previous packet does not match the criteria, neglect it -// + +/* If the previous packet does not match the criteria, neglect it */ +if (!pprevious_stats->bPacketMatchBSSID) {if (!pprevious_stats->bToSelfBA)
@@ -4764,18 +4765,21 @@ void rtl8192_process_phyinfo(struct r8192_priv * priv,u8* buffer, struct ieee802return ; -//rtl8190_process_cck_rxpathsel(priv,pprevious_stats);//only rtl8190 supported +/* rtl8190_process_cck_rxpathsel(priv,pprevious_stats); */ +/* only rtl8190 supported */ + + +/* Check RSSI */ -// -// Check RSSI -// priv->stats.num_process_phyinfo++;/* record the general signal strength to the sliding window. */ -// <2> Showed on UI for engineering -// hardware does not provide rssi information for each rf path in CCK +/* <2> Showed on UI for engineering */ +/* hardware does not provide rssi information for each rf path +* in CCK +*/ if (!pprevious_stats->bIsCCK && (pprevious_stats->bPacketToSelf || pprevious_stats->bToSelfBA)) {for (rfpath =RF90_PATH_A ; rfpath < priv->NumTotalRFPath; rfpath++)
@@ -4783,11 +4787,11 @@ void rtl8192_process_phyinfo(struct r8192_priv * priv,u8* buffer, struct ieee802if (!rtl8192_phy_CheckIsLegalRFPath (priv->ieee80211->dev, rfpath))continue ; -//Fixed by Jacken 2008-03-20 +/* Fixed by Jacken 2008-03-20 */ if (priv->stats.rx_rssi_percentage[rfpath] ==0 ) { priv->stats.rx_rssi_percentage[rfpath] = pprevious_stats->RxMIMOSignalStrength[rfpath]; -//DbgPrint("MIMO RSSI initialize \n"); +/* DbgPrint("MIMO RSSI initialize \n"); */ }if (pprevious_stats->RxMIMOSignalStrength[rfpath] > priv->stats.rx_rssi_percentage[rfpath]) {
@@ -4806,28 +4810,34 @@ void rtl8192_process_phyinfo(struct r8192_priv * priv,u8* buffer, struct ieee802 } } +/* Check PWDB. */ -// -// Check PWDB. -// RT_TRACE (COMP_RXDESC ,"Smooth %s PWDB = %d\n" , pprevious_stats->bIsCCK?"CCK" :"OFDM" , pprevious_stats->RxPWDBAll);if (pprevious_stats->bPacketBeacon) { -/* record the beacon pwdb to the sliding window. */ +/* record the beacon pwdb to the sliding window. */ if (slide_beacon_adc_pwdb_statistics++ >= PHY_Beacon_RSSI_SLID_WIN_MAX) { slide_beacon_adc_pwdb_statistics = PHY_Beacon_RSSI_SLID_WIN_MAX; last_beacon_adc_pwdb = priv->stats.Slide_Beacon_pwdb[slide_beacon_adc_pwdb_index]; priv->stats.Slide_Beacon_Total -= last_beacon_adc_pwdb; -//DbgPrint("slide_beacon_adc_pwdb_index = %d, last_beacon_adc_pwdb = %d, Adapter->RxStats.Slide_Beacon_Total = %d\n", -// slide_beacon_adc_pwdb_index, last_beacon_adc_pwdb, Adapter->RxStats.Slide_Beacon_Total); +/* DbgPrint("slide_beacon_adc_pwdb_index = %d, " +* "last_beacon_adc_pwdb = %d, Adapter->" +* "RxStats.Slide_Beacon_Total = %d\n", +* slide_beacon_adc_pwdb_index, +* last_beacon_adc_pwdb, Adapter-> +* RxStats.Slide_Beacon_Total); +*/ } priv->stats.Slide_Beacon_Total += pprevious_stats->RxPWDBAll; priv->stats.Slide_Beacon_pwdb[slide_beacon_adc_pwdb_index] = pprevious_stats->RxPWDBAll; -//DbgPrint("slide_beacon_adc_pwdb_index = %d, pPreviousRfd->Status.RxPWDBAll = %d\n", slide_beacon_adc_pwdb_index, pPreviousRfd->Status.RxPWDBAll); +/* DbgPrint("slide_beacon_adc_pwdb_index = %d, pPreviousRfd->" +* "Status.RxPWDBAll = %d\n", slide_beacon_adc_pwdb_index, +* pPreviousRfd->Status.RxPWDBAll); +*/ slide_beacon_adc_pwdb_index++;if (slide_beacon_adc_pwdb_index >= PHY_Beacon_RSSI_SLID_WIN_MAX) slide_beacon_adc_pwdb_index =0 ;
@@ -4843,10 +4853,10 @@ void rtl8192_process_phyinfo(struct r8192_priv * priv,u8* buffer, struct ieee802if (pprevious_stats->bPacketToSelf || pprevious_stats->bPacketBeacon || pprevious_stats->bToSelfBA) { -if (priv->undecorated_smoothed_pwdb <0 )// initialize +if (priv->undecorated_smoothed_pwdb <0 )/* initialize */ { priv->undecorated_smoothed_pwdb = pprevious_stats->RxPWDBAll; -//DbgPrint("First pwdb initialize \n"); +/* DbgPrint("First pwdb initialize \n"); */ }if (pprevious_stats->RxPWDBAll > (u32 )priv->undecorated_smoothed_pwdb) {
@@ -4864,9 +4874,8 @@ void rtl8192_process_phyinfo(struct r8192_priv * priv,u8* buffer, struct ieee802 } -// -// Check EVM -// + +/* Check EVM */ /* record the general EVM to the sliding window. */ if (pprevious_stats->SignalQuality ==0 ) {
@@ -4886,21 +4895,23 @@ void rtl8192_process_phyinfo(struct r8192_priv * priv,u8* buffer, struct ieee802if (slide_evm_index >=PHY_RSSI_SLID_WIN_MAX ) slide_evm_index =0 ; -// <1> Showed on UI for user, in percentage. +/* <1> Showed on UI for user, in percentage. */ tmp_val = priv->stats.slide_evm_total/slide_evm_statistics; priv->stats.signal_quality = tmp_val; -//cosa add 10/11/2007, Showed on UI for user in Windows Vista, for Link quality. +/* cosa add 10/11/2007, Showed on UI for user in Windows Vista, for Link quality. */ priv->stats.last_signal_strength_inpercent = tmp_val; } -// <2> Showed on UI for engineering +/* <2> Showed on UI for engineering */ if (pprevious_stats->bPacketToSelf || pprevious_stats->bPacketBeacon || pprevious_stats->bToSelfBA) { -for (nspatial_stream =0 ; nspatial_stream<2 ; nspatial_stream++)// 2 spatial stream +for (nspatial_stream =0 ; nspatial_stream<2 ; nspatial_stream++) +/* 2 spatial stream */ {if (pprevious_stats->RxMIMOSignalQuality[nspatial_stream] !=-1 ) { -if (priv->stats.rx_evm_percentage[nspatial_stream] ==0 )// initialize +if (priv->stats.rx_evm_percentage[nspatial_stream] ==0 ) +/* initialize */ { priv->stats.rx_evm_percentage[nspatial_stream] = pprevious_stats->RxMIMOSignalQuality[nspatial_stream]; }
@@ -4969,11 +4980,11 @@ rtl819x_evm_dbtopercentage( ret_val =100 ;return (ret_val); } -// -// Description: -// We want good-looking for signal strength/quality -// 2007/7/19 01:09, by cosa. -// + +/* Description: +*We want good-looking for signal strength/quality +*2007/7/19 01:09, by cosa. +*/ long rtl819x_signal_scale_mapping ( long currsig
@@ -4981,7 +4992,7 @@ rtl819x_signal_scale_mapping( {long retsig; -// Step 1. Scale mapping. +/* Step 1. Scale mapping. */ if (currsig >=61 && currsig <=100 ) { retsig =90 + ((currsig -60 ) /4 );
@@ -5037,18 +5048,19 @@ static void rtl8192_query_rxphystatus(bool bToSelfBA ) { -//PRT_RFD_STATUS pRtRfdStatus = &(pRfd->Status); +/* PRT_RFD_STATUS pRtRfdStatus = &(pRfd->Status); */ phy_sts_ofdm_819xusb_t * pofdm_buf;phy_sts_cck_819xusb_t * pcck_buf;phy_ofdm_rx_status_rxsc_sgien_exintfflag * prxsc;u8 *prxpkt;u8 i, max_spatial_stream, tmp_rxsnr, tmp_rxevm, rxsc_sgien_exflg;char rx_pwr[4 ], rx_pwr_all=0 ; -//long rx_avg_pwr = 0; +/* long rx_avg_pwr = 0; */ char rx_snrX, rx_evmX;u8 evm, pwdb_all; -u32 RSSI , total_rssi=0 ;//, total_evm=0; -// long signal_strength_index = 0; +u32 RSSI , total_rssi=0 ; +/* , total_evm=0; */ +/* long signal_strength_index = 0; */ u8 is_cck_rate=0 ;u8 rf_rx_num =0 ;
@@ -5057,7 +5069,7 @@ static void rtl8192_query_rxphystatus( is_cck_rate =rx_hal_is_cck_rate (pdrvinfo); -// Record it for next packet processing +/* Record it for next packet processing */ memset (precord_stats,0 ,sizeof (struct ieee80211_rx_stats )); pstats->bPacketMatchBSSID = precord_stats->bPacketMatchBSSID = bpacket_match_bssid; pstats->bPacketToSelf = precord_stats->bPacketToSelf = bpacket_toself;
Signature · 1 line
1.6.3.3
PATCH 12/12 staging: rtl8192u: remove all C99 style comments from file r8192U_core This patch removes all C99 comments from file rtl8192U_core.c
--- drivers/staging/rtl8192u/r8192U_core.c | 395 +++++++++++++++++--------------- 1 files changed, 214 insertions(+), 181 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +214 -181
@@ -80,7 +80,7 @@ double __extendsfdf2(float a) {return a; }#ifdef ENABLE_DOT11D #include "dot11d.h" #endif -/* set here to open your trace code. //WB */ +/* set here to open your trace code. WB */ u32 rt_global_debug_component =/*COMP_INIT | *COMP_DBG |
@@ -196,7 +196,7 @@ static CHANNEL_LIST ChannelPlan[] = { 56, 60, 64}, 22}, /* MIC */ {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}, 14} /* For Global Domain. 1-11:active scan, 12-14 passive scan. - * //+YJ, 080626 + * +YJ, 080626 */ };
@@ -2785,15 +2785,15 @@ static void rtl8192_init_priv_variable(struct net_device* dev)IEEE_SOFTMAC_ASSOCIATE |IEEE_SOFTMAC_PROBERQ |IEEE_SOFTMAC_PROBERS |IEEE_SOFTMAC_TX_QUEUE |IEEE_SOFTMAC_BEACONS ; -/* added by amy 080604 //| //IEEE_SOFTMAC_SINGLE_QUEUE; */ +/* added by amy 080604 | IEEE_SOFTMAC_SINGLE_QUEUE; */ priv->ieee80211->active_scan =1 ; priv->ieee80211->modulation =IEEE80211_CCK_MODULATION |IEEE80211_OFDM_MODULATION ; priv->ieee80211->host_encrypt =1 ; priv->ieee80211->host_decrypt =1 ; priv->ieee80211->start_send_beacons =NULL ; -/* rtl819xusb_beacon_tx;//-by amy 080604 */ +/* rtl819xusb_beacon_tx; -by amy 080604 */ priv->ieee80211->stop_send_beacons =NULL ; -/* rtl8192_beacon_stop;//-by amy 080604 */ +/* rtl8192_beacon_stop; -by amy 080604 */ priv->ieee80211->softmac_hard_start_xmit = rtl8192_hard_start_xmit; priv->ieee80211->set_chan = rtl8192_set_chan; priv->ieee80211->link_change = rtl8192_link_change;
@@ -2882,7 +2882,7 @@ static void rtl8192_init_priv_variable(struct net_device* dev)* 2005.07.07, by rcnjko. */ RCR_AB |RCR_AM |RCR_APM |/* accept BC/MC/UC */ -/* RCR_AICV | RCR_ACRC32 | //accept ICV/CRC error packet */ +/* RCR_AICV | RCR_ACRC32 | accept ICV/CRC error packet */ ((u32 )7 <<RCR_MXDMA_OFFSET )|/* Max DMA Burst Size per Rx DMA Burst, 7: unlimited. */ (priv->EarlyRxThreshold<<RX_FIFO_THRESHOLD_SHIFT) |
@@ -4387,7 +4387,7 @@ int rtl8192_down(struct net_device *dev)/* as cancel_delayed_work will del work->timer, so if work is not * defined as struct delayed_work, it will corrupt */ -/* flush_scheduled_work(); evvl */ +/* flush_scheduled_work(); */ rtl8192_cancel_deferred_work (priv);deinit_hal_dm (dev);del_timer_sync (&priv->watch_dog_timer);
@@ -4687,7 +4687,7 @@ void UpdateRxPktTimeStamp8190 (struct net_device *dev, struct ieee80211_rx_statslong rtl819x_translate_todbm (u8 signal_strength_index )/* 0-100 index. */ { -long signal_power;// in dBm. +long signal_power;/* in dBm. */ /* Translate to dBm (x=0.5y-95). */ signal_power = (long )((signal_strength_index +1 ) >>1 );
@@ -5073,7 +5073,8 @@ static void rtl8192_query_rxphystatus(memset (precord_stats,0 ,sizeof (struct ieee80211_rx_stats )); pstats->bPacketMatchBSSID = precord_stats->bPacketMatchBSSID = bpacket_match_bssid; pstats->bPacketToSelf = precord_stats->bPacketToSelf = bpacket_toself; - pstats->bIsCCK = precord_stats->bIsCCK = is_cck_rate;//RX_HAL_IS_CCK_RATE(pDrvInfo); + pstats->bIsCCK = precord_stats->bIsCCK = is_cck_rate; +/* RX_HAL_IS_CCK_RATE(pDrvInfo); */ pstats->bPacketBeacon = precord_stats->bPacketBeacon = bPacketBeacon; pstats->bToSelfBA = precord_stats->bToSelfBA = bToSelfBA;
@@ -5093,14 +5094,11 @@ static void rtl8192_query_rxphystatus(if (is_cck_rate) { -// -// (1)Hardware does not provide RSSI for CCK -// +/* (1)Hardware does not provide RSSI for CCK */ -// -// (2)PWDB, Average PWDB cacluated by hardware (for rate adaptive) -// -u8 report;//, cck_agc_rpt; +/* (2)PWDB, Average PWDB cacluated by hardware (for rate adaptive) */ + +u8 report;/* , cck_agc_rpt; */ priv->stats.numqry_phystatusCCK++;
@@ -5110,9 +5108,10 @@ static void rtl8192_query_rxphystatus( report = report>>6 ;switch (report) { -//Fixed by Jacken from Bryant 2008-03-20 -//Original value is -38 , -26 , -14 , -2 -//Fixed value is -35 , -23 , -11 , 6 +/* Fixed by Jacken from Bryant 2008-03-20 +* Original value is -38 , -26 , -14 , -2 +* Fixed value is -35 , -23 , -11 , 6 +*/ case 0x3 : rx_pwr_all =-35 - (pcck_buf->cck_agc_rpt &0x3e );break ;
@@ -5152,10 +5151,9 @@ static void rtl8192_query_rxphystatus( pstats->RxPWDBAll = precord_stats->RxPWDBAll = pwdb_all; pstats->RecvSignalPower = pwdb_all; -// -// (3) Get Signal Quality (EVM) -// -//if(bpacket_match_bssid) +/* (3) Get Signal Quality (EVM) */ + +/* if(bpacket_match_bssid) */ {u8 sq;
@@ -5181,12 +5179,12 @@ static void rtl8192_query_rxphystatus(else { priv->stats.numqry_phystatusHT++; -// -// (1)Get RSSI for HT rate -// + +/* (1)Get RSSI for HT rate */ +for (i=RF90_PATH_A ; i<priv->NumTotalRFPath; i++) { -// 2008/01/30 MH we will judge RF RX path now. +/* 2008/01/30 MH we will judge RF RX path now. */ if (priv->brfpath_rxenable[i]) rf_rx_num++;else
@@ -5195,14 +5193,14 @@ static void rtl8192_query_rxphystatus(if (!rtl8192_phy_CheckIsLegalRFPath (priv->ieee80211->dev, i))continue ; -//Fixed by Jacken from Bryant 2008-03-20 -//Original value is 106 +/* Fixed by Jacken from Bryant 2008-03-20 */ +/* Original value is 106 */ rx_pwr[i] = ((pofdm_buf->trsw_gain_X[i]&0x3F )*2 ) -106 ; -//Get Rx snr value in DB +/* Get Rx snr value in DB */ tmp_rxsnr = pofdm_buf->rxsnr_X[i]; rx_snrX = (char )(tmp_rxsnr); -//rx_snrX >>= 1;; +/* rx_snrX >>= 1;; */ rx_snrX /=2 ; priv->stats.rxSNRdB[i] = (long )rx_snrX;
@@ -5211,48 +5209,52 @@ static void rtl8192_query_rxphystatus( total_rssi +=RSSI ;/* Record Signal Strength for next packet */ -//if(bpacket_match_bssid) +/* if(bpacket_match_bssid) */ { pstats->RxMIMOSignalStrength[i] =(u8 )RSSI ; precord_stats->RxMIMOSignalStrength[i] =(u8 )RSSI ; } } +/* (2)PWDB, Average PWDB cacluated by hardware (for rate adaptive) */ -// -// (2)PWDB, Average PWDB cacluated by hardware (for rate adaptive) -// -//Fixed by Jacken from Bryant 2008-03-20 -//Original value is 106 +/* Fixed by Jacken from Bryant 2008-03-20 */ +/* Original value is 106 */ rx_pwr_all = (((pofdm_buf->pwdb_all ) >>1 )&0x7f ) -106 ; pwdb_all =rtl819x_query_rxpwrpercentage (rx_pwr_all); pstats->RxPWDBAll = precord_stats->RxPWDBAll = pwdb_all; pstats->RxPower = precord_stats->RxPower = rx_pwr_all; -// -// (3)EVM of HT rate -// +/* (3)EVM of HT rate */ +if (pdrvinfo->RxHT && pdrvinfo->RxRate>=DESC90_RATEMCS8 && pdrvinfo->RxRate<=DESC90_RATEMCS15 ) - max_spatial_stream =2 ;//both spatial stream make sense + max_spatial_stream =2 ; +/* both spatial stream make sense */ else - max_spatial_stream =1 ;//only spatial stream 1 makes sense + max_spatial_stream =1 ; +/* only spatial stream 1 makes sense */ -for (i=0 ; i<max_spatial_stream; i++) - { +for (i =0 ; i < max_spatial_stream; i++) { tmp_rxevm = pofdm_buf->rxevm_X[i]; rx_evmX = (char )(tmp_rxevm); -// Do not use shift operation like "rx_evmX >>= 1" because the compilor of free build environment -// fill 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. - rx_evmX /=2 ;//dbm +/* Do not use shift operation like "rx_evmX >>= 1" +* because the compilor of free build environment fill +* 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. +*/ + rx_evmX /=2 ;/* dbm */ evm =rtl819x_evm_dbtopercentage (rx_evmX); -//if(bpacket_match_bssid) +/* if(bpacket_match_bssid) */ { -if (i==0 )// Fill value in RFD, Get the first spatial stream only +if (i==0 ) +/* Fill value in RFD, +* Get the first spatial stream only */ pstats->SignalQuality = precord_stats->SignalQuality = (u8)(evm &0xff ); pstats->RxMIMOSignalQuality[i] = precord_stats->RxMIMOSignalQuality[i] = (u8)(evm &0xff ); }
@@ -5262,23 +5264,30 @@ static void rtl8192_query_rxphystatus(/* record rx statistics for debug */ rxsc_sgien_exflg = pofdm_buf->rxsc_sgien_exflg; prxsc = (phy_ofdm_rx_status_rxsc_sgien_exintfflag *)&rxsc_sgien_exflg; -if (pdrvinfo->BW)//40M channel +if (pdrvinfo->BW)/* 40M channel */ priv->stats.received_bwtype[1 +prxsc->rxsc]++; -else //20M channel +else /* 20M channel */ priv->stats.received_bwtype[0 ]++; } -//UI BSS List signal strength(in percentage), make it good looking, from 0~100. -//It is assigned to the BSS List in GetValueFromBeaconOrProbeRsp(). +/* UI BSS List signal strength(in percentage), make it good looking, +* from 0~100. It is assigned to the BSS List in +* GetValueFromBeaconOrProbeRsp(). +*/ if (is_cck_rate) { - pstats->SignalStrength = precord_stats->SignalStrength = (u8)(rtl819x_signal_scale_mapping ((long )pwdb_all));//PWDB_ALL; + pstats->SignalStrength = precord_stats->SignalStrength = (u8)(rtl819x_signal_scale_mapping ((long )pwdb_all)); +/* PWDB_ALL; */ }else { -//pRfd->Status.SignalStrength = pRecordRfd->Status.SignalStrength = (u8)(SignalScaleMapping(total_rssi/=RF90_PATH_MAX));//(u8)(total_rssi/=RF90_PATH_MAX); -// We can judge RX path number now. +/* pRfd->Status.SignalStrength = +* pRecordRfd->Status.SignalStrength = +* (u8)(SignalScaleMapping(total_rssi/=RF90_PATH_MAX)); +*(u8)(total_rssi/=RF90_PATH_MAX); +* We can judge RX path number now. +*/ if (rf_rx_num !=0 ) pstats->SignalStrength = precord_stats->SignalStrength = (u8)(rtl819x_signal_scale_mapping ((long )(total_rssi/=rf_rx_num))); }
@@ -5300,24 +5309,26 @@ void TranslateRxSignalStuff819xUsb(struct sk_buff *skb,struct ieee80211_rx_stats * pstats, rx_drvinfo_819x_usb *pdrvinfo) { -// TODO: We must only check packet for current MAC address. Not finish +/* TODO: We must only check packet for current MAC address. +* Not finish */ rtl8192_rx_info *info = (struct rtl8192_rx_info *)skb->cb;struct net_device *dev=info->dev;struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv (dev);bool bpacket_match_bssid, bpacket_toself;bool bPacketBeacon=FALSE, bToSelfBA=FALSE;static struct ieee80211_rx_stats previous_stats; -struct ieee80211_hdr_3addr *hdr;//by amy -u16 fc,type; +struct ieee80211_hdr_3addr *hdr;/* by amy */ +u16 fc,type; -// Get Signal Quality for only RX data queue (but not command queue) +/* Get Signal Quality for only RX data queue (but not command queue) */ u8 * tmp_buf; -//u16 tmp_buf_len = 0; +/* u16 tmp_buf_len = 0; */ u8 *praddr;/* Get MAC frame start address. */ - tmp_buf = (u8 *)skb->data;// + get_rxpacket_shiftbytes_819xusb(pstats); + tmp_buf = (u8 *)skb->data; +/* + get_rxpacket_shiftbytes_819xusb(pstats); */ hdr = (struct ieee80211_hdr_3addr *)tmp_buf; fc =le16_to_cpu (hdr->frame_ctl);
@@ -5333,29 +5344,29 @@ void TranslateRxSignalStuff819xUsb(struct sk_buff *skb,if (WLAN_FC_GET_FRAMETYPE (fc)==IEEE80211_STYPE_BEACON ) { bPacketBeacon = true; -//DbgPrint("Beacon 2, MatchBSSID = %d, ToSelf = %d \n", bPacketMatchBSSID, bPacketToSelf); +/* DbgPrint("Beacon 2, MatchBSSID = %d, ToSelf = %d \n" +* , bPacketMatchBSSID, bPacketToSelf); */ }if (WLAN_FC_GET_FRAMETYPE (fc) ==IEEE80211_STYPE_BLOCKACK ) {if ((eqMacAddr (praddr,dev->dev_addr))) bToSelfBA = true; -//DbgPrint("BlockAck, MatchBSSID = %d, ToSelf = %d \n", bPacketMatchBSSID, bPacketToSelf); +/* DbgPrint("BlockAck, MatchBSSID = %d, +* ToSelf = %d \n", bPacketMatchBSSID, +* bPacketToSelf); +*/ } - -if (bpacket_match_bssid) - { priv->stats.numpacket_matchbssid++; - }if (bpacket_toself){ priv->stats.numpacket_toself++; } -// -// Process PHY information for previous packet (RSSI/PWDB/EVM) -// -// Because phy information is contained in the last packet of AMPDU only, so driver -// should process phy information of previous packet + +/* Process PHY information for previous packet (RSSI/PWDB/EVM) +* Because phy information is contained in the last packet of AMPDU +* only, so driver should process phy information of previous packet +*/ rtl8192_process_phyinfo (priv, tmp_buf, &previous_stats, pstats);rtl8192_query_rxphystatus (priv, pstats, pdrvinfo, &previous_stats, bpacket_match_bssid,bpacket_toself,bPacketBeacon,bToSelfBA);rtl8192_record_rxdesc_forlateruse (pstats, &previous_stats);
@@ -5383,9 +5394,10 @@ UpdateReceivedRateHistogramStatistics8190( ) {struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv (dev); -u32 rcvType=1 ;//0: Total, 1:OK, 2:CRC, 3:ICV +u32 rcvType=1 ;/* 0: Total, 1:OK, 2:CRC, 3:ICV */ u32 rateIndex; -u32 preamble_guardinterval;//1: short preamble/GI, 0: long preamble/GI +u32 preamble_guardinterval; +/* 1: short preamble/GI, 0: long preamble/GI */ if (stats->bCRC)
@@ -5394,22 +5406,18 @@ UpdateReceivedRateHistogramStatistics8190( rcvType =3 ;if (stats->bShortPreamble) - preamble_guardinterval =1 ;// short + preamble_guardinterval =1 ;/* short */ else - preamble_guardinterval =0 ;// long + preamble_guardinterval =0 ;/* long */ switch (stats->rate) { -// -// CCK rate -// +/* CCK rate */ case MGN_1M : rateIndex =0 ;break ;case MGN_2M : rateIndex =1 ;break ;case MGN_5_5M : rateIndex =2 ;break ;case MGN_11M : rateIndex =3 ;break ; -// -// Legacy OFDM rate -// +/* Legacy OFDM rate */ case MGN_6M : rateIndex =4 ;break ;case MGN_9M : rateIndex =5 ;break ;case MGN_12M : rateIndex =6 ;break ;
@@ -5418,9 +5426,7 @@ UpdateReceivedRateHistogramStatistics8190(case MGN_36M : rateIndex =9 ;break ;case MGN_48M : rateIndex =10 ;break ;case MGN_54M : rateIndex =11 ;break ; -// -// 11n High throughput rate -// +/* 11n High throughput rate */ case MGN_MCS0 : rateIndex =12 ;break ;case MGN_MCS1 : rateIndex =13 ;break ;case MGN_MCS2 : rateIndex =14 ;break ;
@@ -5440,7 +5446,7 @@ UpdateReceivedRateHistogramStatistics8190(default : rateIndex =28 ;break ; } priv->stats.received_preamble_GI[preamble_guardinterval][rateIndex]++; - priv->stats.received_rate_histogram[0 ][rateIndex]++;//total + priv->stats.received_rate_histogram[0 ][rateIndex]++;/* total */ priv->stats.received_rate_histogram[rcvType][rateIndex]++; }
@@ -5450,23 +5456,27 @@ void query_rxdesc_status(struct sk_buff *skb, struct ieee80211_rx_stats *stats,rtl8192_rx_info *info = (struct rtl8192_rx_info *)skb->cb;struct net_device *dev=info->dev;struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv (dev); -//rx_desc_819x_usb *desc = (rx_desc_819x_usb *)skb->data; +/* rx_desc_819x_usb *desc = (rx_desc_819x_usb *)skb->data; */ rx_drvinfo_819x_usb *driver_info =NULL ; -// -//Get Rx Descriptor Information -// +/* Get Rx Descriptor Information */ #ifdef USB_RX_AGGREGATION_SUPPORT if (bIsRxAggrSubframe) {rx_desc_819x_usb_aggr_subframe *desc = (rx_desc_819x_usb_aggr_subframe *)skb->data; stats->Length = desc->Length ; stats->RxDrvInfoSize = desc->RxDrvInfoSize; - stats->RxBufShift =0 ;//RxBufShift = 2 in RxDesc, but usb didn't shift bytes in fact. + stats->RxBufShift =0 ; +/* RxBufShift = 2 in RxDesc, +* but usb didn't shift bytes in fact. +*/ stats->bICV = desc->ICV; stats->bCRC = desc->CRC32; stats->bHwError = stats->bCRC|stats->bICV; - stats->Decrypted = !desc->SWDec;//RTL8190 set this bit to indicate that Hw does not decrypt packet + stats->Decrypted = !desc->SWDec; +/* RTL8190 set this bit to indicate +* that Hw does not decrypt packet +*/ } else#endif {
@@ -5474,11 +5484,13 @@ void query_rxdesc_status(struct sk_buff *skb, struct ieee80211_rx_stats *stats, stats->Length = desc->Length; stats->RxDrvInfoSize = desc->RxDrvInfoSize; - stats->RxBufShift =0 ;//desc->Shift&0x03; + stats->RxBufShift =0 ;/* desc->Shift&0x03; */ stats->bICV = desc->ICV; stats->bCRC = desc->CRC32; stats->bHwError = stats->bCRC|stats->bICV; -//RTL8190 set this bit to indicate that Hw does not decrypt packet +/* RTL8190 set this bit to indicate +* that Hw does not decrypt packet +*/ stats->Decrypted = !desc->SWDec; }
@@ -5493,11 +5505,10 @@ void query_rxdesc_status(struct sk_buff *skb, struct ieee80211_rx_stats *stats,if (stats->Length <24 || stats->Length >MAX_8192U_RX_SIZE ) stats->bHwError |=1 ; -// -//Get Driver Info -// -// TODO: Need to verify it on FGPA platform -//Driver info are written to the RxBuffer following rx desc + +/* Get Driver Info */ +/* TODO: Need to verify it on FGPA platform */ +/* Driver info are written to the RxBuffer following rx desc */ if (stats->RxDrvInfoSize !=0 ) { driver_info = (rx_drvinfo_819x_usb *)(skb->data +sizeof (rx_desc_819x_usb) + \ stats->RxBufShift);
@@ -5508,11 +5519,16 @@ void query_rxdesc_status(struct sk_buff *skb, struct ieee80211_rx_stats *stats, ret_rate =HwRateToMRate90 (driver_info->RxHT, driver_info->RxRate);if (ret_rate ==0xff ) { -// Abnormal Case: Receive CRC OK packet with Rx descriptor indicating non supported rate. -// Special Error Handling here, 2008.05.16, by Emily +/* Abnormal Case: Receive CRC OK packet with Rx +* descriptor indicating non supported rate. +*/ +/* Special Error Handling here, 2008.05.16, +* by Emily +*/ stats->bHwError =1 ; - stats->rate =MGN_1M ;//Set 1M rate by default + stats->rate =MGN_1M ; +/* Set 1M rate by default */ }else { stats->rate = ret_rate;
@@ -5529,15 +5545,15 @@ void query_rxdesc_status(struct sk_buff *skb, struct ieee80211_rx_stats *stats, stats->bIsAMPDU = (driver_info->PartAggr==1 ); stats->bFirstMPDU = (driver_info->PartAggr==1 ) && (driver_info->FirstAGGR==1 ); stats->TimeStampLow = driver_info->TSFL; -// xiong mask it, 070514 -//pRfd->Status.TimeStampHigh = PlatformEFIORead4Byte(Adapter, TSFR+4); -// stats->TimeStampHigh = read_nic_dword(dev, TSFR+4); +/* xiong mask it, 070514 */ +/* pRfd->Status.TimeStampHigh = +* PlatformEFIORead4Byte(Adapter, TSFR+4); +*/ +/* stats->TimeStampHigh = read_nic_dword(dev, TSFR+4); */ UpdateRxPktTimeStamp8190 (dev, stats); -// -// Rx A-MPDU -// +/* Rx A-MPDU */ if (driver_info->FirstAGGR==1 || driver_info->PartAggr ==1 )RT_TRACE (COMP_RXDESC ,"driver_info->FirstAGGR = %d, driver_info->PartAggr = %d\n" , driver_info->FirstAGGR, driver_info->PartAggr);
@@ -5545,23 +5561,23 @@ void query_rxdesc_status(struct sk_buff *skb, struct ieee80211_rx_stats *stats, }skb_pull (skb,sizeof (rx_desc_819x_usb)); -// -// Get Total offset of MPDU Frame Body -// +/* Get Total offset of MPDU Frame Body */ if ((stats->RxBufShift + stats->RxDrvInfoSize) >0 ) { stats->bShift =1 ;skb_pull (skb,stats->RxBufShift + stats->RxDrvInfoSize); }#ifdef USB_RX_AGGREGATION_SUPPORT -/* for the rx aggregated sub frame, the redundant space truelly contained in the packet */ +/* for the rx aggregated sub frame, the redundant space truly +* contained in the packet +*/ if (bIsRxAggrSubframe) {skb_pull (skb,8 ); }#endif /* for debug 2008.5.29 */ -//added by vivi, for MP, 20080108 +/* added by vivi, for MP, 20080108 */ stats->RxIs40MHzPacket = driver_info->BW;if (stats->RxDrvInfoSize !=0 )TranslateRxSignalStuff819xUsb (skb, stats, driver_info);
@@ -5589,7 +5605,7 @@ void rtl8192_rx_nomal(struct sk_buff* skb) .signal = 0, .noise = -98, .rate = 0, - // .mac_time = jiffies, + /* .mac_time = jiffies, */ .freq = IEEE80211_24GHZ_BAND, };u32 rx_pkt_len =0 ;
@@ -5605,7 +5621,7 @@ void rtl8192_rx_nomal(struct sk_buff* skb)u32 PacketShiftBytes =0 ;rx_desc_819x_usb_aggr_subframe *RxDescr =NULL ;u8 PaddingBytes =0 ; -//add just for testing +/* add just for testing */ u8 testing;#endif
@@ -5622,9 +5638,11 @@ void rtl8192_rx_nomal(struct sk_buff* skb)#ifdef USB_RX_AGGREGATION_SUPPORT if (TempByte &BIT0 ) { agg_skb = skb; -//TotalLength = agg_skb->len - 4; /*sCrcLng*/ +/* TotalLength = agg_skb->len - 4; */ /*sCrcLng*/ TotalLength = stats.Length -4 ;/*sCrcLng*/ -//RT_TRACE(COMP_RECV, "%s:first aggregated packet!Length=%d\n",__func__,TotalLength); +/* RT_TRACE(COMP_RECV, "%s:first aggregated" +* " packet!Length=%d\n",__func__,TotalLength); +*/ /* though the head pointer has passed this position */ TempDWord = *(u32 *)(agg_skb->data -4 ); PacketLength = (u16)(TempDWord &0x3FFF );/*sCrcLng*/
@@ -5640,9 +5658,9 @@ void rtl8192_rx_nomal(struct sk_buff* skb) ieee80211_hdr = (struct ieee80211_hdr_1addr *)skb->data; unicast_packet = false;if (is_broadcast_ether_addr (ieee80211_hdr->addr1)) { -//TODO +/* TODO */ }else if (is_multicast_ether_addr (ieee80211_hdr->addr1)){ -//TODO +/* TODO */ }else {/* unicast packet */ unicast_packet = true;
@@ -5658,7 +5676,7 @@ void rtl8192_rx_nomal(struct sk_buff* skb) }#ifdef USB_RX_AGGREGATION_SUPPORT testing =1 ; -// (PipeIndex == 0) && (TempByte & BIT0) => TotalLength > 0. +/* (PipeIndex == 0) && (TempByte & BIT0) => TotalLength > 0. */ if (TotalLength >0 ) { PacketOccupiedLendth = PacketLength + (PacketShiftBytes +8 );if ((PacketOccupiedLendth &0xFF ) !=0 )
@@ -5672,7 +5690,9 @@ void rtl8192_rx_nomal(struct sk_buff* skb)while (agg_skb->len>=GetRxPacketShiftBytes819xUsb (&stats, true)) {u8 tmpCRC =0 , tmpICV =0 ; -//RT_TRACE(COMP_RECV,"%s:aggred pkt,total_len = %d\n",__func__,agg_skb->len); +/* RT_TRACE(COMP_RECV,"%s:aggred pkt,total_len" +* " = %d\n",__func__,agg_skb->len); +*/ RxDescr = (rx_desc_819x_usb_aggr_subframe *)(agg_skb->data); tmpCRC = RxDescr->CRC32; tmpICV = RxDescr->ICV;
@@ -5700,9 +5720,9 @@ void rtl8192_rx_nomal(struct sk_buff* skb) ieee80211_hdr = (struct ieee80211_hdr_1addr *)skb->data; unicast_packet = false;if (is_broadcast_ether_addr (ieee80211_hdr->addr1)) { -//TODO +/* TODO */ }else if (is_multicast_ether_addr (ieee80211_hdr->addr1)){ -//TODO +/* TODO */ }else {/* unicast packet */ unicast_packet = true;
@@ -5744,30 +5764,35 @@ rtl819xusb_process_received_packet(struct ieee80211_rx_stats *pstats ) { -// bool bfreerfd=false, bqueued=false; +/* bool bfreerfd=false, bqueued=false; */ u8 * frame;u16 frame_len=0 ;struct r8192_priv *priv =ieee80211_priv (dev); -// u8 index = 0; -// u8 TID = 0; -//u16 seqnum = 0; -//PRX_TS_RECORD pts = NULL; +/* u8 index = 0; */ +/* u8 TID = 0; */ +/* u16 seqnum = 0; */ +/* PRX_TS_RECORD pts = NULL; */ -// Get shifted bytes of Starting address of 802.11 header. 2006.09.28, by Emily -//porting by amy 080508 +/* Get shifted bytes of Starting address of 802.11 header. +* 2006.09.28, by Emily +*/ +/* porting by amy 080508 */ pstats->virtual_address +=get_rxpacket_shiftbytes_819xusb (pstats); frame = pstats->virtual_address; frame_len = pstats->packetlength; -#ifdef TODO // by amy about HCT +#ifdef TODO /* by amy about HCT */ if (!Adapter->bInHctTest)CountRxErrStatistics (Adapter, pRfd);#endif { -#ifdef ENABLE_PS //by amy for adding ps function in future +#ifdef ENABLE_PS /* by amy for adding ps function in future */ RT_RF_POWER_STATE rtState; -// When RF is off, we should not count the packet for hw/sw synchronize -// reason, ie. there may be a duration while sw switch is changed and hw -// switch is being changed. 2006.12.04, by shien chang. +/* When RF is off, we should not count the packet for hw/sw +* synchronize +* reason, ie. there may be a duration while sw switch is +* changed and hw switch is being changed. +* 2006.12.04, by shien chang. +*/ Adapter->HalFunc.GetHwRegHandler (Adapter,HW_VAR_RF_STATE , (u8 * )(&rtState));if (rtState == eRfOff) {
@@ -5796,15 +5821,15 @@ rtl819xusb_process_received_packet(void query_rx_cmdpkt_desc_status (struct sk_buff *skb,struct ieee80211_rx_stats *stats) { -// rtl8192_rx_info *info = (struct rtl8192_rx_info *)skb->cb; -// struct net_device *dev=info->dev; -// struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); +/* rtl8192_rx_info *info = (struct rtl8192_rx_info *)skb->cb; */ +/* struct net_device *dev=info->dev; */ +/* struct r8192_priv *priv = +* (struct r8192_priv *)ieee80211_priv(dev); +*/ rx_desc_819x_usb *desc = (rx_desc_819x_usb *)skb->data; -// rx_drvinfo_819x_usb *driver_info; +/* rx_drvinfo_819x_usb *driver_info; */ -// -//Get Rx Descriptor Information -// +/* Get Rx Descriptor Information */ stats->virtual_address = (u8 *)skb->data; stats->Length = desc->Length; stats->RxDrvInfoSize =0 ;
@@ -5820,14 +5845,14 @@ void rtl8192_rx_cmd(struct sk_buff *skb) {struct rtl8192_rx_info *info = (struct rtl8192_rx_info *)skb->cb;struct net_device *dev = info->dev; -//int ret; -// struct urb *rx_urb = info->urb; +/* int ret; */ +/* struct urb *rx_urb = info->urb; */ /* TODO */ struct ieee80211_rx_stats stats = { .signal =0 , .noise =-98 , .rate =0 , -// .mac_time = jiffies, +/* .mac_time = jiffies, */ .freq =IEEE80211_24GHZ_BAND , };
@@ -5835,21 +5860,14 @@ void rtl8192_rx_cmd(struct sk_buff *skb) {query_rx_cmdpkt_desc_status (skb,&stats); -// this is to be done by amy 080508 prfd->queue_id = 1; - - -// -// Process the command packet received. -// +/* this is to be done by amy 080508 prfd->queue_id = 1; */ +/* Process the command packet received. */ rtl819xusb_process_received_packet (dev,&stats); -dev_kfree_skb_any (skb); } else ; - - }void rtl8192_irq_rx_tasklet (struct r8192_priv *priv)
@@ -5862,7 +5880,9 @@ void rtl8192_irq_rx_tasklet(struct r8192_priv *priv)switch (info->out_pipe) {/* Nomal packet pipe */ case 3 : -//RT_TRACE(COMP_RECV, "normal in-pipe index(%d)\n",info->out_pipe); +/* RT_TRACE(COMP_RECV, "normal in-pipe" +* " index(%d)\n", info->out_pipe); +*/ priv->IrpPendingCount--;rtl8192_rx_nomal (skb);break ;
@@ -5900,13 +5920,14 @@ static const struct net_device_ops rtl8192_netdev_ops = {/**************************************************************************** ----------------------------- USB_STUFF--------------------------- -*****************************************************************************/ +* ---------------------------- USB_STUFF--------------------------- +**************************************************************************** +*/ static int __devinit rtl8192_usb_probe (struct usb_interface *intf,const struct usb_device_id *id) { -// unsigned long ioaddr = 0; +/* unsigned long ioaddr = 0; */ struct net_device *dev =NULL ;struct r8192_priv *priv=NULL ;struct usb_device *udev =interface_to_usbdev (intf);
@@ -5923,7 +5944,7 @@ static int __devinit rtl8192_usb_probe(struct usb_interface *intf, dev->netdev_ops = &rtl8192_netdev_ops; -//DMESG("Oops: i'm coming\n"); +/* DMESG("Oops: i'm coming\n"); */ #if WIRELESS_EXT >=12 #if WIRELESS_EXT <17 dev->get_wireless_stats = r8192_get_wireless_stats;
@@ -5932,7 +5953,7 @@ static int __devinit rtl8192_usb_probe(struct usb_interface *intf,#endif dev->type=ARPHRD_ETHER ; - dev->watchdog_timeo =HZ *3 ;//modified by john, 0805 + dev->watchdog_timeo =HZ *3 ;/* modified by john, 0805 */ if (dev_alloc_name (dev, ifname) <0 ){RT_TRACE (COMP_INIT ,"Oops: devname already taken! Trying wlan%%d...\n" );
@@ -5965,7 +5986,9 @@ fail: } -//detach all the work and timer structure declared or inititialize in r8192U_init function. +/*detach all the work and timer structure declared or +* inititialize in r8192U_init function. +*/ void rtl8192_cancel_deferred_work (struct r8192_priv * priv) {
@@ -5973,8 +5996,8 @@ void rtl8192_cancel_deferred_work(struct r8192_priv* priv)cancel_delayed_work (&priv->watch_dog_wq);cancel_delayed_work (&priv->update_beacon_wq);cancel_work_sync (&priv->qos_activate); -//cancel_work_sync(&priv->SetBWModeWorkItem); -//cancel_work_sync(&priv->SwChnlWorkItem); +/* cancel_work_sync(&priv->SetBWModeWorkItem); */ +/* cancel_work_sync(&priv->SwChnlWorkItem); */ }
@@ -5997,12 +6020,12 @@ static void __devexit rtl8192_usb_disconnect(struct usb_interface *intf)kfree (priv->pFirmware); priv->pFirmware =NULL ; } -// priv->rf_close(dev); -// rtl8192_SetRFPowerState(dev, eRfOff); +/* priv->rf_close(dev); */ +/* rtl8192_SetRFPowerState(dev, eRfOff); */ rtl8192_usb_deleteendpoints (dev);destroy_workqueue (priv->priv_wq); -//rtl8192_irq_disable(dev); -//rtl8192_reset(dev); +/* rtl8192_irq_disable(dev); */ +/* rtl8192_reset(dev); */ mdelay (10 ); }
@@ -6073,7 +6096,7 @@ static void __exit rtl8192_usb_module_exit(void)usb_deregister (&rtl8192_usb_driver);RT_TRACE (COMP_DOWN ,"Exiting" ); -// rtl8192_proc_module_remove(); +/* rtl8192_proc_module_remove(); */ }
@@ -6107,12 +6130,18 @@ void EnableHWSecurityConfig8192(struct net_device *dev) SECR_value |= SCR_RxUseDK; SECR_value |= SCR_TxUseDK; } -//add HWSec active enable here. -//default using hwsec. when peer AP is in N mode only and pairwise_key_type is none_aes(which HT_IOT_ACT_PURE_N_MODE indicates it), use software security. when peer AP is in b,g,n mode mixed and pairwise_key_type is none_aes, use g mode hw security. WB on 2008.7.4 +/* add HWSec active enable here. */ +/* default using hwsec. when peer AP is in N mode only and pairwise_key_type +* is none_aes(which HT_IOT_ACT_PURE_N_MODE indicates it), +* use software security. when peer AP is in b,g,n mode mixed and +* pairwise_key_type is none_aes, use g mode hw security. +* WB on 2008.7.4 */ ieee->hwsec_active =1 ; -if ((ieee->pHTInfo->IOTAction&HT_IOT_ACT_PURE_N_MODE ) || !hwwep)//!ieee->hwsec_support) //add hwsec_support flag to totol control hw_sec on/off +if ((ieee->pHTInfo->IOTAction&HT_IOT_ACT_PURE_N_MODE ) || !hwwep) +/* !ieee->hwsec_support) */ +/*add hwsec_support flag to totol control hw_sec on/off */ { ieee->hwsec_active =0 ; SECR_value &= ~SCR_RxDecEnable;
@@ -6120,7 +6149,8 @@ void EnableHWSecurityConfig8192(struct net_device *dev)RT_TRACE (COMP_SEC ,"%s:, hwsec:%d, pairwise_key:%d, SECR_value:%x\n" , __func__, \ ieee->hwsec_active, ieee->pairwise_key_type, SECR_value); { -write_nic_byte (dev,SECR , SECR_value);//SECR_value | SCR_UseDK ); +write_nic_byte (dev,SECR , SECR_value); +/* SECR_value | SCR_UseDK ); */ } }
@@ -6146,23 +6176,25 @@ void setKey( struct net_device *dev, usConfig |=BIT15 | (KeyType<<2 ); else usConfig |= BIT15 | (KeyType<<2) | KeyIndex; -// usConfig |= BIT15 | (KeyType<<2) | (DefaultKey<<5) | KeyIndex; +/* usConfig |= BIT15 | (KeyType<<2) | (DefaultKey<<5) | KeyIndex; */ for(i=0 ; i<CAM_CONTENT_COUNT; i++){ TargetCommand = i+CAM_CONTENT_COUNT *EntryNo; TargetCommand |=BIT31 |BIT16 ; -if (i==0 ){//MAC|Config +if (i==0 ){/* MAC|Config */ TargetContent = (u32)(*(MacAddr+0 )) <<16 | (u32)(*(MacAddr+1 )) <<24 | (u32 )usConfig;write_nic_dword (dev,WCAMI , TargetContent);write_nic_dword (dev,RWCAM , TargetCommand); -// printk("setkey cam =%8x\n", read_cam(dev, i+6*EntryNo)); +/* printk("setkey cam =%8x\n", +* read_cam(dev, i+6*EntryNo)); +*/ } -else if (i==1 ){//MAC +else if (i==1 ){/* MAC */ TargetContent = (u32)(*(MacAddr+2 )) | (u32)(*(MacAddr+3 )) <<8 | (u32)(*(MacAddr+4)) << 16|
@@ -6171,7 +6203,7 @@ void setKey( struct net_device *dev,write_nic_dword (dev,RWCAM , TargetCommand); }else { -//Key Material +/* Key Material */ if (KeyContent !=NULL ){write_nic_dword (dev,WCAMI , (u32)(*(KeyContent+i-2 )) );write_nic_dword (dev,RWCAM , TargetCommand);
@@ -6182,7 +6214,8 @@ void setKey( struct net_device *dev, }/*************************************************************************** -------------------- module init / exit stubs ---------------- -****************************************************************************/ +* ------------------- module init / exit stubs ---------------- +*************************************************************************** +*/ module_init (rtl8192_usb_module_init);module_exit (rtl8192_usb_module_exit);
Signature · 1 line
1.6.3.3