Staging: rtl8192su: remove ENABLE_DOT11D ifdefs
PATCH 1/22 Staging: rtl8192su: remove ENABLE_DOT11D ifdefs
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove ENABLE_DOT11D ifdefs
---
the overdue patches from my rtl8192su tree for next-20090703
drivers/staging/rtl8192su/Makefile | 1 drivers/staging/rtl8192su/ieee80211/Makefile | 3 drivers/staging/rtl8192su/ieee80211/dot11d.c | 2 drivers/staging/rtl8192su/ieee80211/dot11d.h | 4 - drivers/staging/rtl8192su/ieee80211/ieee80211.h | 8 -- drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 12 --- drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c | 44 ------------- drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c | 4 - drivers/staging/rtl8192su/r8192S_phy.c | 4 - drivers/staging/rtl8192su/r8192U_core.c | 22 ------ drivers/staging/rtl8192su/r8192U_wx.c | 6 - drivers/staging/rtl8192su/r819xU_phy.c | 4 - 12 files changed, 1 insertion(+), 113 deletions(-)
drivers/staging/rtl8192su/Makefile +0 -1
@@ -7,7 +7,6 @@ EXTRA_CFLAGS += -mhard-float -DCONFIG_FO EXTRA_CFLAGS += -DJACKSON_NEW_RX EXTRA_CFLAGS += -DTHOMAS_BEACON -DTHOMAS_TURBO #EXTRA_CFLAGS += -DUSE_ONE_PIPE -EXTRA_CFLAGS += -DENABLE_DOT11D EXTRA_CFLAGS += -DRTL8192SU EXTRA_CFLAGS += -DRTL8190_Download_Firmware_From_Header=1
drivers/staging/rtl8192su/ieee80211/Makefile +1 -2
@@ -5,8 +5,7 @@ EXTRA_CFLAGS += -DRTL8192S_DISABLE_FW_DM EXTRA_CFLAGS += -DRTL8192SU #EXTRA_CFLAGS += -DJOHN_NOCPY EXTRA_CFLAGS += -DTHOMAS_TURBO -#flags to enable or disble 80211D feature -EXTRA_CFLAGS += -DENABLE_DOT11D + ieee80211-rsl-objs := ieee80211_rx.o \ ieee80211_softmac.o \ ieee80211_tx.o \
drivers/staging/rtl8192su/ieee80211/dot11d.c +0 -2
@@ -1,4 +1,3 @@ -#ifdef ENABLE_DOT11D //----------------------------------------------------------------------------- // File: // Dot11d.c
@@ -227,4 +226,3 @@ EXPORT_SYMBOL(DOT11D_ScanComplete);EXPORT_SYMBOL (IsLegalChannel);EXPORT_SYMBOL (ToLegalChannel); -#endif
drivers/staging/rtl8192su/ieee80211/dot11d.h +0 -4
@@ -1,11 +1,8 @@ #ifndef __INC_DOT11D_H #define __INC_DOT11D_H -#ifdef ENABLE_DOT11D #include "ieee80211.h" -//#define ENABLE_DOT11D - //#define DOT11D_MAX_CHNL_NUM 83 typedef struct _CHNL_TXPOWER_TRIPLE {
@@ -98,5 +95,4 @@ int ToLegalChannel(struct ieee80211_device * dev, u8 channel ); -#endif //ENABLE_DOT11D #endif // #ifndef __INC_DOT11D_H
drivers/staging/rtl8192su/ieee80211/ieee80211.h +0 -8
@@ -1374,10 +1374,8 @@ struct ieee80211_network {#ifdef THOMAS_TURBO u8 Turbo_Enable;//enable turbo mode, added by thomas #endif -#ifdef ENABLE_DOT11D u16 CountryIeLen;u8 CountryIeBuf[MAX_IE_LEN ]; -#endif // HT Related, by amy, 2008.04.29 BSS_HT bssht;// Add to handle broadcom AP management frame CCK rate.
@@ -1602,7 +1600,6 @@ typedef u32 RT_RF_CHANGE_SOURCE;#define RF_CHANGE_BY_IPS BIT28#define RF_CHANGE_BY_INIT 0 // Do not change the RFOff reason. Defined by Bruce, 2008-01-17. -#ifdef ENABLE_DOT11D typedef enum { COUNTRY_CODE_FCC = 0,
@@ -1617,7 +1614,6 @@ typedef enumCOUNTRY_CODE_MIC , COUNTRY_CODE_GLOBAL_DOMAIN }country_code_type_t; -#endif // Firmware realted CMD IO. typedef enum _FW_CMD_IO_TYPE{ FW_CMD_DIG_ENABLE = 0, // For DIG DM
@@ -1826,12 +1822,8 @@ struct ieee80211_device {/* map of allowed channels. 0 is dummy */ // FIXME: remeber to default to a basic channel plan depending of the PHY type -#ifdef ENABLE_DOT11D void * pDot11dInfo;bool bGlobalDomain; -#else -int channel_map[MAX_CHANNEL_NUMBER +1 ]; -#endif int rate;/* current rate */ int basic_rate;//FIXME: pleace callback, see if redundant with softmac_features
drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c +0 -12
@@ -44,9 +44,7 @@#include <linux/ctype.h> #include "ieee80211.h" -#ifdef ENABLE_DOT11D #include "dot11d.h" -#endif static inline void ieee80211_monitor_rx (struct ieee80211_device *ieee,struct sk_buff *skb,struct ieee80211_rx_stats *rx_stats)
@@ -1652,7 +1650,6 @@ static const char *get_info_element_stri }#endif -#ifdef ENABLE_DOT11D static inline void ieee80211_extract_country_ie( struct ieee80211_device *ieee, struct ieee80211_info_element *info_element,
@@ -1685,7 +1682,6 @@ static inline void ieee80211_extract_cou } } -#endif int ieee80211_parse_info_param(struct ieee80211_device *ieee, struct ieee80211_info_element *info_element,
@@ -2176,14 +2172,12 @@ int ieee80211_parse_info_param(struct ie "QoS Error need to parse QOS_PARAMETER IE\n");break ; -#ifdef ENABLE_DOT11D case MFIE_TYPE_COUNTRY :IEEE80211_DEBUG_SCAN ("MFIE_TYPE_COUNTRY: %d bytes\n" , info_element->len);//printk("=====>Receive <%s> Country IE\n",network->ssid); ieee80211_extract_country_ie (ieee, info_element, network, network->bssid);//addr2 is same as addr3 when from an AP break ; -#endif /* TODO */ #if 0 /* 802.11h */
@@ -2359,10 +2353,8 @@ static inline int ieee80211_network_init#ifdef THOMAS_TURBO network->Turbo_Enable =0 ;#endif -#ifdef ENABLE_DOT11D network->CountryIeLen =0 ;memset (network->CountryIeBuf,0 ,MAX_IE_LEN ); -#endif //Initialize HT parameters //ieee80211_ht_initialize(&network->bssht); HTInitializeBssDesc (&network->bssht);
@@ -2540,10 +2532,8 @@ static inline void update_network(struct dst->Turbo_Enable = src->Turbo_Enable;#endif -#ifdef ENABLE_DOT11D dst->CountryIeLen = src->CountryIeLen;memcpy (dst->CountryIeBuf, src->CountryIeBuf, src->CountryIeLen); -#endif //added by amy for LEAP dst->bWithAironetIE = src->bWithAironetIE;
@@ -2611,7 +2601,6 @@ static inline void ieee80211_process_proreturn ; } -#ifdef ENABLE_DOT11D // For Asus EeePc request, // (1) if wireless adapter receive get any 802.11d country code in AP beacon, // wireless adapter should follow the country code.
@@ -2668,7 +2657,6 @@ static inline void ieee80211_process_pro } } } -#endif /* The network parsed correctly -- so now we scan our known networks * to see if we can find it in our list.
drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c +0 -44
193 lines not on this page · raw message
drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c +0 -4
@@ -15,9 +15,7 @@#include "ieee80211.h" -#ifdef ENABLE_DOT11D #include "dot11d.h" -#endif /* FIXME: add A freqs */ const long ieee80211_wlan_frequencies[] = {
@@ -63,12 +61,10 @@ int ieee80211_wx_set_freq(struct ieee802 }else {/* Set the channel */ -#ifdef ENABLE_DOT11D if (!(GET_DOT11D_INFO (ieee)->channel_map)[fwrq->m]) { ret = -EINVAL ; goto out; } -#endif ieee->current_network.channel = fwrq->m; ieee->set_chan (ieee->dev, ieee->current_network.channel);
drivers/staging/rtl8192su/r8192S_phy.c +0 -4
@@ -47,9 +47,7 @@#include "r819xU_phyreg.h" #endif -#ifdef ENABLE_DOT11D #include "ieee80211/dot11d.h" -#endif /*---------------------------Define Local Constant---------------------------*/ /* Channel switch:The size of command tables for switch channel*/
@@ -3691,13 +3689,11 @@ phy_SwChnlStepByStep(//RT_ASSERT(IsLegalChannel(dev, channel), ("illegal channel: %d\n", channel)); RT_TRACE (COMP_CH ,"===========>%s(), channel:%d, stage:%d, step:%d\n" , __FUNCTION__, channel, *stage, *step);//RT_ASSERT((pHalData != NULL), ("pHalData should not be NULL\n")); -#ifdef ENABLE_DOT11D if (!IsLegalChannel (priv->ieee80211, channel)) {RT_TRACE (COMP_ERR ,"=============>set to illegal channel:%d\n" , channel);return true;//return true to tell upper caller function this channel setting is finished! Or it will in while loop. } -#endif //pChnlAccessSetting = &Adapter->MgntInfo.Info8185.ChannelAccessSetting; //RT_ASSERT((pChnlAccessSetting != NULL), ("pChnlAccessSetting should not be NULL\n"));
drivers/staging/rtl8192su/r8192U_core.c +0 -22
@@ -80,9 +80,7 @@ double __extendsfdf2(float a) {return a;#include "r8192U_pm.h" #endif -#ifdef ENABLE_DOT11D #include "ieee80211/dot11d.h" -#endif #else
@@ -103,9 +101,7 @@ double __extendsfdf2(float a) {return a;#include "r8192U_pm.h" #endif -#ifdef ENABLE_DOT11D #include "ieee80211/dot11d.h" -#endif #endif
@@ -286,7 +282,6 @@ struct rtl819x_ops rtl8192u_ops = { };#endif -#ifdef ENABLE_DOT11D typedef struct _CHANNEL_LIST {
@@ -362,7 +357,6 @@ static void rtl819x_set_channel_map(u8 c }return ; } -#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 )
@@ -6850,7 +6844,6 @@ static void rtl8192_read_eeprom_info(strshort rtl8192_get_channel_map (struct net_device * dev) {struct r8192_priv *priv =ieee80211_priv (dev); -#ifdef ENABLE_DOT11D if (priv->ChannelPlan >COUNTRY_CODE_GLOBAL_DOMAIN ){printk ("rtl8180_init:Error channel plan! Set to default.\n" ); priv->ChannelPlan=0 ;
@@ -6858,21 +6851,6 @@ short rtl8192_get_channel_map(struct netRT_TRACE (COMP_INIT ,"Channel plan is %d\n" ,priv->ChannelPlan);rtl819x_set_channel_map (priv->ChannelPlan, priv); -#else -int ch,i; -//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 -for (i=1 ; i<=14 ; i++) { - (priv->ieee80211->channel_map)[i] = (u8)(ch &0x01 ); - ch >>=1 ; - } -#endif return 0 ; }
drivers/staging/rtl8192su/r8192U_wx.c +0 -6
@@ -27,9 +27,7 @@#include "r8192U_hw.h" #endif -#ifdef ENABLE_DOT11D #include "ieee80211/dot11d.h" -#endif #define RATE_COUNT 12u32 rtl8180_rates[] = {1000000 ,2000000 ,5500000 ,11000000 ,
@@ -529,11 +527,7 @@ static int rtl8180_wx_get_range(struct nfor (i =0 , val =0 ; i <14 ; i++) {// Include only legal frequencies for some countries -#ifdef ENABLE_DOT11D if ((GET_DOT11D_INFO (priv->ieee80211)->channel_map)[i+1 ]) { -#else -if ((priv->ieee80211->channel_map)[i+1 ]) { -#endif range->freq[val].i = i +1 ; range->freq[val].m = ieee80211_wlan_frequencies[i] *100000 ; range->freq[val].e =1 ;
drivers/staging/rtl8192su/r819xU_phy.c +0 -4
@@ -6,9 +6,7 @@#include "r8192U_dm.h" #include "r819xU_firmware_img.h" -#ifdef ENABLE_DOT11D #include "ieee80211/dot11d.h" -#endif static u32 RF_CHANNEL_TABLE_ZEBRA [] = {0 ,0x085c ,//2412 1
@@ -1279,13 +1277,11 @@ u8 rtl8192_phy_SwChnlStepByStep(struct nRT_TRACE (COMP_CH ,"====>%s()====stage:%d, step:%d, channel:%d\n" , __FUNCTION__, *stage, *step, channel);// RT_ASSERT(IsLegalChannel(Adapter, channel), ("illegal channel: %d\n", channel)); -#ifdef ENABLE_DOT11D if (!IsLegalChannel (priv->ieee80211, channel)) {RT_TRACE (COMP_ERR ,"=============>set to illegal channel:%d\n" , channel);return true;//return true to tell upper caller function this channel setting is finished! Or it will in while loop. } -#endif //FIXME:need to check whether channel is legal or not here.WB
PATCH 2/22 Staging: rtl8192su: remove CONFIG_RTL8192_PM ifdefs
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove CONFIG_RTL8192_PM ifdefs
--- drivers/staging/rtl8192su/Makefile | 1 - drivers/staging/rtl8192su/r8192U_core.c | 10 ---------- drivers/staging/rtl8192su/r8192U_pm.c | 2 -- drivers/staging/rtl8192su/r8192U_pm.h | 2 -- 4 files changed, 15 deletions(-)
drivers/staging/rtl8192su/Makefile +0 -1
@@ -27,7 +27,6 @@ EXTRA_CFLAGS += -DRTL8192SU_ASIC_VERIFIC EXTRA_CFLAGS += -DRTL8192SU_USB_PHY_TEST=0 #EXTRA_CFLAGS += -DMUTIPLE_BULK_OUT -EXTRA_CFLAGS += -DCONFIG_RTL8192_PM r8192s_usb-objs := \ r8180_93cx6.o \
drivers/staging/rtl8192su/r8192U_core.c +0 -10
@@ -76,9 +76,7 @@ double __extendsfdf2(float a) {return a;//#include "r8192xU_phyreg.h" #include <linux/usb.h> -#ifdef CONFIG_RTL8192_PM #include "r8192U_pm.h" -#endif #include "ieee80211/dot11d.h"
@@ -97,9 +95,7 @@ double __extendsfdf2(float a) {return a;//#include "r8192xU_phyreg.h" #include <linux/usb.h> -#ifdef CONFIG_RTL8192_PM #include "r8192U_pm.h" -#endif #include "ieee80211/dot11d.h"
@@ -222,15 +218,9 @@ static struct usb_driver rtl8192_usb_dri .id_table = rtl8192_usb_id_tbl, /* PCI_ID table */ .probe = rtl8192_usb_probe, /* probe fn */ .disconnect = rtl8192_usb_disconnect, /* remove fn */ -#ifdef CONFIG_RTL8192_PM .suspend = rtl8192U_suspend, /* PM suspend fn */ .resume = rtl8192U_resume, /* PM resume fn */ .reset_resume = rtl8192U_resume, /* PM reset resume fn */ -#else - .suspend = NULL, /* PM suspend fn */ - .resume = NULL, /* PM resume fn */ - .reset_resume = NULL, /* PM reset resume fn */ -#endif };
drivers/staging/rtl8192su/r8192U_pm.c +0 -2
@@ -9,7 +9,6 @@Released under the terms of GPL (General Public Licence) */ -#ifdef CONFIG_RTL8192_PM #include "r8192U.h" #include "r8192U_pm.h"
@@ -71,4 +70,3 @@ int rtl8192U_enable_wake (struct pci_devreturn (-EAGAIN ); } -#endif //CONFIG_RTL8192_PM
drivers/staging/rtl8192su/r8192U_pm.h +0 -2
@@ -10,7 +10,6 @@*/ -#ifdef CONFIG_RTL8192_PM #ifndef R8192_PM_H #define R8192_PM_H
@@ -24,4 +23,3 @@ int rtl8192U_resume (struct usb_interfacint rtl8192U_enable_wake (struct pci_dev *dev,u32 state,int enable);#endif //R8192U_PM_H -#endif // CONFIG_RTL8192_PM
PATCH 3/22 Staging: rtl8192su: remove THOMAS_TURBO ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove THOMAS_TURBO ifdefs
--- drivers/staging/rtl8192su/Makefile | 2 - drivers/staging/rtl8192su/ieee80211/ieee80211.h | 2 - drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 6 ---- drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c | 20 ---------------- 4 files changed, 1 insertion(+), 29 deletions(-)
drivers/staging/rtl8192su/Makefile +1 -1
@@ -5,7 +5,7 @@ EXTRA_CFLAGS += -O2 EXTRA_CFLAGS += -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y EXTRA_CFLAGS += -DJACKSON_NEW_RX -EXTRA_CFLAGS += -DTHOMAS_BEACON -DTHOMAS_TURBO +EXTRA_CFLAGS += -DTHOMAS_BEACON #EXTRA_CFLAGS += -DUSE_ONE_PIPE EXTRA_CFLAGS += -DRTL8192SU
drivers/staging/rtl8192su/ieee80211/ieee80211.h +0 -2
@@ -1443,9 +1443,7 @@ struct ieee80211_network {u8 wmm_info;struct ieee80211_wmm_ac_param wmm_param[4 ];u8 QoS_Enable; -#ifdef THOMAS_TURBO u8 Turbo_Enable;//enable turbo mode, added by thomas -#endif u16 CountryIeLen;u8 CountryIeBuf[MAX_IE_LEN ];// HT Related, by amy, 2008.04.29
drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c +0 -6
@@ -1880,7 +1880,6 @@ int ieee80211_parse_info_param(struct iebreak ; } -#ifdef THOMAS_TURBO if (info_element->len == 7 && info_element->data[0] == 0x00 && info_element->data[1] == 0xe0 &&
@@ -1889,7 +1888,6 @@ int ieee80211_parse_info_param(struct ie info_element->data[4] == 0x02) { network->Turbo_Enable =1 ; } -#endif //for HTcap and HTinfo parameters if (tmp_htcap_len ==0 ){
@@ -2350,9 +2348,7 @@ static inline int ieee80211_network_init network->unknown_cap_exist = false; network->realtek_cap_exit = false; network->marvell_cap_exist = false; -#ifdef THOMAS_TURBO network->Turbo_Enable =0 ; -#endif network->CountryIeLen =0 ;memset (network->CountryIeBuf,0 ,MAX_IE_LEN );//Initialize HT parameters
@@ -2528,9 +2524,7 @@ static inline void update_network(struct#else dst->QoS_Enable =1 ;//for Rtl8187 simulation #endif -#ifdef THOMAS_TURBO dst->Turbo_Enable = src->Turbo_Enable; -#endif dst->CountryIeLen = src->CountryIeLen;memcpy (dst->CountryIeBuf, src->CountryIeBuf, src->CountryIeLen);
drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c +0 -20
@@ -127,7 +127,6 @@ void ieee80211_WMM_Info(struct ieee80211 *tag_p = tag; } -#ifdef THOMAS_TURBO void ieee80211_TURBO_Info (struct ieee80211_device *ieee,u8 **tag_p) {u8 *tag = *tag_p;
@@ -144,7 +143,6 @@ void ieee80211_TURBO_Info(struct ieee802 *tag_p = tag;printk (KERN_ALERT "This is enable turbo mode IE process\n" ); } -#endif void enqueue_mgmt (struct ieee80211_device *ieee,struct sk_buff *skb) {
@@ -1063,9 +1061,7 @@ inline struct sk_buff *ieee80211_associaunsigned int rate_len =ieee80211_MFIE_rate_len (ieee);unsigned int wmm_info_len = beacon->qos_data.supported?9 :0 ; -#ifdef THOMAS_TURBO unsigned int turbo_info_len = beacon->Turbo_Enable?9 :0 ; -#endif int len =0 ;
@@ -1103,7 +1099,6 @@ inline struct sk_buff *ieee80211_associa { cxvernum_ie_len =5 +2 ; } -#ifdef THOMAS_TURBO len =sizeof (struct ieee80211_assoc_request_frame )+2 + beacon->ssid_len//essid tagged val + rate_len//rates tagged val
@@ -1116,19 +1111,6 @@ inline struct sk_buff *ieee80211_associa + ccxrm_ie_len + cxvernum_ie_len + ieee->tx_headroom; -#else - len =sizeof (struct ieee80211_assoc_request_frame )+2 - + beacon->ssid_len//essid tagged val - + rate_len//rates tagged val - + wpa_ie_len - + wmm_info_len - + ht_cap_len - + realtek_ie_len - + ckip_ie_len - + ccxrm_ie_len - + cxvernum_ie_len - + ieee->tx_headroom; -#endif skb =dev_alloc_skb (len);
@@ -1250,12 +1232,10 @@ inline struct sk_buff *ieee80211_associaif (wmm_info_len) {ieee80211_WMM_Info (ieee, &tag); } -#ifdef THOMAS_TURBO tag =skb_put (skb,turbo_info_len);if (turbo_info_len) {ieee80211_TURBO_Info (ieee, &tag); } -#endif if (ieee->pHTInfo->bCurrentHTSupport&&ieee->pHTInfo->bEnableHT){if (ieee->pHTInfo->ePeerHTSpecVer ==HT_SPEC_VER_EWC )
PATCH 4/22 Staging: rtl8192su: remove USE_ONE_PIPE ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove USE_ONE_PIPE ifdefs
--- drivers/staging/rtl8192su/Makefile | 1 - drivers/staging/rtl8192su/r8192U.h | 13 ------------- drivers/staging/rtl8192su/r8192U_core.c | 15 --------------- 3 files changed, 29 deletions(-)
drivers/staging/rtl8192su/Makefile +0 -1
@@ -6,7 +6,6 @@ EXTRA_CFLAGS += -mhard-float -DCONFIG_FO EXTRA_CFLAGS += -DJACKSON_NEW_RX EXTRA_CFLAGS += -DTHOMAS_BEACON -#EXTRA_CFLAGS += -DUSE_ONE_PIPE EXTRA_CFLAGS += -DRTL8192SU EXTRA_CFLAGS += -DRTL8190_Download_Firmware_From_Header=1
drivers/staging/rtl8192su/r8192U.h +0 -13
@@ -1085,18 +1085,6 @@ typedef struct _rt_firmware_info_819xUsb#define NUM_OF_FIRMWARE_QUEUE 10#define NUM_OF_PAGES_IN_FW 0x100 -#ifdef USE_ONE_PIPE -#define NUM_OF_PAGE_IN_FW_QUEUE_BE 0x000 -#define NUM_OF_PAGE_IN_FW_QUEUE_BK 0x000 -#define NUM_OF_PAGE_IN_FW_QUEUE_VI 0x0ff -#define NUM_OF_PAGE_IN_FW_QUEUE_VO 0x000 -#define NUM_OF_PAGE_IN_FW_QUEUE_HCCA 0 -#define NUM_OF_PAGE_IN_FW_QUEUE_CMD 0x0 -#define NUM_OF_PAGE_IN_FW_QUEUE_MGNT 0x00 -#define NUM_OF_PAGE_IN_FW_QUEUE_HIGH 0 -#define NUM_OF_PAGE_IN_FW_QUEUE_BCN 0x0 -#define NUM_OF_PAGE_IN_FW_QUEUE_PUB 0x00 -#else #define NUM_OF_PAGE_IN_FW_QUEUE_BE 0x020#define NUM_OF_PAGE_IN_FW_QUEUE_BK 0x020
@@ -1109,7 +1097,6 @@ typedef struct _rt_firmware_info_819xUsb#define NUM_OF_PAGE_IN_FW_QUEUE_BCN 0x4#define NUM_OF_PAGE_IN_FW_QUEUE_PUB 0x18 -#endif #define APPLIED_RESERVED_QUEUE_IN_FW 0x80000000#define RSVD_FW_QUEUE_PAGE_BK_SHIFT 0x00
drivers/staging/rtl8192su/r8192U_core.c +0 -15
@@ -2985,11 +2985,7 @@ short rtl819xU_tx_cmd(struct net_device// Fill up USB_OUT_CONTEXT. //---------------------------------------------------------------------------- // Get index to out pipe from specified QueueID. -#ifndef USE_ONE_PIPE idx_pipe =txqueue2outpipe (priv,queue_index); -#else - idx_pipe =0x04 ; -#endif #ifdef JOHN_DUMP_TXDESC int i;printk ("<Tx descriptor>--rate %x---" ,rate);
@@ -3786,11 +3782,7 @@ short rtl8192_tx(struct net_device *dev, tx_desc->TxBufferSize = (u32)(skb->len -USB_HWDESC_HEADER_LEN ); }/* Get index to out pipe from specified QueueID */ -#ifndef USE_ONE_PIPE idx_pipe =txqueue2outpipe (priv,tcb_desc->queue_index); -#else - 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));
@@ -11721,7 +11713,6 @@ static void HalUsbSetQueuePipeMapping819memset (priv->RtOutPipes,0 ,16 );memset (priv->RtInPipes,0 ,16 ); -#ifndef USE_ONE_PIPE iface_desc = intf->cur_altsetting; priv->ep_num = iface_desc->desc.bNumEndpoints;
@@ -11776,12 +11767,6 @@ static void HalUsbSetQueuePipeMapping819for (i=0 ; i <9 ; i++)printk ("%d " , priv->txqueue_to_outpipemap[i]);printk ("\n" ); -#else - { -memset (priv->txqueue_to_outpipemap,0 ,9 ); -memset (priv->RtOutPipes,4 ,16 );//all use endpoint 4 for out - } -#endif return ; }
PATCH 5/22 Staging: rtl8192su: remove EEPROM_OLD_FORMAT_SUPPORT ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove EEPROM_OLD_FORMAT_SUPPORT ifdefs
--- drivers/staging/rtl8192su/Makefile | 2 drivers/staging/rtl8192su/r8192S_hw.h | 26 ---- drivers/staging/rtl8192su/r8192S_phy.c | 5 drivers/staging/rtl8192su/r8192U.h | 6 drivers/staging/rtl8192su/r8192U_core.c | 197 -------------------------------- 5 files changed, 236 deletions(-)
drivers/staging/rtl8192su/Makefile +0 -2
@@ -12,8 +12,6 @@ EXTRA_CFLAGS += -DRTL8190_Download_Firmw EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1 -#EXTRA_CFLAGS += -DEEPROM_OLD_FORMAT_SUPPORT - #EXTRA_CFLAGS += -DUSB_RX_AGGREGATION_SUPPORT=0 #EXTRA_CFLAGS += -DUSB_TX_DRIVER_AGGREGATION_ENABLE=0 #EXTRA_CFLAGS += -DRTL8192SU_DISABLE_CCK_RATE=0
drivers/staging/rtl8192su/r8192S_hw.h +0 -26
@@ -1282,17 +1282,11 @@ Default: 00b.#define EEPROM_Default_TxPower 0x1010#define EEPROM_Default_HT2T_TxPwr 0x10 -#ifdef EEPROM_OLD_FORMAT_SUPPORT -#define EEPROM_Default_TxPowerBase 0x0 -#define EEPROM_Default_ThermalMeter 0x12 -#define EEPROM_Default_PwDiff 0x4 -#else #define EEPROM_Default_LegacyHTTxPowerDiff 0x3#define EEPROM_Default_ThermalMeter 0x12#define EEPROM_Default_AntTxPowerDiff 0x0#define EEPROM_Default_TxPwDiff_CrystalCap 0x5#define EEPROM_Default_TxPowerLevel 0x22 -#endif #define EEPROM_CHANNEL_PLAN_FCC 0x0#define EEPROM_CHANNEL_PLAN_IC 0x1
@@ -1330,25 +1324,6 @@ Default: 00b.// <Roger_Notes> The followin are for different version of EEPROM contents purpose. 2008.11.22. -#ifdef EEPROM_OLD_FORMAT_SUPPORT -#define EEPROM_PwDiff 0x54 // Difference of gain index between legacy and high throughput OFDM. -#define EEPROM_ThermalMeter 0x55 // Thermal meter default value. -#define EEPROM_Reserved 0x56 // Reserved. -#define EEPROM_CrystalCap 0x57 // Crystal Cap. -#define EEPROM_TxPowerBase 0x58 // Tx Power of serving station. -#define EEPROM_TxPwIndex_CCK_24G 0x59 // 0x59~0x66 -#define EEPROM_TxPwIndex_OFDM_24G 0x67 // 0x67~0x74 -#define EEPROM_TSSI_A 0x75 //TSSI value of path A. -#define EEPROM_TSSI_B 0x76 //TSSI value of path B. -#define EEPROM_TxPwTkMode 0x77 //Tx Power tracking mode. -#define EEPROM_HT2T_CH1_A 0x78 //HT 2T path A channel 1 Power Index. -#define EEPROM_HT2T_CH7_A 0x79 //HT 2T path A channel 7 Power Index. -#define EEPROM_HT2T_CH13_A 0x7a //HT 2T path A channel 13 Power Index. -#define EEPROM_HT2T_CH1_B 0x7b //HT 2T path B channel 1 Power Index. -#define EEPROM_HT2T_CH7_B 0x7c //HT 2T path B channel 7 Power Index. -#define EEPROM_HT2T_CH13_B 0x7d //HT 2T path B channel 13 Power Index. -#define EEPROM_BoardType 0x7e //0x0: RTL8188SU, 0x1: RTL8191SU, 0x2: RTL8192SU, 0x3: RTL8191GU -#else #define EEPROM_BoardType 0x54 //0x0: RTL8188SU, 0x1: RTL8191SU, 0x2: RTL8192SU, 0x3: RTL8191GU#define EEPROM_TxPwIndex 0x55 //0x55-0x66, Tx Power index.#define EEPROM_PwDiff 0x67 // Difference of gain index between legacy and high throughput OFDM.
@@ -1366,7 +1341,6 @@ Default: 00b.#define EEPROM_TX_PWR_OFDM_DIFF 0x71// OFDM Tx Power Index Difference#define EEPROM_TX_PWR_BAND_EDGE 0x73// TX Power offset at band-edge channel#define TX_PWR_BAND_EDGE_CHK 0x79// Check if band-edge scheme is enabled -#endif #define EEPROM_Default_LegacyHTTxPowerDiff 0x3#define EEPROM_USB_Default_OPTIONAL_FUNC 0x8#define EEPROM_USB_Default_PHY_PARAM 0x0
drivers/staging/rtl8192su/r8192S_phy.c +0 -5
@@ -2639,10 +2639,6 @@ PHY_GetTxPowerLevel8192S(// // if(priv->epromtype == EPROM_93c46) { -#ifdef EEPROM_OLD_FORMAT_SUPPORT - powerlevel = priv->TxPowerLevelCCK[index]; - powerlevelOFDM24G = priv->TxPowerLevelOFDM24G[index]; -#else // // Mainly we use RF-A Tx Power to write the Tx Power registers, but the RF-B Tx // Power must be calculated by the antenna diff.
@@ -2821,7 +2817,6 @@ PHY_GetTxPowerLevel8192S(// Notify Tx power difference for B/C/D to A!!! rtl8192_setBBreg (dev, rFPGA0_TxGainStage, (bXBTxAGC|bXCTxAGC|bXDTxAGC), u4RegValue); -#endif }//
drivers/staging/rtl8192su/r8192U.h +0 -6
@@ -1662,11 +1662,6 @@ typedef struct r8192_privbool bDmDisableProtect;bool bIgnoreDiffRateTxPowerOffset; -#ifdef EEPROM_OLD_FORMAT_SUPPORT -u8 EEPROMTxPowerLevelCCK24G[14 ];// CCK 2.4G channel 1~14 -//u8 EEPROMTxPowerLevelOFDM24G[14]; // OFDM 2.4G channel 1~14 -//u8 EEPROMTxPowerLevelOFDM5G[24]; // OFDM 5G -#else // For EEPROM TX Power Index like 8190 series u8 EEPROMRfACCKChnl1TxPwLevel[3 ];//RF-A CCK Tx Power Level at channel 7 u8 EEPROMRfAOfdmChnlTxPwLevel[3 ];//RF-A CCK Tx Power Level at [0],[1],[2] = channel 1,7,13
@@ -1678,7 +1673,6 @@ typedef struct r8192_privu8 RfCckChnlAreaTxPwr[2 ][3 ];u8 RfOfdmChnlAreaTxPwr1T[2 ][3 ];u8 RfOfdmChnlAreaTxPwr2T[2 ][3 ]; -#endif // Add For EEPROM Efuse switch and Efuse Shadow map Setting bool EepromOrEfuse;
drivers/staging/rtl8192su/r8192U_core.c +0 -197
254 lines not on this page · raw message
PATCH 6/22 Staging: rtl8192su: remove USB_RX_AGGREGATION_SUPPORT ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove USB_RX_AGGREGATION_SUPPORT ifdefs
--- drivers/staging/rtl8192su/Makefile | 1 drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h | 6 drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 15 drivers/staging/rtl8192su/r8192U.h | 32 - drivers/staging/rtl8192su/r8192U_core.c | 471 ------------------- drivers/staging/rtl8192su/r8192U_dm.c | 98 --- drivers/staging/rtl8192su/r819xU_HTType.h | 6 7 files changed, 629 deletions(-)
drivers/staging/rtl8192su/Makefile +0 -1
@@ -12,7 +12,6 @@ EXTRA_CFLAGS += -DRTL8190_Download_Firmw EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1 -#EXTRA_CFLAGS += -DUSB_RX_AGGREGATION_SUPPORT=0 #EXTRA_CFLAGS += -DUSB_TX_DRIVER_AGGREGATION_ENABLE=0 #EXTRA_CFLAGS += -DRTL8192SU_DISABLE_CCK_RATE=0 EXTRA_CFLAGS += -DRTL8192S_DISABLE_FW_DM=0
drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h +0 -6
@@ -327,12 +327,6 @@ typedef struct _RT_HIGH_THROUGHPUT{#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE u8 UsbTxAggrNum;#endif -#ifdef USB_RX_AGGREGATION_SUPPORT -u8 UsbRxFwAggrEn; -u8 UsbRxFwAggrPageNum; -u8 UsbRxFwAggrPacketNum; -u8 UsbRxFwAggrTimeout; -#endif // Add for Broadcom(Linksys) IOT. Joseph u8 bIsPeerBcm;
drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c +0 -15
@@ -105,21 +105,6 @@ void HTUpdateDefaultSetting(struct ieee8#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE pHTInfo->UsbTxAggrNum =4 ;#endif -#ifdef USB_RX_AGGREGATION_SUPPORT -#ifdef RTL8192SU - pHTInfo->UsbRxFwAggrEn =1 ; - pHTInfo->UsbRxFwAggrPageNum =16 ; - pHTInfo->UsbRxFwAggrPacketNum =8 ; - pHTInfo->UsbRxFwAggrTimeout =4 ;////usb rx FW aggregation timeout threshold.It's in units of 64us -// For page size of receive packet buffer. - pHTInfo->UsbRxPageSize=128 ; -#else - pHTInfo->UsbRxFwAggrEn =1 ; - pHTInfo->UsbRxFwAggrPageNum =24 ; - pHTInfo->UsbRxFwAggrPacketNum =8 ; - pHTInfo->UsbRxFwAggrTimeout =16 ;////usb rx FW aggregation timeout threshold.It's in units of 64us -#endif -#endif }
drivers/staging/rtl8192su/r8192U.h +0 -32
@@ -693,11 +693,7 @@ typedef struct rx_desc_819x_usb{//DWORD 2 u16 Seq:12; u16 Frag:4; -#ifdef USB_RX_AGGREGATION_SUPPORT -u8 UsbAggPktNum;//:8; -#else u8 NextPktLen;//:8; -#endif u8 Rsvd0:6; u8 NextIND:1; u8 Rsvd1:1;
@@ -751,27 +747,6 @@ typedef struct rx_desc_819x_usb{ }rx_desc_819x_usb, *prx_desc_819x_usb;#endif -#ifdef USB_RX_AGGREGATION_SUPPORT -typedef struct _rx_desc_819x_usb_aggr_subframe { -//DOWRD 0 -u16 Length:14 ; -u16 CRC32:1 ; -u16 ICV:1 ; -u8 Offset; -u8 RxDrvInfoSize; -//DOWRD 1 -u8 Shift:2 ; -u8 PHYStatus:1 ; -u8 SWDec:1 ; -u8 Reserved1:4 ; -u8 Reserved2; -u16 Reserved3; -//DWORD 2 -//u4Byte Reserved3; -//DWORD 3 -//u4Byte BufferAddress; -}rx_desc_819x_usb_aggr_subframe , *prx_desc_819x_usb_aggr_subframe ; -#endif #ifdef RTL8192SU //
@@ -1896,13 +1871,6 @@ typedef struct r8192_priv//#endif -#ifdef USB_RX_AGGREGATION_SUPPORT -bool bCurrentRxAggrEnable; -bool bForcedUsbRxAggr; -u32 ForcedUsbRxAggrInfo; -u32 LastUsbRxAggrInfoSetting; -u32 RegUsbRxAggrInfo; -#endif
drivers/staging/rtl8192su/r8192U_core.c +0 -471
564 lines not on this page · raw message
drivers/staging/rtl8192su/r8192U_dm.c +0 -98
116 lines not on this page · raw message
drivers/staging/rtl8192su/r819xU_HTType.h +0 -6
@@ -296,12 +296,6 @@ typedef struct _RT_HIGH_THROUGHPUT{#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE u8 UsbTxAggrNum;#endif -#ifdef USB_RX_AGGREGATION_SUPPORT -u8 UsbRxFwAggrEn; -u8 UsbRxFwAggrPageNum; -u8 UsbRxFwAggrPacketNum; -u8 UsbRxFwAggrTimeout; -#endif // Add for Broadcom(Linksys) IOT. Joseph u8 bIsPeerBcm;
PATCH 7/22 Staging: rtl8192su: remove USB_TX_DRIVER_AGGREGATION_ENABLE ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove USB_TX_DRIVER_AGGREGATION_ENABLE ifdefs
--- drivers/staging/rtl8192su/Makefile | 1 drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c | 8 drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h | 3 drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 3 drivers/staging/rtl8192su/r8192U.h | 31 - drivers/staging/rtl8192su/r8192U_core.c | 327 ---------------- drivers/staging/rtl8192su/r819xU_HTType.h | 3 7 files changed, 376 deletions(-)
drivers/staging/rtl8192su/Makefile +0 -1
@@ -12,7 +12,6 @@ EXTRA_CFLAGS += -DRTL8190_Download_Firmw EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1 -#EXTRA_CFLAGS += -DUSB_TX_DRIVER_AGGREGATION_ENABLE=0 #EXTRA_CFLAGS += -DRTL8192SU_DISABLE_CCK_RATE=0 EXTRA_CFLAGS += -DRTL8192S_DISABLE_FW_DM=0 EXTRA_CFLAGS += -DDISABLE_BB_RF=0
drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c +0 -8
@@ -2237,11 +2237,7 @@ void ieee80211_softmac_xmit(struct ieee8#if 1 /* if xmit available, just xmit it immediately, else just insert it to the wait queue */ for (i =0 ; i < txb->nr_frags; i++) { -#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE -if ((skb_queue_len (&ieee->skb_drv_aggQ[queue_index]) !=0 ) || -#elseif ((skb_queue_len (&ieee->skb_waitQ[queue_index]) !=0 ) || -#endif (!ieee->check_nic_enough_desc (ieee->dev,queue_index))||\ (ieee->queue_stop)) {/* insert the skb packet to the wait queue */
@@ -2250,11 +2246,7 @@ void ieee80211_softmac_xmit(struct ieee8* */ //printk("error:no descriptor left@queue_index %d, %d, %d\n", queue_index, skb_queue_len(&ieee->skb_waitQ[queue_index]), ieee->check_nic_enough_desc(ieee->dev,queue_index)); //ieee80211_stop_queue(ieee); -#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE -skb_queue_tail (&ieee->skb_drv_aggQ[queue_index], txb->fragments[i]); -#else skb_queue_tail (&ieee->skb_waitQ[queue_index], txb->fragments[i]); -#endif }else { ieee->softmac_data_hard_start_xmit( txb->fragments[i],
drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h +0 -3
@@ -324,9 +324,6 @@ typedef struct _RT_HIGH_THROUGHPUT{u8 RxReorderPendingTime;u16 RxReorderDropCounter; -#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE -u8 UsbTxAggrNum; -#endif // Add for Broadcom(Linksys) IOT. Joseph u8 bIsPeerBcm;
drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c +0 -3
@@ -102,9 +102,6 @@ void HTUpdateDefaultSetting(struct ieee8 pHTInfo->RxReorderWinSize =64 ; pHTInfo->RxReorderPendingTime =30 ; -#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE - pHTInfo->UsbTxAggrNum =4 ; -#endif }
drivers/staging/rtl8192su/r8192U.h +0 -31
@@ -465,30 +465,6 @@ typedef struct _tx_desc_819x_usb { }tx_desc_819x_usb, *ptx_desc_819x_usb;#endif -#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE -typedef struct _tx_desc_819x_usb_aggr_subframe { -//DWORD 0 -u16 PktSize; -u8 Offset; -u8 TxFWInfoSize; - -//DWORD 1 -u8 RATid:3 ; -u8 DISFB:1 ; -u8 USERATE:1 ; -u8 MOREFRAG:1 ; -u8 NoEnc:1 ; -u8 PIFS:1 ; -u8 QueueSelect:5 ; -u8 NoACM:1 ; -u8 Reserved1:2 ; -u8 SecCAMID:5 ; -u8 SecDescAssign:1 ; -u8 SecType:2 ; -u8 PacketID:7 ; -u8 OWN:1 ; -}tx_desc_819x_usb_aggr_subframe , *ptx_desc_819x_usb_aggr_subframe ; -#endif #ifdef RTL8192SU
@@ -868,17 +844,10 @@ typedef struct rx_drvinfo_819x_usb{//#define TX_PACKET_SHIFT_BYTES (USB_HWDESC_HEADER_LEN + sizeof(tx_fwinfo_819x_usb)) #define MAX_FRAGMENT_COUNT 8#ifdef RTL8192U -#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE -#define MAX_TRANSMIT_BUFFER_SIZE 32000 -#else #define MAX_TRANSMIT_BUFFER_SIZE 8000 -#endif #else #define MAX_TRANSMIT_BUFFER_SIZE (1600+(MAX_802_11_HEADER_LENGTH+ENCRYPTION_MAX_OVERHEAD)*MAX_FRAGMENT_COUNT)#endif -#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE -#define TX_PACKET_DRVAGGR_SUBFRAME_SHIFT_BYTES (sizeof(tx_desc_819x_usb_aggr_subframe) + sizeof(tx_fwinfo_819x_usb)) -#endif #define scrclng 4 // octets for crc32 (FCS, ICV) typedef enum rf_optype
drivers/staging/rtl8192su/r8192U_core.c +0 -327
382 lines not on this page · raw message
drivers/staging/rtl8192su/r819xU_HTType.h +0 -3
@@ -293,9 +293,6 @@ typedef struct _RT_HIGH_THROUGHPUT{u8 RxReorderPendingTime;u16 RxReorderDropCounter; -#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE -u8 UsbTxAggrNum; -#endif // Add for Broadcom(Linksys) IOT. Joseph u8 bIsPeerBcm;
PATCH 8/22 Staging: rtl8192su: remove RTL8192SU_DISABLE_CCK_RATE ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove RTL8192SU_DISABLE_CCK_RATE ifdefs
--- drivers/staging/rtl8192su/Makefile | 1 - drivers/staging/rtl8192su/r8192U_core.c | 24 ------------------------ 2 files changed, 25 deletions(-)
drivers/staging/rtl8192su/Makefile +0 -1
@@ -12,7 +12,6 @@ EXTRA_CFLAGS += -DRTL8190_Download_Firmw EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1 -#EXTRA_CFLAGS += -DRTL8192SU_DISABLE_CCK_RATE=0 EXTRA_CFLAGS += -DRTL8192S_DISABLE_FW_DM=0 EXTRA_CFLAGS += -DDISABLE_BB_RF=0 EXTRA_CFLAGS += -DRTL8192SU_USE_PARAM_TXPWR=0
drivers/staging/rtl8192su/r8192U_core.c +0 -24
@@ -2981,10 +2981,6 @@ short rtl8192SU_tx(struct net_device *de/* DWORD 0 */ tx_desc->TxHT = (tcb_desc->data_rate&0x80 )?1 :0 ; -#ifdef RTL8192SU_DISABLE_CCK_RATE -if (tx_hal_is_cck_rate (tcb_desc->data_rate)) - tcb_desc->data_rate =MGN_6M ; -#endif tx_desc->TxRate =MRateToHwRate8190Pci (tcb_desc->data_rate);//tx_desc->EnableCPUDur = tcb_desc->bTxEnableFwCalcDur;
@@ -3567,11 +3563,7 @@ void rtl8192SU_net_update(struct net_dev//update Basic rate: RR, BRSR rtl8192_config_rate (dev, &rate_config);//HalSetBrateCfg -#ifdef RTL8192SU_DISABLE_CCK_RATE - priv->basic_rate = rate_config = rate_config &0x150 ;// Disable CCK 11M, 5.5M, 2M, and 1M rates. -#else priv->basic_rate = rate_config = rate_config &0x15f ; -#endif // Set RRSR rate table. write_nic_byte (dev,RRSR , rate_config&0xff );
@@ -3700,11 +3692,7 @@ void rtl8192SU_update_ratr_table(structbreak ; } -#ifdef RTL8192SU_DISABLE_CCK_RATE - ratr_value &=0x0FFFFFF0 ; -#else ratr_value &=0x0FFFFFFF ; -#endif // Get MAX MCS available. if ( (bNMode && ((ieee->pHTInfo->IOTAction & HT_IOT_ACT_DISABLE_SHORT_GI)==0)) &&
@@ -6763,11 +6751,7 @@ static void rtl8192SU_MacConfigAfterFwDo// Set Data Auto Rate Fallback Reg. Added by Roger, 2008.09.22. for (i =0 ; i <8 ; i++) -#ifdef RTL8192SU_DISABLE_CCK_RATE -write_nic_dword (dev,ARFR0 +i*4 ,0x1f0ff0f0 ); -#else write_nic_dword (dev,ARFR0 +i*4 ,0x1f0ffff0 ); -#endif // // Set driver info, we only accept PHY status now.
@@ -6877,11 +6861,7 @@ void rtl8192SU_HwConfigureRTL8192SUsb(st// 2008.09.23. // regTmp =read_nic_byte (dev,INIRTSMCS_SEL ); -#ifdef RTL8192SU_DISABLE_CCK_RATE - regRRSR = ((regRRSR &0x000ffff0 )<<8 ) | regTmp; -#else regRRSR = ((regRRSR &0x000fffff )<<8 ) | regTmp; -#endif // // Update SIFS timing.
@@ -6918,11 +6898,7 @@ void rtl8192SU_HwConfigureRTL8192SUsb(st// Set Data Auto Rate Fallback Reg. Added by Roger, 2008.09.22. for (i =0 ; i <8 ; i++) -#ifdef RTL8192SU_DISABLE_CCK_RATE -write_nic_dword (dev,ARFR0 +i*4 ,0x1f0ff0f0 ); -#else write_nic_dword (dev,ARFR0 +i*4 ,0x1f0ffff0 ); -#endif // // Aggregation length limit. Revised by Roger. 2008.09.22.
PATCH 9/22 Staging: rtl8192su: remove RTL8192S_DISABLE_FW_DM ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove RTL8192S_DISABLE_FW_DM ifdefs
--- drivers/staging/rtl8192su/Makefile | 1 - drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c | 4 ---- drivers/staging/rtl8192su/r8192S_phy.c | 2 -- drivers/staging/rtl8192su/r8192U_core.c | 3 --- 4 files changed, 10 deletions(-)
drivers/staging/rtl8192su/Makefile +0 -1
@@ -12,7 +12,6 @@ EXTRA_CFLAGS += -DRTL8190_Download_Firmw EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1 -EXTRA_CFLAGS += -DRTL8192S_DISABLE_FW_DM=0 EXTRA_CFLAGS += -DDISABLE_BB_RF=0 EXTRA_CFLAGS += -DRTL8192SU_USE_PARAM_TXPWR=0 EXTRA_CFLAGS += -DRTL8192SU_FPGA_UNSPECIFIED_NETWORK=0
drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c +0 -4
@@ -330,13 +330,11 @@ void ieee80211_wx_sync_scan_wq(struct wo#ifndef RTL8192SE ieee->InitialGainHandler (ieee->dev,IG_Backup);#endif -#if (RTL8192S_DISABLE_FW_DM ==0 )if (ieee->SetFwCmdHandler) { ieee->SetFwCmdHandler (ieee->dev,FW_CMD_DIG_HALT ); ieee->SetFwCmdHandler (ieee->dev,FW_CMD_HIGH_PWR_DISABLE ); } -#endif if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT && ieee->pHTInfo->bCurBW40MHz) { b40M =1 ; chan_offset = ieee->pHTInfo->CurSTAExtChnlOffset;
@@ -361,13 +359,11 @@ void ieee80211_wx_sync_scan_wq(struct wo#ifndef RTL8192SE ieee->InitialGainHandler (ieee->dev,IG_Restore);#endif -#if (RTL8192S_DISABLE_FW_DM ==0 )if (ieee->SetFwCmdHandler) { ieee->SetFwCmdHandler (ieee->dev,FW_CMD_DIG_RESUME ); ieee->SetFwCmdHandler (ieee->dev,FW_CMD_HIGH_PWR_ENABLE ); } -#endif ieee->state =IEEE80211_LINKED ; ieee->link_change (ieee->dev);// To prevent the immediately calling watch_dog after scan.
drivers/staging/rtl8192su/r8192S_phy.c +0 -2
@@ -3074,7 +3074,6 @@ PHY_ScanOperationBackup8192S( -#if (RTL8192S_DISABLE_FW_DM ==0 )if (!Adapter->bDriverStopped) {
@@ -3103,7 +3102,6 @@ PHY_ScanOperationBackup8192S( break; } } -#endif }#endif
drivers/staging/rtl8192su/r8192U_core.c +0 -3
@@ -7014,9 +7014,6 @@ start:// rtl8192SU_MacConfigAfterFwDownload (dev); -#if (RTL8192S_DISABLE_FW_DM ==1 ) -write_nic_dword (dev,WFM5 ,FW_DM_DISABLE ); -#endif //priv->bLbusEnable = TRUE; //if(priv->RegRfOff == TRUE) // priv->eRFPowerState = eRfOff;
PATCH 10/22 Staging: rtl8192su: remove DISABLE_BB_RF ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove DISABLE_BB_RF ifdefs
--- drivers/staging/rtl8192su/Makefile | 1 - drivers/staging/rtl8192su/r8192S_phy.c | 12 ------------ 2 files changed, 13 deletions(-)
drivers/staging/rtl8192su/Makefile +0 -1
@@ -12,7 +12,6 @@ EXTRA_CFLAGS += -DRTL8190_Download_Firmw EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1 -EXTRA_CFLAGS += -DDISABLE_BB_RF=0 EXTRA_CFLAGS += -DRTL8192SU_USE_PARAM_TXPWR=0 EXTRA_CFLAGS += -DRTL8192SU_FPGA_UNSPECIFIED_NETWORK=0 #EXTRA_CFLAGS += -DRTL8192SU_FPGA_2MAC_VERIFICATION #=0
drivers/staging/rtl8192su/r8192S_phy.c +0 -12
@@ -418,9 +418,6 @@ u32 rtl8192_QueryBBReg(struct net_deviceu32 ReturnValue =0 , OriginalValue, BitShift; -#if (DISABLE_BB_RF ==1 ) -return 0 ; -#endif RT_TRACE (COMP_RF ,"--->PHY_QueryBBReg(): RegAddr(%#x), BitMask(%#x)\n" , RegAddr, BitMask);
@@ -481,9 +478,6 @@ void rtl8192_setBBreg(struct net_device* {u32 OriginalValue, BitShift, NewValue; -#if (DISABLE_BB_RF ==1 ) -return ; -#endif RT_TRACE (COMP_RF ,"--->PHY_SetBBReg(): RegAddr(%#x), BitMask(%#x), Data(%#x)\n" , RegAddr, BitMask, Data);
@@ -557,9 +551,6 @@ u32 rtl8192_phy_QueryRFReg(struct net_deu32 Original_Value, Readback_Value, BitShift;//, flags; struct r8192_priv *priv =ieee80211_priv (dev); -#if (DISABLE_BB_RF ==1 ) -return 0 ; -#endif RT_TRACE (COMP_RF ,"--->PHY_QueryRFReg(): RegAddr(%#x), eRFPath(%#x), BitMask(%#x)\n" , RegAddr, eRFPath,BitMask);
@@ -636,9 +627,6 @@ void rtl8192_phy_SetRFReg(struct net_devstruct r8192_priv *priv =ieee80211_priv (dev);u32 Original_Value, BitShift, New_Value;//, flags; -#if (DISABLE_BB_RF ==1 ) -return ; -#endif RT_TRACE (COMP_RF ,"--->PHY_SetRFReg(): RegAddr(%#x), BitMask(%#x), Data(%#x), eRFPath(%#x)\n" , RegAddr, BitMask, Data, eRFPath);
PATCH 11/22 Staging: rtl8192su: remove RTL8192SU_USE_PARAM_TXPWR ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove RTL8192SU_USE_PARAM_TXPWR ifdefs
--- drivers/staging/rtl8192su/Makefile | 1 - drivers/staging/rtl8192su/r8192U_core.c | 5 ----- 2 files changed, 6 deletions(-)
drivers/staging/rtl8192su/Makefile +0 -1
@@ -12,7 +12,6 @@ EXTRA_CFLAGS += -DRTL8190_Download_Firmw EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1 -EXTRA_CFLAGS += -DRTL8192SU_USE_PARAM_TXPWR=0 EXTRA_CFLAGS += -DRTL8192SU_FPGA_UNSPECIFIED_NETWORK=0 #EXTRA_CFLAGS += -DRTL8192SU_FPGA_2MAC_VERIFICATION #=0 EXTRA_CFLAGS += -DRTL8192SU_ASIC_VERIFICATION
drivers/staging/rtl8192su/r8192U_core.c +0 -5
@@ -5513,12 +5513,7 @@ rtl8192SU_ReadAdapterInfo8192SUsb(structelse { priv->AutoloadFailFlag=FALSE; -#if RTL8192SU_USE_PARAM_TXPWR - priv->bTXPowerDataReadFromEEPORM = FALSE; -#else priv->bTXPowerDataReadFromEEPORM = TRUE; -#endif - }// Read IC Version && Channel Plan if (!priv->AutoloadFailFlag)
PATCH 12/22 Staging: rtl8192su: remove RTL8192SU_FPGA_UNSPECIFIED_NETWORK ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove RTL8192SU_FPGA_UNSPECIFIED_NETWORK ifdefs
--- drivers/staging/rtl8192su/Makefile | 1 - drivers/staging/rtl8192su/r8192U_core.c | 22 ---------------------- 2 files changed, 23 deletions(-)
drivers/staging/rtl8192su/Makefile +0 -1
@@ -12,7 +12,6 @@ EXTRA_CFLAGS += -DRTL8190_Download_Firmw EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1 -EXTRA_CFLAGS += -DRTL8192SU_FPGA_UNSPECIFIED_NETWORK=0 #EXTRA_CFLAGS += -DRTL8192SU_FPGA_2MAC_VERIFICATION #=0 EXTRA_CFLAGS += -DRTL8192SU_ASIC_VERIFICATION EXTRA_CFLAGS += -DRTL8192SU_USB_PHY_TEST=0
drivers/staging/rtl8192su/r8192U_core.c +0 -22
@@ -2957,19 +2957,6 @@ short rtl8192SU_tx(struct net_device *dememset (tx_desc,0 ,sizeof (tx_desc_819x_usb)); -#if RTL8192SU_FPGA_UNSPECIFIED_NETWORK -if (IsQoSDataFrame (skb->data)) - { - tcb_desc->bAMPDUEnable = TRUE; - tx_desc->NonQos =0 ; - } -else - tcb_desc->bAMPDUEnable = FALSE; - - tcb_desc->bPacketBW = TRUE; - priv->CurrentChannelBW =HT_CHANNEL_WIDTH_20_40 ; -#endif -#if (defined (RTL8192SU_FPGA_2MAC_VERIFICATION )||defined (RTL8192SU_ASIC_VERIFICATION )) tx_desc->NonQos = (IsQoSDataFrame (skb->data)==TRUE)?0 :1 ;#endif
@@ -7280,15 +7267,6 @@ start:// <Roger_Notes> We return status here for temporal FPGA verification. 2008.05.12. // -#if RTL8192SU_FPGA_UNSPECIFIED_NETWORK -// -// To send specific number of packets to verify MAC Lookback mode. -// -//SendRandomTxPkt(Adapter, 0); // Burst mode for verification. -//rtStatus = RT_STATUS_FAILURE; - rtStatus = true; - goto end; -#endif // The following IO was for FPGA verification purpose. Added by Roger, 2008.09.11. #if 0
PATCH 13/22 Staging: rtl8192su: remove RTL8192SU_FPGA_2MAC_VERIFICATION ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove RTL8192SU_FPGA_2MAC_VERIFICATION ifdefs
--- drivers/staging/rtl8192su/Makefile | 1 - drivers/staging/rtl8192su/r8192S_firmware.c | 2 +- drivers/staging/rtl8192su/r8192U_core.c | 12 ++++++------ 3 files changed, 7 insertions(+), 8 deletions(-)
drivers/staging/rtl8192su/Makefile +0 -1
@@ -12,7 +12,6 @@ EXTRA_CFLAGS += -DRTL8190_Download_Firmw EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1 -#EXTRA_CFLAGS += -DRTL8192SU_FPGA_2MAC_VERIFICATION #=0 EXTRA_CFLAGS += -DRTL8192SU_ASIC_VERIFICATION EXTRA_CFLAGS += -DRTL8192SU_USB_PHY_TEST=0
drivers/staging/rtl8192su/r8192S_firmware.c +1 -1
@@ -320,7 +320,7 @@ FirmwareCheckReady(struct net_device *deRT_TRACE (COMP_FIRMWARE ,"FirmwareCheckReady(): Current RCR settings(%#x)\n" , tmpU4b); -#if (defined (RTL8192SU_FPGA_2MAC_VERIFICATION ) ||defined (RTL8192SU_ASIC_VERIFICATION )) +#if defined (RTL8192SU_ASIC_VERIFICATION )#ifdef NOT_YET //YJ,TMP priv->TransmitConfig =read_nic_dword (dev,TCR );RT_TRACE (COMP_FIRMWARE ,"FirmwareCheckReady(): Current TCR settings(%x)\n" , priv->TransmitConfig);
drivers/staging/rtl8192su/r8192U_core.c +6 -6
@@ -2957,7 +2957,7 @@ short rtl8192SU_tx(struct net_device *dememset (tx_desc,0 ,sizeof (tx_desc_819x_usb)); -#if (defined (RTL8192SU_FPGA_2MAC_VERIFICATION )||defined (RTL8192SU_ASIC_VERIFICATION )) +#if defined (RTL8192SU_ASIC_VERIFICATION ) tx_desc->NonQos = (IsQoSDataFrame (skb->data)==TRUE)?0 :1 ;#endif
@@ -4029,7 +4029,7 @@ bool GetNmodeSupportBySecCfg8192(structint wpa_ie_len= ieee->wpa_ie_len;struct ieee80211_crypt_data * crypt;int encrypt; -#if (defined (RTL8192SU_FPGA_2MAC_VERIFICATION )||defined (RTL8192SU_ASIC_VERIFICATION )) +#if defined (RTL8192SU_ASIC_VERIFICATION )return TRUE;#endif
@@ -4883,7 +4883,7 @@ static void rtl8192SU_ReadAdapterInfo819RT_TRACE (COMP_EPROM ,"MAC addr:" MAC_FMT "\n" ,MAC_ARG (dev->dev_addr)); priv->rf_type =RTL819X_DEFAULT_RF_TYPE ;//default 1T2R -#if (defined (RTL8192SU_FPGA_2MAC_VERIFICATION )||defined (RTL8192SU_ASIC_VERIFICATION )) +#if defined (RTL8192SU_ASIC_VERIFICATION ) priv->rf_chip =RF_6052 ; priv->rf_type =RTL819X_DEFAULT_RF_TYPE ;//priv->card_8192_version = VERSION_8192SU_A; //Over write for temporally experiment. 2008.10.16. By Roger.
@@ -5215,7 +5215,7 @@ rtl8192SU_ReadAdapterInfo8192SEFuse(stru// 2007/11/15 MH For RTL8192USB we assign as 1T2R now. priv->rf_type =RTL819X_DEFAULT_RF_TYPE ;// default : 1T2R -#if (defined (RTL8192SU_FPGA_2MAC_VERIFICATION )||defined (RTL8192SU_ASIC_VERIFICATION )) +#if defined (RTL8192SU_ASIC_VERIFICATION ) priv->rf_chip =RF_6052 ; priv->rf_type =RTL819X_DEFAULT_RF_TYPE ;#else
@@ -5660,7 +5660,7 @@ rtl8192SU_ReadAdapterInfo8192SUsb(struct// priv->rf_type = RF_1T2R; //} -#if (defined (RTL8192SU_FPGA_2MAC_VERIFICATION )||defined (RTL8192SU_ASIC_VERIFICATION )) +#if defined (RTL8192SU_ASIC_VERIFICATION ) priv->rf_chip =RF_6052 ;#else priv->rf_chip =RF_8256 ;
@@ -7778,7 +7778,7 @@ rtl819x_ifcheck_resetornot(struct net_deRESET_TYPE RxResetType =RESET_TYPE_NORESET ;RT_RF_POWER_STATE rfState; -#if (defined (RTL8192SU_FPGA_2MAC_VERIFICATION )||defined (RTL8192SU_ASIC_VERIFICATION )) +#if defined (RTL8192SU_ASIC_VERIFICATION )return RESET_TYPE_NORESET ;#endif
PATCH 14/22 Staging: rtl8192su: remove RTL8192SU_ASIC_VERIFICATION ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove RTL8192SU_ASIC_VERIFICATION ifdefs
--- drivers/staging/rtl8192su/Makefile | 1 - drivers/staging/rtl8192su/r8192S_firmware.c | 2 -- drivers/staging/rtl8192su/r8192U_core.c | 18 ------------------ 3 files changed, 21 deletions(-)
drivers/staging/rtl8192su/Makefile +0 -1
@@ -12,7 +12,6 @@ EXTRA_CFLAGS += -DRTL8190_Download_Firmw EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1 -EXTRA_CFLAGS += -DRTL8192SU_ASIC_VERIFICATION EXTRA_CFLAGS += -DRTL8192SU_USB_PHY_TEST=0 #EXTRA_CFLAGS += -DMUTIPLE_BULK_OUT
drivers/staging/rtl8192su/r8192S_firmware.c +0 -2
@@ -320,13 +320,11 @@ FirmwareCheckReady(struct net_device *deRT_TRACE (COMP_FIRMWARE ,"FirmwareCheckReady(): Current RCR settings(%#x)\n" , tmpU4b); -#if defined (RTL8192SU_ASIC_VERIFICATION )#ifdef NOT_YET //YJ,TMP priv->TransmitConfig =read_nic_dword (dev,TCR );RT_TRACE (COMP_FIRMWARE ,"FirmwareCheckReady(): Current TCR settings(%x)\n" , priv->TransmitConfig); pHalData->FwRsvdTxPageCfg =read_nic_byte (dev,FW_RSVD_PG_CRTL );#endif -#endif // Set to normal mode. write_nic_byte (dev,LBKMD_SEL ,LBK_NORMAL );
drivers/staging/rtl8192su/r8192U_core.c +0 -18
@@ -2957,9 +2957,7 @@ short rtl8192SU_tx(struct net_device *dememset (tx_desc,0 ,sizeof (tx_desc_819x_usb)); -#if defined (RTL8192SU_ASIC_VERIFICATION ) tx_desc->NonQos = (IsQoSDataFrame (skb->data)==TRUE)?0 :1 ; -#endif /* Fill Tx descriptor */ //memset(tx_fwinfo,0,sizeof(tx_fwinfo_819x_usb));
@@ -4029,9 +4027,7 @@ bool GetNmodeSupportBySecCfg8192(structint wpa_ie_len= ieee->wpa_ie_len;struct ieee80211_crypt_data * crypt;int encrypt; -#if defined (RTL8192SU_ASIC_VERIFICATION )return TRUE; -#endif 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
@@ -4883,13 +4879,9 @@ static void rtl8192SU_ReadAdapterInfo819RT_TRACE (COMP_EPROM ,"MAC addr:" MAC_FMT "\n" ,MAC_ARG (dev->dev_addr)); priv->rf_type =RTL819X_DEFAULT_RF_TYPE ;//default 1T2R -#if defined (RTL8192SU_ASIC_VERIFICATION ) priv->rf_chip =RF_6052 ; priv->rf_type =RTL819X_DEFAULT_RF_TYPE ;//priv->card_8192_version = VERSION_8192SU_A; //Over write for temporally experiment. 2008.10.16. By Roger. -#else - priv->rf_chip =RF_8256 ; -#endif {#if 0
@@ -5215,12 +5207,8 @@ rtl8192SU_ReadAdapterInfo8192SEFuse(stru// 2007/11/15 MH For RTL8192USB we assign as 1T2R now. priv->rf_type =RTL819X_DEFAULT_RF_TYPE ;// default : 1T2R -#if defined (RTL8192SU_ASIC_VERIFICATION ) priv->rf_chip =RF_6052 ; priv->rf_type =RTL819X_DEFAULT_RF_TYPE ; -#else - priv->rf_chip =RF_8256 ; -#endif {//
@@ -5660,11 +5648,7 @@ rtl8192SU_ReadAdapterInfo8192SUsb(struct// priv->rf_type = RF_1T2R; //} -#if defined (RTL8192SU_ASIC_VERIFICATION ) priv->rf_chip =RF_6052 ; -#else - priv->rf_chip =RF_8256 ; -#endif priv->rf_chip =RF_6052 ;//lzm test RT_TRACE (COMP_INIT ,"BoardType = 0x%2x\n" , priv->EEPROMBoardType);
@@ -7778,9 +7762,7 @@ rtl819x_ifcheck_resetornot(struct net_deRESET_TYPE RxResetType =RESET_TYPE_NORESET ;RT_RF_POWER_STATE rfState; -#if defined (RTL8192SU_ASIC_VERIFICATION )return RESET_TYPE_NORESET ; -#endif rfState = priv->ieee80211->eRFPowerState;
PATCH 15/22 Staging: rtl8192su: remove RTL8192SU_USB_PHY_TEST ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove RTL8192SU_USB_PHY_TEST ifdefs
--- drivers/staging/rtl8192su/Makefile | 2 -- drivers/staging/rtl8192su/r8192U_core.c | 17 ----------------- 2 files changed, 19 deletions(-)
drivers/staging/rtl8192su/Makefile +0 -2
@@ -12,8 +12,6 @@ EXTRA_CFLAGS += -DRTL8190_Download_Firmw EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1 -EXTRA_CFLAGS += -DRTL8192SU_USB_PHY_TEST=0 - #EXTRA_CFLAGS += -DMUTIPLE_BULK_OUT r8192s_usb-objs := \
drivers/staging/rtl8192su/r8192U_core.c +0 -17
@@ -6683,23 +6683,6 @@ static void rtl8192SU_MacConfigAfterFwDo tmpU1b =read_nic_byte_E (dev,0x5C );write_nic_byte_E (dev,0x5C , tmpU1b|BIT7 ); -// -// Revise USB PHY to solve the issue of Rx payload error, Rivesed by Roger, 2008-04-10 -// Suggest by SD1 Alex. -// -// <Roger_Notes> The following operation are ONLY for USB PHY test chip. -// 2008.10.07. -// -#if RTL8192SU_USB_PHY_TEST -write_nic_byte (dev,0x41 ,0xf4 ); -write_nic_byte (dev,0x40 ,0x00 ); -write_nic_byte (dev,0x42 ,0x00 ); -write_nic_byte (dev,0x42 ,0x01 ); -write_nic_byte (dev,0x40 ,0x0f ); -write_nic_byte (dev,0x42 ,0x00 ); -write_nic_byte (dev,0x42 ,0x01 ); -#endif -#if 0 //LZM 090219 // // Suggested by SD1 Alex, 2008-06-14.
PATCH 16/22 Staging: rtl8192su: remove RTL8190_Download_Firmware_From_Header ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove RTL8190_Download_Firmware_From_Header ifdefs
--- drivers/staging/rtl8192su/Makefile | 1 drivers/staging/rtl8192su/r8192S_phy.c | 36 ----------------------------- drivers/staging/rtl8192su/r8192S_rtl6052.c | 11 -------- 3 files changed, 48 deletions(-)
drivers/staging/rtl8192su/Makefile +0 -1
@@ -8,7 +8,6 @@ EXTRA_CFLAGS += -DJACKSON_NEW_RX EXTRA_CFLAGS += -DTHOMAS_BEACON EXTRA_CFLAGS += -DRTL8192SU -EXTRA_CFLAGS += -DRTL8190_Download_Firmware_From_Header=1 EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1
drivers/staging/rtl8192su/r8192S_phy.c +0 -36
@@ -1331,13 +1331,7 @@ extern bool PHY_MACConfig8192S(struct ne// // Config MAC // -#if RTL8190_Download_Firmware_From_Header rtStatus =phy_ConfigMACWithHeaderFile (dev); -#else -// Not make sure EEPROM, add later -RT_TRACE (COMP_INIT ,"Read MACREG.txt\n" ); -//rtStatus = phy_ConfigMACWithParaFile(dev, RTL819X_PHY_MACREG);// lzm del it temp -#endif return (rtStatus ==RT_STATUS_SUCCESS ) ? true:false; }
@@ -1545,7 +1539,6 @@ phy_BB8192S_Config_ParaFile(struct net_d// 1. Read PHY_REG.TXT BB INIT!! // We will seperate as 1T1R/1T2R/1T2R_GREEN/2T2R // -#if RTL8190_Download_Firmware_From_Headerif (priv->rf_type ==RF_1T2R || priv->rf_type ==RF_2T2R || priv->rf_type ==RF_1T1R ||priv->rf_type ==RF_2T2R_GREEN ) {
@@ -1557,26 +1550,6 @@ phy_BB8192S_Config_ParaFile(struct net_d } }else rtStatus =RT_STATUS_FAILURE ; -#else -RT_TRACE (COMP_INIT ,"RF_Type == %d\n" , priv->rf_type); -// No matter what kind of RF we always read PHY_REG.txt. We must copy different -// type of parameter files to phy_reg.txt at first. -if (priv->rf_type ==RF_1T2R || priv->rf_type ==RF_2T2R || - priv->rf_type ==RF_1T1R ||priv->rf_type ==RF_2T2R_GREEN ) - { - rtStatus =phy_ConfigBBWithParaFile (dev, (char * )&szBBRegFile); -if (priv->rf_type !=RF_2T2R && priv->rf_type !=RF_2T2R_GREEN ) - {//2008.11.10 Added by tynli. The default PHY_REG.txt we read is for 2T2R, -//so we should reconfig BB reg with the right PHY parameters. -if (priv->rf_type ==RF_1T1R ) - rtStatus =phy_SetBBtoDiffRFWithParaFile (dev, (char * )&szBBRegto1T1RFile); -else if (priv->rf_type ==RF_1T2R ) - rtStatus =phy_SetBBtoDiffRFWithParaFile (dev, (char * )&szBBRegto1T2RFile); - } - - }else - rtStatus =RT_STATUS_FAILURE ; -#endif if (rtStatus !=RT_STATUS_SUCCESS ){RT_TRACE (COMP_INIT ,"phy_BB8192S_Config_ParaFile():Write BB Reg Fail!!" );
@@ -1588,11 +1561,7 @@ phy_BB8192S_Config_ParaFile(struct net_d// if (priv->AutoloadFailFlag == false) { -#if RTL8190_Download_Firmware_From_Header rtStatus =phy_ConfigBBWithPgHeaderFile (dev,BaseBand_Config_PHY_REG); -#else - rtStatus =phy_ConfigBBWithPgParaFile (dev, (char * )&szBBRegPgFile); -#endif }if (rtStatus !=RT_STATUS_SUCCESS ){RT_TRACE (COMP_INIT ,"phy_BB8192S_Config_ParaFile():BB_PG Reg Fail!!" );
@@ -1602,12 +1571,7 @@ phy_BB8192S_Config_ParaFile(struct net_d// // 3. BB AGC table Initialization // -#if RTL8190_Download_Firmware_From_Header rtStatus =phy_ConfigBBWithHeaderFile (dev,BaseBand_Config_AGC_TAB); -#else -RT_TRACE (COMP_INIT ,"phy_BB8192S_Config_ParaFile AGC_TAB.txt\n" ); - rtStatus =phy_ConfigBBWithParaFile (Adapter, (char * )&szAGCTableFile); -#endif if (rtStatus !=RT_STATUS_SUCCESS ){printk ("phy_BB8192S_Config_ParaFile():AGC Table Fail\n" );
drivers/staging/rtl8192su/r8192S_rtl6052.c +0 -11
@@ -684,21 +684,10 @@ RT_STATUS phy_RF6052_Config_ParaFile(strswitch (eRFPath) {case RF90_PATH_A : -#if RTL8190_Download_Firmware_From_Header rtStatus=rtl8192_phy_ConfigRFWithHeaderFile (dev,(RF90_RADIO_PATH_E )eRFPath); -#else - rtStatus =PHY_ConfigRFWithParaFile (Adapter, (char * )&szRadioAFile, (RF90_RADIO_PATH_E )eRFPath); -#endif break ;case RF90_PATH_B : -#if RTL8190_Download_Firmware_From_Header rtStatus=rtl8192_phy_ConfigRFWithHeaderFile (dev,(RF90_RADIO_PATH_E )eRFPath); -#else -if (priv->rf_type ==RF_2T2R_GREEN ) - rtStatus =PHY_ConfigRFWithParaFile (Adapter, (ps1Byte)&szRadioBGMFile, (RF90_RADIO_PATH_E )eRFPath); -else - rtStatus =PHY_ConfigRFWithParaFile (Adapter, (char * )&szRadioBFile, (RF90_RADIO_PATH_E )eRFPath); -#endif break ;case RF90_PATH_C :break ;
PATCH 17/22 Staging: rtl8192su: remove RTL8192S_PREPARE_FOR_NORMAL_RELEASE ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove RTL8192S_PREPARE_FOR_NORMAL_RELEASE ifdefs
--- drivers/staging/rtl8192su/Makefile | 1 - drivers/staging/rtl8192su/r8192U_core.c | 8 -------- 2 files changed, 9 deletions(-)
drivers/staging/rtl8192su/Makefile +0 -1
@@ -8,7 +8,6 @@ EXTRA_CFLAGS += -DJACKSON_NEW_RX EXTRA_CFLAGS += -DTHOMAS_BEACON EXTRA_CFLAGS += -DRTL8192SU -EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1 #EXTRA_CFLAGS += -DMUTIPLE_BULK_OUT
drivers/staging/rtl8192su/r8192U_core.c +0 -8
@@ -6572,7 +6572,6 @@ static void rtl8192SU_SetHwRegAmpduMinSpu8 MinSpacingToSet;u8 SecMinSpace; -#ifdef RTL8192S_PREPARE_FOR_NORMAL_RELEASE MinSpacingToSet = MinSpaceCfg;if (MinSpacingToSet <=7 ) {
@@ -6593,13 +6592,6 @@ static void rtl8192SU_SetHwRegAmpduMinSp write_nic_byte(dev, AMPDU_MIN_SPACE, priv->MinSpaceCfg); } -#else - MinSpacingToSet = MinSpaceCfg; - MinSpacingToSet &=0x07 ;// We only care about bit[2:0] - priv->MinSpaceCfg |= MinSpacingToSet; -RT_TRACE (COMP_SEC ,"Set AMPDU_MIN_SPACE: %x\n" , priv->MinSpaceCfg); -write_nic_byte (dev,AMPDU_MIN_SPACE , priv->MinSpaceCfg);//FIXLZM -#endif }#endif
PATCH 18/22 Staging: rtl8192su: remove RTL8192SU_DISABLE_IQK ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove RTL8192SU_DISABLE_IQK ifdefs
--- drivers/staging/rtl8192su/Makefile | 1 - drivers/staging/rtl8192su/r8192U_core.c | 11 ----------- 2 files changed, 12 deletions(-)
drivers/staging/rtl8192su/Makefile +0 -1
@@ -8,7 +8,6 @@ EXTRA_CFLAGS += -DJACKSON_NEW_RX EXTRA_CFLAGS += -DTHOMAS_BEACON EXTRA_CFLAGS += -DRTL8192SU -EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1 #EXTRA_CFLAGS += -DMUTIPLE_BULK_OUT
drivers/staging/rtl8192su/r8192U_core.c +0 -11
@@ -7033,17 +7033,6 @@ start://PHY_SetBBReg(Adapter, rOFDM0_TRxPathEnable, bMaskByte0, 0x11); } -#if (RTL8192SU_DISABLE_IQK ==0 ) -// For 1T2R IQK only currently. -if (priv->card_8192_version ==VERSION_8192S_BCUT ) - { -PHY_IQCalibrateBcut (dev); - } -else if (priv->card_8192_version ==VERSION_8192S_ACUT ) - { -PHY_IQCalibrate (dev); - } -#endif //LZM 090219 // Set CCK and OFDM Block "ON"
PATCH 19/22 Staging: rtl8192su: remove RTL8192SE ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove RTL8192SE ifdefs
--- drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c | 4 drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 2 drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 16 drivers/staging/rtl8192su/r8192S_Efuse.c | 27 drivers/staging/rtl8192su/r8192S_firmware.c | 28 drivers/staging/rtl8192su/r8192S_firmware.h | 5 drivers/staging/rtl8192su/r8192S_hw.h | 101 --- drivers/staging/rtl8192su/r8192S_phy.c | 417 ------------- 8 files changed, 12 insertions(+), 588 deletions(-)
drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c +0 -4
@@ -327,9 +327,7 @@ void ieee80211_wx_sync_scan_wq(struct wo ieee->state =IEEE80211_LINKED_SCANNING ; ieee->link_change (ieee->dev); -#ifndef RTL8192SE ieee->InitialGainHandler (ieee->dev,IG_Backup); -#endif if (ieee->SetFwCmdHandler) { ieee->SetFwCmdHandler (ieee->dev,FW_CMD_DIG_HALT );
@@ -356,9 +354,7 @@ void ieee80211_wx_sync_scan_wq(struct wo ieee->set_chan (ieee->dev, chan); } -#ifndef RTL8192SE ieee->InitialGainHandler (ieee->dev,IG_Restore); -#endif if (ieee->SetFwCmdHandler) { ieee->SetFwCmdHandler (ieee->dev,FW_CMD_DIG_RESUME );
drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c +1 -1
@@ -495,7 +495,7 @@ void ieee80211_query_protectionmode(stru { tcb_desc->bCTSEnable = true; tcb_desc->rts_rate =MGN_24M ; -#if defined(RTL8192SE ) || defined(RTL8192SU ) +#if defined(RTL8192SU ) tcb_desc->bRTSEnable = false;#else tcb_desc->bRTSEnable = true;
drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c +7 -9
@@ -516,7 +516,7 @@ bool HTIOTActIsDisableMCSTwoSpatialStrea//#endif #endif #if 1 -#if (defined(RTL8192SE) || (defined(RTL8192SU))) +#if defined(RTL8192SU) PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; if(ieee->is_ap_in_wep_tkip && ieee->is_ap_in_wep_tkip(ieee->dev)) {
@@ -595,7 +595,7 @@ u8 HTIOTActIsForcedRTSCTS(struct ieee802u8 retValue =0 ;printk ("============>%s(), %d\n" , __FUNCTION__, network->realtek_cap_exit);// Force protection -#if defined(RTL8192SE ) || defined(RTL8192SU ) +#if defined(RTL8192SU )if (ieee->pHTInfo->bCurrentHTSupport) {//if(!network->realtek_cap_exit)
@@ -621,14 +621,12 @@ HTIOTActIsForcedAMSDU8K(struct ieee80211u8 HTIOTActIsCCDFsync (u8 * PeerMacAddr) {u8 retValue =0 ; -#ifndef RTL8192SE if ( (memcmp (PeerMacAddr,UNKNOWN_BORADCOM ,3 )==0 ) || (memcmp (PeerMacAddr,LINKSYSWRT330_LINKSYSWRT300_BROADCOM ,3 )==0 ) || (memcmp (PeerMacAddr,LINKSYSWRT350_LINKSYSWRT150_BROADCOM ,3 ) ==0 )) { retValue =1 ; } -#endif return retValue; }
@@ -642,7 +640,7 @@ HTIOCActRejcectADDBARequest(struct ieee8//if(IS_HARDWARE_TYPE_8192SE(Adapter) || // IS_HARDWARE_TYPE_8192SU(Adapter) //) -#if (definedRTL8192SE || definedRTL8192SU ) +#if definedRTL8192SU {// Do not reject ADDBA REQ because some of the AP may // keep on sending ADDBA REQ qhich cause DHCP fail or ping loss!
@@ -735,7 +733,7 @@ HTIOTActIsDisableTx40MHz(struct ieee8021 {u8 retValue =0 ; -#if (definedRTL8192SU || definedRTL8192SE ) +#if definedRTL8192SU PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; if( (KEY_TYPE_WEP104 == ieee->pairwise_key_type) || (KEY_TYPE_WEP40 == ieee->pairwise_key_type) ||
@@ -756,7 +754,7 @@ HTIOTActIsTxNoAggregation(struct ieee802 {u8 retValue =0 ; -#if (definedRTL8192SU || definedRTL8192SE ) +#if definedRTL8192SU PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; if( (KEY_TYPE_WEP104 == ieee->pairwise_key_type) || (KEY_TYPE_WEP40 == ieee->pairwise_key_type) ||
@@ -779,7 +777,7 @@ HTIOTActIsDisableTx2SS(struct ieee80211_ {u8 retValue =0 ; -#if (definedRTL8192SU || definedRTL8192SE ) +#if definedRTL8192SU PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; if( (KEY_TYPE_WEP104 == ieee->pairwise_key_type) || (KEY_TYPE_WEP40 == ieee->pairwise_key_type) ||
@@ -799,7 +797,7 @@ HTIOTActIsDisableTx2SS(struct ieee80211_bool HTIOCActAllowPeerAggOnePacket (struct ieee80211_device * ieee,struct ieee80211_network *network) {bool retValue = false; -#if defined(RTL8192SE ) || defined(RTL8192SU ) +#if defined(RTL8192SU )PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; {if (pHTInfo->IOTPeer ==HT_IOT_PEER_MARVELL )
drivers/staging/rtl8192su/r8192S_Efuse.c +0 -27
@@ -708,12 +708,6 @@ EFUSE_ShadowUpdate(struct net_device* defor (offset =0 ; offset <16 ; offset++) {// Offset 0x18-1F are reserved now!!! -#ifdef RTL8192SE -if (priv->card_8192 ==NIC_8192SE ){ -if (offset ==3 ) -continue ; - } -#endif word_en =0x0F ; base = offset *8 ;
@@ -729,12 +723,6 @@ EFUSE_ShadowUpdate(struct net_device* de }// 2008/12/11 MH HW autoload fail workaround for A/BCUT. -#ifdef RTL8192SE -if (first_pg == TRUE && offset ==1 && (priv->card_8192 ==NIC_8192SE )) - { -continue ; - } -#endif if (first_pg == TRUE) {
@@ -774,21 +762,6 @@ EFUSE_ShadowUpdate(struct net_device* de// 2008/12/01 MH For Efuse HW load bug workarounf method!!!! // We will force write 0x10EC into address 10&11 after all Efuse content. // -#ifdef RTL8192SE -if (first_pg == TRUE && (priv->card_8192 ==NIC_8192SE )) - { -// 2008/12/11 MH Use new method to prevent HW autoload fail. -u8 tmpdata[8 ]; - -memcpy (tmpdata, (&priv->EfuseMap[EFUSE_MODIFY_MAP ][8 ]),8 ); -efuse_PgPacketWrite (dev,1 ,0x0 , tmpdata); -#if 0 -u1Byte tmpdata[8 ] = {0xFF ,0xFF ,0xEC ,0x10 ,0xFF ,0xFF ,0xFF ,0xFF }; - -efuse_PgPacketWrite (pAdapter,1 ,0xD , tmpdata); -#endif - } -#endif // For warm reboot, we must resume Efuse clock to 500K.
drivers/staging/rtl8192su/r8192S_firmware.c +1 -27
@@ -11,7 +11,7 @@* NDIS_STATUS_FAILURE - the following initialization process should be terminated * NDIS_STATUS_SUCCESS - if firmware initialization process success **************************************************************************************************/ -#if defined(RTL8192SE )||defined(RTL8192SU ) +#if defined(RTL8192SU )#include "r8192U.h" #include "r8192S_firmware.h" #include <linux/unistd.h>
@@ -50,9 +50,6 @@ bool FirmwareDownloadCode(struct net_devu8 bLastIniPkt =0 ;u16 ExtraDescOffset =0 ; -#ifdef RTL8192SE -fw_SetRQPN (dev);// For 92SE only -#endif RT_TRACE (COMP_FIRMWARE ,"--->FirmwareDownloadCode()\n" );
@@ -117,19 +114,6 @@ cmdsend_downloadcode_fail: } -#ifdef RTL8192SE -static void fw_SetRQPN (struct net_device *dev) -{ -// Only for 92SE HW bug, we have to set RAPN before every FW download -// We can remove the code later. -write_nic_dword (dev,RQPN ,0xffffffff ); -write_nic_dword (dev,RQPN +4 ,0xffffffff ); -write_nic_byte (dev,RQPN +8 ,0xff ); -write_nic_byte (dev,RQPN +0xB ,0x80 ); -//#if ((HAL_CODE_BASE == RTL8192_S) && (PLATFORM != PLATFORM_WINDOWS_USB)) - -}/* fw_SetRQPN */ -#endif RT_STATUS FirmwareEnableCPU (struct net_device *dev)
@@ -141,9 +125,6 @@ FirmwareEnableCPU(struct net_device *devu32 iCheckTime =200 ;RT_TRACE (COMP_FIRMWARE ,"-->FirmwareEnableCPU()\n" ); -#ifdef RTL8192SE -fw_SetRQPN (dev);// For 92SE only -#endif // Enable CPU. tmpU1b =read_nic_byte (dev,SYS_CLKR );write_nic_byte (dev,SYS_CLKR , (tmpU1b|SYS_CPU_CLKSEL ));//AFE source
@@ -302,10 +283,6 @@ FirmwareCheckReady(struct net_device *de// <Roger_Notes> USB interface will update reserved followings parameters later!! // 2008.08.28. // -#ifdef RTL8192SE -//write_nic_dword(dev, RQPN, 0x10101010); -//write_nic_byte(dev, 0xAB, 0x80); -#endif // // <Roger_Notes> If right here, we can set TCR/RCR to desired value
@@ -601,9 +578,6 @@ bool fw_download_code(struct net_deviceunsigned char *seg_ptr;cb_desc *tcb_desc;u8 bLastIniPkt; -#ifdef RTL8192SE -fw_SetRQPN (dev);// For 92SE only -#endif #ifndef RTL8192SU if (buffer_len >=64000 -USB_HWDESC_HEADER_LEN )
drivers/staging/rtl8192su/r8192S_firmware.h +0 -5
@@ -30,12 +30,7 @@#define MAX_FIRMWARE_CODE_SIZE 0xFF00 // Firmware Local buffer size.#define RTL8190_CPU_START_OFFSET 0x80 -#ifdef RTL8192SE -//It should be double word alignment -#define GET_COMMAND_PACKET_FRAG_THRESHOLD (v) 4*(v/4) - 8 -#else #define GET_COMMAND_PACKET_FRAG_THRESHOLD (v) (4*(v/4) - 8 - USB_HWDESC_HEADER_LEN) -#endif //typedef enum _DESC_PACKET_TYPE{ // DESC_PACKET_TYPE_INIT = 0,
drivers/staging/rtl8192su/r8192S_hw.h +0 -101
113 lines not on this page · raw message
drivers/staging/rtl8192su/r8192S_phy.c +3 -414
453 lines not on this page · raw message
PATCH 20/22 Staging: rtl8192su: remove RTL8192SU ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove RTL8192SU ifdefs
--- drivers/staging/rtl8192su/Makefile | 2 drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c | 5 drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 4 drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 22 drivers/staging/rtl8192su/r8180_93cx6.h | 5 drivers/staging/rtl8192su/r8192S_Efuse.c | 2 drivers/staging/rtl8192su/r8192S_firmware.c | 434 -- drivers/staging/rtl8192su/r8192S_hw.h | 2 drivers/staging/rtl8192su/r8192S_phy.c | 95 drivers/staging/rtl8192su/r8192S_rtl6052.c | 27 drivers/staging/rtl8192su/r8192U.h | 190 - drivers/staging/rtl8192su/r8192U_core.c | 1900 ------------- drivers/staging/rtl8192su/r8192U_dm.c | 178 - drivers/staging/rtl8192su/r8192U_wx.c | 12 drivers/staging/rtl8192su/r819xU_cmdpkt.c | 77 15 files changed, 82 insertions(+), 2873 deletions(-)
drivers/staging/rtl8192su/Makefile +0 -2
@@ -7,8 +7,6 @@ EXTRA_CFLAGS += -mhard-float -DCONFIG_FO EXTRA_CFLAGS += -DJACKSON_NEW_RX EXTRA_CFLAGS += -DTHOMAS_BEACON -EXTRA_CFLAGS += -DRTL8192SU - #EXTRA_CFLAGS += -DMUTIPLE_BULK_OUT r8192s_usb-objs := \
drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c +0 -5
@@ -230,7 +230,6 @@ int ieee80211_wx_get_rate(struct ieee802 union iwreq_data *wrqu, char *extra) { u32 tmp_rate = 0; -#ifdef RTL8192SU //printk("===>mode:%d, halfNmode:%d\n", ieee->mode, ieee->bHalfWirelessN24GMode); if (ieee->mode & (IEEE_A |IEEE_B |IEEE_G )) tmp_rate = ieee->rate;
@@ -243,10 +242,6 @@ int ieee80211_wx_get_rate(struct ieee802else tmp_rate =HTMcsToDataRate (ieee,15 ); } -#else - tmp_rate =TxCountToDataRate (ieee, ieee->softmac_stats.CurrentShowTxate); - -#endif wrqu->bitrate.value = tmp_rate *500000 ;return 0 ;
drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c +0 -4
@@ -495,11 +495,7 @@ void ieee80211_query_protectionmode(stru { tcb_desc->bCTSEnable = true; tcb_desc->rts_rate =MGN_24M ; -#if defined(RTL8192SU ) tcb_desc->bRTSEnable = false; -#else - tcb_desc->bRTSEnable = true; -#endif break ; } else if(pHTInfo->IOTAction & (HT_IOT_ACT_FORCED_RTS|HT_IOT_ACT_PURE_N_MODE))
drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c +0 -22
@@ -516,7 +516,6 @@ bool HTIOTActIsDisableMCSTwoSpatialStrea//#endif #endif #if 1 -#if defined(RTL8192SU)PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;if (ieee->is_ap_in_wep_tkip && ieee->is_ap_in_wep_tkip (ieee->dev)) {
@@ -526,7 +525,6 @@ bool HTIOTActIsDisableMCSTwoSpatialStrea retValue = true; }#endif -#endif return retValue; }
@@ -595,7 +593,6 @@ u8 HTIOTActIsForcedRTSCTS(struct ieee802u8 retValue =0 ;printk ("============>%s(), %d\n" , __FUNCTION__, network->realtek_cap_exit);// Force protection -#if defined(RTL8192SU )if (ieee->pHTInfo->bCurrentHTSupport) {//if(!network->realtek_cap_exit)
@@ -606,7 +603,6 @@ u8 HTIOTActIsForcedRTSCTS(struct ieee802 retValue =1 ; } } -#endif return retValue; }
@@ -640,7 +636,6 @@ HTIOCActRejcectADDBARequest(struct ieee8//if(IS_HARDWARE_TYPE_8192SE(Adapter) || // IS_HARDWARE_TYPE_8192SU(Adapter) //) -#if definedRTL8192SU {// Do not reject ADDBA REQ because some of the AP may // keep on sending ADDBA REQ qhich cause DHCP fail or ping loss!
@@ -650,7 +645,6 @@ HTIOCActRejcectADDBARequest(struct ieee8// return FALSE; } -#endif return retValue;
@@ -664,7 +658,6 @@ HTIOCActRejcectADDBARequest(struct ieee8 {u8 retValue =0 ;//if(IS_HARDWARE_TYPE_8192SU(Adapter)) -#ifdef RTL8192SU PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; {//#if UNDER_VISTA
@@ -678,7 +671,6 @@ HTIOCActRejcectADDBARequest(struct ieee8return 1 ; } -#endif return retValue; }
@@ -733,7 +725,6 @@ HTIOTActIsDisableTx40MHz(struct ieee8021 {u8 retValue =0 ; -#if definedRTL8192SU PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; if( (KEY_TYPE_WEP104 == ieee->pairwise_key_type) || (KEY_TYPE_WEP40 == ieee->pairwise_key_type) ||
@@ -744,7 +735,6 @@ HTIOTActIsDisableTx40MHz(struct ieee8021if ((pHTInfo->IOTPeer==HT_IOT_PEER_REALTEK ) && (network->bssht.bdSupportHT)) retValue =1 ; } -#endif return retValue; }
@@ -754,7 +744,6 @@ HTIOTActIsTxNoAggregation(struct ieee802 {u8 retValue =0 ; -#if definedRTL8192SU PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; if( (KEY_TYPE_WEP104 == ieee->pairwise_key_type) || (KEY_TYPE_WEP40 == ieee->pairwise_key_type) ||
@@ -766,7 +755,6 @@ HTIOTActIsTxNoAggregation(struct ieee802 pHTInfo->IOTPeer==HT_IOT_PEER_UNKNOWN) retValue =1 ; } -#endif return retValue; }
@@ -777,7 +765,6 @@ HTIOTActIsDisableTx2SS(struct ieee80211_ {u8 retValue =0 ; -#if definedRTL8192SU PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; if( (KEY_TYPE_WEP104 == ieee->pairwise_key_type) || (KEY_TYPE_WEP40 == ieee->pairwise_key_type) ||
@@ -788,7 +775,6 @@ HTIOTActIsDisableTx2SS(struct ieee80211_if ((pHTInfo->IOTPeer==HT_IOT_PEER_REALTEK ) && (network->bssht.bdSupportHT)) retValue =1 ; } -#endif return retValue; }
@@ -797,14 +783,12 @@ HTIOTActIsDisableTx2SS(struct ieee80211_bool HTIOCActAllowPeerAggOnePacket (struct ieee80211_device * ieee,struct ieee80211_network *network) {bool retValue = false; -#if defined(RTL8192SU )PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; {if (pHTInfo->IOTPeer ==HT_IOT_PEER_MARVELL )return true; } -#endif return retValue; }
@@ -1783,11 +1767,9 @@ void HTResetSelfAndSavePeerSetting(struc//if(bIOTAction) // pHTInfo->IOTAction |= HT_IOT_ACT_FORCED_RTS; -#if defined(RTL8192SU ) bIOTAction =HTIOCActRejcectADDBARequest (pNetwork);if (bIOTAction) pHTInfo->IOTAction |=HT_IOT_ACT_REJECT_ADDBA_REQ ; -#endif bIOTAction =HTIOCActAllowPeerAggOnePacket (ieee, pNetwork);if (bIOTAction)
@@ -1797,7 +1779,6 @@ void HTResetSelfAndSavePeerSetting(strucif (bIOTAction) pHTInfo->IOTAction |=HT_IOT_ACT_EDCA_BIAS_ON_RX ; -#if defined(RTL8192SU ) bIOTAction =HTIOTActDisableShortGI (ieee, pNetwork);if (bIOTAction) pHTInfo->IOTAction |=HT_IOT_ACT_DISABLE_SHORT_GI ;
@@ -1805,13 +1786,11 @@ void HTResetSelfAndSavePeerSetting(struc bIOTAction =HTIOTActDisableHighPower (ieee, pNetwork);if (bIOTAction) pHTInfo->IOTAction |=HT_IOT_ACT_DISABLE_HIGH_POWER ; -#endif bIOTAction =HTIOTActIsForcedAMSDU8K (ieee, pNetwork);if (bIOTAction) pHTInfo->IOTAction |=HT_IOT_ACT_TX_USE_AMSDU_8K ; -#if defined(RTL8192SU ) bIOTAction =HTIOTActIsTxNoAggregation (ieee, pNetwork);if (bIOTAction) pHTInfo->IOTAction |=HT_IOT_ACT_TX_NO_AGGREGATION ;
@@ -1823,7 +1802,6 @@ void HTResetSelfAndSavePeerSetting(struc bIOTAction =HTIOTActIsDisableTx2SS (ieee, pNetwork);if (bIOTAction) pHTInfo->IOTAction |=HT_IOT_ACT_DISABLE_TX_2SS ; -#endif //must after HT_IOT_ACT_TX_NO_AGGREGATION bIOTAction =HTIOTActIsForcedRTSCTS (ieee, pNetwork);if (bIOTAction)
drivers/staging/rtl8192su/r8180_93cx6.h +0 -5
@@ -13,13 +13,8 @@/*This files contains card eeprom (93c46 or 93c56) programming routines*/ /*memory is addressed by WORDS*/ -#ifdef RTL8192SU #include "r8192U.h" #include "r8192S_hw.h" -#else -#include "r8192U.h" -#include "r8192U_hw.h" -#endif #define EPROM_DELAY 10
drivers/staging/rtl8192su/r8192S_Efuse.c +0 -2
@@ -35,7 +35,6 @@// // In the future, we will always support EFUSE!! // -#ifdef RTL8192SU /*---------------------------Define Local Constant---------------------------*/ #define _POWERON_DELAY_#define _PRE_EXECUTE_READ_CMD_
@@ -2401,7 +2400,6 @@ void efuset_test_func_write(struct net_d -#endif // #if (HAL_CODE_BASE == RTL8192_S)
drivers/staging/rtl8192su/r8192S_firmware.c +0 -434
460 lines not on this page · raw message
drivers/staging/rtl8192su/r8192S_hw.h +0 -2
@@ -49,10 +49,8 @@ typedef enum _RT_RF_TYPE_DEFINITIONRF_1T2R =0 ,RF_2T4R ,RF_2T2R , -#ifdef RTL8192SURF_1T1R , RF_2T2R_GREEN, -#endif//RF_3T3R, //RF_3T4R, //RF_4T4R,
drivers/staging/rtl8192su/r8192S_phy.c +0 -95
229 lines not on this page · raw message
drivers/staging/rtl8192su/r8192S_rtl6052.c +0 -27
@@ -23,15 +23,9 @@#include "r8192U.h" #include "r8192S_rtl6052.h" -#ifdef RTL8192SU #include "r8192S_hw.h" #include "r8192S_phyreg.h" #include "r8192S_phy.h" -#else -#include "r8192U_hw.h" -#include "r819xU_phyreg.h" -#include "r819xU_phy.h" -#endif /*---------------------------Define Local Constant---------------------------*/
@@ -162,7 +156,6 @@ void PHY_RF6052SetBandwidth(struct net_d//if (priv->card_8192 == NIC_8192SE) -#ifdef RTL8192SU //YJ,test,090113 {switch (Bandwidth) {
@@ -184,26 +177,6 @@ void PHY_RF6052SetBandwidth(struct net_d } }// else -#else - { -for (eRFPath =0 ; eRFPath <priv->NumTotalRFPath; eRFPath++) - { -switch (Bandwidth) - { -case HT_CHANNEL_WIDTH_20 : -//PHY_SetRFReg(Adapter, (RF90_RADIO_PATH_E)RF90_PATH_A, RF_CHNLBW, (BIT10|BIT11), 0x01); -break ; -case HT_CHANNEL_WIDTH_20_40 : -//PHY_SetRFReg(Adapter, (RF90_RADIO_PATH_E)RF90_PATH_A, RF_CHNLBW, (BIT10|BIT11), 0x00); -break ; -default : -RT_TRACE (COMP_DBG ,"PHY_SetRF8225Bandwidth(): unknown Bandwidth: %#X\n" ,Bandwidth ); -break ; - - } - } - } -#endif }
drivers/staging/rtl8192su/r8192U.h +0 -190
278 lines not on this page · raw message
drivers/staging/rtl8192su/r8192U_core.c +81 -1819
1,762 lines not on this page · raw message
drivers/staging/rtl8192su/r8192U_dm.c +1 -177
178 lines not on this page · raw message
drivers/staging/rtl8192su/r819xU_cmdpkt.c +0 -77
77 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
PATCH 21/22 Staging: rtl8192su: remove unused files
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove unused files
--- drivers/staging/rtl8192su/r8190_rtl8256.c | 312 ---- drivers/staging/rtl8192su/r8192U_hw.h | 746 ----------- drivers/staging/rtl8192su/r819xU_firmware.c | 697 ---------- drivers/staging/rtl8192su/r819xU_firmware.h | 106 - drivers/staging/rtl8192su/r819xU_phy.c | 1808 ---------------------------- drivers/staging/rtl8192su/r819xU_phy.h | 90 - drivers/staging/rtl8192su/r819xU_phyreg.h | 871 ------------- 7 files changed, 4630 deletions(-)
drivers/staging/rtl8192su/r8190_rtl8256.c deleted +0 -312
@@ -1,312 +0,0 @@ -/* -This is part of the rtl8192 driver -released under the GPL (See file COPYING for details). - -This files contains programming code for the rtl8256 -radio frontend. - -*Many* thanks to Realtek Corp. for their great support! - -*/ - -#include "r8192U.h" -#include "r8192U_hw.h" -#include "r819xU_phyreg.h" -#include "r819xU_phy.h" -#include "r8190_rtl8256.h" - -/*-------------------------------------------------------------------------- -* Overview: set RF band width (20M or 40M) -* Input: struct net_device* dev -* WIRELESS_BANDWIDTH_E Bandwidth //20M or 40M -* Output: NONE -* Return: NONE -* Note: 8226 support both 20M and 40 MHz -*---------------------------------------------------------------------------*/ -void PHY_SetRF8256Bandwidth (struct net_device * dev ,HT_CHANNEL_WIDTH Bandwidth)//20M or 40M -{ -u8 eRFPath; -struct r8192_priv *priv =ieee80211_priv (dev); - -//for(eRFPath = RF90_PATH_A; eRFPath <pHalData->NumTotalRFPath; eRFPath++) -for (eRFPath =0 ; eRFPath <RF90_PATH_MAX ; eRFPath++) - { -if (!rtl8192_phy_CheckIsLegalRFPath (dev, eRFPath)) -continue ; - -switch (Bandwidth) - { -case HT_CHANNEL_WIDTH_20 : -if (priv->card_8192_version == VERSION_819xU_A || priv->card_8192_version == VERSION_819xU_B)// 8256 D-cut, E-cut, xiong: consider it later! - { -rtl8192_phy_SetRFReg (dev, (RF90_RADIO_PATH_E )eRFPath,0x0b , bMask12Bits,0x100 );//phy para:1ba -rtl8192_phy_SetRFReg (dev, (RF90_RADIO_PATH_E )eRFPath,0x2c , bMask12Bits,0x3d7 ); -rtl8192_phy_SetRFReg (dev, (RF90_RADIO_PATH_E )eRFPath,0x0e , bMask12Bits,0x021 ); - -//cosa add for sd3's request 01/23/2008 -rtl8192_phy_SetRFReg (dev, (RF90_RADIO_PATH_E )eRFPath,0x14 , bMask12Bits,0x5ab ); - } -else - { -RT_TRACE (COMP_ERR ,"PHY_SetRF8256Bandwidth(): unknown hardware version\n" ); - } - -break ; -case HT_CHANNEL_WIDTH_20_40 : -if (priv->card_8192_version == VERSION_819xU_A ||priv->card_8192_version == VERSION_819xU_B)// 8256 D-cut, E-cut, xiong: consider it later! - { -rtl8192_phy_SetRFReg (dev, (RF90_RADIO_PATH_E )eRFPath,0x0b , bMask12Bits,0x300 );//phy para:3ba -rtl8192_phy_SetRFReg (dev, (RF90_RADIO_PATH_E )eRFPath,0x2c , bMask12Bits,0x3df ); -rtl8192_phy_SetRFReg (dev, (RF90_RADIO_PATH_E )eRFPath,0x0e , bMask12Bits,0x0a1 ); - -//cosa add for sd3's request 01/23/2008 -if (priv->chan ==3 || priv->chan ==9 )//I need to set priv->chan whenever current channel changes -rtl8192_phy_SetRFReg (dev, (RF90_RADIO_PATH_E )eRFPath,0x14 , bMask12Bits,0x59b ); -else -rtl8192_phy_SetRFReg (dev, (RF90_RADIO_PATH_E )eRFPath,0x14 , bMask12Bits,0x5ab ); - } -else - { -RT_TRACE (COMP_ERR ,"PHY_SetRF8256Bandwidth(): unknown hardware version\n" ); - } - - -break ; -default : -RT_TRACE (COMP_ERR ,"PHY_SetRF8256Bandwidth(): unknown Bandwidth: %#X\n" ,Bandwidth ); -break ; - - } - } -return ; -} -/*-------------------------------------------------------------------------- -* Overview: Interface to config 8256 -* Input: struct net_device* dev -* Output: NONE -* Return: NONE -*---------------------------------------------------------------------------*/ -void PHY_RF8256_Config (struct net_device * dev) -{ -struct r8192_priv *priv =ieee80211_priv (dev); -// Initialize general global value -// -// TODO: Extend RF_PATH_C and RF_PATH_D in the future - priv->NumTotalRFPath =RTL819X_TOTAL_RF_PATH ; -// Config BB and RF -phy_RF8256_Config_ParaFile (dev); - -return ; -} -/*-------------------------------------------------------------------------- -* Overview: Interface to config 8256 -* Input: struct net_device* dev -* Output: NONE -* Return: NONE -*---------------------------------------------------------------------------*/ -void phy_RF8256_Config_ParaFile (struct net_device * dev) -{ -u32 u4RegValue =0 ; -//static s1Byte szRadioAFile[] = RTL819X_PHY_RADIO_A; -//static s1Byte szRadioBFile[] = RTL819X_PHY_RADIO_B; -//static s1Byte szRadioCFile[] = RTL819X_PHY_RADIO_C; -//static s1Byte szRadioDFile[] = RTL819X_PHY_RADIO_D; -u8 eRFPath; -BB_REGISTER_DEFINITION_T *pPhyReg; -struct r8192_priv *priv =ieee80211_priv (dev); -u32 RegOffSetToBeCheck =0x3 ; -u32 RegValueToBeCheck =0x7f1 ; -u32 RF3_Final_Value =0 ; -u8 ConstRetryTimes =5 , RetryTimes =5 ; -u8 ret =0 ; -//3//----------------------------------------------------------------- -//3// <2> Initialize RF -//3//----------------------------------------------------------------- -for (eRFPath = (RF90_RADIO_PATH_E )RF90_PATH_A ; eRFPath <priv->NumTotalRFPath; eRFPath++) - { -if (!rtl8192_phy_CheckIsLegalRFPath (dev, eRFPath)) -continue ; - - pPhyReg = &priv->PHYRegDef[eRFPath]; - -// Joseph test for shorten RF config -// pHalData->RfReg0Value[eRFPath] = rtl8192_phy_QueryRFReg(dev, (RF90_RADIO_PATH_E)eRFPath, rGlobalCtrl, bMaskDWord); - -/*----Store original RFENV control type----*/ -switch (eRFPath) - { -case RF90_PATH_A : -case RF90_PATH_C : - u4RegValue =rtl8192_QueryBBReg (dev, pPhyReg->rfintfs, bRFSI_RFENV); -break ; -case RF90_PATH_B : -case RF90_PATH_D : - u4RegValue =rtl8192_QueryBBReg (dev, pPhyReg->rfintfs, bRFSI_RFENV<<16 ); -break ; - } - -/*----Set RF_ENV enable----*/ -rtl8192_setBBreg (dev, pPhyReg->rfintfe, bRFSI_RFENV<<16 ,0x1 ); - -/*----Set RF_ENV output high----*/ -rtl8192_setBBreg (dev, pPhyReg->rfintfo, bRFSI_RFENV,0x1 ); - -/* Set bit number of Address and Data for RF register */ -rtl8192_setBBreg (dev, pPhyReg->rfHSSIPara2, b3WireAddressLength,0x0 );// Set 0 to 4 bits for Z-serial and set 1 to 6 bits for 8258 -rtl8192_setBBreg (dev, pPhyReg->rfHSSIPara2, b3WireDataLength,0x0 );// Set 0 to 12 bits for Z-serial and 8258, and set 1 to 14 bits for ??? - -rtl8192_phy_SetRFReg (dev, (RF90_RADIO_PATH_E ) eRFPath,0x0 , bMask12Bits,0xbf ); - -/*----Check RF block (for FPGA platform only)----*/ -// TODO: this function should be removed on ASIC , Emily 2007.2.2 -if (rtl8192_phy_checkBBAndRF (dev,HW90_BLOCK_RF , (RF90_RADIO_PATH_E )eRFPath)) - { -RT_TRACE (COMP_ERR ,"PHY_RF8256_Config():Check Radio[%d] Fail!!\n" , eRFPath); - goto phy_RF8256_Config_ParaFile_Fail; - } - - RetryTimes = ConstRetryTimes; - RF3_Final_Value =0 ; -/*----Initialize RF fom connfiguration file----*/ -switch (eRFPath) - { -case RF90_PATH_A : -while (RF3_Final_Value!=RegValueToBeCheck && RetryTimes!=0 ) - { - ret =rtl8192_phy_ConfigRFWithHeaderFile (dev,(RF90_RADIO_PATH_E )eRFPath); - RF3_Final_Value =rtl8192_phy_QueryRFReg (dev, (RF90_RADIO_PATH_E )eRFPath, RegOffSetToBeCheck, bMask12Bits); -RT_TRACE (COMP_RF ,"RF %d %d register final value: %x\n" , eRFPath, RegOffSetToBeCheck, RF3_Final_Value); - RetryTimes--; - } -break ; -case RF90_PATH_B : -while (RF3_Final_Value!=RegValueToBeCheck && RetryTimes!=0 ) - { - ret =rtl8192_phy_ConfigRFWithHeaderFile (dev,(RF90_RADIO_PATH_E )eRFPath); - RF3_Final_Value =rtl8192_phy_QueryRFReg (dev, (RF90_RADIO_PATH_E )eRFPath, RegOffSetToBeCheck, bMask12Bits); -RT_TRACE (COMP_RF ,"RF %d %d register final value: %x\n" , eRFPath, RegOffSetToBeCheck, RF3_Final_Value); - RetryTimes--; - } -break ; -case RF90_PATH_C : -while (RF3_Final_Value!=RegValueToBeCheck && RetryTimes!=0 ) - { - ret =rtl8192_phy_ConfigRFWithHeaderFile (dev,(RF90_RADIO_PATH_E )eRFPath); - RF3_Final_Value =rtl8192_phy_QueryRFReg (dev, (RF90_RADIO_PATH_E )eRFPath, RegOffSetToBeCheck, bMask12Bits); -RT_TRACE (COMP_RF ,"RF %d %d register final value: %x\n" , eRFPath, RegOffSetToBeCheck, RF3_Final_Value); - RetryTimes--; - } -break ; -case RF90_PATH_D : -while (RF3_Final_Value!=RegValueToBeCheck && RetryTimes!=0 ) - { - ret =rtl8192_phy_ConfigRFWithHeaderFile (dev,(RF90_RADIO_PATH_E )eRFPath); - RF3_Final_Value =rtl8192_phy_QueryRFReg (dev, (RF90_RADIO_PATH_E )eRFPath, RegOffSetToBeCheck, bMask12Bits); -RT_TRACE (COMP_RF ,"RF %d %d register final value: %x\n" , eRFPath, RegOffSetToBeCheck, RF3_Final_Value); - RetryTimes--; - } -break ; - } - -/*----Restore RFENV control type----*/ ; -switch (eRFPath) - { -case RF90_PATH_A : -case RF90_PATH_C : -rtl8192_setBBreg (dev, pPhyReg->rfintfs, bRFSI_RFENV, u4RegValue); -break ; -case RF90_PATH_B : -case RF90_PATH_D : -rtl8192_setBBreg (dev, pPhyReg->rfintfs, bRFSI_RFENV<<16 , u4RegValue); -break ; - } - -if (ret){ -RT_TRACE (COMP_ERR ,"phy_RF8256_Config_ParaFile():Radio[%d] Fail!!" , eRFPath); - goto phy_RF8256_Config_ParaFile_Fail; - } - - } - -RT_TRACE (COMP_PHY ,"PHY Initialization Success\n" ) ; -return ; - -phy_RF8256_Config_ParaFile_Fail: -RT_TRACE (COMP_ERR ,"PHY Initialization failed\n" ) ; -return ; -} - - -void PHY_SetRF8256CCKTxPower (struct net_device * dev,u8 powerlevel) -{ -u32 TxAGC=0 ; -struct r8192_priv *priv =ieee80211_priv (dev); -//modified by vivi, 20080109 - TxAGC = powerlevel; - -if (priv->bDynamicTxLowPower == TRUE )//cosa 05/22/2008 for scan - { -if (priv->CustomerID == RT_CID_819x_Netcore) - TxAGC =0x22 ; -else - TxAGC += priv->CckPwEnl; - } - -if (TxAGC >0x24 ) - TxAGC =0x24 ; -rtl8192_setBBreg (dev, rTxAGC_CCK_Mcs32, bTxAGCRateCCK, TxAGC); -} - - -void PHY_SetRF8256OFDMTxPower (struct net_device * dev,u8 powerlevel) -{ -struct r8192_priv *priv =ieee80211_priv (dev); -//Joseph TxPower for 8192 testing -u32 writeVal, powerBase0, powerBase1, writeVal_tmp; -u8 index =0 ; -u16 RegOffset[6 ] = {0xe00 ,0xe04 ,0xe10 ,0xe14 ,0xe18 ,0xe1c }; -u8 byte0, byte1, byte2, byte3; - - powerBase0 = powerlevel + priv->TxPowerDiff;//OFDM rates - powerBase0 = (powerBase0<<24 ) | (powerBase0<<16 ) |(powerBase0<<8 ) |powerBase0; - powerBase1 = powerlevel;//MCS rates - powerBase1 = (powerBase1<<24 ) | (powerBase1<<16 ) |(powerBase1<<8 ) |powerBase1; - -for (index=0 ; index<6 ; index++) - { - writeVal = priv->MCSTxPowerLevelOriginalOffset[index] + ((index<2 )?powerBase0:powerBase1); - byte0 = (u8)(writeVal &0x7f ); - byte1 = (u8)((writeVal &0x7f00 )>>8 ); - byte2 = (u8)((writeVal &0x7f0000 )>>16 ); - byte3 = (u8)((writeVal &0x7f000000 )>>24 ); -if (byte0 >0x24 )// Max power index = 0x24 - byte0 =0x24 ; -if (byte1 >0x24 ) - byte1 =0x24 ; -if (byte2 >0x24 ) - byte2 =0x24 ; -if (byte3 >0x24 ) - byte3 =0x24 ; - -//for tx power track -if (index ==3 ) - { - writeVal_tmp = (byte3<<24 ) | (byte2<<16 ) |(byte1<<8 ) |byte0; - priv->Pwr_Track = writeVal_tmp; - } - -if (priv->bDynamicTxHighPower == TRUE)//Add by Jacken 2008/03/06 - { -// Emily, 20080613. Set low tx power for both MCS and legacy OFDM - writeVal =0x03030303 ; - } -else - { - writeVal = (byte3<<24 ) | (byte2<<16 ) |(byte1<<8 ) |byte0; - } -rtl8192_setBBreg (dev, RegOffset[index],0x7f7f7f7f , writeVal); - } -return ; - -} -
drivers/staging/rtl8192su/r8192U_hw.h deleted +0 -746
746 lines not on this page · raw message
drivers/staging/rtl8192su/r819xU_firmware.c deleted +0 -697
697 lines not on this page · raw message
drivers/staging/rtl8192su/r819xU_firmware.h deleted +0 -106
106 lines not on this page · raw message
drivers/staging/rtl8192su/r819xU_phy.c deleted +0 -1808
1,139 lines not on this page · raw message
drivers/staging/rtl8192su/r819xU_phy.h deleted +0 -90
90 lines not on this page · raw message
drivers/staging/rtl8192su/r819xU_phyreg.h deleted +0 -871
871 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
PATCH 22/22 Staging: rtl8192su: remove dead code
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH staging] Staging: rtl8192su: remove dead code
--- drivers/staging/rtl8192su/ieee80211/dot11d.c | 5 drivers/staging/rtl8192su/ieee80211/ieee80211.h | 28 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 12 drivers/staging/rtl8192su/ieee80211/ieee80211_module.c | 13 drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 94 drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c | 85 drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c | 8 drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 5 drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 42 drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c | 43 drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 226 - drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h | 168 - drivers/staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 22 drivers/staging/rtl8192su/r8192S_Efuse.c | 84 drivers/staging/rtl8192su/r8192S_hw.h | 55 drivers/staging/rtl8192su/r8192S_phy.c | 342 -- drivers/staging/rtl8192su/r8192S_rtl6052.c | 66 drivers/staging/rtl8192su/r8192S_rtl6052.h | 47 drivers/staging/rtl8192su/r8192U.h | 214 - drivers/staging/rtl8192su/r8192U_core.c | 1652 ------------- drivers/staging/rtl8192su/r8192U_dm.c | 213 - drivers/staging/rtl8192su/r8192U_dm.h | 47 drivers/staging/rtl8192su/r8192U_wx.c | 65 drivers/staging/rtl8192su/r819xU_cmdpkt.c | 36 drivers/staging/rtl8192su/r819xU_cmdpkt.h | 20 25 files changed, 84 insertions(+), 3508 deletions(-)
drivers/staging/rtl8192su/ieee80211/dot11d.c +1 -4
@@ -34,10 +34,7 @@ Dot11d_Reset(struct ieee80211_device *ie {u32 i;PRT_DOT11D_INFO pDot11dInfo =GET_DOT11D_INFO (ieee); -#if 0 -if (!pDot11dInfo->bEnabled) -return ; -#endif +// Clear old channel map memset (pDot11dInfo->channel_map,0 ,MAX_CHANNEL_NUMBER +1 );memset (pDot11dInfo->MaxTxPwrDbmList,0xFF ,MAX_CHANNEL_NUMBER +1 );
drivers/staging/rtl8192su/ieee80211/ieee80211.h +1 -27
@@ -2119,36 +2119,10 @@ struct ieee80211_device {// void (*ps_request_tx_ack) (struct net_device *dev); void (*enter_sleep_state) (struct net_device *dev,u32 th,u32 tl);short (*ps_is_queue_empty) (struct net_device *dev); -#if 0 -/* Typical STA methods */ -int (*handle_auth) (struct net_device * dev, -struct ieee80211_auth * auth); -int (*handle_deauth) (struct net_device * dev, -struct ieee80211_deauth * auth); -int (*handle_action) (struct net_device * dev, -struct ieee80211_action * action, -struct ieee80211_rx_stats * stats); -int (*handle_disassoc) (struct net_device * dev, -struct ieee80211_disassoc * assoc); -#endif +int (*handle_beacon) (struct net_device * dev,struct ieee80211_beacon * beacon,struct ieee80211_network * network); -#if 0 -int (*handle_probe_response) (struct net_device * dev, -struct ieee80211_probe_response * resp, -struct ieee80211_network * network); -int (*handle_probe_request) (struct net_device * dev, -struct ieee80211_probe_request * req, -struct ieee80211_rx_stats * stats); -#endif int (*handle_assoc_response) (struct net_device * dev,struct ieee80211_assoc_response_frame * resp,struct ieee80211_network * network); -#if 0 -/* Typical AP methods */ -int (*handle_assoc_request) (struct net_device * dev); -int (*handle_reassoc_request) (struct net_device * dev, -struct ieee80211_reassoc_request * req); -#endif -/* check whether Tx hw resouce available */ short (*check_nic_enough_desc)(struct net_device *dev,int queue_index);//added by wb for HT related
drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c +0 -12
@@ -327,18 +327,6 @@ static int ieee80211_tkip_encrypt(struct hdr = (struct ieee80211_hdr_4addr *) skb->data; -#if 0 -printk ("@@ tkey\n" ); -printk ("%x|" , ((u32 *)tkey->key)[0 ]); -printk ("%x|" , ((u32 *)tkey->key)[1 ]); -printk ("%x|" , ((u32 *)tkey->key)[2 ]); -printk ("%x|" , ((u32 *)tkey->key)[3 ]); -printk ("%x|" , ((u32 *)tkey->key)[4 ]); -printk ("%x|" , ((u32 *)tkey->key)[5 ]); -printk ("%x|" , ((u32 *)tkey->key)[6 ]); -printk ("%x\n" , ((u32 *)tkey->key)[7 ]); -#endif -if (!tcb_desc->bHwSec) {if (!tkey->tx_phase1_done) {
drivers/staging/rtl8192su/ieee80211/ieee80211_module.c +1 -12
@@ -170,9 +170,7 @@ struct net_device *alloc_ieee80211(int sHTUpdateDefaultSetting (ieee);HTInitializeHTInfo (ieee);//may move to other place. TSInitialize (ieee); -#if 0 -INIT_WORK (&ieee->ht_onAssRsp, (void (*)(void *)) HTOnAssocRsp_wq); -#endif +for (i =0 ; i <IEEE_IBSS_MAC_HASH_SIZE ; i++)INIT_LIST_HEAD (&ieee->ibss_mac_hash[i]);
@@ -228,15 +226,6 @@ void free_ieee80211(struct net_device *d }ieee80211_networks_free (ieee); -#if 0 -for (i =0 ; i <IEEE_IBSS_MAC_HASH_SIZE ; i++) { -list_for_each_safe (p, q, &ieee->ibss_mac_hash[i]) { -kfree (list_entry(p ,struct ieee_ibss_seq ,list )); -list_del (p); - } - } - -#endif free_netdev (dev); }
drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c +0 -94
145 lines not on this page · raw message
drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c +1 -84
141 lines not on this page · raw message
drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c +0 -8
@@ -436,14 +436,6 @@ int ieee80211_wx_set_essid(struct ieee80 len = ((wrqu->essid.length-1 ) <IW_ESSID_MAX_SIZE ) ? (wrqu->essid.length-1 ) :IW_ESSID_MAX_SIZE ;strncpy (ieee->current_network.ssid, extra, len+1 ); ieee->current_network.ssid_len = len+1 ; -#if 0 - { -int i; -for (i=0 ; i<len +1 ; i++) -printk ("%c " , extra[i]); -printk ("\n" ); - } -#endif ieee->ssid_set =1 ; }else {
drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c +0 -5
@@ -235,11 +235,6 @@ void ieee80211_txb_free(struct ieee80211//int i; if (unlikely (!txb))return ; -#if 0 -for (i =0 ; i < txb->nr_frags; i++) -if (txb->fragments[i]) -dev_kfree_skb_any (txb->fragments[i]); -#endif kfree (txb); }
drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c +4 -38
72 lines not on this page · raw message
drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c +0 -43
49 lines not on this page · raw message
drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c +2 -224
264 lines not on this page · raw message
drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h +1 -167
186 lines not on this page · raw message
drivers/staging/rtl8192su/ieee80211/rtl819x_TSProc.c +1 -21
@@ -89,21 +89,7 @@ void RxPktPendingTimeout(unsigned long dif (bPktInBuf && (pRxTs->RxTimeoutIndicateSeq==0xffff )) { pRxTs->RxTimeoutIndicateSeq = pRxTs->RxIndicateSeq; -#if 0 -if (timer_pending (&pTS->RxPktPendingTimer)) -del_timer_sync (&pTS->RxPktPendingTimer); - pTS->RxPktPendingTimer.expires = jiffies +MSECS (pHTInfo->RxReorderPendingTime); -add_timer (&pTS->RxPktPendingTimer); -#else mod_timer (&pRxTs->RxPktPendingTimer, jiffies +MSECS (ieee->pHTInfo->RxReorderPendingTime)); -#endif - -#if 0 -if (timer_pending (&pRxTs->RxPktPendingTimer)) -del_timer_sync (&pRxTs->RxPktPendingTimer); - pRxTs->RxPktPendingTimer.expires = jiffies + ieee->pHTInfo->RxReorderPendingTime; -add_timer (&pRxTs->RxPktPendingTimer); -#endif }spin_unlock_irqrestore (&(ieee->reorder_spinlock), flags);//PlatformReleaseSpinLock(Adapter, RT_RX_SPINLOCK);
@@ -372,17 +358,11 @@ bool GetTs(IEEE80211_DEBUG (IEEE80211_DL_ERR ,"get TS for Broadcast or Multicast\n" );return false; } -#if 0 -if (ieee->pStaQos->CurrentQosMode ==QOS_DISABLE ) - {UP =0 ; }//only use one TS -else if (ieee->pStaQos->CurrentQosMode &QOS_WMM ) - { -#else +if (ieee->current_network.qos_data.supported ==0 )UP =0 ;else { -#endif // In WMM case: we use 4 TID only if (!IsACValid (TID )) {
drivers/staging/rtl8192su/r8192S_Efuse.c +0 -84
102 lines not on this page · raw message
drivers/staging/rtl8192su/r8192S_hw.h +0 -55
67 lines not on this page · raw message
drivers/staging/rtl8192su/r8192S_phy.c +0 -342
430 lines not on this page · raw message
drivers/staging/rtl8192su/r8192S_rtl6052.c +0 -66
84 lines not on this page · raw message
drivers/staging/rtl8192su/r8192S_rtl6052.h +0 -47
53 lines not on this page · raw message
drivers/staging/rtl8192su/r8192U.h +0 -214
244 lines not on this page · raw message
drivers/staging/rtl8192su/r8192U_core.c +69 -1583
1,008 lines not on this page · raw message
drivers/staging/rtl8192su/r8192U_dm.c +1 -212
213 lines not on this page · raw message
drivers/staging/rtl8192su/r8192U_dm.h +0 -47
47 lines not on this page · raw message
drivers/staging/rtl8192su/r8192U_wx.c +0 -65
65 lines not on this page · raw message
drivers/staging/rtl8192su/r819xU_cmdpkt.c +2 -34
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8192su/r819xU_cmdpkt.h +0 -20
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.