From 94a799425eee8225a1e3fbe5f473d2ef04002577 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 23 Aug 2011 19:00:42 -0500 Subject: From: wlanfae [PATCH 1/8] rtl8192e: Import new version of driver from realtek Signed-off-by: wlanfae Signed-off-by: Mike McCormack Signed-off-by: Larry Finger --- --- drivers/staging/rtl8192e/rtl_debug.h | 319 +++++++++++++++++++++++++++++++++++ 1 file changed, 319 insertions(+) create mode 100644 drivers/staging/rtl8192e/rtl_debug.h (limited to 'drivers/staging/rtl8192e/rtl_debug.h') diff --git a/drivers/staging/rtl8192e/rtl_debug.h b/drivers/staging/rtl8192e/rtl_debug.h new file mode 100644 index 000000000000..5ae7c7d07de3 --- /dev/null +++ b/drivers/staging/rtl8192e/rtl_debug.h @@ -0,0 +1,319 @@ +/****************************************************************************** + * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved. + * + * Based on the r8180 driver, which is: + * Copyright 2004-2005 Andrea Merello , et al. + * This program is free software; you can redistribute it and/or modify it + * under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA + * + * The full GNU General Public License is included in this distribution in the + * file called LICENSE. + * + * Contact Information: + * wlanfae +******************************************************************************/ +#ifndef _RTL_DEBUG_H +#define _RTL_DEBUG_H +#include +#include +#include +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)) +#include +#endif + +struct r8192_priv; +struct _tx_desc_8192se; +struct _TX_DESC_8192CE; +struct net_device; + +#define DBG_LOUD 4 + +#define RT_ASSERT(_Exp,Fmt) \ + if (!(_Exp)) \ + { \ + printk("Rtl819x: "); \ + printk Fmt; \ + } + +typedef enum tag_DBGP_Flag_Type_Definition +{ + FQoS = 0, + FTX = 1, + FRX = 2, + FSEC = 3, + FMGNT = 4, + FMLME = 5, + FRESOURCE = 6, + FBEACON = 7, + FISR = 8, + FPHY = 9, + FMP = 10, + FEEPROM = 11, + FPWR = 12, + FDM = 13, + FDBGCtrl = 14, + FC2H = 15, + FBT = 16, + FINIT = 17, + FIOCTL = 18, + DBGP_TYPE_MAX +}DBGP_FLAG_E; + +#define QoS_INIT BIT0 +#define QoS_VISTA BIT1 + +#define TX_DESC BIT0 +#define TX_DESC_TID BIT1 + +#define RX_DATA BIT0 +#define RX_PHY_STS BIT1 +#define RX_PHY_SS BIT2 +#define RX_PHY_SQ BIT3 +#define RX_PHY_ASTS BIT4 +#define RX_ERR_LEN BIT5 +#define RX_DEFRAG BIT6 +#define RX_ERR_RATE BIT7 + + + +#define MEDIA_STS BIT0 +#define LINK_STS BIT1 + +#define OS_CHK BIT0 + +#define BCN_SHOW BIT0 +#define BCN_PEER BIT1 + +#define ISR_CHK BIT0 + +#define PHY_BBR BIT0 +#define PHY_BBW BIT1 +#define PHY_RFR BIT2 +#define PHY_RFW BIT3 +#define PHY_MACR BIT4 +#define PHY_MACW BIT5 +#define PHY_ALLR BIT6 +#define PHY_ALLW BIT7 +#define PHY_TXPWR BIT8 +#define PHY_PWRDIFF BIT9 + +#define MP_RX BIT0 +#define MP_SWICH_CH BIT1 + +#define EEPROM_W BIT0 +#define EFUSE_PG BIT1 +#define EFUSE_READ_ALL BIT2 + +#define LPS BIT0 +#define IPS BIT1 +#define PWRSW BIT2 +#define PWRHW BIT3 +#define PWRHAL BIT4 + +#define WA_IOT BIT0 +#define DM_PWDB BIT1 +#define DM_Monitor BIT2 +#define DM_DIG BIT3 +#define DM_EDCA_Turbo BIT4 + +#define DbgCtrl_Trace BIT0 +#define DbgCtrl_InbandNoise BIT1 + +#define BT_TRACE BIT0 +#define BT_RFPoll BIT1 + +#define C2H_Summary BIT0 +#define C2H_PacketData BIT1 +#define C2H_ContentData BIT2 +#define BT_TRACE BIT0 +#define BT_RFPoll BIT1 + +#define INIT_EEPROM BIT0 +#define INIT_TxPower BIT1 +#define INIT_IQK BIT2 +#define INIT_RF BIT3 + +#define IOCTL_TRACE BIT0 +#define IOCTL_BT_EVENT BIT1 +#define IOCTL_BT_EVENT_DETAIL BIT2 +#define IOCTL_BT_TX_ACLDATA BIT3 +#define IOCTL_BT_TX_ACLDATA_DETAIL BIT4 +#define IOCTL_BT_RX_ACLDATA BIT5 +#define IOCTL_BT_RX_ACLDATA_DETAIL BIT6 +#define IOCTL_BT_HCICMD BIT7 +#define IOCTL_BT_HCICMD_DETAIL BIT8 +#define IOCTL_IRP BIT9 +#define IOCTL_IRP_DETAIL BIT10 +#define IOCTL_CALLBACK_FUN BIT11 +#define IOCTL_STATE BIT12 +#define IOCTL_BT_TP BIT13 +#define IOCTL_BT_LOGO BIT14 + +/* 2007/07/13 MH ------For DeBuG Print modeue------*/ +/*------------------------------Define structure----------------------------*/ + + +/*------------------------Export Marco Definition---------------------------*/ +#define DEBUG_PRINT 1 + +#if (DEBUG_PRINT == 1) +#define RTPRINT(dbgtype, dbgflag, printstr) \ +{ \ + if (DBGP_Type[dbgtype] & dbgflag)\ + { \ + printk printstr; \ + } \ +} + +#define RTPRINT_ADDR(dbgtype, dbgflag, printstr, _Ptr)\ +{\ + if (DBGP_Type[dbgtype] & dbgflag)\ + {\ + int __i; \ + u8* ptr = (u8*)_Ptr; \ + printk printstr; \ + printk(" "); \ + for ( __i=0; __i<6; __i++ ) \ + printk("%02X%s", ptr[__i], (__i==5)?"":"-"); \ + printk("\n"); \ + }\ +} + +#define RTPRINT_DATA(dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen)\ +{\ + if (DBGP_Type[dbgtype] & dbgflag)\ + {\ + int __i; \ + u8* ptr = (u8*)_HexData; \ + printk(_TitleString); \ + for ( __i=0; __i<(int)_HexDataLen; __i++ ) \ + { \ + printk("%02X%s", ptr[__i], (((__i + 1) % 4) == 0)?" ":" ");\ + if (((__i + 1) % 16) == 0) printk("\n");\ + } \ + printk("\n"); \ + }\ +} +#else +#define RTPRINT(dbgtype, dbgflag, printstr) +#define RTPRINT_ADDR(dbgtype, dbgflag, printstr, _Ptr) +#define RTPRINT_DATA(dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen) +#endif + +extern u32 DBGP_Type[DBGP_TYPE_MAX]; + +#define RT_PRINT_DATA(_Comp, _Level, _TitleString, _HexData, _HexDataLen) \ +do {\ + if (((_Comp) & rt_global_debug_component ) && (_Level <= rt_global_debug_component )) \ + { \ + int __i; \ + u8* ptr = (u8*)_HexData; \ + printk("Rtl819x: "); \ + printk(_TitleString); \ + for ( __i=0; __i<(int)_HexDataLen; __i++ ) \ + { \ + printk("%02X%s", ptr[__i], (((__i + 1) % 4) == 0)?" ":" "); \ + if (((__i + 1) % 16) == 0) printk("\n"); \ + } \ + printk("\n"); \ + } \ +}while(0); + +#define DMESG(x,a...) +#define DMESGW(x,a...) +#define DMESGE(x,a...) +extern u32 rt_global_debug_component; +#define RT_TRACE(component, x, args...) \ +do { if (rt_global_debug_component & component) \ + printk(KERN_DEBUG DRV_NAME ":" x "\n" , \ + ##args);\ +}while(0); + +#define RTL819x_DEBUG +#ifdef RTL819x_DEBUG +#define assert(expr) \ + if (!(expr)) { \ + printk( "Assertion failed! %s,%s,%s,line=%d\n", \ + #expr,__FILE__,__func__,__LINE__); \ + } +#define RT_DEBUG_DATA(level, data, datalen) \ + do{ if ((rt_global_debug_component & (level)) == (level)) \ + { \ + int _i; \ + u8* _pdata = (u8*) data; \ + printk(KERN_DEBUG DRV_NAME ": %s()\n", __func__); \ + for (_i=0; _i<(int)(datalen); _i++) \ + { \ + printk("%2x ", _pdata[_i]); \ + if ((_i+1)%16 == 0) printk("\n"); \ + } \ + printk("\n"); \ + } \ + } while (0) +#else +#define assert(expr) do {} while (0) +#define RT_DEBUG_DATA(level, data, datalen) do {} while(0) +#endif + +typedef struct _rtl_fs_debug +{ + const char *name; + struct dentry *dir_drv; + struct dentry *debug_register; + u32 hw_type; + u32 hw_offset; +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,20)) + bool hw_holding; +#else + u8 hw_holding; +#endif +} rtl_fs_debug; + +void print_buffer(u32 *buffer, int len); +void dump_eprom(struct net_device *dev); +void rtl8192_dump_reg(struct net_device *dev); + +#ifdef RTL8192SE +void rtl8192se_dump_tx_desc(struct _tx_desc_8192se *pDesc); +#endif +#ifdef RTL8192CE +void rtl8192ce_dump_tx_desc(struct _TX_DESC_8192CE *pDesc); +#endif + +/* debugfs stuff */ +#ifdef CONFIG_RTLWIFI_DEBUGFS +int rtl_debug_module_init(struct r8192_priv *priv, const char *name); +void rtl_debug_module_remove(struct r8192_priv *priv); +int rtl_create_debugfs_root(void); +void rtl_remove_debugfs_root(void); +#else +static inline int rtl_debug_module_init(struct r8192_priv *priv, const char *name) { + return 0; +} +static inline void rtl_debug_module_remove(struct r8192_priv *priv) { + +} +static inline int rtl_create_debugfs_root(void) { + return 0; +} +static inline void rtl_remove_debugfs_root(void) { +} +#endif + +/* proc stuff */ +void rtl8192_proc_init_one(struct net_device *dev); +void rtl8192_proc_remove_one(struct net_device *dev); +void rtl8192_proc_module_init(void); +void rtl8192_proc_module_remove(void); +void rtl8192_dbgp_flag_init(struct net_device *dev); +#endif -- cgit v1.2.3-59-g8ed1b From cb76215448947ddcc133c4b1c2ff2d4a77e851e0 Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Mon, 11 Jul 2011 08:56:20 +0900 Subject: rtl8192e: Remove extra ifdefs Signed-off-by: Larry Finger Signed-off-by: Mike McCormack --- drivers/staging/rtl8192e/internal.h | 21 -- drivers/staging/rtl8192e/r8192E_cmdpkt.c | 30 +- drivers/staging/rtl8192e/r8192E_firmware.c | 15 - drivers/staging/rtl8192e/r8192E_phy.c | 78 +----- drivers/staging/rtl8192e/rtl819x_HTProc.c | 27 +- drivers/staging/rtl8192e/rtl819x_Qos.h | 8 - drivers/staging/rtl8192e/rtl819x_TSProc.c | 8 +- drivers/staging/rtl8192e/rtl_cam.c | 2 - drivers/staging/rtl8192e/rtl_core.c | 129 +-------- drivers/staging/rtl8192e/rtl_core.h | 36 +-- drivers/staging/rtl8192e/rtl_debug.c | 13 - drivers/staging/rtl8192e/rtl_debug.h | 6 - drivers/staging/rtl8192e/rtl_dm.c | 394 +-------------------------- drivers/staging/rtl8192e/rtl_ethtool.c | 6 - drivers/staging/rtl8192e/rtl_pci.c | 352 ------------------------ drivers/staging/rtl8192e/rtl_pm.c | 16 -- drivers/staging/rtl8192e/rtl_pm.h | 4 - drivers/staging/rtl8192e/rtl_ps.c | 63 ----- drivers/staging/rtl8192e/rtllib.h | 167 +----------- drivers/staging/rtl8192e/rtllib_crypt.h | 8 - drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 49 +--- drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 189 +------------ drivers/staging/rtl8192e/rtllib_crypt_wep.c | 91 +------ drivers/staging/rtl8192e/rtllib_rx.c | 141 +--------- drivers/staging/rtl8192e/rtllib_softmac.c | 49 +--- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 9 - 26 files changed, 39 insertions(+), 1872 deletions(-) (limited to 'drivers/staging/rtl8192e/rtl_debug.h') diff --git a/drivers/staging/rtl8192e/internal.h b/drivers/staging/rtl8192e/internal.h index 1c39c000e91b..3041f0fa5cb4 100644 --- a/drivers/staging/rtl8192e/internal.h +++ b/drivers/staging/rtl8192e/internal.h @@ -19,12 +19,8 @@ #include #include -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)) -#include -#else #include #include -#endif #include #ifdef BUILT_IN_CRYPTO @@ -37,23 +33,6 @@ #endif #endif /* BUILT_IN_CRYPTO */ -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20)) -#define list_for_each_entry(pos, head, member) \ - for (pos = list_entry((head)->next, typeof(*pos), member), \ - prefetch(pos->member.next); \ - &pos->member != (head); \ - pos = list_entry(pos->member.next, typeof(*pos), member), \ - prefetch(pos->member.next)) - -static inline void cond_resched(void) -{ - if (need_resched()) { - set_current_state(TASK_RUNNING); - schedule(); - } -} -#endif - extern enum km_type crypto_km_types[]; static inline enum km_type crypto_kmap_type(int out) diff --git a/drivers/staging/rtl8192e/r8192E_cmdpkt.c b/drivers/staging/rtl8192e/r8192E_cmdpkt.c index 11506db1f78e..ea9fa579832a 100644 --- a/drivers/staging/rtl8192e/r8192E_cmdpkt.c +++ b/drivers/staging/rtl8192e/r8192E_cmdpkt.c @@ -114,56 +114,36 @@ cmpk_count_txstatistic( pAdapter->HalFunc.GetHwRegHandler(pAdapter, HW_VAR_RF_STATE, (pu1Byte)(&rtState)); if (rtState == eRfOff) - { return; - } #endif -#ifdef TODO - if (pAdapter->bInHctTest) - return; -#endif - if (pstx_fb->tok) - { + if (pstx_fb->tok) { priv->stats.txfeedbackok++; priv->stats.txoktotal++; priv->stats.txokbytestotal += pstx_fb->pkt_length; priv->stats.txokinperiod++; - if (pstx_fb->pkt_type == PACKET_MULTICAST) - { + if (pstx_fb->pkt_type == PACKET_MULTICAST) { priv->stats.txmulticast++; priv->stats.txbytesmulticast += pstx_fb->pkt_length; - } - else if (pstx_fb->pkt_type == PACKET_BROADCAST) - { + } else if (pstx_fb->pkt_type == PACKET_BROADCAST) { priv->stats.txbroadcast++; priv->stats.txbytesbroadcast += pstx_fb->pkt_length; - } - else - { + } else { priv->stats.txunicast++; priv->stats.txbytesunicast += pstx_fb->pkt_length; } - } - else - { + } else { priv->stats.txfeedbackfail++; priv->stats.txerrtotal++; priv->stats.txerrbytestotal += pstx_fb->pkt_length; if (pstx_fb->pkt_type == PACKET_MULTICAST) - { priv->stats.txerrmulticast++; - } else if (pstx_fb->pkt_type == PACKET_BROADCAST) - { priv->stats.txerrbroadcast++; - } else - { priv->stats.txerrunicast++; - } } priv->stats.txretrycount += pstx_fb->retry_cnt; diff --git a/drivers/staging/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/r8192E_firmware.c index 6d490292c036..8c77d133ad0a 100644 --- a/drivers/staging/rtl8192e/r8192E_firmware.c +++ b/drivers/staging/rtl8192e/r8192E_firmware.c @@ -17,19 +17,11 @@ * wlanfae ******************************************************************************/ -#if (defined(RTL8192E) || defined(RTL8190P)) - #include "rtl_core.h" #include "r8192E_hw.h" -#ifdef RTL8190P -#include "r8190P_hwimg.h" -#elif defined RTL8192E #include "r8192E_hwimg.h" -#endif #include "r8192E_firmware.h" -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) #include -#endif extern void firmware_init_param(struct net_device *dev) { @@ -308,17 +300,12 @@ bool init_firmware(struct net_device *dev) RT_TRACE(COMP_FIRMWARE, "PlatformInitFirmware: undefined firmware state\n"); } -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) && defined(USE_FW_SOURCE_IMG_FILE) priv->firmware_source = FW_SOURCE_IMG_FILE; -#else - priv->firmware_source = FW_SOURCE_HEADER_FILE; -#endif for (init_step = starting_state; init_step <= FW_INIT_STEP2_DATA; init_step++) { if (rst_opt == OPT_SYSTEM_RESET) { switch (priv->firmware_source) { case FW_SOURCE_IMG_FILE: { -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) && defined(USE_FW_SOURCE_IMG_FILE) if (pfirmware->firmware_buf_size[init_step] == 0) { const char *fw_name[3] = { "RTL8192E/boot.img", "RTL8192E/main.img", @@ -352,7 +339,6 @@ bool init_firmware(struct net_device *dev) } mapped_file = pfirmware->firmware_buf[init_step]; file_length = pfirmware->firmware_buf_size[init_step]; -#endif break; } case FW_SOURCE_HEADER_FILE: @@ -393,4 +379,3 @@ download_firmware_fail: return rt_status; } -#endif diff --git a/drivers/staging/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/r8192E_phy.c index a20451b6ee60..78395a1a998e 100644 --- a/drivers/staging/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/r8192E_phy.c @@ -815,83 +815,7 @@ void rtl8192_phy_setTxPower(struct net_device* dev, u8 channel) (bXBTxAGC|bXCTxAGC|bXDTxAGC), u4RegValue); } } -#ifdef TODO - if ( pMgntInfo->OpMode == RT_OP_MODE_INFRASTRUCTURE && - pMgntInfo->bWithCcxCellPwr && - channel == pMgntInfo->dot11CurrentChannelNumber) - { - u8 CckCellPwrIdx = DbmToTxPwrIdx(dev, WIRELESS_MODE_B, pMgntInfo->CcxCellPwr); - u8 LegacyOfdmCellPwrIdx = DbmToTxPwrIdx(dev, WIRELESS_MODE_G, pMgntInfo->CcxCellPwr); - u8 OfdmCellPwrIdx = DbmToTxPwrIdx(dev, WIRELESS_MODE_N_24G, pMgntInfo->CcxCellPwr); - - RT_TRACE(COMP_TXAGC, DBG_LOUD, - ("CCX Cell Limit: %d dbm => CCK Tx power index : %d, Legacy OFDM Tx power index : %d, OFDM Tx power index: %d\n", - pMgntInfo->CcxCellPwr, CckCellPwrIdx, LegacyOfdmCellPwrIdx, OfdmCellPwrIdx)); - RT_TRACE(COMP_TXAGC, DBG_LOUD, - ("EEPROM channel(%d) => CCK Tx power index: %d, Legacy OFDM Tx power index : %d, OFDM Tx power index: %d\n", - channel, powerlevel, powerlevelOFDM24G + pHalData->LegacyHTTxPowerDiff, powerlevelOFDM24G)); - - if (powerlevel > CckCellPwrIdx) - powerlevel = CckCellPwrIdx; - if (powerlevelOFDM24G + pHalData->LegacyHTTxPowerDiff > OfdmCellPwrIdx) - { - if ((OfdmCellPwrIdx - pHalData->LegacyHTTxPowerDiff) > 0) - { - powerlevelOFDM24G = OfdmCellPwrIdx - pHalData->LegacyHTTxPowerDiff; - } - else - { - LegacyOfdmCellPwrIdx = 0; - } - } - - RT_TRACE(COMP_TXAGC, DBG_LOUD, - ("Altered CCK Tx power index : %d, Legacy OFDM Tx power index: %d, OFDM Tx power index: %d\n", - powerlevel, powerlevelOFDM24G + pHalData->LegacyHTTxPowerDiff, powerlevelOFDM24G)); - } - - pHalData->CurrentCckTxPwrIdx = powerlevel; - pHalData->CurrentOfdm24GTxPwrIdx = powerlevelOFDM24G; - - RtActChannelList(Adapter, RT_CHNL_LIST_ACTION_GET_CHANNEL, &channel, &pChannelInfo); - - if (pChannelInfo) - { - if (pChannelInfo->MaxTxPwrDbm != UNSPECIFIED_PWR_DBM) - { - u1Byte CckMaxPwrIdx = DbmToTxPwrIdx(Adapter, WIRELESS_MODE_B, pChannelInfo->MaxTxPwrDbm); - u1Byte LegacyOfdmMaxPwrIdx = DbmToTxPwrIdx(Adapter, WIRELESS_MODE_G, pChannelInfo->MaxTxPwrDbm); - u1Byte OfdmMaxPwrIdx = DbmToTxPwrIdx(Adapter, WIRELESS_MODE_N_24G, pChannelInfo->MaxTxPwrDbm); - - RT_TRACE(COMP_TXAGC, DBG_LOUD, - ("CCX Cell Limit: %ld dbm => CCK Tx power index : %d, Legacy OFDM Tx power index : %d, OFDM Tx power index: %d\n", - pChannelInfo->MaxTxPwrDbm, CckMaxPwrIdx, LegacyOfdmMaxPwrIdx, OfdmMaxPwrIdx)); - RT_TRACE(COMP_TXAGC, DBG_LOUD, - ("EEPROM channel(%d) => CCK Tx power index: %d, Legacy OFDM Tx power index : %d, OFDM Tx power index: %d\n", - channel, powerlevel, powerlevelOFDM24G + pHalData->LegacyHTTxPowerDiff, powerlevelOFDM24G)); - - if (powerlevel > CckMaxPwrIdx) - powerlevel = CckMaxPwrIdx; - if (powerlevelOFDM24G + pHalData->LegacyHTTxPowerDiff > OfdmMaxPwrIdx) - { - if ((OfdmMaxPwrIdx - pHalData->LegacyHTTxPowerDiff) > 0) - { - powerlevelOFDM24G = OfdmMaxPwrIdx - pHalData->LegacyHTTxPowerDiff; - } - else - { - LegacyOfdmMaxPwrIdx = 0; - } - } - - RT_TRACE(COMP_TXAGC, DBG_LOUD, - ("Altered CCK Tx power index : %d, Legacy OFDM Tx power index: %d, OFDM Tx power index: %d\n", - powerlevel, powerlevelOFDM24G + pHalData->LegacyHTTxPowerDiff, powerlevelOFDM24G)); - } - } -#endif - switch (priv->rf_chip) - { + switch (priv->rf_chip) { case RF_8225: break; case RF_8256: diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index eaf73676f952..1aa7d80e8de2 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -958,14 +958,6 @@ void HTConstructRT2RTAggElement(struct rtllib_device* ieee, u8* posRT2RTAgg, u8* *len = 6 + 2; return; - -#ifdef TODO - posRT2RTAgg->Length = 6; -#endif - - - - } u8 HT_PickMCSRate(struct rtllib_device* ieee, u8* pOperateMCS) @@ -1410,8 +1402,7 @@ void HTUseDefaultSetting(struct rtllib_device* ieee) { PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - if (pHTInfo->bEnableHT) - { + if (pHTInfo->bEnableHT) { pHTInfo->bCurrentHTSupport = true; pHTInfo->bCurSuppCCK = pHTInfo->bRegSuppCCK; @@ -1434,27 +1425,15 @@ void HTUseDefaultSetting(struct rtllib_device* ieee) HTFilterMCSRate(ieee, ieee->Regdot11TxHTOperationalRateSet, ieee->dot11HTOperationalRateSet); -#ifdef TODO - Adapter->HalFunc.InitHalRATRTableHandler( Adapter, &pMgntInfo->dot11OperationalRateSet, pMgntInfo->dot11HTOperationalRateSet); -#endif ieee->HTHighestOperaRate = HTGetHighestMCSRate(ieee, ieee->dot11HTOperationalRateSet, MCS_FILTER_ALL); ieee->HTCurrentOperaRate = ieee->HTHighestOperaRate; -#if (defined RTL8192SE || defined RTL8192SU || defined RTL8192CE) - if (ieee->SetHwRegHandler != NULL) { - ieee->SetHwRegHandler( ieee->dev, HW_VAR_SHORTGI_DENSITY, (u8*)(&ieee->MaxMssDensity)); - ieee->SetHwRegHandler(ieee->dev, HW_VAR_AMPDU_FACTOR, &pHTInfo->CurrentAMPDUFactor); - ieee->SetHwRegHandler(ieee->dev, HW_VAR_AMPDU_MIN_SPACE, &pHTInfo->CurrentMPDUDensity); - } -#endif - - } - else - { + } else { pHTInfo->bCurrentHTSupport = false; } return; } + u8 HTCCheck(struct rtllib_device* ieee, u8* pFrame) { if (ieee->pHTInfo->bCurrentHTSupport) diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl8192e/rtl819x_Qos.h index 4c89a769915a..8f5e0fdd2f31 100644 --- a/drivers/staging/rtl8192e/rtl819x_Qos.h +++ b/drivers/staging/rtl8192e/rtl819x_Qos.h @@ -54,14 +54,6 @@ #define BIT30 0x40000000 #define BIT31 0x80000000 -#ifndef RTK_DMP_PLATFORM -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)) -#ifndef bool -typedef enum{false = 0, true} bool; -#endif -#endif -#endif - typedef union _QOS_TSINFO{ u8 charData[3]; struct { diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c index 0900bfa5fadc..4159cb85a8b3 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -20,13 +20,7 @@ #include #include "rtl819x_TS.h" extern void _setup_timer( struct timer_list*, void*, unsigned long); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) -#define list_for_each_entry_safe(pos, n, head, member) \ - for (pos = list_entry((head)->next, typeof(*pos), member), \ - n = list_entry(pos->member.next, typeof(*pos), member); \ - &pos->member != (head); \ - pos = n, n = list_entry(n->member.next, typeof(*n), member)) -#endif + void TsSetupTimeOut(unsigned long data) { } diff --git a/drivers/staging/rtl8192e/rtl_cam.c b/drivers/staging/rtl8192e/rtl_cam.c index c2d51bc5a878..31f198c82526 100644 --- a/drivers/staging/rtl8192e/rtl_cam.c +++ b/drivers/staging/rtl8192e/rtl_cam.c @@ -170,9 +170,7 @@ void setKey(struct net_device *dev, if (KeyContent != NULL) { write_nic_dword(dev, WCAMI, (u32)(*(KeyContent+i-2)) ); write_nic_dword(dev, RWCAM, TargetCommand); -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)) udelay(100); -#endif } } } diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c index 9551c5ed7842..18030d6d9f06 100644 --- a/drivers/staging/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl_core.c @@ -570,11 +570,7 @@ void rtl8192_tx_timeout(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) schedule_work(&priv->reset_wq); -#else - schedule_task(&priv->reset_wq); -#endif printk("TXTIMEOUT"); } @@ -700,13 +696,8 @@ static struct rtllib_qos_parameters def_qos_parameters = { void rtl8192_update_beacon(void *data) { -#if LINUX_VERSION_CODE >=KERNEL_VERSION(2,6,20) struct r8192_priv *priv = container_of_work_rsl(data, struct r8192_priv, update_beacon_wq.work); struct net_device *dev = priv->rtllib->dev; -#else - struct net_device *dev = (struct net_device *)data; - struct r8192_priv *priv = rtllib_priv(dev); -#endif struct rtllib_device* ieee = priv->rtllib; struct rtllib_network* net = &ieee->current_network; @@ -718,20 +709,12 @@ void rtl8192_update_beacon(void *data) } #define MOVE_INTO_HANDLER -#ifdef RTL8192CE -int WDCAPARA_ADD[] = {REG_EDCA_BE_PARAM,REG_EDCA_BK_PARAM,REG_EDCA_VI_PARAM,REG_EDCA_VO_PARAM}; -#else int WDCAPARA_ADD[] = {EDCAPARA_BE,EDCAPARA_BK,EDCAPARA_VI,EDCAPARA_VO}; -#endif + void rtl8192_qos_activate(void *data) { -#if LINUX_VERSION_CODE >=KERNEL_VERSION(2,6,20) struct r8192_priv *priv = container_of_work_rsl(data, struct r8192_priv, qos_activate); struct net_device *dev = priv->rtllib->dev; -#else - struct net_device *dev = (struct net_device *)data; - struct r8192_priv *priv = rtllib_priv(dev); -#endif #ifndef MOVE_INTO_HANDLER struct rtllib_qos_parameters *qos_parameters = &priv->rtllib->current_network.qos_data.parameters; u8 mode = priv->rtllib->current_network.mode; @@ -743,11 +726,7 @@ void rtl8192_qos_activate(void *data) if (priv == NULL) return; -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)) - down(&priv->mutex); -#else mutex_lock(&priv->mutex); -#endif if (priv->rtllib->state != RTLLIB_LINKED) goto success; RT_TRACE(COMP_QOS,"qos active process with associate response received\n"); @@ -767,11 +746,7 @@ void rtl8192_qos_activate(void *data) } success: -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)) - up(&priv->mutex); -#else mutex_unlock(&priv->mutex); -#endif } static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv, @@ -1199,11 +1174,7 @@ int rtl8192_sta_down(struct net_device *dev, bool shutdownrf) del_timer_sync(&priv->watch_dog_timer); rtl8192_cancel_deferred_work(priv); -#ifndef RTL8190P -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) cancel_delayed_work(&priv->rtllib->hw_wakeup_wq); -#endif -#endif rtllib_softmac_stop_protocol(priv->rtllib, 0, true); spin_lock_irqsave(&priv->rf_ps_lock,flags); @@ -1481,11 +1452,7 @@ static void rtl8192_init_priv_lock(struct r8192_priv* priv) #endif sema_init(&priv->wx_sem,1); sema_init(&priv->rf_sem,1); -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)) - sema_init(&priv->mutex, 1); -#else mutex_init(&priv->mutex); -#endif } static void rtl8192_init_priv_task(struct net_device* dev) @@ -2032,13 +1999,8 @@ void rtl819x_update_rxcounts(struct r8192_priv *priv, void rtl819x_watchdog_wqcallback(void *data) { -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) struct r8192_priv *priv = container_of_dwork_rsl(data,struct r8192_priv,watch_dog_wq); struct net_device *dev = priv->rtllib->dev; -#else - struct net_device *dev = (struct net_device *)data; - struct r8192_priv *priv = rtllib_priv(dev); -#endif struct rtllib_device* ieee = priv->rtllib; RESET_TYPE ResetType = RESET_TYPE_NORESET; static u8 check_reset_cnt = 0; @@ -3005,33 +2967,11 @@ void rtl8192_irq_rx_tasklet(struct r8192_priv *priv) *****************************************************************************/ void rtl8192_cancel_deferred_work(struct r8192_priv* priv) { -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) cancel_delayed_work(&priv->watch_dog_wq); cancel_delayed_work(&priv->update_beacon_wq); -#ifndef RTL8190P cancel_delayed_work(&priv->rtllib->hw_sleep_wq); -#endif -#if defined RTL8192SE - cancel_delayed_work(&priv->check_hw_scan_wq); - cancel_delayed_work(&priv->hw_scan_simu_wq); - cancel_delayed_work(&priv->start_hw_scan_wq); - cancel_delayed_work(&priv->rtllib->update_assoc_sta_info_wq); - cancel_delayed_work(&priv->rtllib->check_tsf_wq); -#endif -#endif - -#if LINUX_VERSION_CODE >=KERNEL_VERSION(2,6,22) cancel_work_sync(&priv->reset_wq); cancel_work_sync(&priv->qos_activate); -#elif ((LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))) - cancel_delayed_work(&priv->reset_wq); - cancel_delayed_work(&priv->qos_activate); -#if defined RTL8192SE - cancel_delayed_work(&priv->rtllib->update_assoc_sta_info_wq); - cancel_delayed_work(&priv->rtllib->check_tsf_wq); -#endif -#endif - } int _rtl8192_up(struct net_device *dev,bool is_silent_reset) @@ -3123,13 +3063,8 @@ void rtl8192_commit(struct net_device *dev) void rtl8192_restart(void *data) { -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) struct r8192_priv *priv = container_of_work_rsl(data, struct r8192_priv, reset_wq); struct net_device *dev = priv->rtllib->dev; -#else - struct net_device *dev = (struct net_device *)data; - struct r8192_priv *priv = rtllib_priv(dev); -#endif down(&priv->wx_sem); @@ -3165,11 +3100,7 @@ int r8192_set_mac_adr(struct net_device *dev, void *mac) memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) schedule_work(&priv->reset_wq); -#else - schedule_task(&priv->reset_wq); -#endif up(&priv->wx_sem); return 0; @@ -3515,11 +3446,7 @@ irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs) done: -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) - return; -#else return IRQ_HANDLED; -#endif } @@ -3547,9 +3474,7 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev, unsigned long ioaddr = 0; struct net_device *dev = NULL; struct r8192_priv *priv= NULL; -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) struct rtl819x_ops *ops = (struct rtl819x_ops *)(id->driver_data); -#endif #ifdef CONFIG_RTL8192_IO_MAP unsigned long pio_start, pio_len, pio_flags; @@ -3569,10 +3494,6 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev, pci_set_master(pdev); -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)) -#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL < (n)) -1)) -#endif - #ifdef CONFIG_64BIT_DMA if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) { printk("RTL819xCE: Using 64bit DMA\n"); @@ -3586,13 +3507,11 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev, #endif { if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) { -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) { printk( "Unable to obtain 32bit DMA for consistent allocations\n"); pci_disable_device(pdev); return -ENOMEM; } -#endif } } dev = alloc_rtllib(sizeof(struct r8192_priv)); @@ -3603,26 +3522,16 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev, dev->features |= NETIF_F_HIGHDMA; } -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) - SET_MODULE_OWNER(dev); -#endif - pci_set_drvdata(pdev, dev); -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) SET_NETDEV_DEV(dev, &pdev->dev); -#endif priv = rtllib_priv(dev); priv->rtllib = (struct rtllib_device *)netdev_priv_rsl(dev); priv->pdev=pdev; priv->rtllib->pdev=pdev; -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) - if ((pdev->subsystem_vendor == PCI_VENDOR_ID_DLINK)&&(pdev->subsystem_device == 0x3304)){ + if ((pdev->subsystem_vendor == PCI_VENDOR_ID_DLINK)&&(pdev->subsystem_device == 0x3304)) priv->rtllib->bSupportRemoteWakeUp = 1; - } else -#endif - { + else priv->rtllib->bSupportRemoteWakeUp = 0; - } #ifdef CONFIG_RTL8192_IO_MAP pio_start = (unsigned long)pci_resource_start (pdev, 0); @@ -3687,15 +3596,7 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev, if (pdev->device == 0x8192 && revision_id == 0x10) goto fail1; -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) priv->ops = ops; -#else -#if defined RTL8190P || defined RTL8192E - priv->ops = &rtl819xp_ops; -#else - priv->ops = &rtl8192se_ops; -#endif -#endif if (rtl8192_pci_findadapter(pdev, dev) == false) goto fail1; @@ -3721,9 +3622,7 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev, #endif dev->wireless_handlers = (struct iw_handler_def *) &r8192_wx_handlers_def; #endif -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) dev->ethtool_ops = &rtl819x_ethtool_ops; -#endif dev->type = ARPHRD_ETHER; dev->watchdog_timeo = HZ*3; @@ -3825,9 +3724,7 @@ static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev) #ifdef ENABLE_GPIO_RADIO_CTL del_timer_sync(&priv->gpio_polling_timer); -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) cancel_delayed_work(&priv->gpio_change_rf_wq); -#endif priv->polling_timer_on = 0; #endif rtl_debug_module_remove(priv); @@ -3837,14 +3734,11 @@ static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev) #ifdef CONFIG_ASPM_OR_D3 ; #endif - if (priv->pFirmware) - { + if (priv->pFirmware) { vfree(priv->pFirmware); priv->pFirmware = NULL; } -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) destroy_workqueue(priv->priv_wq); -#endif { u32 i; rtl8192_free_rx_ring(dev); @@ -4012,12 +3906,7 @@ static int __init rtl8192_pci_module_init(void) } rtl8192_proc_module_init(); -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)) - if (0!=pci_module_init(&rtl8192_pci_driver)) -#else - if (0!=pci_register_driver(&rtl8192_pci_driver)) -#endif - { + if (0!=pci_register_driver(&rtl8192_pci_driver)) { DMESG("No device found"); /*pci_unregister_driver (&rtl8192_pci_driver);*/ return -ENODEV; @@ -4070,20 +3959,12 @@ module_exit(rtl8192_pci_module_exit); MODULE_DESCRIPTION("Linux driver for Realtek RTL819x WiFi cards"); MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR); -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) MODULE_VERSION(DRV_VERSION); -#endif MODULE_LICENSE("GPL"); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 9) module_param(ifname, charp, S_IRUGO|S_IWUSR ); module_param(hwwep,int, S_IRUGO|S_IWUSR); module_param(channels,int, S_IRUGO|S_IWUSR); -#else -MODULE_PARM(ifname, "s"); -MODULE_PARM(hwwep,"i"); -MODULE_PARM(channels,"i"); -#endif MODULE_PARM_DESC(ifname," Net interface name, wlan%d=default"); MODULE_PARM_DESC(hwwep," Try to use hardware WEP support(default use hw. set 0 to use software security)"); diff --git a/drivers/staging/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl_core.h index d858cc9eacb4..1e56ceb874e5 100644 --- a/drivers/staging/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl_core.h @@ -46,9 +46,6 @@ #include #include #include -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)) -#include -#endif #include "rtllib.h" #ifdef ENABLE_DOT11D @@ -95,31 +92,8 @@ .driver_data = (kernel_ulong_t)&(cfg) typedef irqreturn_t irqreturn_type; -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)) - -#if !defined(PCI_CAP_ID_EXP) -#define PCI_CAP_ID_EXP 0x10 -#endif -#if !defined(PCI_EXP_LNKCTL) -#define PCI_EXP_LNKCTL 0x10 -#endif -typedef int __bitwise pci_power_t; -#define PCI_D0 ((pci_power_t __force) 0) -#define PCI_D1 ((pci_power_t __force) 1) -#define PCI_D2 ((pci_power_t __force) 2) -#define PCI_D3hot ((pci_power_t __force) 3) -#define PCI_D3cold ((pci_power_t __force) 4) -#define PCI_UNKNOWN ((pci_power_t __force) 5) -#define PCI_POWER_ERROR ((pci_power_t __force) -1) - -#endif - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) - #define rtl8192_interrupt(x,y,z) rtl8192_interrupt_rsl(x,y,z) -#else - #define rtl8192_interrupt(x,y,z) rtl8192_interrupt_rsl(x,y) -#endif +#define rtl8192_interrupt(x,y,z) rtl8192_interrupt_rsl(x,y) #define RTL_MAX_SCAN_SIZE 128 @@ -592,10 +566,6 @@ typedef struct r8192_priv struct pci_dev *pdev; struct pci_dev *bridge_pdev; -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)) - u32 pci_state; -#endif - bool bfirst_init; bool bfirst_after_down; bool initialized_at_probe; @@ -684,11 +654,7 @@ typedef struct r8192_priv struct semaphore wx_sem; struct semaphore rf_sem; -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)) - struct semaphore mutex; -#else struct mutex mutex; -#endif struct Stats stats; struct iw_statistics wstats; diff --git a/drivers/staging/rtl8192e/rtl_debug.c b/drivers/staging/rtl8192e/rtl_debug.c index 688399440836..cec8998abfaa 100644 --- a/drivers/staging/rtl8192e/rtl_debug.c +++ b/drivers/staging/rtl8192e/rtl_debug.c @@ -243,12 +243,7 @@ int rtl_debug_module_init(struct r8192_priv *priv, const char *name) if (!rtl_debugfs_root) return -ENOENT; -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)) debug = kzalloc(sizeof(rtl_fs_debug), GFP_KERNEL); -#else - rtl_fs_debug = kmalloc(sizeof(*rtl_fs_debug), GFP_KERNEL); - memset(rtl_fs_debug,0,sizeof(*rtl_fs_debug)); -#endif if (!debug) { ret = -ENOMEM; goto err; @@ -1086,21 +1081,13 @@ static int proc_get_stats_rx(char *page, char **start, void rtl8192_proc_module_init(void) { RT_TRACE(COMP_INIT, "Initializing proc filesystem"); -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - rtl8192_proc=create_proc_entry(DRV_NAME, S_IFDIR, proc_net); -#else rtl8192_proc=create_proc_entry(DRV_NAME, S_IFDIR, init_net.proc_net); -#endif } void rtl8192_proc_module_remove(void) { -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - remove_proc_entry(DRV_NAME, proc_net); -#else remove_proc_entry(DRV_NAME, init_net.proc_net); -#endif } diff --git a/drivers/staging/rtl8192e/rtl_debug.h b/drivers/staging/rtl8192e/rtl_debug.h index 5ae7c7d07de3..8d85979d313a 100644 --- a/drivers/staging/rtl8192e/rtl_debug.h +++ b/drivers/staging/rtl8192e/rtl_debug.h @@ -27,9 +27,7 @@ #include #include #include -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)) #include -#endif struct r8192_priv; struct _tx_desc_8192se; @@ -272,11 +270,7 @@ typedef struct _rtl_fs_debug struct dentry *debug_register; u32 hw_type; u32 hw_offset; -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,20)) bool hw_holding; -#else - u8 hw_holding; -#endif } rtl_fs_debug; void print_buffer(u32 *buffer, int len); diff --git a/drivers/staging/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl_dm.c index 5ea11c520c0e..e864acb2c0b1 100644 --- a/drivers/staging/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl_dm.c @@ -25,41 +25,6 @@ #include "r8192E_cmdpkt.h" /*---------------------------Define Local Constant---------------------------*/ -#ifdef RTL8190P -static u32 edca_setting_DL[HT_IOT_PEER_MAX] = -{ 0x5e4322, - 0x5e4322, - 0x5ea44f, - 0x5e4322, - 0x604322, - 0xa44f, - 0x5e4322, - 0x5e4322 - }; - -static u32 edca_setting_DL_GMode[HT_IOT_PEER_MAX] = -{ 0x5e4322, - 0x5e4322, - 0x5e4322, - 0x5e4322, - 0x604322, - 0xa44f, - 0x5e4322, - 0x5e4322 -}; - -static u32 edca_setting_UL[HT_IOT_PEER_MAX] = -{ 0x5e4322, - 0xa44f, - 0x5ea44f, - 0x5e4322, - 0x604322, - 0x5e4322, - 0x5e4322, - 0x5e4322 -}; - -#elif defined RTL8192E static u32 edca_setting_DL[HT_IOT_PEER_MAX] = { 0x5e4322, 0x5e4322, @@ -93,48 +58,6 @@ static u32 edca_setting_UL[HT_IOT_PEER_MAX] = 0x5e4332 }; -#elif defined(RTL8192SE) -static u32 edca_setting_DL[HT_IOT_PEER_MAX] = -{ 0xa44f, - 0x5ea44f, - 0x5ea44f, - 0xa630, - 0xa44f, - 0xa630, - 0xa630, - 0xa42b, - 0x5e4322, - 0x5e4322 - }; - -static u32 edca_setting_DL_GMode[HT_IOT_PEER_MAX] = - -{ 0x4322, - 0xa44f, - 0x5ea44f, - 0xa42b, - 0x5e4322, - 0x4322, - 0xa430, - 0x5ea44f, - 0x5e4322, - 0x5e4322 -}; - -static u32 edca_setting_UL[HT_IOT_PEER_MAX] = -{ 0x5e4322, - 0xa44f, - 0x5ea44f, - 0x5ea322, - 0x5ea422, - 0x5ea322, - 0x3ea44f, - 0x5ea44f, - 0x5e4322, - 0x5e4322 - }; -#endif - #define RTK_UL_EDCA 0xa44f #define RTK_DL_EDCA 0x5e4322 /*---------------------------Define Local Constant---------------------------*/ @@ -1255,24 +1178,13 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device * dev) void dm_txpower_trackingcallback(void *data) { -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) struct r8192_priv *priv = container_of_dwork_rsl(data,struct r8192_priv,txpower_tracking_wq); struct net_device *dev = priv->rtllib->dev; -#else - struct net_device *dev = (struct net_device *)data; - struct r8192_priv *priv = rtllib_priv(dev); -#endif -#ifdef RTL8190P - dm_TXPowerTrackingCallback_TSSI(dev); -#elif defined(RTL8192E) if (priv->IC_Cut >= IC_VersionCut_D) dm_TXPowerTrackingCallback_TSSI(dev); else dm_TXPowerTrackingCallback_ThermalMeter(dev); -#elif defined(RTL8192SE) - dm_TXPowerTrackingCallback_ThermalMeter(dev); -#endif } #ifndef RTL8192SE @@ -1776,16 +1688,10 @@ static void dm_InitializeTXPowerTracking_TSSI(struct net_device *dev) } #endif -#ifndef RTL8190P static void dm_InitializeTXPowerTracking_ThermalMeter(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); -#ifdef RTL8192SE - priv->btxpower_tracking = false; - priv->txpower_count = 0; - priv->btxpower_trackingInit = false; -#else if (priv->rtllib->FwRWRF) priv->btxpower_tracking = true; @@ -1793,16 +1699,12 @@ static void dm_InitializeTXPowerTracking_ThermalMeter(struct net_device *dev) priv->btxpower_tracking = false; priv->txpower_count = 0; priv->btxpower_trackingInit = false; -#endif RT_TRACE(COMP_POWER_TRACKING, "pMgntInfo->bTXPowerTracking = %d\n", priv->btxpower_tracking); } -#endif void dm_initialize_txpower_tracking(struct net_device *dev) { -#ifdef RTL8192E struct r8192_priv *priv = rtllib_priv(dev); -#endif #ifdef RTL8190P dm_InitializeTXPowerTracking_TSSI(dev); #elif defined RTL8192E @@ -3365,13 +3267,8 @@ static void dm_check_pbc_gpio(struct net_device *dev) extern void dm_CheckRfCtrlGPIO(void *data) { -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) struct r8192_priv *priv = container_of_dwork_rsl(data,struct r8192_priv,gpio_change_rf_wq); struct net_device *dev = priv->rtllib->dev; -#else - struct r8192_priv *priv = rtllib_priv((struct net_device *)data); - struct net_device *dev = priv->rtllib->dev; -#endif u8 tmp1byte; RT_RF_POWER_STATE eRfPowerStateToSet; bool bActuallySet = false; @@ -3652,13 +3549,8 @@ u8 RfOnOffDetect(struct net_device *dev) extern void dm_CheckRfCtrlGPIO(void *data) { -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) - struct r8192_priv *priv = container_of_dwork_rsl(data,struct r8192_priv,gpio_change_rf_wq); - struct net_device *dev = priv->rtllib->dev; -#else struct net_device *dev = (struct net_device *)data; struct r8192_priv *priv = rtllib_priv(dev); -#endif RT_RF_POWER_STATE eRfPowerStateToSet, CurRfState; bool bActuallySet = false; @@ -3707,13 +3599,6 @@ extern void dm_CheckRfCtrlGPIO(void *data) RT_DISABLE_ASPM(dev); RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_ASPM); } - else if ((pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_PCI_D3) && RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_PCI_D3)) - { -#ifdef TODO - RT_LEAVE_D3(dev, false); - RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_PCI_D3); -#endif - } #endif if (RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC)) @@ -3753,20 +3638,12 @@ extern void dm_CheckRfCtrlGPIO(void *data) if (bActuallySet) { priv->bHwRfOffAction = 1; #ifdef CONFIG_ASPM_OR_D3 - if (eRfPowerStateToSet == eRfOn) - { - if ((pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_ASPM) && RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_ASPM)) - { + if (eRfPowerStateToSet == eRfOn) { + if ((pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_ASPM) && + RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_ASPM)) { RT_DISABLE_ASPM(dev); RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_ASPM); } -#ifdef TODO - else if ((pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_PCI_D3) && RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_PCI_D3)) - { - RT_LEAVE_D3(dev, false); - RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_PCI_D3); - } -#endif } #endif spin_lock_irqsave(&priv->rf_ps_lock,flag); @@ -3797,54 +3674,33 @@ extern void dm_CheckRfCtrlGPIO(void *data) if (eRfPowerStateToSet == eRfOff) { - if (priv->pwrdown){ - + if (priv->pwrdown) write_nic_byte(dev, SYS_FUNC_EN+1, 0x31); - } #ifdef CONFIG_ASPM_OR_D3 - if (pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_ASPM) - { + if (pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_ASPM) { RT_ENABLE_ASPM(dev); RT_SET_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_ASPM); } -#ifdef TODO - else if (pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_PCI_D3) - { - RT_ENTER_D3(dev, false); - RT_SET_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_PCI_D3); - } -#endif #endif } - } - else if (eRfPowerStateToSet == eRfOff || CurRfState == eRfOff || priv->bDriverIsGoingToUnload) - { + } else if (eRfPowerStateToSet == eRfOff || CurRfState == eRfOff || + priv->bDriverIsGoingToUnload) { - if (pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_HALT_NIC && turnonbypowerdomain) - { + if (pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_HALT_NIC && + turnonbypowerdomain) { PHY_SetRtl8192seRfHalt(dev); RT_SET_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC); } #ifdef CONFIG_ASPM_OR_D3 - if (pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_ASPM) - { + if (pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_ASPM) { RT_ENABLE_ASPM(dev); RT_SET_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_ASPM); } -#ifdef TODO - else if (pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_PCI_D3) - { - RT_ENTER_D3(dev, false); - RT_SET_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_PCI_D3); - } -#endif #endif spin_lock_irqsave(&priv->rf_ps_lock,flag); priv->RFChangeInProgress = false; spin_unlock_irqrestore(&priv->rf_ps_lock,flag); - } - else - { + } else { spin_lock_irqsave(&priv->rf_ps_lock,flag); priv->RFChangeInProgress = false; spin_unlock_irqrestore(&priv->rf_ps_lock,flag); @@ -3854,20 +3710,13 @@ extern void dm_CheckRfCtrlGPIO(void *data) #endif void dm_rf_pathcheck_workitemcallback(void *data) { -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) struct r8192_priv *priv = container_of_dwork_rsl(data,struct r8192_priv,rfpath_check_wq); struct net_device *dev =priv->rtllib->dev; -#else - struct net_device *dev = (struct net_device *)data; - struct r8192_priv *priv = rtllib_priv(dev); -#endif u8 rfpath = 0, i; - rfpath = read_nic_byte(dev, 0xc04); - for (i = 0; i < RF90_PATH_MAX; i++) - { + for (i = 0; i < RF90_PATH_MAX; i++) { if (rfpath & (0x01<brfpath_rxenable[i] = 1; else @@ -4161,21 +4010,12 @@ static void dm_init_fsync (struct net_device *dev) priv->rtllib->fsync_time_interval = 500; priv->rtllib->fsync_rate_bitmap = 0x0f000800; priv->rtllib->fsync_rssi_threshold = 30; -#ifdef RTL8190P - priv->rtllib->bfsync_enable = true; -#elif defined RTL8192E || defined RTL8192SE priv->rtllib->bfsync_enable = false; -#endif priv->rtllib->fsync_multiple_timeinterval = 3; priv->rtllib->fsync_firstdiff_ratethreshold= 100; priv->rtllib->fsync_seconddiff_ratethreshold= 200; priv->rtllib->fsync_state = Default_Fsync; - -#ifdef RTL8192SE - priv->framesyncMonitor = 0; -#elif defined RTL8192E || defined RTL8190P priv->framesyncMonitor = 1; -#endif init_timer(&priv->fsync_timer); setup_timer(&priv->fsync_timer, dm_fsync_timer_callback,(unsigned long) dev); @@ -4314,31 +4154,22 @@ extern void dm_fsync_timer_callback(unsigned long data) static void dm_StartHWFsync(struct net_device *dev) { -#if defined RTL8192E u8 rf_timing = 0x77; struct r8192_priv *priv = rtllib_priv(dev); RT_TRACE(COMP_HALDM, "%s\n", __func__); write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c12cf); priv->rtllib->SetHwRegHandler(dev, HW_VAR_RF_TIMING, (u8*)(&rf_timing)); write_nic_byte(dev, 0xc3b, 0x41); -#elif defined RTL8192SE - write_nic_byte(dev, rOFDM0_RxDetector3, 0x96); -#endif } static void dm_EndHWFsync(struct net_device *dev) { -#if defined RTL8192E u8 rf_timing = 0xaa; struct r8192_priv *priv = rtllib_priv(dev); RT_TRACE(COMP_HALDM,"%s\n", __func__); write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c52cd); priv->rtllib->SetHwRegHandler(dev, HW_VAR_RF_TIMING, (u8*)(&rf_timing)); write_nic_byte(dev, 0xc3b, 0x49); -#elif defined RTL8192SE - write_nic_byte(dev, rOFDM0_RxDetector3, 0x94); -#endif - } static void dm_EndSWFsync(struct net_device *dev) @@ -4650,205 +4481,4 @@ static void dm_send_rssi_tofw(struct net_device *dev) DESC_PACKET_TYPE_INIT, sizeof(DCMD_TXCMD_T)); } -#if defined RTL8192SE -/*----------------------------------------------------------------------------- - * Function: dm_RefreshRateAdaptiveMask() - * - * Overview: Update rate table mask according to rssi - * - * Input: NONE - * - * Output: NONE - * - * Return: NONE - * - * Revised History: - * When Who Remark - * 05/27/2009 hpfan Create Version 0. - * - *---------------------------------------------------------------------------*/ -static void dm_RefreshRateAdaptiveMask(struct net_device *dev) -{ - struct r8192_priv *priv = rtllib_priv(dev); - prate_adaptive pRA = (prate_adaptive)&priv->rate_adaptive; - u32 LowRSSIThreshForRA = 0, HighRSSIThreshForRA = 0; - u8 rssi_level; - - if (IS_NIC_DOWN(priv)){ - RT_TRACE(COMP_RATE,"<---- dm_RefreshRateAdaptiveMask(): driver is going to unload\n"); - return; - } - - if (!priv->rtllib->bUseRAMask){ - return; - } - - if (priv->pFirmware->FirmwareVersion >= 61 && !priv->bInformFWDriverControlDM){ - RT_TRACE(COMP_RATE, "<---- dm_RefreshRateAdaptiveMask(): inform fw driver control dm\n"); - priv->rtllib->SetFwCmdHandler(dev, FW_CMD_CTRL_DM_BY_DRIVER); - priv->bInformFWDriverControlDM = true; - } - - if ((priv->rtllib->state == RTLLIB_LINKED && - (priv->rtllib->iw_mode == IW_MODE_INFRA))) { - - switch (pRA->PreRATRState){ - case DM_RATR_STA_HIGH: - HighRSSIThreshForRA = 50; - LowRSSIThreshForRA = 20; - break; - case DM_RATR_STA_MIDDLE: - HighRSSIThreshForRA = 55; - LowRSSIThreshForRA = 20; - break; - case DM_RATR_STA_LOW: - HighRSSIThreshForRA = 50; - LowRSSIThreshForRA = 25; - break; - default: - HighRSSIThreshForRA = 50; - LowRSSIThreshForRA = 20; - break; - } - - if (priv->undecorated_smoothed_pwdb > (long)HighRSSIThreshForRA) { - pRA->ratr_state = DM_RATR_STA_HIGH; - rssi_level = 1; - } else if (priv->undecorated_smoothed_pwdb > (long)LowRSSIThreshForRA) { - pRA->ratr_state = DM_RATR_STA_MIDDLE; - rssi_level = 2; - } else { - pRA->ratr_state = DM_RATR_STA_LOW; - rssi_level = 3; - } - if ((pRA->PreRATRState != pRA->ratr_state) || - ((pRA->PreRATRState == pRA->ratr_state) && - (rssi_level != priv->rssi_level))) { - RT_TRACE(COMP_RATE, "Target AP addr : "MAC_FMT"\n", - MAC_ARG(priv->rtllib->current_network.bssid)); - RT_TRACE(COMP_RATE, "RSSI = %ld\n", - priv->undecorated_smoothed_pwdb); - RT_TRACE(COMP_RATE, "RSSI_LEVEL = %d\n", rssi_level); - RT_TRACE(COMP_RATE, "PreState = %d, CurState = %d\n", - pRA->PreRATRState, pRA->ratr_state); - priv->rtllib->UpdateHalRAMaskHandler(dev, false, 0, - priv->rtllib->pHTInfo->PeerMimoPs, - priv->rtllib->mode, - priv->rtllib->pHTInfo->bCurTxBW40MHz, - rssi_level); - priv->rssi_level = rssi_level; - pRA->PreRATRState = pRA->ratr_state; - } - } - if ((priv->rtllib->state == RTLLIB_LINKED) && - (priv->rtllib->iw_mode == IW_MODE_ADHOC)) { - int i; - struct sta_info *pEntry; - - for (i = 0; i < PEER_MAX_ASSOC; i++) { - pEntry = priv->rtllib->peer_assoc_list[i]; - if (NULL != pEntry) { - pRA = &pEntry->rate_adaptive; - switch (pRA->PreRATRState){ - case DM_RATR_STA_HIGH: - HighRSSIThreshForRA = 50; - LowRSSIThreshForRA = 20; - break; - case DM_RATR_STA_MIDDLE: - HighRSSIThreshForRA = 55; - LowRSSIThreshForRA = 20; - break; - case DM_RATR_STA_LOW: - HighRSSIThreshForRA = 50; - LowRSSIThreshForRA = 25; - break; - default: - HighRSSIThreshForRA = 50; - LowRSSIThreshForRA = 20; - break; - } - - if (pEntry->rssi_stat.UndecoratedSmoothedPWDB > HighRSSIThreshForRA) { - pRA->ratr_state = DM_RATR_STA_HIGH; - rssi_level = 1; - } else if (pEntry->rssi_stat.UndecoratedSmoothedPWDB > LowRSSIThreshForRA) { - pRA->ratr_state = DM_RATR_STA_MIDDLE; - rssi_level = 2; - } else { - pRA->ratr_state = DM_RATR_STA_LOW; - rssi_level = 3; - } - - if (pRA->PreRATRState != pRA->ratr_state) { - RT_TRACE(COMP_RATE, "AsocEntry addr : " - MAC_FMT"\n", - MAC_ARG(pEntry->macaddr)); - RT_TRACE(COMP_RATE, "RSSI = %ld\n", - pEntry->rssi_stat.UndecoratedSmoothedPWDB); - RT_TRACE(COMP_RATE, - "RSSI_LEVEL = %d\n", - rssi_level); - RT_TRACE(COMP_RATE, - "PreState = %d, CurState = %d\n", - pRA->PreRATRState, - pRA->ratr_state); - priv->rtllib->UpdateHalRAMaskHandler( - dev, false, - pEntry->aid+1, - pEntry->htinfo.MimoPs, - pEntry->wireless_mode, - pEntry->htinfo.bCurTxBW40MHz, - rssi_level); - pRA->PreRATRState = pRA->ratr_state; - } - - } - } - } -} - -void Adhoc_InitRateAdaptive(struct net_device *dev,struct sta_info *pEntry) -{ - prate_adaptive pRA = (prate_adaptive)&pEntry->rate_adaptive; - struct r8192_priv *priv = rtllib_priv(dev); - - pRA->ratr_state = DM_RATR_STA_MAX; - pRA->high2low_rssi_thresh_for_ra = RateAdaptiveTH_High; - pRA->low2high_rssi_thresh_for_ra20M = RateAdaptiveTH_Low_20M+5; - pRA->low2high_rssi_thresh_for_ra40M = RateAdaptiveTH_Low_40M+5; - - pRA->high_rssi_thresh_for_ra = RateAdaptiveTH_High+5; - pRA->low_rssi_thresh_for_ra20M = RateAdaptiveTH_Low_20M; - pRA->low_rssi_thresh_for_ra40M = RateAdaptiveTH_Low_40M; - - if (priv->rf_type == RF_2T4R) { - /* 2008/01/11 MH Modify 2T RATR table for different RSSI. */ - pRA->upper_rssi_threshold_ratr = 0x8f0f0000; - pRA->middle_rssi_threshold_ratr = 0x8d0ff000; - pRA->low_rssi_threshold_ratr = 0x8f0ff003; - pRA->low_rssi_threshold_ratr_40M = 0x8f0ff007; - pRA->low_rssi_threshold_ratr_20M = 0x8f0ff003; - } - else if (priv->rf_type == RF_1T2R) - { - pRA->upper_rssi_threshold_ratr = 0x000f0000; - pRA->middle_rssi_threshold_ratr = 0x000ff000; - pRA->low_rssi_threshold_ratr = 0x000ff003; - pRA->low_rssi_threshold_ratr_40M = 0x000ff007; - pRA->low_rssi_threshold_ratr_20M = 0x000ff003; - } - -} - - -void Adhoc_InitRateAdaptiveState(struct net_device *dev,struct sta_info *pEntry) -{ - prate_adaptive pRA = (prate_adaptive)&pEntry->rate_adaptive; - - pRA->ratr_state = DM_RATR_STA_MAX; - pRA->PreRATRState = DM_RATR_STA_MAX; -} - - -#endif /*---------------------------Define function prototype------------------------*/ diff --git a/drivers/staging/rtl8192e/rtl_ethtool.c b/drivers/staging/rtl8192e/rtl_ethtool.c index 6c732e18540f..36452fb7cef8 100644 --- a/drivers/staging/rtl8192e/rtl_ethtool.c +++ b/drivers/staging/rtl8192e/rtl_ethtool.c @@ -29,7 +29,6 @@ #include "rtl_core.h" -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) static void rtl819x_ethtool_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) { @@ -37,10 +36,6 @@ static void rtl819x_ethtool_get_drvinfo(struct net_device *dev, strcpy(info->driver, DRV_NAME); strcpy(info->version, DRV_VERSION); -#if defined RTL8192SE - snprintf(info->fw_version, sizeof(info->fw_version), "%d", - priv->pFirmware->FirmwareVersion); -#endif strcpy(info->bus_info, pci_name(priv->pdev)); } @@ -56,4 +51,3 @@ const struct ethtool_ops rtl819x_ethtool_ops = { .get_drvinfo = rtl819x_ethtool_get_drvinfo, .get_link = rtl819x_ethtool_get_link, }; -#endif diff --git a/drivers/staging/rtl8192e/rtl_pci.c b/drivers/staging/rtl8192e/rtl_pci.c index 39b96c12af51..2416db132179 100644 --- a/drivers/staging/rtl8192e/rtl_pci.c +++ b/drivers/staging/rtl8192e/rtl_pci.c @@ -25,337 +25,6 @@ #include "rtl_pci.h" #include "rtl_core.h" -#if defined RTL8192CE || defined RTL8192SE -bool -rtl8192_get_LinkControl_field( - struct net_device *dev, - u8 BusNum, - u8 DevNum, - u8 FuncNum - ) -{ - struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); - - RT_PCI_CAPABILITIES_HEADER CapabilityHdr; - unsigned char CapabilityOffset, Num4Bytes; - u32 PciCfgAddrPort=0; - u8 LinkCtrlReg; - bool Status = false; - - if ( BusNum == 0xff && DevNum == 0xff && FuncNum == 0xff ){ - printk("GetLinkControlField(): Fail to find PCIe Capability\n"); - return false; - } - - - PciCfgAddrPort= (BusNum<< 16)|(DevNum << 11)|(FuncNum << 8)|(1 << 31); - - - Num4Bytes = 0x34/4; - NdisRawWritePortUlong(PCI_CONF_ADDRESS , PciCfgAddrPort+( Num4Bytes<< 2)); - NdisRawReadPortUchar(PCI_CONF_DATA, &CapabilityOffset); - - - while (CapabilityOffset != 0) - { - Num4Bytes = CapabilityOffset/4; - - - NdisRawWritePortUlong(PCI_CONF_ADDRESS , PciCfgAddrPort+( Num4Bytes<< 2)); - NdisRawReadPortUshort(PCI_CONF_DATA, (u16*)&CapabilityHdr); - - if (CapabilityHdr.CapabilityID == PCI_CAPABILITY_ID_PCI_EXPRESS) - { - break; - } - else - { - CapabilityOffset = CapabilityHdr.Next; - } - } - - - if (CapabilityHdr.CapabilityID == PCI_CAPABILITY_ID_PCI_EXPRESS) - { - Num4Bytes = (CapabilityOffset+0x10)/4; - - NdisRawWritePortUlong(PCI_CONF_ADDRESS , PciCfgAddrPort+(Num4Bytes << 2)); - NdisRawReadPortUchar(PCI_CONF_DATA, &LinkCtrlReg); - - priv->NdisAdapter.PciBridgePCIeHdrOffset = CapabilityOffset; - priv->NdisAdapter.PciBridgeLinkCtrlReg = LinkCtrlReg; - - Status = true; - } - else - { - printk("GetLinkControlField(): Cannot Find PCIe Capability\n"); - } - - return Status; -} - -bool -rtl8192_get_pci_BusInfo( - struct net_device *dev, - u16 VendorId, - u16 DeviceId, - u8 IRQL, - u8 BaseCode, - u8 SubClass, - u8 filed19val, - u8* BusNum, - u8* DevNum, - u8* FuncNum - ) -{ - - u8 busNumIdx, deviceNumIdx, functionNumIdx; - u32 PciCfgAddrPort=0; - u32 devVenID = 0, classCode, field19, headertype; - u16 venId, devId; - u8 basec, subc, irqLine; - u16 RegOffset; - bool bSingleFunc = false; - bool bBridgeChk = false; - - *BusNum = 0xFF; - *DevNum = 0xFF; - *FuncNum = 0xFF; - - if ((BaseCode == PCI_CLASS_BRIDGE_DEV) && (SubClass==PCI_SUBCLASS_BR_PCI_TO_PCI) && (filed19val==U1DONTCARE)) - bBridgeChk = true; - - for (busNumIdx = 0; busNumIdx < PCI_MAX_BRIDGE_NUMBER ; busNumIdx++) - { - for (deviceNumIdx = 0; deviceNumIdx < PCI_MAX_DEVICES; deviceNumIdx ++) - { - bSingleFunc = false; - for (functionNumIdx = 0; functionNumIdx < PCI_MAX_FUNCTION; functionNumIdx++) - { - - if (functionNumIdx == 0) - { - PciCfgAddrPort= (busNumIdx << 16)|(deviceNumIdx << 11)|(functionNumIdx << 8)|(1 << 31); - NdisRawWritePortUlong(PCI_CONF_ADDRESS , PciCfgAddrPort + (3 << 2)); - NdisRawReadPortUlong(PCI_CONF_DATA, &headertype); - headertype = ((headertype >> 16) & 0x0080) >> 7; - if ( headertype == 0) - bSingleFunc = true; - } - else - { - if (bSingleFunc == true) break; - } - - PciCfgAddrPort= (busNumIdx << 16)|(deviceNumIdx << 11)|(functionNumIdx << 8)|(1 << 31); - - NdisRawWritePortUlong(PCI_CONF_ADDRESS , PciCfgAddrPort); - NdisRawReadPortUlong(PCI_CONF_DATA, &devVenID); - - if ( devVenID == 0xFFFFFFFF||devVenID == 0 ) continue; - - RegOffset = 0x3C; - PciCfgAddrPort= (busNumIdx << 16)|(deviceNumIdx << 11)|(functionNumIdx << 8)|(1 << 31)|(RegOffset & 0xFFFFFFFC); - NdisRawWritePortUlong(PCI_CONF_ADDRESS , PciCfgAddrPort); - NdisRawReadPortUchar((PCI_CONF_DATA+ (RegOffset & 0x3)), &irqLine); - - venId = (u16)(devVenID >> 0)& 0xFFFF; - devId = (u16)(devVenID >> 16)& 0xFFFF; - - if (!bBridgeChk && (venId != VendorId) && (VendorId != U2DONTCARE)) - continue; - - if (!bBridgeChk && (devId != DeviceId) && (DeviceId != U2DONTCARE)) - continue; - - if (!bBridgeChk && (irqLine != IRQL) && (IRQL != U1DONTCARE)) - continue; - - PciCfgAddrPort= (busNumIdx << 16)|(deviceNumIdx << 11)|(functionNumIdx << 8)|(1 << 31); - NdisRawWritePortUlong(PCI_CONF_ADDRESS , PciCfgAddrPort + (2 << 2)); - NdisRawReadPortUlong(PCI_CONF_DATA, &classCode); - classCode = classCode >> 8; - - basec = (u8)(classCode >>16 ) & 0xFF; - subc = (u8)(classCode >>8 ) & 0xFF; - if (bBridgeChk && (venId != VendorId) &&(basec == BaseCode) && (subc== SubClass ) ) - return true; - - if (bBridgeChk && (venId != VendorId) && (VendorId != U2DONTCARE)) - continue; - - if (bBridgeChk && (devId != DeviceId) && (DeviceId != U2DONTCARE)) - continue; - - if (bBridgeChk && (irqLine != IRQL) && (IRQL != U1DONTCARE)) - continue; - - - NdisRawWritePortUlong(PCI_CONF_ADDRESS , PciCfgAddrPort + (6 << 2)); - NdisRawReadPortUlong(PCI_CONF_DATA, &field19); - field19 = (field19 >> 8)& 0xFF; - - if ((basec == BaseCode) && (subc== SubClass ) && ((field19 == filed19val) ||(filed19val==U1DONTCARE) )) - { - *BusNum = busNumIdx; - *DevNum = deviceNumIdx; - *FuncNum = functionNumIdx; - - printk( "GetPciBusInfo(): Find Device(%X:%X) bus=%d dev=%d, func=%d\n",VendorId, DeviceId, busNumIdx, deviceNumIdx, functionNumIdx); - return true; - } - } - } - } - - printk( "GetPciBusInfo(): Cannot Find Device(%X:%X:%X)\n",VendorId, DeviceId, devVenID); - return false; -} - -bool rtl8192_get_pci_BridegInfo( - struct net_device *dev, - u8 BaseCode, - u8 SubClass, - u8 filed19val, - u8* BusNum, - u8* DevNum, - u8* FuncNum, - u16* VendorId, - u16* DeviceId - ) - -{ - - u8 busNumIdx, deviceNumIdx, functionNumIdx; - u32 PciCfgAddrPort=0; - u32 devVenID, classCode, field19, headertype; - u16 venId, devId; - u8 basec, subc, irqLine; - u16 RegOffset; - bool bSingleFunc = false; - - *BusNum = 0xFF; - *DevNum = 0xFF; - *FuncNum = 0xFF; - - for (busNumIdx = 0; busNumIdx < PCI_MAX_BRIDGE_NUMBER ; busNumIdx++) - { - for (deviceNumIdx = 0; deviceNumIdx < PCI_MAX_DEVICES; deviceNumIdx ++) - { - bSingleFunc = false; - for (functionNumIdx = 0; functionNumIdx < PCI_MAX_FUNCTION; functionNumIdx++) - { - - if (functionNumIdx == 0) - { - PciCfgAddrPort= (busNumIdx << 16)|(deviceNumIdx << 11)|(functionNumIdx << 8)|(1 << 31); - NdisRawWritePortUlong(PCI_CONF_ADDRESS , PciCfgAddrPort + (3 << 2)); - NdisRawReadPortUlong(PCI_CONF_DATA, &headertype); - headertype = ((headertype >> 16) & 0x0080) >> 7; - if ( headertype == 0) - bSingleFunc = true; - } - else - { - if ( bSingleFunc ==true ) break; - } - - PciCfgAddrPort= (busNumIdx << 16)|(deviceNumIdx << 11)|(functionNumIdx << 8)|(1 << 31); - - NdisRawWritePortUlong(PCI_CONF_ADDRESS , PciCfgAddrPort); - NdisRawReadPortUlong(PCI_CONF_DATA, &devVenID); - - RegOffset = 0x3C; - PciCfgAddrPort= (busNumIdx << 16)|(deviceNumIdx << 11)|(functionNumIdx << 8)|(1 << 31)|(RegOffset & 0xFFFFFFFC); - NdisRawWritePortUlong(PCI_CONF_ADDRESS , PciCfgAddrPort); - NdisRawReadPortUchar((PCI_CONF_DATA+ (RegOffset & 0x3)), &irqLine); - - venId = (u16)(devVenID >> 0)& 0xFFFF; - devId = (u16)(devVenID >> 16)& 0xFFFF; - - PciCfgAddrPort= (busNumIdx << 16)|(deviceNumIdx << 11)|(functionNumIdx << 8)|(1 << 31); - NdisRawWritePortUlong(PCI_CONF_ADDRESS , PciCfgAddrPort + (2 << 2)); - NdisRawReadPortUlong(PCI_CONF_DATA, &classCode); - classCode = classCode >> 8; - - basec = (u8)(classCode >>16 ) & 0xFF; - subc = (u8)(classCode >>8 ) & 0xFF; - - NdisRawWritePortUlong(PCI_CONF_ADDRESS , PciCfgAddrPort + (6 << 2)); - NdisRawReadPortUlong(PCI_CONF_DATA, &field19); - field19 = (field19 >> 8)& 0xFF; - - if ((basec == BaseCode) && (subc== SubClass ) && ((field19 == filed19val) ||(filed19val==U1DONTCARE) )) - { - *BusNum = busNumIdx; - *DevNum = deviceNumIdx; - *FuncNum = functionNumIdx; - *VendorId = venId; - *DeviceId = devId; - - printk("GetPciBridegInfo : Find Device(%X:%X) bus=%d dev=%d, func=%d\n", - venId, devId, busNumIdx, deviceNumIdx, functionNumIdx); - - return true; - } - } - } - } - - printk( "GetPciBridegInfo(): Cannot Find PciBridge for Device\n"); - - return false; -} - - -static u16 PciBridgeVendorArray[PCI_BRIDGE_VENDOR_MAX] - = {INTEL_VENDOR_ID,ATI_VENDOR_ID,AMD_VENDOR_ID,SIS_VENDOR_ID}; - -void -rtl8192_pci_find_BridgeInfo(struct net_device *dev) -{ - struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); - - u8 PciBridgeBusNum = 0xff; - u8 PciBridgeDevNum = 0xff; - u8 PciBridgeFuncNum = 0xff; - u16 PciBridgeVendorId= 0xff; - u16 PciBridgeDeviceId = 0xff; - u8 tmp = 0; - - rtl8192_get_pci_BridegInfo(dev, - PCI_CLASS_BRIDGE_DEV, - PCI_SUBCLASS_BR_PCI_TO_PCI , - priv->NdisAdapter.BusNumber, - &PciBridgeBusNum, - &PciBridgeDevNum, - &PciBridgeFuncNum, - &PciBridgeVendorId, - &PciBridgeDeviceId); - - - priv->NdisAdapter.PciBridgeVendor = PCI_BRIDGE_VENDOR_UNKNOWN; - - for (tmp = 0; tmp < PCI_BRIDGE_VENDOR_MAX; tmp++) { - if (PciBridgeVendorId == PciBridgeVendorArray[tmp]) { - priv->NdisAdapter.PciBridgeVendor = tmp; - printk("Pci Bridge Vendor is found index: %d\n",tmp); - break; - } - } - printk("Pci Bridge Vendor is %x\n",PciBridgeVendorArray[tmp]); - - priv->NdisAdapter.PciBridgeBusNum = PciBridgeBusNum; - priv->NdisAdapter.PciBridgeDevNum = PciBridgeDevNum; - priv->NdisAdapter.PciBridgeFuncNum = PciBridgeFuncNum; - priv->NdisAdapter.PciBridgeVendorId = PciBridgeVendorId; - priv->NdisAdapter.PciBridgeDeviceId = PciBridgeDeviceId; - - -} -#endif - static void rtl8192_parse_pci_configuration(struct pci_dev *pdev, struct net_device *dev) { struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); @@ -417,27 +86,6 @@ bool rtl8192_pci_findadapter(struct pci_dev *pdev, struct net_device *dev) return false; } -#if defined RTL8192CE || defined RTL8192SE - rtl8192_get_pci_BusInfo(dev, - VenderID, - DeviceID, - (u8)IrqLine, - 0x02,0x80, U1DONTCARE, - &priv->NdisAdapter.BusNumber, - &priv->NdisAdapter.DevNumber, - &priv->NdisAdapter.FuncNumber); - - rtl8192_pci_find_BridgeInfo(dev); - -#ifdef RTL8192SE - if (priv->NdisAdapter.PciBridgeVendor != PCI_BRIDGE_VENDOR_UNKNOWN) -#endif - { - rtl8192_get_LinkControl_field(dev, priv->NdisAdapter.PciBridgeBusNum, - priv->NdisAdapter.PciBridgeDevNum, priv->NdisAdapter.PciBridgeFuncNum); - } -#endif - rtl8192_parse_pci_configuration(pdev, dev); return true; diff --git a/drivers/staging/rtl8192e/rtl_pm.c b/drivers/staging/rtl8192e/rtl_pm.c index 4fbe819b59c6..bcefe2d6e044 100644 --- a/drivers/staging/rtl8192e/rtl_pm.c +++ b/drivers/staging/rtl8192e/rtl_pm.c @@ -34,9 +34,7 @@ int rtl8192E_suspend (struct pci_dev *pdev, pm_message_t state) { struct net_device *dev = pci_get_drvdata(pdev); struct r8192_priv *priv = rtllib_priv(dev); -#if !(defined RTL8192SE || defined RTL8192CE) u32 ulRegRead; -#endif RT_TRACE(COMP_POWER, "============> r8192E suspend call.\n"); printk("============> r8192E suspend call.\n"); @@ -59,7 +57,6 @@ int rtl8192E_suspend (struct pci_dev *pdev, pm_message_t state) #endif netif_device_detach(dev); -#if !(defined RTL8192SE || defined RTL8192CE) if (!priv->rtllib->bSupportRemoteWakeUp) { MgntActSet_RF_State(dev, eRfOff, RF_CHANGE_BY_INIT,true); ulRegRead = read_nic_dword(dev, CPU_GEN); @@ -69,18 +66,9 @@ int rtl8192E_suspend (struct pci_dev *pdev, pm_message_t state) write_nic_dword(dev, WFCRC0, 0xffffffff); write_nic_dword(dev, WFCRC1, 0xffffffff); write_nic_dword(dev, WFCRC2, 0xffffffff); -#ifdef RTL8190P - { - u8 ucRegRead; - ucRegRead = read_nic_byte(dev, GPO); - ucRegRead |= BIT0; - write_nic_byte(dev, GPO, ucRegRead); - } -#endif write_nic_byte(dev, PMR, 0x5); write_nic_byte(dev, MacBlkCtrl, 0xa); } -#endif out_pci_suspend: RT_TRACE(COMP_POWER, "r8192E support WOL call??????????????????????\n"); printk("r8192E support WOL call??????????????????????\n"); @@ -101,9 +89,7 @@ out_pci_suspend: int rtl8192E_resume (struct pci_dev *pdev) { struct net_device *dev = pci_get_drvdata(pdev); -#if defined ENABLE_GPIO_RADIO_CTL || !(defined RTL8192SE || defined RTL8192CE) struct r8192_priv *priv = rtllib_priv(dev); -#endif int err; u32 val; @@ -146,11 +132,9 @@ int rtl8192E_resume (struct pci_dev *pdev) dev->open(dev); #endif -#if !(defined RTL8192SE || defined RTL8192CE) if (!priv->rtllib->bSupportRemoteWakeUp) { MgntActSet_RF_State(dev, eRfOn, RF_CHANGE_BY_INIT,true); } -#endif out: RT_TRACE(COMP_POWER, "<================r8192E resume call.\n"); diff --git a/drivers/staging/rtl8192e/rtl_pm.h b/drivers/staging/rtl8192e/rtl_pm.h index edf8427dd816..22df29081817 100644 --- a/drivers/staging/rtl8192e/rtl_pm.h +++ b/drivers/staging/rtl8192e/rtl_pm.h @@ -25,10 +25,6 @@ #include #include -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)) -#define pm_message_t u32 -#endif - int rtl8192E_save_state (struct pci_dev *dev, pm_message_t state); int rtl8192E_suspend (struct pci_dev *dev, pm_message_t state); int rtl8192E_resume (struct pci_dev *dev); diff --git a/drivers/staging/rtl8192e/rtl_ps.c b/drivers/staging/rtl8192e/rtl_ps.c index cf401352c627..65bb397154ed 100644 --- a/drivers/staging/rtl8192e/rtl_ps.c +++ b/drivers/staging/rtl8192e/rtl_ps.c @@ -156,13 +156,6 @@ void InactivePsWorkItemCallback(struct net_device *dev) RT_DISABLE_ASPM(dev); RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_ASPM); } -#ifdef TODO - else if ((pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_PCI_D3) && RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_PCI_D3)) - { - RT_LEAVE_D3(dev, false); - RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_PCI_D3); - } -#endif } #endif MgntActSet_RF_State(dev, pPSC->eInactivePowerState, RF_CHANGE_BY_IPS,false); @@ -175,13 +168,6 @@ void InactivePsWorkItemCallback(struct net_device *dev) RT_ENABLE_ASPM(dev); RT_SET_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_ASPM); } -#ifdef TODO - else if (pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_PCI_D3) - { - RT_ENTER_D3(dev, false); - RT_SET_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_PCI_D3); - } -#endif } #endif @@ -466,18 +452,6 @@ bool PlatformSwitchClkReq(struct net_device *dev, u8 value) pci_write_config_byte(priv->pdev,0x81,value); bResult = true; -#ifdef TODO - if (Buffer) { - priv->ClkReqState = true; - } else { - priv->ClkReqState = false; - } -#endif - -#ifdef RTL8192SE - udelay(100); -#endif - return bResult; } @@ -542,15 +516,6 @@ void PlatformEnableASPM(struct net_device *dev) return; } -#ifdef RTL8192SE - if (priv->NdisAdapter.PciBridgeVendor != PCI_BRIDGE_VENDOR_INTEL ) - { - RT_TRACE(COMP_POWER, "%s(): Dont modify ASPM for non intel chipset. For Bridge Vendor %d.\n" - ,__func__,priv->NdisAdapter.PciBridgeVendor); - return; - } -#endif - ASPMLevel |= priv->RegDevicePciASPMSetting; uDeviceASPMSetting = priv->NdisAdapter.LinkCtrlReg; @@ -586,34 +551,6 @@ bool PlatformSetPMCSR(struct net_device *dev,u8 value,bool bTempSetting) Buffer= value; spin_lock_irqsave(&priv->D3_lock,flag); -#ifdef TODO - if (bTempSetting) - { - if (Buffer==0x00) - { - priv->LeaveD3Cnt++; - - { - bActuallySet =true; - } - } - else - { - priv->LeaveD3Cnt--; - - if (priv->LeaveD3Cnt == 0) - { - bActuallySet=true; - } - } - } - else - { - priv->LeaveD3Cnt=0; - bActuallySet=true; - bSetFunc=true; - } -#endif if (bActuallySet) { if (Buffer) { PlatformSwitchClkReq(dev, 0x01); diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 61780a2caa2a..c2eae51ec0d3 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -28,12 +28,7 @@ #include #include #include -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) #include -#else -#include -#include -#endif #include #include @@ -73,27 +68,6 @@ #define IW_CUSTOM_MAX 256 /* In bytes */ #endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) -#define jiffies_to_msecs(t) ((t) * 1000 / HZ) -#ifndef __bitwise -#define __bitwise __attribute__((bitwise)) -#endif -typedef __u16 __le16; - -#if (WIRELESS_EXT < 16) -struct iw_spy_data{ - /* --- Standard spy support --- */ - int spy_number; - u_char spy_address[IW_MAX_SPY][ETH_ALEN]; - struct iw_quality spy_stat[IW_MAX_SPY]; - /* --- Enhanced spy support (event) */ - struct iw_quality spy_thr_low; /* Low threshold */ - struct iw_quality spy_thr_high; /* High threshold */ - u_char spy_thr_under[IW_MAX_SPY]; -}; -#endif -#endif - #ifndef container_of /** * container_of - cast a member of a structure out to the containing structure @@ -108,115 +82,32 @@ struct iw_spy_data{ (type *)( (char *)__mptr - offsetof(type,member) );}) #endif -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18)) #define skb_tail_pointer_rsl(skb) skb_tail_pointer(skb) -#else -#define skb_tail_pointer_rsl(skb) skb->tail -#endif -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) - #define EXPORT_SYMBOL_RSL(x) EXPORT_SYMBOL(x) -#else - #define EXPORT_SYMBOL_RSL(x) EXPORT_SYMBOL_NOVERS(x) -#endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) -static inline void tq_init(struct tq_struct * task, void(*func)(void *), void *data) -{ - task->routine = func; - task->data = data; - INIT_LIST_HEAD(&task->list); - task->sync = 0; -} -#endif +#define EXPORT_SYMBOL_RSL(x) EXPORT_SYMBOL(x) -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)) -static inline void setup_timer(struct timer_list * timer, void(*function)(unsigned long), unsigned long data) -{ - timer->function = function; - timer->data = data; -} -#endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) typedef struct delayed_work delayed_work_struct_rsl; #define queue_delayed_work_rsl(x,y,z) queue_delayed_work(x,y,z) #define INIT_DELAYED_WORK_RSL(x,y,z) INIT_DELAYED_WORK(x,y) -#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,40) - typedef struct tq_struct delayed_work_struct_rsl; - #define queue_delayed_work_rsl(x,y,z) schedule_task(y) - #define INIT_DELAYED_WORK_RSL(x,y,z) tq_init(x,y,z) -#else - typedef struct work_struct delayed_work_struct_rsl; - #define queue_delayed_work_rsl(x,y,z) queue_delayed_work(x,y,z) - #define INIT_DELAYED_WORK_RSL(x,y,z) INIT_WORK(x,y,z) -#endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) typedef struct work_struct work_struct_rsl; #define queue_work_rsl(x,y) queue_work(x,y) #define INIT_WORK_RSL(x,y,z) INIT_WORK(x,y) -#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,40) - typedef struct tq_struct work_struct_rsl; - #define queue_work_rsl(x,y) schedule_task(y) - #define INIT_WORK_RSL(x,y,z) tq_init(x,y,z) -#else - typedef struct work_struct work_struct_rsl; - #define queue_work_rsl(x,y) queue_work(x,y) - #define INIT_WORK_RSL(x,y,z) INIT_WORK(x,y,z) -#endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) #define container_of_work_rsl(x,y,z) container_of(x,y,z) #define container_of_dwork_rsl(x,y,z) container_of(container_of(x, struct delayed_work, work), y, z) -#else - #define container_of_work_rsl(x,y,z) (x) - #define container_of_dwork_rsl(x,y,z) (x) -#endif -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,20)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) -static inline char * -iwe_stream_add_event_rsl(struct iw_request_info *info, - char * stream, /* Stream of events */ - char * ends, /* End of stream */ - struct iw_event *iwe, /* Payload */ - int event_len) /* Real size of payload */ -{ - /* Check if it's possible */ - if ((stream + event_len) < ends) { - iwe->len = event_len; - ndelay(1); - memcpy(stream, (char *) iwe, event_len); - stream += event_len; - } - return stream; -} -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) #define iwe_stream_add_event_rsl(info,start,stop,iwe,len) iwe_stream_add_event(info,start,stop,iwe,len) -#else - #define iwe_stream_add_event_rsl(info,start,stop,iwe,len) iwe_stream_add_event(start,stop,iwe,len) -#endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) #define iwe_stream_add_point_rsl(info,start,stop,iwe,p) iwe_stream_add_point(info,start,stop,iwe,p) -#else - #define iwe_stream_add_point_rsl(info,start,stop,iwe,p) iwe_stream_add_point(start,stop,iwe,p) -#endif -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) #define usb_alloc_urb_rsl(x,y) usb_alloc_urb(x,y) #define usb_submit_urb_rsl(x,y) usb_submit_urb(x,y) -#else - #define usb_alloc_urb_rsl(x,y) usb_alloc_urb(x) - #define usb_submit_urb_rsl(x,y) usb_submit_urb(x) -#endif static inline void *netdev_priv_rsl(struct net_device *dev) { -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) return netdev_priv(dev); -#else - return dev->priv; -#endif } #define KEY_TYPE_NA 0x0 @@ -645,34 +536,8 @@ typedef struct ieee_param { #define IW_QUAL_NOISE_UPDATED 0x4 #endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)) -#define MSECS(t) (HZ * ((t) / 1000) + (HZ * ((t) % 1000)) / 1000) -static inline unsigned long msleep_interruptible_rsl(unsigned int msecs) -{ - unsigned long timeout = MSECS(msecs) + 1; - - while (timeout) { - set_current_state(TASK_INTERRUPTIBLE); - timeout = schedule_timeout(timeout); - } - return timeout; -} - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,31)) -static inline void msleep(unsigned int msecs) -{ - unsigned long timeout = MSECS(msecs) + 1; - - while (timeout) { - set_current_state(TASK_UNINTERRUPTIBLE); - timeout = schedule_timeout(timeout); - } -} -#endif -#else #define MSECS(t) msecs_to_jiffies(t) #define msleep_interruptible_rsl msleep_interruptible -#endif #define RTLLIB_DATA_LEN 2304 /* Maximum size for the MA-UNITDATA primitive, 802.11 standard section @@ -1572,11 +1437,7 @@ typedef union _frameqos { * main rates information element... */ #define MAX_RATES_LENGTH ((u8)12) #define MAX_RATES_EX_LENGTH ((u8)16) -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) -#define MAX_NETWORK_COUNT 16 -#else #define MAX_NETWORK_COUNT 96 -#endif #define MAX_CHANNEL_NUMBER 161 #define RTLLIB_SOFTMAC_SCAN_TIME 100 @@ -1980,21 +1841,6 @@ enum rtllib_state { #define RTLLIB_52GHZ_MAX_CHANNEL 165 #define RTLLIB_52GHZ_CHANNELS (RTLLIB_52GHZ_MAX_CHANNEL - \ RTLLIB_52GHZ_MIN_CHANNEL + 1) - -#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,11)) -extern inline int is_multicast_ether_addr(const u8 *addr) -{ - return ((addr[0] != 0xff) && (0x01 & addr[0])); -} -#endif - -#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,13)) -extern inline int is_broadcast_ether_addr(const u8 *addr) -{ - return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ - (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); -} -#endif #ifndef eqMacAddr #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 ) #endif @@ -3080,17 +2926,6 @@ static inline int rtllib_is_cck_rate(u8 rate) } -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)) -static inline unsigned compare_ether_addr(const u8 *addr1, const u8 *addr2) -{ - const u16 *a = (const u16 *) addr1; - const u16 *b = (const u16 *) addr2; - - BUILD_BUG_ON(ETH_ALEN != 6); - return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) != 0; -} -#endif - /* rtllib.c */ extern void free_rtllib(struct net_device *dev); extern struct net_device *alloc_rtllib(int sizeof_priv); diff --git a/drivers/staging/rtl8192e/rtllib_crypt.h b/drivers/staging/rtl8192e/rtllib_crypt.h index 5f8990c2ae0f..5772252af538 100644 --- a/drivers/staging/rtl8192e/rtllib_crypt.h +++ b/drivers/staging/rtl8192e/rtllib_crypt.h @@ -82,12 +82,4 @@ void rtllib_crypt_deinit_entries(struct rtllib_device *, int); void rtllib_crypt_deinit_handler(unsigned long); void rtllib_crypt_delayed_deinit(struct rtllib_device *ieee, struct rtllib_crypt_data **crypt); -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) -#define offset_in_page(p) ((unsigned long)(p) & ~PAGE_MASK) -#endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,31)) -#define crypto_alloc_tfm crypto_alloc_tfm_rsl -#define crypto_free_tfm crypto_free_tfm_rsl -#endif - #endif diff --git a/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c b/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c index 80b56b4e60b7..ef17c999009e 100644 --- a/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c +++ b/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c @@ -22,17 +22,9 @@ #include #include "rtllib.h" -#if defined(BUILT_IN_CRYPTO) || (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) -#include "rtl_crypto.h" -#else #include -#endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) - #include -#else - #include -#endif +#include #define AES_BLOCK_LEN 16 #define CCMP_HDR_LEN 8 @@ -64,27 +56,7 @@ struct rtllib_ccmp_data { void rtllib_ccmp_aes_encrypt(struct crypto_tfm *tfm, const u8 pt[16], u8 ct[16]) { -#if ( defined(BUILT_IN_CRYPTO) || ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!OPENSUSE_SLED)) ) - struct scatterlist src, dst; - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - src.page = virt_to_page(pt); - src.offset = offset_in_page(pt); - src.length = AES_BLOCK_LEN; - - dst.page = virt_to_page(ct); - dst.offset = offset_in_page(ct); - dst.length = AES_BLOCK_LEN; - -#else - sg_init_one(&src, pt, AES_BLOCK_LEN); - sg_init_one(&dst, ct, AES_BLOCK_LEN); -#endif - - crypto_cipher_encrypt(tfm, &dst, &src, AES_BLOCK_LEN); -#else crypto_cipher_encrypt_one((void*)tfm, ct, pt); -#endif } static void * rtllib_ccmp_init(int key_idx) @@ -97,32 +69,19 @@ static void * rtllib_ccmp_init(int key_idx) memset(priv, 0, sizeof(*priv)); priv->key_idx = key_idx; -#if ( defined(BUILT_IN_CRYPTO) || ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!OPENSUSE_SLED)) ) - priv->tfm = crypto_alloc_tfm("aes", 0); - if (priv->tfm == NULL) { - printk(KERN_DEBUG "rtllib_crypt_ccmp: could not allocate " - "crypto API aes\n"); - goto fail; - } - #else - priv->tfm = (void*)crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC); + priv->tfm = (void*)crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC); if (IS_ERR(priv->tfm)) { printk(KERN_DEBUG "rtllib_crypt_ccmp: could not allocate " "crypto API aes\n"); priv->tfm = NULL; goto fail; } - #endif return priv; fail: if (priv) { if (priv->tfm) - #if defined(BUILT_IN_CRYPTO) || (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) - crypto_free_tfm(priv->tfm); - #else crypto_free_cipher((void*)priv->tfm); - #endif kfree(priv); } @@ -134,11 +93,7 @@ static void rtllib_ccmp_deinit(void *priv) { struct rtllib_ccmp_data *_priv = priv; if (_priv && _priv->tfm) -#if defined(BUILT_IN_CRYPTO) || (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) - crypto_free_tfm(_priv->tfm); -#else crypto_free_cipher((void*)_priv->tfm); -#endif kfree(priv); } diff --git a/drivers/staging/rtl8192e/rtllib_crypt_tkip.c b/drivers/staging/rtl8192e/rtllib_crypt_tkip.c index ad9a62f4c393..366c94325a70 100644 --- a/drivers/staging/rtl8192e/rtllib_crypt_tkip.c +++ b/drivers/staging/rtl8192e/rtllib_crypt_tkip.c @@ -22,16 +22,8 @@ #include "rtllib.h" -#if defined(BUILT_IN_CRYPTO) || (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) -#include "rtl_crypto.h" -#else #include -#endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) - #include -#else - #include -#endif +#include #include @@ -58,17 +50,10 @@ struct rtllib_tkip_data { u32 dot11RSNAStatsTKIPLocalMICFailures; int key_idx; -#if ( !defined(BUILT_IN_CRYPTO) && ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)) || (OPENSUSE_SLED)) ) struct crypto_blkcipher *rx_tfm_arc4; struct crypto_hash *rx_tfm_michael; struct crypto_blkcipher *tx_tfm_arc4; struct crypto_hash *tx_tfm_michael; -#else - struct crypto_tfm *tx_tfm_arc4; - struct crypto_tfm *tx_tfm_michael; - struct crypto_tfm *rx_tfm_arc4; - struct crypto_tfm *rx_tfm_michael; -#endif /* scratch buffers for virt_to_page() (crypto API) */ u8 rx_hdr[16], tx_hdr[16]; }; @@ -82,35 +67,6 @@ static void * rtllib_tkip_init(int key_idx) goto fail; memset(priv, 0, sizeof(*priv)); priv->key_idx = key_idx; -#if ( defined(BUILT_IN_CRYPTO) || ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!OPENSUSE_SLED)) ) - priv->tx_tfm_arc4 = crypto_alloc_tfm("arc4", 0); - if (priv->tx_tfm_arc4 == NULL) { - printk(KERN_DEBUG "rtllib_crypt_tkip: could not allocate " - "crypto API arc4\n"); - goto fail; - } - - priv->tx_tfm_michael = crypto_alloc_tfm("michael_mic", 0); - if (priv->tx_tfm_michael == NULL) { - printk(KERN_DEBUG "rtllib_crypt_tkip: could not allocate " - "crypto API michael_mic\n"); - goto fail; - } - - priv->rx_tfm_arc4 = crypto_alloc_tfm("arc4", 0); - if (priv->rx_tfm_arc4 == NULL) { - printk(KERN_DEBUG "rtllib_crypt_tkip: could not allocate " - "crypto API arc4\n"); - goto fail; - } - - priv->rx_tfm_michael = crypto_alloc_tfm("michael_mic", 0); - if (priv->rx_tfm_michael == NULL) { - printk(KERN_DEBUG "rtllib_crypt_tkip: could not allocate " - "crypto API michael_mic\n"); - goto fail; - } -#else priv->tx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC); if (IS_ERR(priv->tx_tfm_arc4)) { @@ -146,22 +102,10 @@ static void * rtllib_tkip_init(int key_idx) priv->rx_tfm_michael = NULL; goto fail; } -#endif return priv; fail: if (priv) { -#if ( defined(BUILT_IN_CRYPTO) || ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!OPENSUSE_SLED)) ) - if (priv->tx_tfm_michael) - crypto_free_tfm(priv->tx_tfm_michael); - if (priv->tx_tfm_arc4) - crypto_free_tfm(priv->tx_tfm_arc4); - if (priv->rx_tfm_michael) - crypto_free_tfm(priv->rx_tfm_michael); - if (priv->rx_tfm_arc4) - crypto_free_tfm(priv->rx_tfm_arc4); - -#else if (priv->tx_tfm_michael) crypto_free_hash(priv->tx_tfm_michael); if (priv->tx_tfm_arc4) @@ -170,7 +114,6 @@ fail: crypto_free_hash(priv->rx_tfm_michael); if (priv->rx_tfm_arc4) crypto_free_blkcipher(priv->rx_tfm_arc4); -#endif kfree(priv); } @@ -181,16 +124,7 @@ fail: static void rtllib_tkip_deinit(void *priv) { struct rtllib_tkip_data *_priv = priv; -#if ( defined(BUILT_IN_CRYPTO) || ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!OPENSUSE_SLED)) ) - if (_priv->tx_tfm_michael) - crypto_free_tfm(_priv->tx_tfm_michael); - if (_priv->tx_tfm_arc4) - crypto_free_tfm(_priv->tx_tfm_arc4); - if (_priv->rx_tfm_michael) - crypto_free_tfm(_priv->rx_tfm_michael); - if (_priv->rx_tfm_arc4) - crypto_free_tfm(_priv->rx_tfm_arc4); -#else + if (_priv) { if (_priv->tx_tfm_michael) crypto_free_hash(_priv->tx_tfm_michael); @@ -201,7 +135,6 @@ static void rtllib_tkip_deinit(void *priv) if (_priv->rx_tfm_arc4) crypto_free_blkcipher(_priv->rx_tfm_arc4); } -#endif kfree(priv); } @@ -371,11 +304,8 @@ static int rtllib_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) u8 *pos; struct rtllib_hdr_4addr *hdr; cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE); - - #if ( !defined(BUILT_IN_CRYPTO) && ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)) || (OPENSUSE_SLED)) ) struct blkcipher_desc desc = {.tfm = tkey->tx_tfm_arc4}; int ret = 0; - #endif u8 rc4key[16], *icv; u32 crc; struct scatterlist sg; @@ -426,23 +356,11 @@ static int rtllib_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) icv[2] = crc >> 16; icv[3] = crc >> 24; -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - sg.page = virt_to_page(pos); - sg.offset = offset_in_page(pos); - sg.length = len + 4; -#else sg_init_one(&sg, pos, len+4); -#endif -#if ( defined(BUILT_IN_CRYPTO) || ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!OPENSUSE_SLED)) ) - crypto_cipher_setkey(tkey->tx_tfm_arc4, rc4key, 16); - crypto_cipher_encrypt(tkey->tx_tfm_arc4, &sg, &sg, len + 4); -#else crypto_blkcipher_setkey(tkey->tx_tfm_arc4, rc4key, 16); ret= crypto_blkcipher_encrypt(&desc, &sg, &sg, len + 4); -#endif - } tkey->tx_iv16++; @@ -452,11 +370,7 @@ static int rtllib_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) } if (!tcb_desc->bHwSec) - #if ( defined(BUILT_IN_CRYPTO) || ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!OPENSUSE_SLED)) ) - return 0; - #else return ret; - #endif else return 0; @@ -471,9 +385,7 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) u16 iv16; struct rtllib_hdr_4addr *hdr; cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE); - #if ( !defined(BUILT_IN_CRYPTO) && ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)) || (OPENSUSE_SLED)) ) struct blkcipher_desc desc = {.tfm = tkey->rx_tfm_arc4}; - #endif u8 rc4key[16]; u8 icv[4]; u32 crc; @@ -533,18 +445,8 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) plen = skb->len - hdr_len - 12; -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - sg.page = virt_to_page(pos); - sg.offset = offset_in_page(pos); - sg.length = plen + 4; -#else sg_init_one(&sg, pos, plen+4); -#endif -#if ( defined(BUILT_IN_CRYPTO) || ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!OPENSUSE_SLED)) ) - crypto_cipher_setkey(tkey->rx_tfm_arc4, rc4key, 16); - crypto_cipher_decrypt(tkey->rx_tfm_arc4, &sg, &sg, plen + 4); -#else crypto_blkcipher_setkey(tkey->rx_tfm_arc4, rc4key, 16); if (crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4)) { if (net_ratelimit()) { @@ -554,13 +456,8 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) } return -7; } -#endif - #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) crc = ~crc32_le(~0, pos, plen); - #else - crc = ~ether_crc_le(plen, pos); - #endif icv[0] = crc; icv[1] = crc >> 8; icv[2] = crc >> 16; @@ -607,51 +504,6 @@ if ( ((u16*)skb->data)[0] & 0x4000){ } -#if ( defined(BUILT_IN_CRYPTO) || ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!OPENSUSE_SLED)) ) -static int michael_mic(struct crypto_tfm * tfm_michael, u8 *key, u8 *hdr, - u8 *data, size_t data_len, u8 *mic) -{ - struct scatterlist sg[2]; -#if ( !defined(BUILT_IN_CRYPTO) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) ) - struct hash_desc desc; - int ret = 0; -#endif - - if (tfm_michael == NULL){ - printk(KERN_WARNING "michael_mic: tfm_michael == NULL\n"); - return -1; - } -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) - sg[0].page = virt_to_page(hdr); - sg[0].offset = offset_in_page(hdr); - sg[0].length = 16; - - sg[1].page = virt_to_page(data); - sg[1].offset = offset_in_page(data); - sg[1].length = data_len; -#else - sg_init_table(sg, 2); - sg_set_buf(&sg[0], hdr, 16); - sg_set_buf(&sg[1], data, data_len); -#endif - -#if ( defined(BUILT_IN_CRYPTO) || LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) ) - crypto_digest_init(tfm_michael); - crypto_digest_setkey(tfm_michael, key, 8); - crypto_digest_update(tfm_michael, sg, 2); - crypto_digest_final(tfm_michael, mic); - return 0; -#else -if (crypto_hash_setkey(tkey->tfm_michael, key, 8)) - return -1; - - desc.tfm = tkey->tfm_michael; - desc.flags = 0; - ret = crypto_hash_digest(&desc, sg, data_len + 16, mic); - return ret; -#endif -} -#else static int michael_mic(struct crypto_hash *tfm_michael, u8 * key, u8 * hdr, u8 * data, size_t data_len, u8 * mic) { @@ -662,19 +514,9 @@ static int michael_mic(struct crypto_hash *tfm_michael, u8 * key, u8 * hdr, printk(KERN_WARNING "michael_mic: tfm_michael == NULL\n"); return -1; } -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) - sg[0].page = virt_to_page(hdr); - sg[0].offset = offset_in_page(hdr); - sg[0].length = 16; - - sg[1].page = virt_to_page(data); - sg[1].offset = offset_in_page(data); - sg[1].length = data_len; -#else sg_init_table(sg, 2); sg_set_buf(&sg[0], hdr, 16); sg_set_buf(&sg[1], data, data_len); -#endif if (crypto_hash_setkey(tfm_michael, key, 8)) return -1; @@ -683,9 +525,6 @@ static int michael_mic(struct crypto_hash *tfm_michael, u8 * key, u8 * hdr, desc.flags = 0; return crypto_hash_digest(&desc, sg, data_len + 16, mic); } -#endif - - static void michael_mic_hdr(struct sk_buff *skb, u8 *hdr) { @@ -739,13 +578,8 @@ static int rtllib_michael_mic_add(struct sk_buff *skb, int hdr_len, void *priv) tkey->tx_hdr[12] = *(skb->data + hdr_len - 2) & 0x07; } pos = skb_put(skb, 8); -#if ( defined(BUILT_IN_CRYPTO) || ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!OPENSUSE_SLED)) ) if (michael_mic(tkey->tx_tfm_michael, &tkey->key[16], tkey->tx_hdr, skb->data + hdr_len, skb->len - 8 - hdr_len, pos)) -#else - if (michael_mic(tkey->tx_tfm_michael, &tkey->key[16], tkey->tx_hdr, - skb->data + hdr_len, skb->len - 8 - hdr_len, pos)) -#endif return -1; return 0; @@ -814,13 +648,8 @@ static int rtllib_michael_mic_verify(struct sk_buff *skb, int keyidx, tkey->rx_hdr[12] = *(skb->data + hdr_len - 2) & 0x07; } -#if ( defined(BUILT_IN_CRYPTO) || ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!OPENSUSE_SLED)) ) - if (michael_mic(tkey->rx_tfm_michael, &tkey->key[24], tkey->rx_hdr, - skb->data + hdr_len, skb->len - 8 - hdr_len, mic)) -#else if (michael_mic(tkey->rx_tfm_michael, &tkey->key[24], tkey->rx_hdr, skb->data + hdr_len, skb->len - 8 - hdr_len, mic)) -#endif return -1; if ((memcmp(mic, skb->data + skb->len - 8, 8) != 0)||(ieee->force_mic_error)) { @@ -856,32 +685,18 @@ static int rtllib_tkip_set_key(void *key, int len, u8 *seq, void *priv) { struct rtllib_tkip_data *tkey = priv; int keyidx; -#if ( defined(BUILT_IN_CRYPTO) || ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!OPENSUSE_SLED)) ) - struct crypto_tfm *tfm = tkey->tx_tfm_michael; - struct crypto_tfm *tfm2 = tkey->tx_tfm_arc4; - struct crypto_tfm *tfm3 = tkey->rx_tfm_michael; - struct crypto_tfm *tfm4 = tkey->rx_tfm_arc4; -#else struct crypto_hash *tfm = tkey->tx_tfm_michael; struct crypto_blkcipher *tfm2 = tkey->tx_tfm_arc4; struct crypto_hash *tfm3 = tkey->rx_tfm_michael; struct crypto_blkcipher *tfm4 = tkey->rx_tfm_arc4; -#endif keyidx = tkey->key_idx; memset(tkey, 0, sizeof(*tkey)); tkey->key_idx = keyidx; -#if ( defined(BUILT_IN_CRYPTO) || ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!OPENSUSE_SLED)) ) - tkey->tx_tfm_michael = tfm; - tkey->tx_tfm_arc4 = tfm2; - tkey->rx_tfm_michael = tfm3; - tkey->rx_tfm_arc4 = tfm4; -#else tkey->tx_tfm_michael = tfm; tkey->tx_tfm_arc4 = tfm2; tkey->rx_tfm_michael = tfm3; tkey->rx_tfm_arc4 = tfm4; -#endif if (len == TKIP_KEY_LEN) { memcpy(tkey->key, key, TKIP_KEY_LEN); diff --git a/drivers/staging/rtl8192e/rtllib_crypt_wep.c b/drivers/staging/rtl8192e/rtllib_crypt_wep.c index 38679223fa59..201e2ec5d3a9 100644 --- a/drivers/staging/rtl8192e/rtllib_crypt_wep.c +++ b/drivers/staging/rtl8192e/rtllib_crypt_wep.c @@ -18,44 +18,19 @@ #include #include "rtllib.h" -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,20)) -#endif - - -#if defined(BUILT_IN_CRYPTO) || (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) -#include "rtl_crypto.h" -#else #include -#endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) - #include -#else - #include -#endif +#include #include -/* -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) -#include "rtl_crypto.h" -#else -#include -#endif -#include -#include -*/ struct prism2_wep_data { u32 iv; #define WEP_KEY_LEN 13 u8 key[WEP_KEY_LEN + 1]; u8 key_len; u8 key_idx; - #if ( defined(BUILT_IN_CRYPTO) || ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!OPENSUSE_SLED)) ) - struct crypto_tfm *tfm; - #else struct crypto_blkcipher *tx_tfm; struct crypto_blkcipher *rx_tfm; - #endif }; @@ -69,14 +44,6 @@ static void * prism2_wep_init(int keyidx) memset(priv, 0, sizeof(*priv)); priv->key_idx = keyidx; - #if ( defined(BUILT_IN_CRYPTO) || ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!OPENSUSE_SLED)) ) - priv->tfm = crypto_alloc_tfm("arc4", 0); - if (priv->tfm == NULL) { - printk(KERN_DEBUG "rtllib_crypt_wep: could not allocate " - "crypto API arc4\n"); - goto fail; - } - #else priv->tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC); if (IS_ERR(priv->tx_tfm)) { printk(KERN_DEBUG "rtllib_crypt_wep: could not allocate " @@ -91,7 +58,6 @@ static void * prism2_wep_init(int keyidx) priv->rx_tfm = NULL; goto fail; } - #endif /* start WEP IV from a random value */ get_random_bytes(&priv->iv, 4); @@ -99,13 +65,6 @@ static void * prism2_wep_init(int keyidx) return priv; fail: - #if ( defined(BUILT_IN_CRYPTO) || ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!OPENSUSE_SLED)) ) - if (priv) { - if (priv->tfm) - crypto_free_tfm(priv->tfm); - kfree(priv); - } - #else if (priv) { if (priv->tx_tfm) crypto_free_blkcipher(priv->tx_tfm); @@ -113,7 +72,6 @@ fail: crypto_free_blkcipher(priv->rx_tfm); kfree(priv); } - #endif return NULL; } @@ -121,17 +79,13 @@ fail: static void prism2_wep_deinit(void *priv) { struct prism2_wep_data *_priv = priv; - #if ( defined(BUILT_IN_CRYPTO) || ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!OPENSUSE_SLED)) ) - if (_priv && _priv->tfm) - crypto_free_tfm(_priv->tfm); - #else + if (_priv) { if (_priv->tx_tfm) crypto_free_blkcipher(_priv->tx_tfm); if (_priv->rx_tfm) crypto_free_blkcipher(_priv->rx_tfm); } - #endif kfree(priv); } @@ -148,9 +102,7 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv) u8 key[WEP_KEY_LEN + 3]; u8 *pos; cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE); - #if ( !defined(BUILT_IN_CRYPTO) && ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)) || (OPENSUSE_SLED)) ) struct blkcipher_desc desc = {.tfm = wep->tx_tfm}; - #endif u32 crc; u8 *icv; struct scatterlist sg; @@ -186,36 +138,19 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv) /* Copy rest of the WEP key (the secret part) */ memcpy(key + 3, wep->key, wep->key_len); - if (!tcb_desc->bHwSec) - { + if (!tcb_desc->bHwSec) { /* Append little-endian CRC32 and encrypt it to produce ICV */ - #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) crc = ~crc32_le(~0, pos, len); - #else - crc = ~ether_crc_le(len, pos); - #endif icv = skb_put(skb, 4); icv[0] = crc; icv[1] = crc >> 8; icv[2] = crc >> 16; icv[3] = crc >> 24; - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - sg.page = virt_to_page(pos); - sg.offset = offset_in_page(pos); - sg.length = len + 4; - #else sg_init_one(&sg, pos, len+4); - #endif - #if ( defined(BUILT_IN_CRYPTO) || ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!OPENSUSE_SLED)) ) - crypto_cipher_setkey(wep->tfm, key, klen); - crypto_cipher_encrypt(wep->tfm, &sg, &sg, len + 4); - return 0; - #else crypto_blkcipher_setkey(wep->tx_tfm, key, klen); return crypto_blkcipher_encrypt(&desc, &sg, &sg, len + 4); - #endif } return 0; @@ -236,9 +171,7 @@ static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv) u8 key[WEP_KEY_LEN + 3]; u8 keyidx, *pos; cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE); - #if ( !defined(BUILT_IN_CRYPTO) && ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)) || (OPENSUSE_SLED)) ) struct blkcipher_desc desc = {.tfm = wep->rx_tfm}; - #endif u32 crc; u8 icv[4]; struct scatterlist sg; @@ -261,28 +194,12 @@ static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv) /* Apply RC4 to data and compute CRC32 over decrypted data */ plen = skb->len - hdr_len - 8; - if (!tcb_desc->bHwSec) - { - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - sg.page = virt_to_page(pos); - sg.offset = offset_in_page(pos); - sg.length = plen + 4; - #else + if (!tcb_desc->bHwSec) { sg_init_one(&sg, pos, plen+4); - #endif - #if ( defined(BUILT_IN_CRYPTO) || ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!OPENSUSE_SLED)) ) - crypto_cipher_setkey(wep->tfm, key, klen); - crypto_cipher_decrypt(wep->tfm, &sg, &sg, plen + 4); - #else crypto_blkcipher_setkey(wep->rx_tfm, key, klen); if (crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4)) return -7; - #endif - #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) crc = ~crc32_le(~0, pos, plen); - #else - crc = ~ether_crc_le(plen, pos); - #endif icv[0] = crc; icv[1] = crc >> 8; icv[2] = crc >> 16; diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index 2a7133c6ef38..7f033815f242 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -47,10 +47,6 @@ #include "dot11d.h" #endif -#if defined(RTLLIB_RADIOTAP) && (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10)) -#include -#endif - #if defined CONFIG_CFG_80211 #include @@ -321,140 +317,17 @@ void ieee80211_scan_rx(struct rtllib_device *ieee, struct sk_buff *skb, struct r } #endif - -#if defined(RTLLIB_RADIOTAP) && (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10)) -static int rtllib_rx_radiotap_len(struct rtllib_device *ieee, struct rtllib_rx_stats *rx_status) -{ - int len; - - /* always present fields */ - len = sizeof(struct ieee80211_radiotap_header) + - 8 + /* TSFT */ - 1 + /* FLAGS */ - 1 + /* RATE */ - 2 + /* CHANNEL IN MHZ */ - 2 + /* CHANNEL BITFIELD */ - 1 + /* HW SIGNAL DBM */ - 1 + /* HW NOISE DBM */ - 1; /* ANTENNA NUMBER */ - - - if (len & 1) /* padding for RX_FLAGS if necessary */ - len++; - - /* make sure radiotap starts at a naturally aligned address */ - if (len % 8) - len = roundup(len, 8); - - return len; -} - -static void rtllib_add_rx_radiotap_header(struct rtllib_device *ieee, - struct sk_buff *skb, int rtap_len, struct rtllib_rx_stats *rx_status) -{ - struct ieee80211_radiotap_header *rthdr; - unsigned char *pos; - printk("add header!\n"); - rthdr = (struct ieee80211_radiotap_header *)skb_push(skb, rtap_len); - memset(rthdr, 0, rtap_len); - - rthdr->it_version = PKTHDR_RADIOTAP_VERSION; - rthdr->it_pad = 0; - rthdr->it_len = cpu_to_le16(rtap_len); - /* radiotap header, set always present flags */ - rthdr->it_present = cpu_to_le32( - (1 << IEEE80211_RADIOTAP_TSFT) | - (1 << IEEE80211_RADIOTAP_FLAGS) | - (1 << IEEE80211_RADIOTAP_RATE) | - (1 << IEEE80211_RADIOTAP_CHANNEL) | - (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) | - (1 << IEEE80211_RADIOTAP_DBM_ANTNOISE) | - (1 << IEEE80211_RADIOTAP_ANTENNA)); - - pos = (unsigned char *)(rthdr+1); - /* the order of the following fields is important */ - /* IEEE80211_RADIOTAP_TSFT */ - *(__le64 *)pos = cpu_to_le64(rx_status->TimeStampLow); - pos += 8; - - /* IEEE80211_RADIOTAP_FLAGS */ - if (rx_status->bCRC) - *pos |= IEEE80211_RADIOTAP_F_BADFCS; - if (rx_status->bShortPreamble) - *pos |= IEEE80211_RADIOTAP_F_SHORTPRE; - pos++; - - /* IEEE80211_RADIOTAP_RATE */ - *pos = rx_status->rate / 5; - pos++; - - /* IEEE80211_RADIOTAP_CHANNEL */ - *(__le16 *)pos = cpu_to_le16(rx_status->received_channel); - pos += 2; - pos += 2; - - - /* IEEE80211_RADIOTAP_DBM_ANTSIGNAL */ - *pos = rx_status->RxPower; - pos++; - - /* IEEE80211_RADIOTAP_DBM_ANTNOISE */ - *pos = rx_status->noise; - pos++; - - /* IEEE80211_RADIOTAP_ANTENNA */ - *pos = rx_status->Antenna; - pos++; - - /* IEEE80211_RADIOTAP_DB_ANTNOISE is not used */ - - /* IEEE80211_RADIOTAP_RX_FLAGS */ - /* ensure 2 byte alignment for the 2 byte field as required */ -} -#endif - static inline void rtllib_monitor_rx(struct rtllib_device *ieee, struct sk_buff *skb,struct rtllib_rx_stats *rx_status, size_t hdr_length) { - -#if defined(RTLLIB_RADIOTAP) && (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10)) - int needed_headroom = 0; - struct sk_buff *radiotap_skb; - - needed_headroom = rtllib_rx_radiotap_len(ieee, rx_status); - printk("needed_headroom = %d\n", needed_headroom); - radiotap_skb = skb_copy_expand(skb, needed_headroom, 0, GFP_ATOMIC); - dev_kfree_skb(skb); - if (!radiotap_skb) { - return; - } - - rtllib_add_rx_radiotap_header(ieee, radiotap_skb, needed_headroom, rx_status); - radiotap_skb->dev = ieee->dev; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) - skb_reset_mac_header(radiotap_skb); -#else - radiotap_skb->mac.raw = radiotap_skb->data; -#endif - radiotap_skb->ip_summed = CHECKSUM_UNNECESSARY; - radiotap_skb->pkt_type = PACKET_OTHERHOST; - radiotap_skb->protocol = htons(ETH_P_802_2); - memset(radiotap_skb->cb, 0, sizeof(radiotap_skb->cb)); - netif_rx(radiotap_skb); -#else skb->dev = ieee->dev; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) skb_reset_mac_header(skb); -#else - skb->mac.raw = skb->data; -#endif skb_pull(skb, hdr_length); skb->pkt_type = PACKET_OTHERHOST; skb->protocol = __constant_htons(ETH_P_80211_RAW); memset(skb->cb, 0, sizeof(skb->cb)); netif_rx(skb); -#endif } /* Called only as a tasklet (software IRQ) */ @@ -3252,12 +3125,10 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, { RTLLIB_DEBUG_MGMT("MFIE_TYPE_WZC: %d bytes\n", info_element->len); -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) network->wzc_ie_len = min(info_element->len+2, MAX_WZC_IE_LEN); memcpy(network->wzc_ie, info_element, network->wzc_ie_len); -#endif } break; @@ -3489,9 +3360,7 @@ static inline int rtllib_network_init( network->wpa_ie_len = 0; network->rsn_ie_len = 0; -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) network->wzc_ie_len = 0; -#endif if (rtllib_parse_info_param(ieee, beacon->info_element, @@ -3624,10 +3493,8 @@ static inline void update_network(struct rtllib_network *dst, dst->wpa_ie_len = src->wpa_ie_len; memcpy(dst->rsn_ie, src->rsn_ie, src->rsn_ie_len); dst->rsn_ie_len = src->rsn_ie_len; -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) memcpy(dst->wzc_ie, src->wzc_ie, src->wzc_ie_len); dst->wzc_ie_len = src->wzc_ie_len; -#endif dst->last_scanned = jiffies; /* qos related parameters */ @@ -3945,16 +3812,10 @@ static inline void rtllib_process_probe_response( #endif unsigned long flags; short renew; -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)) struct rtllib_network *network = kzalloc(sizeof(struct rtllib_network), GFP_ATOMIC); -#else - struct rtllib_network *network = kmalloc(sizeof(*network), GFP_ATOMIC); - memset(network,0,sizeof(*network)); -#endif - if (!network) { + if (!network) return; - } RTLLIB_DEBUG_SCAN( "'%s' (" MAC_FMT "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n", diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index a843de99ed3e..3ac740a7c0d4 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -754,21 +754,13 @@ void rtllib_start_send_beacons(struct rtllib_device *ieee) void rtllib_softmac_stop_scan(struct rtllib_device *ieee) { - - down(&ieee->scan_sem); ieee->scan_watch_dog = 0; - if (ieee->scanning_continue == 1){ + if (ieee->scanning_continue == 1) { ieee->scanning_continue = 0; ieee->actscanning = 0; -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,40) -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,67) cancel_delayed_work(&ieee->softmac_scan_wq); -#endif -#else - del_timer_sync(&ieee->scan_timer); -#endif } up(&ieee->scan_sem); @@ -837,18 +829,6 @@ void rtllib_start_scan(struct rtllib_device *ieee) } -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,40) -void rtllib_softmac_scan_cb(unsigned long _dev) -{ - unsigned long flags; - struct rtllib_device *ieee = (struct rtllib_device *)_dev; - - spin_lock_irqsave(&ieee->lock, flags); - rtllib_start_scan(ieee); - spin_unlock_irqrestore(&ieee->lock, flags); -} -#endif - /* called with wx_sem held */ void rtllib_start_scan_syncro(struct rtllib_device *ieee, u8 is_mesh) { @@ -2903,28 +2883,16 @@ void rtllib_stop_queue(struct rtllib_device *ieee) void rtllib_stop_all_queues(struct rtllib_device *ieee) { -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30) unsigned int i; for (i=0; i < ieee->dev->num_tx_queues; i++) netdev_get_tx_queue(ieee->dev,i)->trans_start = jiffies; -#else - ieee->dev->trans_start = jiffies; -#endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) - netif_carrier_off(ieee->dev); -#else netif_tx_stop_all_queues(ieee->dev); -#endif } void rtllib_wake_all_queues(struct rtllib_device *ieee) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) - netif_carrier_on(ieee->dev); -#else netif_tx_wake_all_queues(ieee->dev); -#endif } inline void rtllib_randomize_cell(struct rtllib_device *ieee) @@ -3436,11 +3404,6 @@ void rtllib_softmac_init(struct rtllib_device *ieee) ieee->sta_edca_param[3] = 0x002F3262; ieee->aggregation = true; ieee->enable_rx_imm_BA = 1; -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,40) - _setup_timer(&ieee->scan_timer, - rtllib_softmac_scan_cb, - (unsigned long) ieee); -#endif ieee->tx_pending.txb = NULL; _setup_timer(&ieee->associate_timer, @@ -3451,18 +3414,11 @@ void rtllib_softmac_init(struct rtllib_device *ieee) rtllib_send_beacon_cb, (unsigned long) ieee); -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) - _setup_timer(&ieee->ibss_wait_timer, - rtllib_ibss_wait_timeout, - (unsigned long) ieee); -#endif -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) #ifdef PF_SYNCTHREAD ieee->wq = create_workqueue(DRV_NAME,0); #else ieee->wq = create_workqueue(DRV_NAME); -#endif #endif INIT_DELAYED_WORK_RSL(&ieee->link_change_wq,(void*)rtllib_link_change_wq,ieee); @@ -3499,11 +3455,8 @@ void rtllib_softmac_free(struct rtllib_device *ieee) #endif del_timer_sync(&ieee->associate_timer); -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) cancel_delayed_work(&ieee->associate_retry_wq); destroy_workqueue(ieee->wq); -#endif - up(&ieee->wx_sem); } diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c index 7cda2908baee..863b2851657b 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -311,13 +311,8 @@ int rtllib_wx_set_mode(struct rtllib_device *ieee, struct iw_request_info *a, goto out; if (wrqu->mode == IW_MODE_MONITOR) { -#if defined(RTLLIB_RADIOTAP) && (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10)) - ieee->dev->type = ARPHRD_IEEE80211_RADIOTAP; -#else ieee->dev->type = ARPHRD_IEEE80211; -#endif rtllib_EnableNetMonitorMode(ieee->dev,false); - } else { ieee->dev->type = ARPHRD_ETHER; if (ieee->iw_mode == IW_MODE_MONITOR) @@ -461,11 +456,7 @@ int rtllib_wx_set_essid(struct rtllib_device *ieee, proto_started = ieee->proto_started; -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)) - len = ((wrqu->essid.length-1) < IW_ESSID_MAX_SIZE) ? (wrqu->essid.length-1) : IW_ESSID_MAX_SIZE; -#else len = (wrqu->essid.length < IW_ESSID_MAX_SIZE) ? wrqu->essid.length : IW_ESSID_MAX_SIZE; -#endif if (len > IW_ESSID_MAX_SIZE){ ret= -E2BIG; -- cgit v1.2.3-59-g8ed1b From 1e71e6d0cf764841cdf60dec4a40849ff41be75c Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Mon, 11 Jul 2011 22:25:07 -0500 Subject: staging: rtl8192e: Remove dead code associated with RTL8192SE The vendor code will generate several different drivers. As the RTL8192SE is covered by a mac80211 driver in mainline, eliminate that code heere. Signed-off-by: Larry Finger --- drivers/staging/rtl8192e/r8190P_rtl8256.c | 10 - drivers/staging/rtl8192e/r8192E_dev.c | 83 ---- drivers/staging/rtl8192e/r8192E_phy.c | 2 - drivers/staging/rtl8192e/rtl819x_HTProc.c | 184 -------- drivers/staging/rtl8192e/rtl_core.c | 183 -------- drivers/staging/rtl8192e/rtl_debug.c | 30 -- drivers/staging/rtl8192e/rtl_debug.h | 3 - drivers/staging/rtl8192e/rtl_dm.c | 640 +-------------------------- drivers/staging/rtl8192e/rtl_dm.h | 8 - drivers/staging/rtl8192e/rtl_ps.h | 2 - drivers/staging/rtl8192e/rtl_wx.c | 41 +- drivers/staging/rtl8192e/rtllib.h | 6 - drivers/staging/rtl8192e/rtllib_rx.c | 314 ------------- drivers/staging/rtl8192e/rtllib_softmac.c | 53 --- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 15 - drivers/staging/rtl8192e/rtllib_tx.c | 107 ----- 16 files changed, 4 insertions(+), 1677 deletions(-) (limited to 'drivers/staging/rtl8192e/rtl_debug.h') diff --git a/drivers/staging/rtl8192e/r8190P_rtl8256.c b/drivers/staging/rtl8192e/r8190P_rtl8256.c index ac06d41ab650..d4ba36e8ac2a 100644 --- a/drivers/staging/rtl8192e/r8190P_rtl8256.c +++ b/drivers/staging/rtl8192e/r8190P_rtl8256.c @@ -18,13 +18,8 @@ ******************************************************************************/ #include "rtl_core.h" -#ifdef RTL8192SE -#include "rtl8192s/r8192S_phyreg.h" -#include "rtl8192s/r8192S_phy.h" -#else #include "r8192E_phyreg.h" #include "r8192E_phy.h" -#endif #include "r8190P_rtl8256.h" void PHY_SetRF8256Bandwidth(struct net_device* dev , HT_CHANNEL_WIDTH Bandwidth) @@ -188,7 +183,6 @@ phy_RF8256_Config_ParaFile_Fail: return false; } -#ifndef RTL8192SE void PHY_SetRF8256CCKTxPower(struct net_device* dev, u8 powerlevel) { u32 TxAGC=0; @@ -260,7 +254,3 @@ void PHY_SetRF8256OFDMTxPower(struct net_device* dev, u8 powerlevel) #endif return; } - - - -#endif diff --git a/drivers/staging/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/r8192E_dev.c index 16f2cef29b25..7ec2fd97ebe1 100644 --- a/drivers/staging/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/r8192E_dev.c @@ -1436,61 +1436,6 @@ rtl8192_signal_scale_mapping(struct r8192_priv * priv, { long retsig; -#if defined RTL8192SE || defined RTL8192CE - if (priv->CustomerID == RT_CID_819x_Lenovo) - { - return currsig; - } - else if (priv->CustomerID == RT_CID_819x_Netcore) - { - if (currsig >= 31 && currsig <= 100) - { - retsig = 100; - } - else if (currsig >= 21 && currsig <= 30) - { - retsig = 90 + ((currsig - 20) / 1); - } - else if (currsig >= 11 && currsig <= 20) - { - retsig = 80 + ((currsig - 10) / 1); - } - else if (currsig >= 7 && currsig <= 10) - { - retsig = 69 + (currsig - 7); - } - else if (currsig == 6) - { - retsig = 54; - } - else if (currsig == 5) - { - retsig = 45; - } - else if (currsig == 4) - { - retsig = 36; - } - else if (currsig == 3) - { - retsig = 27; - } - else if (currsig == 2) - { - retsig = 18; - } - else if (currsig == 1) - { - retsig = 9; - } - else - { - retsig = currsig; - } - return retsig; - } -#endif - if (currsig >= 61 && currsig <= 100) { retsig = 90 + ((currsig - 60) / 4); @@ -2257,10 +2202,6 @@ void rtl8192_EnableInterrupt(struct net_device *dev) write_nic_dword(dev,INTA_MASK, priv->irq_mask[0]); #endif -#ifdef RTL8192SE - write_nic_dword(dev,INTA_MASK+4, priv->irq_mask[1]&0x3F); -#endif - } void rtl8192_DisableInterrupt(struct net_device *dev) @@ -2273,9 +2214,6 @@ void rtl8192_DisableInterrupt(struct net_device *dev) write_nic_dword(dev,INTA_MASK,0); #endif -#ifdef RTL8192SE - write_nic_dword(dev,INTA_MASK + 4,0); -#endif priv->irq_enabled = 0; } @@ -2290,10 +2228,6 @@ void rtl8192_ClearInterrupt(struct net_device *dev) write_nic_dword(dev, ISR, tmp); #endif -#ifdef RTL8192SE - tmp = read_nic_dword(dev, ISR+4); - write_nic_dword(dev, ISR+4, tmp); -#endif } @@ -2334,17 +2268,8 @@ void rtl8192_beacon_disable(struct net_device *dev) void rtl8192_interrupt_recognized(struct net_device *dev, u32 *p_inta, u32 *p_intb) { -#ifdef RTL8192SE - struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); - *p_inta = read_nic_dword(dev, ISR) & priv->irq_mask[0]; -#else *p_inta = read_nic_dword(dev, ISR) ; -#endif write_nic_dword(dev,ISR,*p_inta); -#ifdef RTL8192SE - *p_intb = read_nic_dword(dev, ISR+4); - write_nic_dword(dev, ISR+4, *p_intb); -#endif } bool rtl8192_HalRxCheckStuck(struct net_device *dev) @@ -2438,9 +2363,6 @@ bool rtl8192_HalTxCheckStuck(struct net_device *dev) bool rtl8192_GetNmodeSupportBySecCfg(struct net_device *dev) { -#ifdef RTL8192SE - return true; -#else struct r8192_priv *priv = rtllib_priv(dev); struct rtllib_device *ieee = priv->rtllib; if (ieee->rtllib_ap_sec_type && @@ -2449,14 +2371,10 @@ bool rtl8192_GetNmodeSupportBySecCfg(struct net_device *dev) } else { return true; } -#endif } bool rtl8192_GetHalfNmodeSupportByAPs(struct net_device* dev) { -#ifdef RTL8192SE - return false; -#else bool Reval; struct r8192_priv* priv = rtllib_priv(dev); struct rtllib_device* ieee = priv->rtllib; @@ -2467,7 +2385,6 @@ bool rtl8192_GetHalfNmodeSupportByAPs(struct net_device* dev) Reval = false; return Reval; -#endif } u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, cb_desc *tcb_desc) diff --git a/drivers/staging/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/r8192E_phy.c index ff88330a2676..defd69766772 100644 --- a/drivers/staging/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/r8192E_phy.c @@ -1444,7 +1444,6 @@ PHY_SetRtl8192eRfOff(struct net_device* dev ) } #endif -#ifndef RTL8192SE bool SetRFPowerState8190( struct net_device* dev, @@ -1695,7 +1694,6 @@ SetRFPowerState( return bResult; } -#endif extern void PHY_ScanOperationBackup8192( diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index a212a972ec6f..62dd0976e44f 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -436,14 +436,6 @@ bool HTIOTActIsDisableMCSTwoSpatialStream(struct rtllib_device* ieee) (pHTInfo->IOTPeer != HT_IOT_PEER_RALINK) ) retValue = true; } -#elif defined(RTL8192SE) - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - if (ieee->rtllib_ap_sec_type && - (ieee->rtllib_ap_sec_type(ieee)&SEC_ALG_TKIP)) { - if (pHTInfo->IOTPeer == HT_IOT_PEER_RALINK){ - retValue = true; - } - } #endif return retValue; } @@ -519,11 +511,7 @@ HTIOTActWAIOTBroadcom(struct rtllib_device* ieee) u8 HTIOTActIsForcedCTS2Self(struct rtllib_device *ieee, struct rtllib_network *network) { u8 retValue = 0; -#if (defined RTL8192SE || defined RTL8192SU || defined RTL8192CE) - if ((ieee->pHTInfo->IOTPeer == HT_IOT_PEER_MARVELL) ||(ieee->pHTInfo->IOTPeer == HT_IOT_PEER_ATHEROS) ) -#else if (ieee->pHTInfo->IOTPeer == HT_IOT_PEER_MARVELL) -#endif { retValue = 1; } @@ -534,17 +522,6 @@ u8 HTIOTActIsForcedCTS2Self(struct rtllib_device *ieee, struct rtllib_network *n u8 HTIOTActIsForcedRTSCTS(struct rtllib_device *ieee, struct rtllib_network *network) { u8 retValue = 0; -#if defined(RTL8192SE) || defined(RTL8192SU) - if (ieee->pHTInfo->bCurrentHTSupport) - { - if ((ieee->pHTInfo->IOTPeer != HT_IOT_PEER_REALTEK)&& - (ieee->pHTInfo->IOTPeer != HT_IOT_PEER_REALTEK_92SE)) - { - if ((ieee->pHTInfo->IOTAction & HT_IOT_ACT_TX_NO_AGGREGATION) == 0) - retValue = 1; - } - } -#endif return retValue; } @@ -570,12 +547,6 @@ u8 HTIOCActRejcectADDBARequest(struct rtllib_network *network) { u8 retValue = 0; -#if (defined RTL8192SE || defined RTL8192SU || defined RTL8192CE) - { - - - } -#endif return retValue; @@ -601,16 +572,6 @@ u8 pHTInfo->IOTPeer==HT_IOT_PEER_RALINK) return 1; - } -#elif defined RTL8192SE - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - { - if (ieee->rtllib_ap_sec_type != NULL) - if (ieee->rtllib_ap_sec_type(ieee) == SEC_ALG_CCMP) - if (pHTInfo->IOTPeer==HT_IOT_PEER_RALINK){ - return 1; - } - } #endif return retValue; @@ -634,9 +595,6 @@ u8 HTIOTActDisableHighPower(struct rtllib_device* ieee,struct rtllib_network *network) { u8 retValue = 0; -#if (defined RTL8192SE || defined RTL8192SU || defined RTL8192CE) - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; -#endif #ifdef RTL8192SU if (pHTInfo->IOTPeer==HT_IOT_PEER_RALINK || @@ -645,12 +603,6 @@ HTIOTActDisableHighPower(struct rtllib_device* ieee,struct rtllib_network *netwo { retValue = 1; } -#elif defined RTL8192SE || defined RTL8192CE - if (pHTInfo->IOTPeer==HT_IOT_PEER_RALINK || - pHTInfo->IOTPeer==HT_IOT_PEER_REALTEK ) - { - retValue = 1; - } #endif return retValue; } @@ -675,19 +627,6 @@ HTIOTActIsDisableTx40MHz(struct rtllib_device* ieee,struct rtllib_network *netwo { u8 retValue = 0; -#if (defined RTL8192SU || defined RTL8192SE || defined RTL8192CE) - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - if ( (KEY_TYPE_WEP104 == ieee->pairwise_key_type) || - (KEY_TYPE_WEP40 == ieee->pairwise_key_type) || - (KEY_TYPE_WEP104 == ieee->group_key_type) || - (KEY_TYPE_WEP40 == ieee->group_key_type) || - (KEY_TYPE_TKIP == ieee->pairwise_key_type) ) - { - if ((pHTInfo->IOTPeer==HT_IOT_PEER_REALTEK) && (network->bssht.bdSupportHT)) - retValue = 1; - } -#endif - return retValue; } @@ -696,19 +635,6 @@ HTIOTActIsTxNoAggregation(struct rtllib_device* ieee,struct rtllib_network *netw { u8 retValue = 0; -#if (defined RTL8192SU || defined RTL8192SE || defined RTL8192CE) - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - if ( (KEY_TYPE_WEP104 == ieee->pairwise_key_type) || - (KEY_TYPE_WEP40 == ieee->pairwise_key_type) || - (KEY_TYPE_WEP104 == ieee->group_key_type) || - (KEY_TYPE_WEP40 == ieee->group_key_type) || - (KEY_TYPE_TKIP == ieee->pairwise_key_type) ) - { - if (pHTInfo->IOTPeer==HT_IOT_PEER_REALTEK) - retValue = 1; - } -#endif - return retValue; } @@ -718,19 +644,6 @@ HTIOTActIsDisableTx2SS(struct rtllib_device* ieee,struct rtllib_network *network { u8 retValue = 0; -#if (defined RTL8192SU || defined RTL8192SE || defined RTL8192CE) - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - if ( (KEY_TYPE_WEP104 == ieee->pairwise_key_type) || - (KEY_TYPE_WEP40 == ieee->pairwise_key_type) || - (KEY_TYPE_WEP104 == ieee->group_key_type) || - (KEY_TYPE_WEP40 == ieee->group_key_type) || - (KEY_TYPE_TKIP == ieee->pairwise_key_type) ) - { - if ((pHTInfo->IOTPeer==HT_IOT_PEER_REALTEK) && (network->bssht.bdSupportHT)) - retValue = 1; - } -#endif - return retValue; } @@ -753,15 +666,6 @@ bool HTIOCActIsDisableCckRate(struct rtllib_device* ieee,struct rtllib_network * bool HTIOCActAllowPeerAggOnePacket(struct rtllib_device* ieee,struct rtllib_network *network) { bool retValue = false; -#if defined(RTL8192SE) || defined(RTL8192SU) - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - { - if (ieee->VersionID<2) - if (pHTInfo->IOTPeer == HT_IOT_PEER_MARVELL) - return true; - - } -#endif return retValue; } @@ -769,14 +673,6 @@ bool HTIOTActIsNullDataPowerSaving(struct rtllib_device* ieee,struct rtllib_network *network) { bool retValue = false; -#if defined(RTL8192SE) || defined(RTL8192SU) - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - { - if (pHTInfo->IOTPeer == HT_IOT_PEER_BROADCOM) - return true; - - } -#endif return retValue; } @@ -826,9 +722,6 @@ void HTConstructCapabilityElement(struct rtllib_device* ieee, u8* posHTCap, u8* pCapELE->ShortGI40Mhz = 1; pCapELE->TxSTBC = 1; -#if defined RTL8192SE || defined RTL8192CE - pCapELE->TxSTBC = 0; -#endif pCapELE->RxSTBC = 0; pCapELE->DelayBA = 0; pCapELE->MaxAMSDUSize = (MAX_RECEIVE_BUFFER_SIZE>=7935)?1:0; @@ -1131,18 +1024,6 @@ void HTOnAssocRsp(struct rtllib_device *ieee) pHTInfo->CurrentMPDUDensity = pHTInfo->MPDU_Density; else pHTInfo->CurrentMPDUDensity = pPeerHTCap->MPDUDensity; -#if (defined RTL8192SE || defined RTL8192SU || defined RTL8192CE) - if (ieee->SetHwRegHandler != NULL) { - ieee->SetHwRegHandler( ieee->dev, HW_VAR_SHORTGI_DENSITY, (u8*)(&ieee->MaxMssDensity)); - ieee->SetHwRegHandler(ieee->dev, HW_VAR_AMPDU_FACTOR, &pHTInfo->CurrentAMPDUFactor); - ieee->SetHwRegHandler(ieee->dev, HW_VAR_AMPDU_MIN_SPACE, &pHTInfo->CurrentMPDUDensity); - } -#elif defined RTL8192CE - if (ieee->SetHwRegHandler != NULL) { - ieee->SetHwRegHandler(ieee->dev, HW_VAR_AMPDU_FACTOR, &pHTInfo->CurrentAMPDUFactor); - ieee->SetHwRegHandler(ieee->dev, HW_VAR_AMPDU_MIN_SPACE, &pHTInfo->CurrentMPDUDensity); - } -#endif if (pHTInfo->IOTAction & HT_IOT_ACT_TX_USE_AMSDU_8K) { pHTInfo->bCurrentAMPDUEnable = false; @@ -1290,71 +1171,6 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device* ieee, struct rtllib_net bIOTAction = HTIOTActIsCCDFsync(ieee); if (bIOTAction) pHTInfo->IOTAction |= HT_IOT_ACT_CDD_FSYNC; -#if defined(RTL8192SU) || defined(RTL8192SE) || defined RTL8192CE - bIOTAction = HTIOTActIsForcedCTS2Self(ieee,pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_FORCED_CTS2SELF; - - - bIOTAction = HTIOTActIsEnableBETxOPLimit(ieee); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_FORCED_ENABLE_BE_TXOP; - -#if defined(RTL8192SU) - bIOTAction = HTIOCActRejcectADDBARequest(pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_REJECT_ADDBA_REQ; -#endif - - bIOTAction = HTIOCActAllowPeerAggOnePacket(ieee, pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_ALLOW_PEER_AGG_ONE_PKT; - - bIOTAction = HTIOTActIsEDCABiasRx(ieee, pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_EDCA_BIAS_ON_RX; - -#if defined(RTL8192SU) - bIOTAction = HTIOCActIsDisableCckRate(ieee, pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_DISABLE_CCK_RATE; -#endif - bIOTAction = HTIOTActDisableShortGI(ieee, pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_DISABLE_SHORT_GI; - - bIOTAction = HTIOTActDisableHighPower(ieee, pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_DISABLE_HIGH_POWER; - - - 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; - - bIOTAction = HTIOTActIsDisableTx40MHz(ieee, pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_DISABLE_TX_40_MHZ; - - bIOTAction = HTIOTActIsDisableTx2SS(ieee, pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_DISABLE_TX_2SS; -#endif - - bIOTAction = HTIOTActIsForcedRTSCTS(ieee, pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_FORCED_RTS; - - bIOTAction = HTIOTActIsNullDataPowerSaving(ieee, pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_NULL_DATA_POWER_SAVING; -#endif - } else { pHTInfo->bCurrentHTSupport = false; pHTInfo->bCurrentRT2RTAggregation = false; diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c index 406986c8beb0..372f946de70c 100644 --- a/drivers/staging/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl_core.c @@ -329,9 +329,7 @@ void write_nic_byte(struct net_device *dev, int x,u8 y) { writeb(y,(u8*)dev->mem_start +x); -#if !(defined RTL8192SE || defined RTL8192CE) udelay(20); -#endif #if defined RTL8192CE read_nic_byte(dev, x); @@ -342,9 +340,7 @@ void write_nic_dword(struct net_device *dev, int x,u32 y) { writel(y,(u8*)dev->mem_start +x); -#if !(defined RTL8192SE || defined RTL8192CE) udelay(20); -#endif #if defined RTL8192CE read_nic_dword(dev, x); @@ -355,9 +351,7 @@ void write_nic_word(struct net_device *dev, int x,u16 y) { writew(y,(u8*)dev->mem_start +x); -#if !(defined RTL8192SE || defined RTL8192CE) udelay(20); -#endif #if defined RTL8192CE read_nic_word(dev, x); @@ -969,19 +963,6 @@ void rtl8192_refresh_supportrate(struct r8192_priv* priv) } #endif -#ifdef RTL8192SE - if (priv->rf_type == RF_1T1R) { - ieee->Regdot11HTOperationalRateSet[1] = 0; - } - if (priv->rf_type == RF_1T1R || priv->rf_type == RF_1T2R) - { - ieee->Regdot11TxHTOperationalRateSet[1] = 0; - } - - if (priv->rtllib->b1SSSupport == true) { - ieee->Regdot11HTOperationalRateSet[1] = 0; - } -#endif } else { memset(ieee->Regdot11HTOperationalRateSet, 0, 16); } @@ -1077,10 +1058,6 @@ int _rtl8192_sta_up(struct net_device *dev,bool is_silent_reset) RT_TRACE(COMP_INIT, "start adapter finished\n"); RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC); priv->bfirst_init = false; -#if defined RTL8192SE || defined RTL8192CE - if (priv->rtllib->eRFPowerState!=eRfOn) - MgntActSet_RF_State(dev, eRfOn, priv->rtllib->RfOffReason,true); -#endif #ifdef ENABLE_GPIO_RADIO_CTL if (priv->polling_timer_on == 0){ @@ -1226,14 +1203,10 @@ static void rtl8192_init_priv_handler(struct net_device* dev) static void rtl8192_init_priv_constant(struct net_device* dev) { -#if defined RTL8192SE || defined RTL8192CE || defined RTL8192E struct r8192_priv *priv = rtllib_priv(dev); PRT_POWER_SAVE_CONTROL pPSC = (PRT_POWER_SAVE_CONTROL)(&(priv->rtllib->PowerSaveControl)); -#endif -#if defined RTL8192SE || defined RTL8192CE || defined RTL8192E pPSC->RegMaxLPSAwakeIntvl = 5; -#endif #ifdef RTL8192CE priv->bWEPinNmodeFromReg = 0; @@ -1251,17 +1224,6 @@ static void rtl8192_init_priv_constant(struct net_device* dev) priv->RegSupportPciASPM = 1; -#elif defined RTL8192SE - priv->RegPciASPM = 2; - - priv->RegDevicePciASPMSetting = 0x03; - - priv->RegHostPciASPMSetting = 0x02; - - priv->RegHwSwRfOffD3 = 2; - - priv->RegSupportPciASPM = 2; - #elif defined RTL8192E priv->RegPciASPM = 2; @@ -1359,15 +1321,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev) priv->ccktxpower_adjustcnt_ch14 = 0; priv->ccktxpower_adjustcnt_not_ch14 = 0; -#if defined RTL8192SE - for (i = 0; irtllib->peer_assoc_list[i]=NULL; - priv->rtllib->AvailableAIDTable[i] = 99; - } - priv->RATRTableBitmap = 0; - priv->rtllib->amsdu_in_process = 0; -#endif - priv->rtllib->current_network.beacon_interval = DEFAULT_BEACONINTERVAL; priv->rtllib->iw_mode = IW_MODE_INFRA; priv->rtllib->active_scan = 1; @@ -1524,9 +1477,6 @@ short rtl8192_init(struct net_device *dev) init_hal_dm(dev); -#if defined RTL8192SE || defined RTL8192CE - InitSwLeds(dev); -#endif init_timer(&priv->watch_dog_timer); setup_timer(&priv->watch_dog_timer, watch_dog_timer_callback, @@ -1729,15 +1679,6 @@ rtl819x_TxCheckStuck(struct net_device *dev) bCheckFwTxCnt = true; if (tcb_desc->nStuckCount > 1) printk("%s: QueueID=%d tcb_desc->nStuckCount=%d\n",__func__,QueueID,tcb_desc->nStuckCount); -#if defined RTL8192SE || defined RTL8192CE - if (tcb_desc->nStuckCount > ResetThreshold) - { - RT_TRACE( COMP_RESET, "TxCheckStuck(): Need silent reset because nStuckCount > ResetThreshold.\n" ); - spin_unlock_irqrestore(&priv->irq_th_lock,flags); - return RESET_TYPE_SILENT; - } - bCheckFwTxCnt = false; - #endif } } spin_unlock_irqrestore(&priv->irq_th_lock,flags); @@ -1870,10 +1811,7 @@ RESET_START: rtllib_softmac_stop_protocol(priv->rtllib, 0 ,true); } -#if !(defined RTL8192SE || defined RTL8192CE) dm_backup_dynamic_mechanism_state(dev); -#endif - up(&priv->wx_sem); RT_TRACE(COMP_RESET,"%s():<==========down process is finished\n",__func__); @@ -1920,9 +1858,7 @@ RESET_START: } CamRestoreAllEntry(dev); -#if !(defined RTL8192SE || defined RTL8192CE) dm_restore_dynamic_mechanism_state(dev); -#endif END: priv->ResetProgress = RESET_TYPE_NORESET; priv->reset_count++; @@ -1930,9 +1866,7 @@ END: priv->bForcedSilentReset =false; priv->bResetInProgress = false; -#if !(defined RTL8192SE || defined RTL8192CE) write_nic_byte(dev, UFWP, 1); -#endif RT_TRACE(COMP_RESET, "Reset finished!! ====>[%d]\n", priv->reset_count); } } @@ -2048,11 +1982,6 @@ void rtl819x_watchdog_wqcallback(void *data) } { -#if defined RTL8192SE - if (priv->rtllib->iw_mode == IW_MODE_ADHOC) - IbssAgeFunction(ieee); -#endif - if (ieee->state == RTLLIB_LINKED && ieee->iw_mode == IW_MODE_INFRA) { u32 TotalRxBcnNum = 0; @@ -2341,11 +2270,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb) priv->rtllib->bAwakePktSent = true; -#if defined RTL8192SE || defined RTL8192CE - fwinfo_size = 0; -#else fwinfo_size = sizeof(TX_FWINFO_8190PCI); -#endif header = (struct rtllib_hdr_1addr *)(((u8*)skb->data) + fwinfo_size); fc = header->frame_ctl; @@ -2760,82 +2685,6 @@ done: void rtl8192_rx_cmd(struct net_device *dev) { -#ifdef RTL8192SE - struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); - - unsigned int count = priv->rxringcount; - int rx_queue_idx = RX_CMD_QUEUE; - - struct rtllib_rx_stats stats = { - .signal = 0, - .noise = -98, - .rate = 0, - .freq = RTLLIB_24GHZ_BAND, - }; - stats.nic_type = NIC_8192E; - - while (count--) { - rx_desc *pdesc = &priv->rx_ring[rx_queue_idx][priv->rx_idx[rx_queue_idx]]; - struct sk_buff *skb = priv->rx_buf[rx_queue_idx][priv->rx_idx[rx_queue_idx]]; - - if (pdesc->OWN){ - return; - } else { - struct sk_buff *new_skb = NULL; - - pci_unmap_single(priv->pdev, - *((dma_addr_t *)skb->cb), - priv->rxbuffersize, - PCI_DMA_FROMDEVICE); - - skb_put(skb, pdesc->Length); - - if (pdesc->MACID == 0x1e) { - - pdesc->Length = pdesc->Length - 32; - pdesc->DrvInfoSize = 4; - printk(">>>>%s()CMD PKT RX, beacon_len:%d payload_len:%d\n",__func__, pdesc->Length,skb->len); - - - priv->ops->rx_query_status_descriptor(dev, &stats, pdesc, skb); - skb_reserve(skb, stats.RxDrvInfoSize + stats.RxBufShift); - } - - skb_trim(skb, skb->len - 4/*sCrcLng*/); - - if (pdesc->MACID == 0x1e){ - if (!rtllib_rx(priv->rtllib, skb, &stats)){ - dev_kfree_skb_any(skb); - } - }else{ - if (priv->ops->rx_command_packet_handler != NULL) - priv->ops->rx_command_packet_handler(dev, skb, pdesc); - dev_kfree_skb_any(skb); - } - - - new_skb = dev_alloc_skb(priv->rxbuffersize); - if (unlikely(!new_skb)) - { - printk("==========>can't alloc skb for rx\n"); - goto done; - } - skb=new_skb; - skb->dev = dev; - - priv->rx_buf[rx_queue_idx][priv->rx_idx[rx_queue_idx]] = skb; - *((dma_addr_t *) skb->cb) = pci_map_single(priv->pdev, skb_tail_pointer_rsl(skb), priv->rxbuffersize, PCI_DMA_FROMDEVICE); - - } -done: - pdesc->BufferAddress = cpu_to_le32(*((dma_addr_t *)skb->cb)); - pdesc->OWN = 1; - pdesc->Length = priv->rxbuffersize; - if (priv->rx_idx[rx_queue_idx] == priv->rxringcount-1) - pdesc->EOR = 1; - priv->rx_idx[rx_queue_idx] = (priv->rx_idx[rx_queue_idx] + 1) % priv->rxringcount; - } -#endif } @@ -3220,22 +3069,6 @@ irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs) goto done; } -#if defined RTL8192SE - if (intb & IMR_TBDOK){ - RT_TRACE(COMP_INTR, "beacon ok interrupt!\n"); - priv->stats.txbeaconokint++; - priv->bIbssCoordinator = true; - } - - if (intb & IMR_TBDER){ - RT_TRACE(COMP_INTR, "beacon error interrupt!\n"); - priv->stats.txbeaconerr++; - priv->bIbssCoordinator = false; - } - - if ((intb & IMR_TBDOK) ||(intb & IMR_TBDER)) - FairBeacon(dev); -#else if (inta & IMR_TBDOK){ RT_TRACE(COMP_INTR, "beacon ok interrupt!\n"); priv->stats.txbeaconokint++; @@ -3245,7 +3078,6 @@ irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs) RT_TRACE(COMP_INTR, "beacon ok interrupt!\n"); priv->stats.txbeaconerr++; } -#endif if (inta & IMR_BDOK) { RT_TRACE(COMP_INTR, "beacon interrupt!\n"); @@ -3279,11 +3111,7 @@ irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs) rtl8192_tx_isr(dev,HIGH_QUEUE); } -#ifdef RTL8192SE - if ((inta & IMR_ROK) || (inta & IMR_RXCMDOK)) -#else if (inta & IMR_ROK) -#endif { priv->stats.rxint++; priv->InterruptLog.nIMR_ROK++; @@ -3459,13 +3287,6 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev, dev->mem_start = ioaddr; dev->mem_end = ioaddr + pci_resource_len(pdev, 0); -#if defined RTL8192SE || defined RTL8192CE - pci_write_config_byte(pdev, 0x81,0); - pci_write_config_byte(pdev,0x44,0); - pci_write_config_byte(pdev,0x04,0x06); - pci_write_config_byte(pdev,0x04,0x07); -#endif - pci_read_config_byte(pdev, 0x08, &revision_id); /* If the revisionid is 0x10, the device uses rtl8192se. */ if (pdev->device == 0x8192 && revision_id == 0x10) @@ -3625,10 +3446,6 @@ static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev) } pci_disable_device(pdev); -#ifdef RTL8192SE - pci_write_config_byte(pdev, 0x81,1); - pci_write_config_byte(pdev,0x44,3); -#endif RT_TRACE(COMP_DOWN, "wlan driver removed\n"); } diff --git a/drivers/staging/rtl8192e/rtl_debug.c b/drivers/staging/rtl8192e/rtl_debug.c index cec8998abfaa..7381fd6a3bc0 100644 --- a/drivers/staging/rtl8192e/rtl_debug.c +++ b/drivers/staging/rtl8192e/rtl_debug.c @@ -183,21 +183,6 @@ static ssize_t rtl_dbgfs_register_read(struct file *file, if (!priv->debug->hw_type) { page_no = (priv->debug->hw_offset > 0x0f)? 0x0f: priv->debug->hw_offset; -#ifdef RTL8192SE - if (page_no >= 0x08 ) { - len += snprintf(buf + len, count - len, - "\n#################### BB page- %x##################\n ", page_no); - for (n=0;n<=max;) - { - len += snprintf(buf + len, count - len, "\nD: %2x > ",n); - for (i=0;i<4 && n<=max;n+=4,i++) - len += snprintf(buf + len, count - len, - "%8.8x ",rtl8192_QueryBBReg(dev,(page_no << 8|n), - bMaskDWord)); - } - - } else -#endif { len += snprintf(buf + len,count - len, "\n#################### MAC page- %x##################\n ", page_no); @@ -347,21 +332,6 @@ static int proc_get_registers_0(char *page, char **start, int max=0xff; page0 = 0x000; -#ifdef RTL8192SE - /* This dump the current register page */ - if (!IS_BB_REG_OFFSET_92S(page0)){ - len += snprintf(page + len, count - len, - "\n####################page %x##################\n ", (page0>>8)); - for (n=0;n<=max;) - { - len += snprintf(page + len, count - len, - "\nD: %2x > ",n); - for (i=0;i<16 && n<=max;i++,n++) - len += snprintf(page + len, count - len, - "%2.2x ",read_nic_byte(dev,(page0|n))); - } - }else -#endif { len += snprintf(page + len, count - len, "\n####################page %x##################\n ", (page0>>8)); diff --git a/drivers/staging/rtl8192e/rtl_debug.h b/drivers/staging/rtl8192e/rtl_debug.h index 8d85979d313a..201279266623 100644 --- a/drivers/staging/rtl8192e/rtl_debug.h +++ b/drivers/staging/rtl8192e/rtl_debug.h @@ -277,9 +277,6 @@ void print_buffer(u32 *buffer, int len); void dump_eprom(struct net_device *dev); void rtl8192_dump_reg(struct net_device *dev); -#ifdef RTL8192SE -void rtl8192se_dump_tx_desc(struct _tx_desc_8192se *pDesc); -#endif #ifdef RTL8192CE void rtl8192ce_dump_tx_desc(struct _TX_DESC_8192CE *pDesc); #endif diff --git a/drivers/staging/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl_dm.c index c494505d91ce..b0442e495175 100644 --- a/drivers/staging/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl_dm.c @@ -103,19 +103,8 @@ extern void dm_check_fsync(struct net_device *dev); extern void dm_shadow_init(struct net_device *dev); extern void dm_initialize_txpower_tracking(struct net_device *dev); -#if (defined RTL8192E || defined RTL8192SE) extern void dm_CheckRfCtrlGPIO(void *data); -#endif - -#ifdef RTL8192SE -extern void DM_TXPowerTracking92SDirectCall(struct net_device *dev); -static void dm_CtrlInitGainByTwoPort(struct net_device *dev); -static void dm_CtrlInitGainBeforeConnectByRssiAndFalseAlarm(struct net_device *dev); -static void dm_initial_gain_STABeforeConnect(struct net_device *dev); -void dm_InitRateAdaptiveMask(struct net_device *dev); -void Adhoc_InitRateAdaptive(struct net_device *dev,struct sta_info *pEntry); -#endif /*--------------------Define export function prototype-----------------------*/ @@ -149,9 +138,6 @@ static void dm_cs_ratio(struct net_device *dev); static void dm_init_ctstoself(struct net_device *dev); static void dm_Init_WA_Broadcom_IOT(struct net_device *dev); -#ifdef RTL8192SE -static void dm_WA_Broadcom_IOT(struct net_device *dev); -#endif static void dm_check_edca_turbo(struct net_device *dev); @@ -177,9 +163,6 @@ static void dm_dynamic_txpower(struct net_device *dev); static void dm_send_rssi_tofw(struct net_device *dev); static void dm_ctstoself(struct net_device *dev); -#if defined RTL8192SE -static void dm_RefreshRateAdaptiveMask(struct net_device *dev); -#endif /*---------------------------Define function prototype------------------------*/ extern void @@ -192,12 +175,7 @@ init_hal_dm(struct net_device *dev) dm_init_dynamic_txpower(dev); -#ifdef RTL8192SE - if (IS_HARDWARE_TYPE_8192SE(dev)) - dm_InitRateAdaptiveMask(dev); - else -#endif - init_rate_adaptive(dev); + init_rate_adaptive(dev); dm_dig_init(dev); dm_init_edca_turbo(dev); @@ -208,10 +186,7 @@ init_hal_dm(struct net_device *dev) if (IS_HARDWARE_TYPE_8192SE(dev)) dm_Init_WA_Broadcom_IOT(dev); -#if (defined RTL8192E || defined RTL8192SE) INIT_DELAYED_WORK_RSL(&priv->gpio_change_rf_wq, (void *)dm_CheckRfCtrlGPIO,dev); -#endif - } extern void deinit_hal_dm(struct net_device *dev) @@ -272,13 +247,6 @@ extern void hal_dm_watchdog(struct net_device *dev) dm_check_txrateandretrycount(dev); dm_check_edca_turbo(dev); - if (IS_HARDWARE_TYPE_8192SE(dev)){ -#ifdef RTL8192SE - dm_RefreshRateAdaptiveMask(dev); - dm_WA_Broadcom_IOT(dev); - return; -#endif - } dm_check_rate_adaptive(dev); dm_dynamic_txpower(dev); dm_check_txpower_tracking(dev); @@ -693,7 +661,6 @@ static u8 CCKSwingTable_Ch14[CCK_Table_length][8] = { #define Tssi_Report_Value2 0x13e #define FW_Busy_Flag 0x13f -#ifndef RTL8192SE static void dm_TXPowerTrackingCallback_TSSI(struct net_device * dev) { struct r8192_priv *priv = rtllib_priv(dev); @@ -984,7 +951,6 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device * dev) priv->rtllib->bdynamic_txpower_enable = true; write_nic_byte(dev, Pw_Track_Flag, 0); } -#endif #ifdef RTL8192E static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device * dev) @@ -1093,38 +1059,6 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device * dev) } priv->txpower_count = 0; } -#elif defined (RTL8192SE) -static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device * dev) -{ - struct r8192_priv *priv = rtllib_priv(dev); - u8 ThermalValue=0; - u32 FwCmdVal=0; - - priv->btxpower_trackingInit = true; - - - ThermalValue = (u8)rtl8192_phy_QueryRFReg(dev, RF90_PATH_A, RF_T_METER, 0x1f); - RT_TRACE(COMP_POWER_TRACKING, "Readback Thermal Meter = 0x%x\n", ThermalValue); - printk("%s()Readback Thermal Meter = 0x%x\n", __func__,ThermalValue); - if (ThermalValue) - { - priv->ThermalValue = ThermalValue; - if (priv->pFirmware->FirmwareVersion >= 0x35) - { - priv->rtllib->SetFwCmdHandler(dev, FW_CMD_TXPWR_TRACK_THERMAL); - } - else - { - FwCmdVal = (FW_TXPWR_TRACK_THERMAL| - (priv->ThermalMeter[0]<<8)|(ThermalValue<<16)); - RT_TRACE(COMP_POWER_TRACKING, "Write to FW Thermal Val = 0x%x\n", FwCmdVal); - write_nic_dword(dev, WFM5, FwCmdVal); - ChkFwCmdIoDone(dev); - } - } - - priv->txpower_count = 0; -} #endif void dm_txpower_trackingcallback(void *data) @@ -1138,7 +1072,6 @@ void dm_txpower_trackingcallback(void *data) dm_TXPowerTrackingCallback_ThermalMeter(dev); } -#ifndef RTL8192SE static void dm_InitializeTXPowerTracking_TSSI(struct net_device *dev) { @@ -1638,7 +1571,7 @@ static void dm_InitializeTXPowerTracking_TSSI(struct net_device *dev) priv->btxpower_trackingInit = false; } -#endif + static void dm_InitializeTXPowerTracking_ThermalMeter(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); @@ -1702,14 +1635,6 @@ static void dm_CheckTXPowerTracking_ThermalMeter(struct net_device *dev) if (!TM_Trigger) { -#ifdef RTL8192SE - if (IS_HARDWARE_TYPE_8192SE(dev)) - { - rtl8192_phy_SetRFReg(dev, RF90_PATH_A, RF_T_METER, bRFRegOffsetMask, 0x60); - RT_TRACE(COMP_POWER_TRACKING, "Trigger 92S Thermal Meter!!\n"); - } - else -#endif { rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4d); rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4f); @@ -1720,36 +1645,23 @@ static void dm_CheckTXPowerTracking_ThermalMeter(struct net_device *dev) return; } else { printk("===============>Schedule TxPowerTrackingWorkItem\n"); -#ifdef RTL8192SE - DM_TXPowerTracking92SDirectCall(dev); -#else queue_delayed_work_rsl(priv->priv_wq,&priv->txpower_tracking_wq,0); -#endif TM_Trigger = 0; } } -#ifdef RTL8192SE -void DM_TXPowerTracking92SDirectCall(struct net_device *dev) -{ - dm_TXPowerTrackingCallback_ThermalMeter(dev); - } -#endif - static void dm_check_txpower_tracking(struct net_device *dev) { -#ifdef RTL8192E struct r8192_priv *priv = rtllib_priv(dev); -#endif + if (priv->IC_Cut >= IC_VersionCut_D) dm_CheckTXPowerTracking_TSSI(dev); else dm_CheckTXPowerTracking_ThermalMeter(dev); } -#ifndef RTL8192SE static void dm_CCKTxPowerAdjust_TSSI(struct net_device *dev, bool bInCH14) { u32 TempVal; @@ -1793,7 +1705,6 @@ static void dm_CCKTxPowerAdjust_TSSI(struct net_device *dev, bool bInCH14) } -#endif #ifdef RTL8192E static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool bInCH14) { @@ -1851,7 +1762,6 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool bInCH } #endif -#ifndef RTL8192SE extern void dm_cck_txpower_adjust( struct net_device *dev, bool binch14 @@ -1863,7 +1773,6 @@ extern void dm_cck_txpower_adjust( else dm_CCKTxPowerAdjust_ThermalMeter(dev, binch14); } -#endif static void dm_txpower_reset_recovery( struct net_device *dev @@ -1984,14 +1893,6 @@ extern void dm_change_dynamic_initgain_thresh(struct net_device *dev, u32 dm_type, u32 dm_value) { -#ifdef RTL8192SE - struct r8192_priv *priv = rtllib_priv(dev); - if (dm_type == DIG_TYPE_THRESH_HIGHPWR_HIGH) - priv->MidHighPwrTHR_L2 = (u8)dm_value; - else if (dm_type == DIG_TYPE_THRESH_HIGHPWR_LOW) - priv->MidHighPwrTHR_L1 = (u8)dm_value; - return; -#endif if (dm_type == DIG_TYPE_THRESH_HIGH) { dm_digtable.rssi_high_thresh = dm_value; @@ -2157,14 +2058,7 @@ static void dm_dig_init(struct net_device *dev) dm_digtable.dig_enable_flag = true; dm_digtable.Backoff_Enable_Flag = true; -#ifdef RTL8192SE - if ((priv->DM_Type == DM_Type_ByDriver) && (priv->pFirmware->FirmwareVersion >= 0x3c)) - dm_digtable.dig_algorithm = DIG_ALGO_BY_TOW_PORT; - else - dm_digtable.dig_algorithm = DIG_ALGO_BEFORE_CONNECT_BY_RSSI_AND_ALARM; -#else dm_digtable.dig_algorithm = DIG_ALGO_BY_RSSI; -#endif dm_digtable.Dig_TwoPort_Algorithm = DIG_TWO_PORT_ALGO_RSSI; dm_digtable.Dig_Ext_Port_Stage = DIG_EXT_PORT_STAGE_MAX; @@ -2228,19 +2122,6 @@ void dm_FalseAlarmCounterStatistics(struct net_device *dev) FalseAlmCnt->Cnt_Ofdm_fail, FalseAlmCnt->Cnt_Cck_fail , FalseAlmCnt->Cnt_all); } -#ifdef RTL8192SE -static void dm_CtrlInitGainAPByFalseAlarm(struct net_device *dev) -{ - static u8 binitialized = false; - - { - binitialized = false; - dm_digtable.Dig_Ext_Port_Stage = DIG_EXT_PORT_STAGE_MAX; - return; - } -} -#endif - static void dm_ctrl_initgain_byrssi(struct net_device *dev) { @@ -2251,50 +2132,10 @@ static void dm_ctrl_initgain_byrssi(struct net_device *dev) dm_ctrl_initgain_byrssi_by_fwfalse_alarm(dev); else if (dm_digtable.dig_algorithm == DIG_ALGO_BY_RSSI) dm_ctrl_initgain_byrssi_by_driverrssi(dev); -#ifdef RTL8192SE - else if (dm_digtable.dig_algorithm == DIG_ALGO_BEFORE_CONNECT_BY_RSSI_AND_ALARM) - dm_CtrlInitGainBeforeConnectByRssiAndFalseAlarm(dev); - else if (dm_digtable.dig_algorithm == DIG_ALGO_BY_TOW_PORT) - dm_CtrlInitGainByTwoPort(dev); -#endif else return; } -#ifdef RTL8192SE -static void dm_CtrlInitGainByTwoPort(struct net_device *dev) -{ - struct r8192_priv *priv = rtllib_priv(dev); - - if (rtllib_act_scanning(priv->rtllib,true) == true) - return; - - if ((priv->rtllib->state > RTLLIB_NOLINK) && (priv->rtllib->state < RTLLIB_LINKED)) - dm_digtable.CurSTAConnectState = DIG_STA_BEFORE_CONNECT; - else if ((priv->rtllib->state == RTLLIB_LINKED) ||(priv->rtllib->state == RTLLIB_LINKED_SCANNING)) - dm_digtable.CurSTAConnectState = DIG_STA_CONNECT; - else - dm_digtable.CurSTAConnectState = DIG_STA_DISCONNECT; - - dm_digtable.rssi_val = priv->undecorated_smoothed_pwdb; - - if (dm_digtable.CurSTAConnectState != DIG_STA_DISCONNECT) - { - if (dm_digtable.Dig_TwoPort_Algorithm == DIG_TWO_PORT_ALGO_FALSE_ALARM) - { - dm_digtable.Dig_TwoPort_Algorithm = DIG_TWO_PORT_ALGO_RSSI; - priv->rtllib->SetFwCmdHandler(dev, FW_CMD_DIG_MODE_SS); - } - } - - dm_FalseAlarmCounterStatistics(dev); - dm_initial_gain_STABeforeConnect(dev); - dm_CtrlInitGainAPByFalseAlarm(dev); - - dm_digtable.PreSTAConnectState = dm_digtable.CurSTAConnectState; -} -#endif - /*----------------------------------------------------------------------------- * Function: dm_CtrlInitGainBeforeConnectByRssiAndFalseAlarm() * @@ -2313,30 +2154,6 @@ static void dm_CtrlInitGainByTwoPort(struct net_device *dev) * *---------------------------------------------------------------------------*/ -#ifdef RTL8192SE -static void dm_CtrlInitGainBeforeConnectByRssiAndFalseAlarm(struct net_device *dev) -{ - struct r8192_priv *priv = rtllib_priv(dev); - - if (rtllib_act_scanning(priv->rtllib,true) == true) - return; - - if ((priv->rtllib->state > RTLLIB_NOLINK) && (priv->rtllib->state < RTLLIB_LINKED)) - dm_digtable.CurSTAConnectState = DIG_STA_BEFORE_CONNECT; - else if ((priv->rtllib->state == RTLLIB_LINKED) ||(priv->rtllib->state == RTLLIB_LINKED_SCANNING)) - dm_digtable.CurSTAConnectState = DIG_STA_CONNECT; - else - dm_digtable.CurSTAConnectState = DIG_STA_DISCONNECT; - - if (dm_digtable.dbg_mode == DM_DBG_OFF) - dm_digtable.rssi_val = priv->undecorated_smoothed_pwdb; - - dm_FalseAlarmCounterStatistics(dev); - dm_initial_gain_STABeforeConnect(dev); - dm_digtable.PreSTAConnectState = dm_digtable.CurSTAConnectState; - -} -#endif static void dm_ctrl_initgain_byrssi_by_driverrssi( struct net_device *dev) { @@ -3024,81 +2841,6 @@ dm_Init_WA_Broadcom_IOT(struct net_device * dev) pHTInfo->WAIotTH = WAIotTHVal; } -#ifdef RTL8192SE -static void -dm_WA_Broadcom_IOT(struct net_device * dev) -{ - struct r8192_priv *priv = rtllib_priv((struct net_device *)dev); - PRT_HIGH_THROUGHPUT pHTInfo = priv->rtllib->pHTInfo; - u8 update=0; - static enum rtllib_state connectState = RTLLIB_NOLINK; - - if ( (pHTInfo->bWAIotBroadcom != true) || - (priv->rtllib->mode == WIRELESS_MODE_B) || - (pHTInfo->bCurBW40MHz)) - { - if (pHTInfo->IOTAction & HT_IOT_ACT_WA_IOT_Broadcom) - { - pHTInfo->IOTAction &= ~HT_IOT_ACT_WA_IOT_Broadcom; - update = 1; - printk(" dm_WA_Broadcom_IOT(), disable HT_IOT_ACT_WA_IOT_Broadcom\n"); - } - else - return; - } - - if (connectState == RTLLIB_LINKED && priv->rtllib->state == RTLLIB_LINKED) - { - if (pHTInfo->IOTAction & HT_IOT_ACT_WA_IOT_Broadcom) - { - pHTInfo->IOTAction &= ~HT_IOT_ACT_WA_IOT_Broadcom; - update = 1; - pHTInfo->bWAIotBroadcom = false; - printk("dm_WA_Broadcom_IOT(), from connect to disconnected, disable HT_IOT_ACT_WA_IOT_Broadcom\n"); - } - } - connectState = priv->rtllib->state; - - if (!update && pHTInfo->IOTPeer == HT_IOT_PEER_BROADCOM) - { - if (priv->undecorated_smoothed_pwdb < pHTInfo->WAIotTH) - { - if (pHTInfo->IOTAction & HT_IOT_ACT_WA_IOT_Broadcom) - { - pHTInfo->IOTAction &= ~HT_IOT_ACT_WA_IOT_Broadcom; - update = 1; - printk("dm_WA_Broadcom_IOT() ==> WA_IOT enable cck rates\n"); - } - } - else if (priv->undecorated_smoothed_pwdb >= (priv->rtllib->CTSToSelfTH+5)) - { - if ((pHTInfo->IOTAction & HT_IOT_ACT_WA_IOT_Broadcom) == 0) - { - pHTInfo->IOTAction |= HT_IOT_ACT_WA_IOT_Broadcom; - update = 1; - printk("dm_WA_Broadcom_IOT() ==> WA_IOT disable cck rates\n"); - } - } - } - - if (update){ - if (priv->rtllib->bUseRAMask){ - priv->rtllib->UpdateHalRAMaskHandler( - dev, - false, - 0, - priv->rtllib->pHTInfo->PeerMimoPs, - priv->rtllib->mode, - priv->rtllib->pHTInfo->bCurTxBW40MHz, - 0); - }else{ - priv->ops->update_ratr_table(dev, priv->rtllib->dot11HTOperationalRateSet, NULL); - } - priv->rtllib->SetHwRegHandler( dev, HW_VAR_BASIC_RATE, (u8*)(&priv->basic_rate)); - } -} -#endif - static void dm_check_pbc_gpio(struct net_device *dev) { #ifdef RTL8192U @@ -3187,382 +2929,6 @@ extern void dm_CheckRfCtrlGPIO(void *data) } } -#elif defined RTL8192SE -extern void Power_DomainInit92SE(struct net_device *dev) -{ - struct r8192_priv *priv = rtllib_priv(dev); - u8 tmpU1b; - u16 tmpU2b; - - - - priv->PwrDomainProtect = true; - - tmpU1b = read_nic_byte(dev, (SYS_CLKR + 1)); - if (tmpU1b & BIT7) - { - tmpU1b &= ~(BIT6 | BIT7); - if (!HalSetSysClk8192SE(dev, tmpU1b)){ - priv->PwrDomainProtect = false; - return; - } - } - - write_nic_byte(dev, AFE_PLL_CTRL, 0x0); - write_nic_byte(dev, LDOA15_CTRL, 0x34); - - tmpU1b = read_nic_byte(dev, SYS_FUNC_EN+1); - if (priv->rtllib->RfOffReason & (RF_CHANGE_BY_IPS | RF_CHANGE_BY_HW)) { - tmpU1b &= 0xFB; - } else { - tmpU1b &= 0x73; - } - - write_nic_byte(dev, SYS_FUNC_EN+1, tmpU1b); - udelay(1000); - - write_nic_byte(dev, CMDR, 0); - write_nic_byte(dev, TCR, 0); - - tmpU1b = read_nic_byte(dev, 0x562); - tmpU1b |= 0x08; - write_nic_byte(dev, 0x562, tmpU1b); - tmpU1b &= ~(BIT3); - write_nic_byte(dev, 0x562, tmpU1b); - - tmpU1b = read_nic_byte(dev, AFE_XTAL_CTRL); - write_nic_byte(dev, AFE_XTAL_CTRL, (tmpU1b|0x01)); - udelay(1500); - tmpU1b = read_nic_byte(dev, AFE_XTAL_CTRL+1); - write_nic_byte(dev, AFE_XTAL_CTRL+1, (tmpU1b&0xfb)); - - - tmpU1b = read_nic_byte(dev, AFE_MISC); - write_nic_byte(dev, AFE_MISC, (tmpU1b|BIT0)); - udelay(1000); - - tmpU1b = read_nic_byte(dev, AFE_MISC); - write_nic_byte(dev, AFE_MISC, (tmpU1b|0x02)); - udelay(1000); - - tmpU1b = read_nic_byte(dev, LDOA15_CTRL); - write_nic_byte(dev, LDOA15_CTRL, (tmpU1b|BIT0)); - - tmpU2b = read_nic_word(dev, SYS_ISO_CTRL); - write_nic_word(dev, SYS_ISO_CTRL, (tmpU2b|BIT11)); - - - tmpU2b = read_nic_word(dev, SYS_FUNC_EN); - write_nic_word(dev, SYS_FUNC_EN, (tmpU2b |BIT13)); - - write_nic_byte(dev, SYS_ISO_CTRL+1, 0x68); - - tmpU1b = read_nic_byte(dev, AFE_PLL_CTRL); - write_nic_byte(dev, AFE_PLL_CTRL, (tmpU1b|BIT0|BIT4)); - tmpU1b = read_nic_byte(dev, AFE_PLL_CTRL+1); - write_nic_byte(dev, AFE_PLL_CTRL+1, (tmpU1b|BIT0)); - udelay(1000); - - write_nic_byte(dev, SYS_ISO_CTRL, 0xA6); - - tmpU2b = read_nic_word(dev, SYS_CLKR); - write_nic_word(dev, SYS_CLKR, (tmpU2b|BIT12|BIT11)); - - tmpU2b = read_nic_word(dev, SYS_FUNC_EN); - write_nic_word(dev, SYS_FUNC_EN, (tmpU2b|BIT11)); - write_nic_word(dev, SYS_FUNC_EN, (tmpU2b|BIT11|BIT15)); - - tmpU2b = read_nic_word(dev, SYS_CLKR); - write_nic_word(dev, SYS_CLKR, (tmpU2b&(~BIT2))); - - tmpU1b = read_nic_byte(dev, (SYS_CLKR + 1)); - tmpU1b = ((tmpU1b | BIT7) & (~BIT6)); - if (!HalSetSysClk8192SE(dev, tmpU1b)) - { - priv->PwrDomainProtect = false; - return; - } - - write_nic_word(dev, CMDR, 0x37FC); - - gen_RefreshLedState(dev); - - priv->PwrDomainProtect = false; - -} - -void SET_RTL8192SE_RF_HALT(struct net_device *dev) -{ - u8 u1bTmp; - struct r8192_priv *priv = rtllib_priv(dev); - - if (priv->rtllib->RfOffReason == RF_CHANGE_BY_IPS && priv->LedStrategy == SW_LED_MODE8) - { - SET_RTL8192SE_RF_SLEEP(dev); - return; - } - - u1bTmp = read_nic_byte(dev, LDOV12D_CTRL); - u1bTmp |= BIT0; - write_nic_byte(dev, LDOV12D_CTRL, u1bTmp); - write_nic_byte(dev, SPS1_CTRL, 0x0); - write_nic_byte(dev, TXPAUSE, 0xFF); - write_nic_word(dev, CMDR, 0x57FC); - udelay(100); - write_nic_word(dev, CMDR, 0x77FC); - write_nic_byte(dev, PHY_CCA, 0x0); - udelay(10); - write_nic_word(dev, CMDR, 0x37FC); - udelay(10); - write_nic_word(dev, CMDR, 0x77FC); - udelay(10); - write_nic_word(dev, CMDR, 0x57FC); - write_nic_word(dev, CMDR, 0x0000); - u1bTmp = read_nic_byte(dev, (SYS_CLKR + 1)); - if (u1bTmp & BIT7) - { - u1bTmp &= ~(BIT6 | BIT7); - if (!HalSetSysClk8192SE(dev, u1bTmp)) - return; - } - if (priv->rtllib->RfOffReason==RF_CHANGE_BY_IPS ) - { - write_nic_byte(dev, 0x03, 0xF9); - } - else - { - write_nic_byte(dev, 0x03, 0x71); - } - write_nic_byte(dev, SYS_CLKR+1, 0x70); - write_nic_byte(dev, AFE_PLL_CTRL+1, 0x68); - write_nic_byte(dev, AFE_PLL_CTRL, 0x00); - write_nic_byte(dev, LDOA15_CTRL, 0x34); - write_nic_byte(dev, AFE_XTAL_CTRL, 0x0E); - -} - -u8 RfOnOffDetect(struct net_device *dev) -{ - struct r8192_priv *priv = rtllib_priv(dev); - u8 u1Tmp; - u8 retval=eRfOn; - - if (priv->pwrdown) - { - u1Tmp = read_nic_byte(dev, 0x06); - printk("pwrdown, 0x6(BIT6)=%02x\n", u1Tmp); - retval = (u1Tmp & BIT6) ? eRfOn: eRfOff; - } - else - { -#ifdef CONFIG_BT_COEXIST - if (pHalData->bt_coexist.BluetoothCoexist) - { - if (pHalData->bt_coexist.BT_CoexistType == BT_2Wire) - { - PlatformEFIOWrite1Byte(pAdapter, MAC_PINMUX_CFG, 0xa); - u1Tmp = PlatformEFIORead1Byte(pAdapter, GPIO_IO_SEL); - delay_us(100); - u1Tmp = PlatformEFIORead1Byte(pAdapter, GPIO_IN); - RTPRINT(FPWR, PWRHW, ("GPIO_IN=%02x\n", u1Tmp)); - retval = (u1Tmp & HAL_8192S_HW_GPIO_OFF_BIT) ? eRfOn : eRfOff; - } - else if ( (pHalData->bt_coexist.BT_CoexistType == BT_ISSC_3Wire) || - (pHalData->bt_coexist.BT_CoexistType == BT_Accel) || - (pHalData->bt_coexist.BT_CoexistType == BT_CSR) ) - { - u4tmp = PHY_QueryBBReg(pAdapter, 0x87c, bMaskDWord); - if ((u4tmp & BIT17) != 0) - { - PHY_SetBBReg(pAdapter, 0x87c, bMaskDWord, u4tmp & ~BIT17); - delay_us(50); - RTPRINT(FBT, BT_RFPoll, ("BT write 0x87c (~BIT17) = 0x%x\n", u4tmp &~BIT17)); - } - u4tmp = PHY_QueryBBReg(pAdapter, 0x8e0, bMaskDWord); - RTPRINT(FBT, BT_RFPoll, ("BT read 0x8e0 (BIT24)= 0x%x\n", u4tmp)); - retval = (u4tmp & BIT24) ? eRfOn : eRfOff; - RTPRINT(FBT, BT_RFPoll, ("BT check RF state to %s\n", (retval==eRfOn)? "ON":"OFF")); - } - } - else -#endif - { - write_nic_byte(dev, MAC_PINMUX_CFG, (GPIOMUX_EN | GPIOSEL_GPIO)); - u1Tmp = read_nic_byte(dev, GPIO_IO_SEL); - - u1Tmp &= HAL_8192S_HW_GPIO_OFF_MASK; - write_nic_byte(dev, GPIO_IO_SEL, u1Tmp); - - mdelay(10); - - u1Tmp = read_nic_byte(dev, GPIO_IN); - retval = (u1Tmp & HAL_8192S_HW_GPIO_OFF_BIT) ? eRfOn : eRfOff; - } - } - - return retval; -} - -extern void dm_CheckRfCtrlGPIO(void *data) -{ - struct net_device *dev = (struct net_device *)data; - struct r8192_priv *priv = rtllib_priv(dev); - - RT_RF_POWER_STATE eRfPowerStateToSet, CurRfState; - bool bActuallySet = false; - PRT_POWER_SAVE_CONTROL pPSC = (PRT_POWER_SAVE_CONTROL)(&(priv->rtllib->PowerSaveControl)); - unsigned long flag = 0; - bool turnonbypowerdomain = false; - - -#ifdef CONFIG_RTL_RFKILL - return; -#endif - if ((priv->up_first_time == 1) || (priv->being_init_adapter)) - { - ; - return; - } - - if (priv->ResetProgress == RESET_TYPE_SILENT) - { - RT_TRACE((COMP_INIT | COMP_POWER | COMP_RF), "GPIOChangeRFWorkItemCallBack(): Silent Reseting!!!!!!!\n"); - return; - } - - - if (pPSC->bSwRfProcessing) - { - RT_TRACE(COMP_SCAN, "GPIOChangeRFWorkItemCallBack(): Rf is in switching state.\n"); - return; - } - - RT_TRACE(COMP_RF, "GPIOChangeRFWorkItemCallBack() ---------> \n"); - - spin_lock_irqsave(&priv->rf_ps_lock,flag); - if (priv->RFChangeInProgress) { - spin_unlock_irqrestore(&priv->rf_ps_lock,flag); - RT_TRACE(COMP_RF, "GPIOChangeRFWorkItemCallBack(): RF Change in progress! \n"); - return; - } else { - priv->RFChangeInProgress = true; - spin_unlock_irqrestore(&priv->rf_ps_lock,flag); - } - CurRfState = priv->rtllib->eRFPowerState; -#ifdef CONFIG_ASPM_OR_D3 - if ((pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_ASPM) && RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_ASPM)) - { - RT_DISABLE_ASPM(dev); - RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_ASPM); - } - -#endif - if (RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC)) - { - Power_DomainInit92SE(dev); - turnonbypowerdomain = true; - } - - eRfPowerStateToSet = RfOnOffDetect(dev); - if (priv->bResetInProgress) { - spin_lock_irqsave(&priv->rf_ps_lock,flag); - priv->RFChangeInProgress = false; - spin_unlock_irqrestore(&priv->rf_ps_lock,flag); - return; - } - - if ( (priv->bHwRadioOff == true) && \ - (((eRfPowerStateToSet == eRfOn)&&(priv->sw_radio_on == true)) -#ifdef CONFIG_RTLWIFI_DEBUGFS - ||priv->debug->hw_holding -#endif - )) - { - RT_TRACE(COMP_RF, "GPIOChangeRF - HW Radio ON, RF ON\n"); - printk("GPIOChangeRF - HW Radio ON, RF ON\n"); - eRfPowerStateToSet = eRfOn; - bActuallySet = true; - } else if ((priv->bHwRadioOff == false) && - ((eRfPowerStateToSet == eRfOff) || (priv->sw_radio_on == false))) - { - RT_TRACE(COMP_RF, "GPIOChangeRF - HW Radio OFF\n"); - printk("GPIOChangeRF - HW Radio OFF\n"); - eRfPowerStateToSet = eRfOff; - bActuallySet = true; - } - - if (bActuallySet) { - priv->bHwRfOffAction = 1; -#ifdef CONFIG_ASPM_OR_D3 - if (eRfPowerStateToSet == eRfOn) { - if ((pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_ASPM) && - RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_ASPM)) { - RT_DISABLE_ASPM(dev); - RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_ASPM); - } - } -#endif - spin_lock_irqsave(&priv->rf_ps_lock,flag); - priv->RFChangeInProgress = false; - spin_unlock_irqrestore(&priv->rf_ps_lock,flag); - MgntActSet_RF_State(dev, eRfPowerStateToSet, RF_CHANGE_BY_HW,true); - - { -#ifdef CONFIG_CFG_80211 - struct wireless_dev *wdev = &priv->rtllib->wdev; - wiphy_rfkill_set_hw_state(wdev->wiphy, priv->bHwRadioOff); -#else - char *argv[3]; - static char *RadioPowerPath = "/etc/acpi/events/RadioPower.sh"; - static char *envp[] = {"HOME=/", "TERM=linux", "PATH=/usr/bin:/bin", NULL}; - - if (priv->bHwRadioOff == true) - argv[1] = "RFOFF"; - else - argv[1] = "RFON"; - - argv[0] = RadioPowerPath; - argv[2] = NULL; - call_usermodehelper(RadioPowerPath,argv,envp,1); - -#endif - } - - if (eRfPowerStateToSet == eRfOff) - { - if (priv->pwrdown) - write_nic_byte(dev, SYS_FUNC_EN+1, 0x31); -#ifdef CONFIG_ASPM_OR_D3 - if (pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_ASPM) { - RT_ENABLE_ASPM(dev); - RT_SET_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_ASPM); - } -#endif - } - } else if (eRfPowerStateToSet == eRfOff || CurRfState == eRfOff || - priv->bDriverIsGoingToUnload) { - - if (pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_HALT_NIC && - turnonbypowerdomain) { - PHY_SetRtl8192seRfHalt(dev); - RT_SET_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC); - } -#ifdef CONFIG_ASPM_OR_D3 - if (pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_ASPM) { - RT_ENABLE_ASPM(dev); - RT_SET_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_ASPM); - } -#endif - spin_lock_irqsave(&priv->rf_ps_lock,flag); - priv->RFChangeInProgress = false; - spin_unlock_irqrestore(&priv->rf_ps_lock,flag); - } else { - spin_lock_irqsave(&priv->rf_ps_lock,flag); - priv->RFChangeInProgress = false; - spin_unlock_irqrestore(&priv->rf_ps_lock,flag); - } - RT_TRACE(COMP_RF, "GPIOChangeRFWorkItemCallBack() <--------- \n"); -} #endif void dm_rf_pathcheck_workitemcallback(void *data) { diff --git a/drivers/staging/rtl8192e/rtl_dm.h b/drivers/staging/rtl8192e/rtl_dm.h index 967a5e426e22..6f59097873c1 100644 --- a/drivers/staging/rtl8192e/rtl_dm.h +++ b/drivers/staging/rtl8192e/rtl_dm.h @@ -285,9 +285,7 @@ extern void hal_dm_watchdog(struct net_device *dev); extern void init_rate_adaptive(struct net_device *dev); extern void dm_txpower_trackingcallback(void *data); -#ifndef RTL8192SE extern void dm_cck_txpower_adjust(struct net_device *dev,bool binch14); -#endif extern void dm_restore_dynamic_mechanism_state(struct net_device *dev); extern void dm_backup_dynamic_mechanism_state(struct net_device *dev); @@ -308,13 +306,7 @@ extern void dm_check_fsync(struct net_device *dev); extern void dm_shadow_init(struct net_device *dev); extern void dm_initialize_txpower_tracking(struct net_device *dev); -#if (defined RTL8192E || defined RTL8192SE) extern void dm_CheckRfCtrlGPIO(void *data); -#endif - -#ifdef RTL8192SE -extern void Power_DomainInit92SE(struct net_device *dev); -#endif extern void dm_InitRateAdaptiveMask(struct net_device * dev); diff --git a/drivers/staging/rtl8192e/rtl_ps.h b/drivers/staging/rtl8192e/rtl_ps.h index 71f20424278f..be85ac9022f1 100644 --- a/drivers/staging/rtl8192e/rtl_ps.h +++ b/drivers/staging/rtl8192e/rtl_ps.h @@ -47,13 +47,11 @@ void PlatformEnableASPM(struct net_device *dev); u32 PlatformResetPciSpace(struct net_device *dev,u8 Value); #endif -#if defined(RTL8192E) || defined(RTL8192SE) || defined RTL8192CE void rtl8192_hw_wakeup(struct net_device *dev); void rtl8192_hw_to_sleep(struct net_device *dev, u32 th, u32 tl); void rtllib_ips_leave_wq(struct net_device *dev); void rtllib_ips_leave(struct net_device *dev); void IPSLeave_wq (void *data); -#endif void IPSEnter(struct net_device *dev); void IPSLeave(struct net_device *dev); diff --git a/drivers/staging/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl_wx.c index cc6bcc6b023f..673382b560c7 100644 --- a/drivers/staging/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl_wx.c @@ -203,51 +203,12 @@ typedef struct adhoc_peer_entry_t Entry[MAX_ADHOC_PEER_NUM]; unsigned char num; } adhoc_peers_info_t, *p_adhoc_peers_info_t; + int r8192_wx_get_adhoc_peers(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { -#ifndef RTL8192SE - return 0; -#else - struct r8192_priv *priv = rtllib_priv(dev); - struct sta_info * psta = NULL; - adhoc_peers_info_t adhoc_peers_info; - p_adhoc_peers_info_t padhoc_peers_info = &adhoc_peers_info; - p_adhoc_peer_entry_t padhoc_peer_entry = NULL; - int k=0; - - - memset(extra, 0, 2047); - padhoc_peers_info->num = 0; - - down(&priv->wx_sem); - - for (k=0; krtllib->peer_assoc_list[k]; - if (NULL != psta) - { - padhoc_peer_entry = &padhoc_peers_info->Entry[padhoc_peers_info->num]; - memset(padhoc_peer_entry,0, sizeof(adhoc_peer_entry_t)); - memcpy(padhoc_peer_entry->MacAddr, psta->macaddr, ETH_ALEN); - padhoc_peer_entry->WirelessMode = psta->wireless_mode; - padhoc_peer_entry->bCurTxBW40MHz = psta->htinfo.bCurTxBW40MHz; - padhoc_peers_info->num ++; - printk("[%d] MacAddr:"MAC_FMT" \tWirelessMode:%d \tBW40MHz:%d \n", \ - k, MAC_ARG(padhoc_peer_entry->MacAddr), padhoc_peer_entry->WirelessMode, padhoc_peer_entry->bCurTxBW40MHz); - sprintf(extra, "[%d] MacAddr:"MAC_FMT" \tWirelessMode:%d \tBW40MHz:%d \n", \ - k, MAC_ARG(padhoc_peer_entry->MacAddr), padhoc_peer_entry->WirelessMode, padhoc_peer_entry->bCurTxBW40MHz); - } - } - - up(&priv->wx_sem); - - wrqu->data.length = strlen(extra); - wrqu->data.flags = 0; return 0; - -#endif } diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index ad1e8106d6a9..16571aa2083d 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -3210,12 +3210,6 @@ extern int rtllib_parse_info_param(struct rtllib_device *ieee, struct rtllib_rx_stats *stats); void rtllib_indicate_packets(struct rtllib_device *ieee, struct rtllib_rxb** prxbIndicateArray,u8 index); -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) -extern void IbssAgeFunction(struct rtllib_device *ieee); -extern struct sta_info *GetStaInfo(struct rtllib_device *ieee, u8 *addr); -extern void DelStaInfoList(struct rtllib_device *ieee); -extern void DelStaInfo(struct rtllib_device *ieee, u8 *addr); -#endif extern u8 HTFilterMCSRate( struct rtllib_device* ieee, u8* pSupportMCS, u8* pOperateMCS); extern void HTUseDefaultSetting(struct rtllib_device* ieee); #define RT_ASOC_RETRY_LIMIT 5 diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index 4c3590b4a96a..e11d9a3d9ff6 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -1608,9 +1608,6 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, struct net_device *dev = ieee->dev; struct rtllib_hdr_4addr *hdr = (struct rtllib_hdr_4addr *)skb->data; struct rtllib_crypt_data *crypt = NULL; -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) - struct sta_info * psta = NULL; -#endif struct rtllib_rxb* rxb = NULL; PRX_TS_RECORD pTS = NULL; u16 fc, sc, SeqNum = 0; @@ -1695,14 +1692,6 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, } } -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) - if (ieee->iw_mode == IW_MODE_ADHOC){ - psta = GetStaInfo(ieee, src); - if (NULL != psta) - psta->LastActiveTime = jiffies; - } -#endif - /* Get crypt if encrypted */ ret = rtllib_rx_get_crypt(ieee, skb, &crypt, hdrlen); if (ret == -1) @@ -2935,231 +2924,6 @@ static inline int is_beacon(__le16 fc) return (WLAN_FC_GET_STYPE(le16_to_cpu(fc)) == RTLLIB_STYPE_BEACON); } -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) -u8 AsocEntry_ComputeSum(u8 *paddr) -{ - u32 sum; - - sum = paddr[0]+ - paddr[1]+ - paddr[2]+ - paddr[3]+ - paddr[4]+ - paddr[5]; - - return (u8)(sum % PEER_MAX_ASSOC); -} -u8 AsocEntry_AssignAvailableAID(struct rtllib_device *ieee, u8 *paddr) -{ - int i; - - for (i = 0; i < PEER_MAX_ASSOC; i++) - { - if (ieee->AvailableAIDTable[i] == 99) - { - ieee->AvailableAIDTable[i] = AsocEntry_ComputeSum(paddr); - return i+1; - } - } - - return 1; -} - -void InitStaInfo(struct rtllib_device *ieee,int index) -{ - int idx = index; - ieee->peer_assoc_list[idx]->StaDataRate = 0; - ieee->peer_assoc_list[idx]->StaSS = 0; - ieee->peer_assoc_list[idx]->RetryFrameCnt = 0; - ieee->peer_assoc_list[idx]->NoRetryFrameCnt = 0; - ieee->peer_assoc_list[idx]->LastRetryCnt = 0; - ieee->peer_assoc_list[idx]->LastNoRetryCnt = 0; - ieee->peer_assoc_list[idx]->AvgRetryRate = 0; - ieee->peer_assoc_list[idx]->LastRetryRate = 0; - ieee->peer_assoc_list[idx]->txRateIndex = 11; - ieee->peer_assoc_list[idx]->APDataRate = 0x2; - ieee->peer_assoc_list[idx]->ForcedDataRate = 0x2; - -} -static u8 IsStaInfoExist(struct rtllib_device *ieee, u8 *addr) -{ - int k=0; - struct sta_info * psta = NULL; - u8 sta_idx = PEER_MAX_ASSOC; - - for (k=0; kpeer_assoc_list[k]; - if (NULL != psta) - { - if (memcmp(addr, psta->macaddr, ETH_ALEN) == 0) - { - sta_idx = k; - break; - } - } - } - return sta_idx; -} -static u8 GetFreeStaInfoIdx(struct rtllib_device *ieee, u8 *addr) -{ - int k = 0; - while((ieee->peer_assoc_list[k] != NULL) && (k < PEER_MAX_ASSOC)) - k++; - printk("%s: addr:"MAC_FMT" index: %d\n", __func__, MAC_ARG(addr), k); - return k; -} -struct sta_info *GetStaInfo(struct rtllib_device *ieee, u8 *addr) -{ - int k=0; - struct sta_info * psta = NULL; - struct sta_info * psta_find = NULL; - - for (k=0; kpeer_assoc_list[k]; - if (NULL != psta) - { - if (memcmp(addr, psta->macaddr, ETH_ALEN) == 0) - { - psta_find = psta; - break; - } - } - } - return psta_find; -} -void DelStaInfoList(struct rtllib_device *ieee) -{ - int idx = 0; - struct sta_info * AsocEntry = NULL; - - atomic_set(&ieee->AsocEntryNum, 0); - for (idx=0; idxpeer_assoc_list[idx]; - if (NULL != AsocEntry){ - kfree(AsocEntry); - ieee->peer_assoc_list[idx] = NULL; - } - ieee->AvailableAIDTable[idx] = 99; - } -} -void DelStaInfo(struct rtllib_device *ieee, u8 *addr) -{ - struct sta_info * psta = NULL; - int k=0; - - for (k=0; kpeer_assoc_list[k]; - if (NULL != psta){ - if (memcmp(addr, psta->macaddr, ETH_ALEN) == 0){ - if (psta->aid > 0 && psta->aid-1 < PEER_MAX_ASSOC) - ieee->AvailableAIDTable[psta->aid-1] = 99; - else - printk("%s(): clear non-existing entry AID\n", __func__); - - kfree(psta); - ieee->peer_assoc_list[k] = NULL; - atomic_dec(&ieee->AsocEntryNum); - } - } - } -} -void IbssAgeFunction(struct rtllib_device *ieee) -{ - struct sta_info* AsocEntry = NULL; - int idx; - unsigned long CurrentTime; - signed long TimeDifference; - struct rtllib_network *target; - - CurrentTime = jiffies; - - for (idx = 0; idx < PEER_MAX_ASSOC; idx++) - { - AsocEntry = ieee->peer_assoc_list[idx]; - if (AsocEntry) - { - TimeDifference = jiffies_to_msecs(CurrentTime - AsocEntry->LastActiveTime); - - if (TimeDifference > 20000) - { - printk("IbssAgeFunction(): "MAC_FMT" timeout\n", MAC_ARG(AsocEntry->macaddr)); - kfree(AsocEntry); - ieee->peer_assoc_list[idx] = NULL; - atomic_dec(&ieee->AsocEntryNum); - - if (atomic_read(&ieee->AsocEntryNum) == 0){ - - down(&ieee->wx_sem); - rtllib_stop_protocol(ieee,true); - - list_for_each_entry(target, &ieee->network_list, list) { - if (is_same_network(target, &ieee->current_network,(target->ssid_len?1:0))){ - printk("delete sta of previous Ad-hoc\n"); - list_del(&target->list); - break; - } - } - - rtllib_start_protocol(ieee); - up(&ieee->wx_sem); - } - } - } - } - -#ifdef TO_DO_LIST - if (AsocEntry_AnyStationAssociated(pMgntInfo)==false) - DrvIFIndicateDisassociation(Adapter, unspec_reason); - - if (pMgntInfo->dot11CurrentWirelessMode == WIRELESS_MODE_G || - (IS_WIRELESS_MODE_N_24G(Adapter) && pMgntInfo->pHTInfo->bCurSuppCCK) ) - { - if (nBModeStaCnt == 0) - { - pMgntInfo->bUseProtection = false; - ActUpdate_mCapInfo(Adapter, pMgntInfo->mCap); - } - } - - if (IS_WIRELESS_MODE_N_24G(Adapter) || IS_WIRELESS_MODE_N_5G(Adapter) ) - { - if (nLegacyStaCnt > 0) - { - pMgntInfo->pHTInfo->CurrentOpMode = HT_OPMODE_MIXED; - } - else - { - if ((pMgntInfo->pHTInfo->bCurBW40MHz) && (n20MHzStaCnt > 0)) - pMgntInfo->pHTInfo->CurrentOpMode = HT_OPMODE_40MHZ_PROTECT; - else - pMgntInfo->pHTInfo->CurrentOpMode = HT_OPMODE_NO_PROTECT; - - } - } - - if (IS_WIRELESS_MODE_G(Adapter) || - (IS_WIRELESS_MODE_N_24G(Adapter) && pMgntInfo->pHTInfo->bCurSuppCCK)) - { - if (pMgntInfo->bUseProtection) - { - u8 CckRate[4] = { MGN_1M, MGN_2M, MGN_5_5M, MGN_11M }; - OCTET_STRING osCckRate; - FillOctetString(osCckRate, CckRate, 4); - FilterSupportRate(pMgntInfo->mBrates, &osCckRate, false); - Adapter->HalFunc.SetHwRegHandler(Adapter, HW_VAR_BASIC_RATE, (pu1Byte)&osCckRate); - } - else - { - Adapter->HalFunc.SetHwRegHandler( Adapter, HW_VAR_BASIC_RATE, (pu1Byte)(&pMgntInfo->mBrates) ); - } - } -#endif -} -#endif - static int IsPassiveChannel( struct rtllib_device *rtllib, u8 channel) { if (MAX_CHANNEL_NUMBER < channel) { @@ -3258,76 +3022,6 @@ static inline void rtllib_process_probe_response( * already there. */ spin_lock_irqsave(&ieee->lock, flags); -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) - if (is_beacon(beacon->header.frame_ctl)){ - if ((ieee->iw_mode == IW_MODE_ADHOC) && (ieee->state == RTLLIB_LINKED)) - { - if ((network->ssid_len == ieee->current_network.ssid_len) - && (!memcmp(network->ssid,ieee->current_network.ssid,ieee->current_network.ssid_len)) - && (network->channel == ieee->current_network.channel) - && (ieee->current_network.channel > 0) - && (ieee->current_network.channel <= 14)) - { - if (!memcmp(ieee->current_network.bssid,network->bssid,6)) - { - int idx = 0; - struct rtllib_hdr_3addr* header = NULL; - int idx_exist = 0; - if (timer_pending(&ieee->ibss_wait_timer)) - del_timer_sync(&ieee->ibss_wait_timer); - header = (struct rtllib_hdr_3addr*)&(beacon->header); - idx_exist = IsStaInfoExist(ieee,header->addr2); - if (idx_exist >= PEER_MAX_ASSOC) { - idx = GetFreeStaInfoIdx(ieee, header->addr2); - } else { - ieee->peer_assoc_list[idx_exist]->LastActiveTime = jiffies; - goto no_alloc; - } - if (idx >= PEER_MAX_ASSOC - 1) { - printk("\n%s():ERR!!!Buffer overflow - could not append!!!",__func__); - goto free_network; - } else { - ieee->peer_assoc_list[idx] = (struct sta_info *)kmalloc(sizeof(struct sta_info), GFP_ATOMIC); - memset(ieee->peer_assoc_list[idx], 0, sizeof(struct sta_info)); - ieee->peer_assoc_list[idx]->LastActiveTime = jiffies; - memcpy(ieee->peer_assoc_list[idx]->macaddr,header->addr2,ETH_ALEN); - ieee->peer_assoc_list[idx]->ratr_index = 8; - InitStaInfo(ieee,idx); - atomic_inc(&ieee->AsocEntryNum); - ieee->peer_assoc_list[idx]->aid = AsocEntry_AssignAvailableAID(ieee, ieee->peer_assoc_list[idx]->macaddr); - ieee->check_ht_cap(ieee->dev,ieee->peer_assoc_list[idx],network); - queue_delayed_work_rsl(ieee->wq, &ieee->update_assoc_sta_info_wq, 0); - ieee->Adhoc_InitRateAdaptive(ieee->dev,ieee->peer_assoc_list[idx]); - } - } - } - } - } - if (ieee->iw_mode == IW_MODE_ADHOC){ - if ((network->ssid_len == ieee->current_network.ssid_len) - && (!memcmp(network->ssid,ieee->current_network.ssid,ieee->current_network.ssid_len)) - && (network->capability & WLAN_CAPABILITY_IBSS) - && (ieee->state == RTLLIB_LINKED_SCANNING)) - { - if (memcmp(ieee->current_network.bssid,network->bssid,6)) - { - printk("%s(): SSID matched but BSSID mismatched.\n",__func__); - - ieee->TargetTsf = beacon->time_stamp[1]; - ieee->TargetTsf <<= 32; - ieee->TargetTsf |= beacon->time_stamp[0]; - - ieee->CurrTsf = stats->TimeStampLow; - - queue_delayed_work_rsl(ieee->wq, &ieee->check_tsf_wq, 0); - } - } - } -#endif -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) -no_alloc: - if (ieee->iw_mode == IW_MODE_INFRA) -#endif { if (is_same_network(&ieee->current_network, network, (network->ssid_len?1:0))) { update_network(&ieee->current_network, network); @@ -3345,14 +3039,6 @@ no_alloc: } } } -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) - else if (ieee->iw_mode == IW_MODE_ADHOC) - { - if (is_same_network(&ieee->current_network, network, (network->ssid_len?1:0))) { - update_ibss_network(&ieee->current_network, network); - } - } -#endif list_for_each_entry(target, &ieee->network_list, list) { if (is_same_network(target, network,(target->ssid_len?1:0))) break; diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index dadb5430bfab..c9c5df4c9948 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -1066,14 +1066,6 @@ static struct sk_buff* rtllib_probe_resp(struct rtllib_device *ieee, u8 *dest) *(tag++) = 1; *(tag++) = erpinfo_content; } -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) - if (tmp_ht_cap_len){ - *(tag++) = MFIE_TYPE_HT_CAP; - *(tag++) = tmp_ht_cap_len - 2; - memcpy(tag, tmp_ht_cap_buf, tmp_ht_cap_len - 2); - tag += tmp_ht_cap_len - 2; - } -#endif if (rate_ex_len){ *(tag++) = MFIE_TYPE_RATES_EX; *(tag++) = rate_ex_len-2; @@ -1081,15 +1073,6 @@ static struct sk_buff* rtllib_probe_resp(struct rtllib_device *ieee, u8 *dest) tag+=rate_ex_len-2; } -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) - if (tmp_ht_info_len){ - *(tag++) = MFIE_TYPE_HT_INFO; - *(tag++) = tmp_ht_info_len - 2; - memcpy(tag, tmp_ht_info_buf, tmp_ht_info_len -2); - tag += tmp_ht_info_len - 2; - } -#endif - if (wpa_ie_len) { if (ieee->iw_mode == IW_MODE_ADHOC) @@ -1100,23 +1083,6 @@ static struct sk_buff* rtllib_probe_resp(struct rtllib_device *ieee, u8 *dest) tag += ieee->wpa_ie_len; } -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) - if (tmp_generic_ie_len) - { - (*tag++) = 0xdd; - (*tag++) = tmp_generic_ie_len - 2; - memcpy(tag,tmp_generic_ie_buf,tmp_generic_ie_len -2); - tag += tmp_generic_ie_len -2; - - } -#endif - -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) - if (wmm_len) { - memcpy(tag,wmmie,wmm_len); - tag += wmm_len; - } -#endif return skb; } @@ -2154,20 +2120,10 @@ static inline u16 assoc_parse(struct rtllib_device *ieee, struct sk_buff *skb, i void rtllib_rx_probe_rq(struct rtllib_device *ieee, struct sk_buff *skb) { u8 dest[ETH_ALEN]; -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) - struct sta_info *psta = NULL; -#endif ieee->softmac_stats.rx_probe_rq++; if (probe_rq_parse(ieee, skb, dest) > 0){ ieee->softmac_stats.tx_probe_rs++; rtllib_resp_to_probe(ieee, dest); -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) - if (ieee->iw_mode == IW_MODE_ADHOC){ - psta = GetStaInfo(ieee, dest); - if (NULL != psta) - psta->LastActiveTime = jiffies; - } -#endif } } @@ -3040,17 +2996,8 @@ void rtllib_start_ibss_wq(void *data) ieee->rate = 22; } -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) -#ifdef ADHOC_11N - ieee->current_network.qos_data.supported = 1; -#else - ieee->current_network.qos_data.supported = 0; -#endif - ieee->SetWirelessMode(ieee->dev, ieee->mode); -#else ieee->current_network.qos_data.supported = 0; ieee->SetWirelessMode(ieee->dev, IEEE_G); -#endif ieee->current_network.mode = ieee->mode; ieee->current_network.atim_window = 0; ieee->current_network.capability = WLAN_CAPABILITY_IBSS; diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c index d88bb109a31e..01f22045000d 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -239,22 +239,7 @@ int rtllib_wx_get_rate(struct rtllib_device *ieee, union iwreq_data *wrqu, char *extra) { u32 tmp_rate = 0; -#if defined RTL8192SU - if (ieee->mode & (IEEE_A | IEEE_B | IEEE_G)) - tmp_rate = ieee->rate; - else if (ieee->mode & IEEE_N_5G) - tmp_rate = 580; - else if (ieee->mode & IEEE_N_24G) { - if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev)) - tmp_rate = HTHalfMcsToDataRate(ieee, 15); - else - tmp_rate = HTMcsToDataRate(ieee, 15); - } -#elif defined RTL8192SE || defined RTL8192CE - tmp_rate = ieee->rtl_11n_user_show_rates(ieee->dev); -#else tmp_rate = TxCountToDataRate(ieee, ieee->softmac_stats.CurrentShowTxate); -#endif wrqu->bitrate.value = tmp_rate * 500000; return 0; diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c index 78b1707b12ae..7662bf5bf3e7 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -449,53 +449,7 @@ void rtllib_query_BandwidthMode(struct rtllib_device* ieee, cb_desc *tcb_desc) tcb_desc->bPacketBW = true; return; } -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) -extern void rtllib_ibss_query_HTCapShortGI(struct rtllib_device *ieee, cb_desc *tcb_desc,u8 is_peer_shortGI_40M,u8 is_peer_shortGI_20M) -{ - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - - tcb_desc->bUseShortGI = false; - - if (!pHTInfo->bCurrentHTSupport||!pHTInfo->bEnableHT || (ieee->iw_mode != IW_MODE_ADHOC)) - { - return; - } - if (pHTInfo->bForcedShortGI) - { - tcb_desc->bUseShortGI = true; - return; - } - if ((pHTInfo->bCurBW40MHz==true) && is_peer_shortGI_40M) - tcb_desc->bUseShortGI = true; - else if ((pHTInfo->bCurBW40MHz==false) && is_peer_shortGI_20M) - tcb_desc->bUseShortGI = true; -} -void rtllib_ibss_query_BandwidthMode(struct rtllib_device* ieee, cb_desc *tcb_desc, u8 is_peer_40M) -{ - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - - tcb_desc->bPacketBW = false; - - if (!pHTInfo->bCurrentHTSupport||!pHTInfo->bEnableHT || (ieee->iw_mode != IW_MODE_ADHOC)) - { - return; - } - - if (tcb_desc->bMulticast || tcb_desc->bBroadcast) - { - return; - } - - if ((tcb_desc->data_rate & 0x80)==0) - { - return; - } - if (pHTInfo->bCurBW40MHz && is_peer_40M && !ieee->bandwidth_auto_switch.bforced_tx20Mhz) - tcb_desc->bPacketBW = true; - return; -} -#endif void rtllib_query_protectionmode(struct rtllib_device* ieee, cb_desc* tcb_desc, struct sk_buff* skb) { tcb_desc->bRTSSTBC = false; @@ -596,11 +550,7 @@ NO_PROTECTION: } -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) -void rtllib_txrate_selectmode(struct rtllib_device* ieee, cb_desc* tcb_desc,struct sta_info *psta) -#else void rtllib_txrate_selectmode(struct rtllib_device* ieee, cb_desc* tcb_desc) -#endif { #ifdef TO_DO_LIST if (!IsDataFrame(pFrame)) @@ -1000,62 +950,6 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) tcb_desc->bMulticast = 1; if (is_broadcast_ether_addr(header.addr1)) tcb_desc->bBroadcast = 1; -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) - if ( tcb_desc->bMulticast || tcb_desc->bBroadcast){ - rtllib_txrate_selectmode(ieee, tcb_desc, p_sta); - tcb_desc->data_rate = ieee->basic_rate; - } - else - { - if (ieee->iw_mode == IW_MODE_ADHOC) - { - u8 is_peer_shortGI_40M = 0; - u8 is_peer_shortGI_20M = 0; - u8 is_peer_BW_40M = 0; - p_sta = GetStaInfo(ieee, header.addr1); - if (NULL == p_sta) - { - rtllib_txrate_selectmode(ieee, tcb_desc, p_sta); - tcb_desc->data_rate = ieee->rate; - } - else - { - rtllib_txrate_selectmode(ieee, tcb_desc, p_sta); - tcb_desc->data_rate = CURRENT_RATE(p_sta->wireless_mode, p_sta->CurDataRate, p_sta->htinfo.HTHighestOperaRate); - is_peer_shortGI_40M = p_sta->htinfo.bCurShortGI40MHz; - is_peer_shortGI_20M = p_sta->htinfo.bCurShortGI20MHz; - is_peer_BW_40M = p_sta->htinfo.bCurTxBW40MHz; - } - rtllib_qurey_ShortPreambleMode(ieee, tcb_desc); - rtllib_tx_query_agg_cap(ieee, txb->fragments[0], tcb_desc); - rtllib_ibss_query_HTCapShortGI(ieee, tcb_desc,is_peer_shortGI_40M,is_peer_shortGI_20M); - rtllib_ibss_query_BandwidthMode(ieee, tcb_desc,is_peer_BW_40M); - rtllib_query_protectionmode(ieee, tcb_desc, txb->fragments[0]); - } - else { - rtllib_txrate_selectmode(ieee, tcb_desc, p_sta); - tcb_desc->data_rate = CURRENT_RATE(ieee->mode, ieee->rate, ieee->HTCurrentOperaRate); - if (bdhcp == true){ - if (ieee->pHTInfo->IOTAction & HT_IOT_ACT_WA_IOT_Broadcom) { - tcb_desc->data_rate = MGN_1M; - tcb_desc->bTxDisableRateFallBack = false; - }else{ - tcb_desc->data_rate = MGN_1M; - tcb_desc->bTxDisableRateFallBack = 1; - } - - tcb_desc->RATRIndex = 7; - tcb_desc->bTxUseDriverAssingedRate = 1; - tcb_desc->bdhcp = 1; - } - rtllib_qurey_ShortPreambleMode(ieee, tcb_desc); - rtllib_tx_query_agg_cap(ieee, txb->fragments[0], tcb_desc); - rtllib_query_HTCapShortGI(ieee, tcb_desc); - rtllib_query_BandwidthMode(ieee, tcb_desc); - rtllib_query_protectionmode(ieee, tcb_desc, txb->fragments[0]); - } - } -#else rtllib_txrate_selectmode(ieee, tcb_desc); if ( tcb_desc->bMulticast || tcb_desc->bBroadcast) tcb_desc->data_rate = ieee->basic_rate; @@ -1083,7 +977,6 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) rtllib_query_HTCapShortGI(ieee, tcb_desc); rtllib_query_BandwidthMode(ieee, tcb_desc); rtllib_query_protectionmode(ieee, tcb_desc, txb->fragments[0]); -#endif } } spin_unlock_irqrestore(&ieee->lock, flags); -- cgit v1.2.3-59-g8ed1b From b355c1d0bceee3276b406327c6f1765c73901ab0 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Mon, 11 Jul 2011 22:37:27 -0500 Subject: staging: rtl8192e: Remove dead code associated with RTL8192CE The vendor code will generate several different drivers. As the RTL8192CE is covered by a mac80211 driver in mainline, eliminate that code here. Signed-off-by: Larry Finger --- drivers/staging/rtl8192e/r8192E_dev.c | 21 ---------- drivers/staging/rtl8192e/rtl819x_HT.h | 4 -- drivers/staging/rtl8192e/rtl819x_HTProc.c | 33 --------------- drivers/staging/rtl8192e/rtl_core.c | 67 +------------------------------ drivers/staging/rtl8192e/rtl_debug.h | 4 -- 5 files changed, 1 insertion(+), 128 deletions(-) (limited to 'drivers/staging/rtl8192e/rtl_debug.h') diff --git a/drivers/staging/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/r8192E_dev.c index 7ec2fd97ebe1..3ced5d2fff92 100644 --- a/drivers/staging/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/r8192E_dev.c @@ -2196,11 +2196,7 @@ void rtl8192_EnableInterrupt(struct net_device *dev) struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); priv->irq_enabled = 1; -#ifdef RTL8192CE - write_nic_dword(dev, REG_HIMR, priv->irq_mask[0]&0xFFFFFFFF); -#else write_nic_dword(dev,INTA_MASK, priv->irq_mask[0]); -#endif } @@ -2208,11 +2204,7 @@ void rtl8192_DisableInterrupt(struct net_device *dev) { struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); -#ifdef RTL8192CE - write_nic_dword(dev, REG_HIMR, IMR8190_DISABLED); -#else write_nic_dword(dev,INTA_MASK,0); -#endif priv->irq_enabled = 0; } @@ -2220,14 +2212,8 @@ void rtl8192_DisableInterrupt(struct net_device *dev) void rtl8192_ClearInterrupt(struct net_device *dev) { u32 tmp = 0; -#ifdef RTL8192CE - tmp = read_nic_dword(dev, REG_HISR); - write_nic_dword(dev, REG_HISR, tmp); -#else tmp = read_nic_dword(dev, ISR); write_nic_dword(dev, ISR, tmp); -#endif - } @@ -2253,17 +2239,10 @@ void rtl8192_beacon_disable(struct net_device *dev) struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); u32 reg; -#ifdef RTL8192CE - reg = read_nic_dword(priv->rtllib->dev,REG_HIMR); - - reg &= ~(IMR_BcnInt | IMR_BcnInt | IMR_TBDOK | IMR_TBDER); - write_nic_dword(priv->rtllib->dev, REG_HIMR, reg); -#else reg = read_nic_dword(priv->rtllib->dev,INTA_MASK); reg &= ~(IMR_BcnInt | IMR_BcnInt | IMR_TBDOK | IMR_TBDER); write_nic_dword(priv->rtllib->dev, INTA_MASK, reg); -#endif } void rtl8192_interrupt_recognized(struct net_device *dev, u32 *p_inta, u32 *p_intb) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index 15878ad01d7f..703d9dde5708 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -305,10 +305,6 @@ typedef struct _RT_HIGH_THROUGHPUT{ u8 bWAIotBroadcom; u8 WAIotTH; -#ifdef RTL8192CE - u8 bRDGEnable; -#endif - u8 bAcceptAddbaReq; } __attribute__ ((packed)) RT_HIGH_THROUGHPUT, *PRT_HIGH_THROUGHPUT; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index 62dd0976e44f..0e7f078c05c3 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -64,10 +64,6 @@ void HTUpdateDefaultSetting(struct rtllib_device* ieee) { PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; -#ifdef RTL8192CE - pHTInfo->bRDGEnable = 0; -#endif - pHTInfo->bAcceptAddbaReq = 1; pHTInfo->bRegShortGI20MHz= 1; @@ -423,19 +419,6 @@ bool HTIOTActIsDisableMCSTwoSpatialStream(struct rtllib_device* ieee) retValue = false; } } -#endif -#if defined(RTL8192SU) || defined RTL8192CE - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - if (ieee->rtllib_ap_sec_type && - (ieee->rtllib_ap_sec_type(ieee)&(SEC_ALG_WEP|SEC_ALG_TKIP))) - { - if ( (pHTInfo->IOTPeer != HT_IOT_PEER_ATHEROS) && - (pHTInfo->IOTPeer != HT_IOT_PEER_UNKNOWN) && - (pHTInfo->IOTPeer != HT_IOT_PEER_MARVELL) && - (pHTInfo->IOTPeer != HT_IOT_PEER_REALTEK_92SE) && - (pHTInfo->IOTPeer != HT_IOT_PEER_RALINK) ) - retValue = true; - } #endif return retValue; } @@ -453,10 +436,6 @@ bool HTIOTActIsEnableBETxOPLimit(struct rtllib_device* ieee) #if defined RTL8192SU if (ieee->mode == IEEE_G) retValue = true; -#elif defined RTL8192CE - if (ieee->mode == IEEE_G || - (ieee->rtllib_ap_sec_type(ieee)&(SEC_ALG_WEP|SEC_ALG_TKIP))) - retValue = true; #endif return retValue; @@ -564,14 +543,6 @@ u8 pHTInfo->IOTPeer==HT_IOT_PEER_RALINK) return 1; - } -#elif defined RTL8192CE - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - { - if (pHTInfo->IOTPeer==HT_IOT_PEER_ATHEROS || - pHTInfo->IOTPeer==HT_IOT_PEER_RALINK) - return 1; - } #endif return retValue; @@ -832,11 +803,7 @@ void HTConstructRT2RTAggElement(struct rtllib_device* ieee, u8* posRT2RTAgg, u8* *posRT2RTAgg++ = 0x02; *posRT2RTAgg++ = 0x01; -#ifdef RTL8192CE - *posRT2RTAgg = 0x70; -#else *posRT2RTAgg = 0x30; -#endif if (ieee->bSupportRemoteWakeUp) { *posRT2RTAgg |= RT_HT_CAP_USE_WOW; diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c index 372f946de70c..5dbf3740195a 100644 --- a/drivers/staging/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl_core.c @@ -51,9 +51,7 @@ #include "r8192E_cmdpkt.h" #include "rtl_wx.h" -#ifndef RTL8192CE #include "rtl_dm.h" -#endif #ifdef CONFIG_PM_RTL #include "rtl_pm.h" @@ -330,10 +328,6 @@ void write_nic_byte(struct net_device *dev, int x,u8 y) writeb(y,(u8*)dev->mem_start +x); udelay(20); - -#if defined RTL8192CE - read_nic_byte(dev, x); -#endif } void write_nic_dword(struct net_device *dev, int x,u32 y) @@ -341,10 +335,6 @@ void write_nic_dword(struct net_device *dev, int x,u32 y) writel(y,(u8*)dev->mem_start +x); udelay(20); - -#if defined RTL8192CE - read_nic_dword(dev, x); -#endif } void write_nic_word(struct net_device *dev, int x,u16 y) @@ -352,10 +342,6 @@ void write_nic_word(struct net_device *dev, int x,u16 y) writew(y,(u8*)dev->mem_start +x); udelay(20); - -#if defined RTL8192CE - read_nic_word(dev, x); -#endif } /**************************************************************************** @@ -378,9 +364,7 @@ MgntActSet_RF_State( unsigned long flag; RT_TRACE((COMP_PS | COMP_RF), "===>MgntActSet_RF_State(): StateToSet(%d)\n",StateToSet); -#ifndef RTL8192CE ProtectOrNot = false; -#endif if (!ProtectOrNot) @@ -957,12 +941,6 @@ void rtl8192_refresh_supportrate(struct r8192_priv* priv) memcpy(ieee->Regdot11HTOperationalRateSet, ieee->RegHTSuppRateSet, 16); memcpy(ieee->Regdot11TxHTOperationalRateSet, ieee->RegHTSuppRateSet, 16); -#ifdef RTL8192CE - if (priv->rf_type == RF_1T1R) { - ieee->Regdot11HTOperationalRateSet[1] = 0; - } -#endif - } else { memset(ieee->Regdot11HTOperationalRateSet, 0, 16); } @@ -1208,23 +1186,6 @@ static void rtl8192_init_priv_constant(struct net_device* dev) pPSC->RegMaxLPSAwakeIntvl = 5; -#ifdef RTL8192CE - priv->bWEPinNmodeFromReg = 0; - priv->bTKIPinNmodeFromReg = 0; - - priv->RegAMDPciASPM = 0; - - priv->RegPciASPM = 3; - - priv->RegDevicePciASPMSetting = 0x03; - - priv->RegHostPciASPMSetting = 0x02; - - priv->RegHwSwRfOffD3 = 0; - - priv->RegSupportPciASPM = 1; - -#elif defined RTL8192E priv->RegPciASPM = 2; priv->RegDevicePciASPMSetting = 0x03; @@ -1234,8 +1195,6 @@ static void rtl8192_init_priv_constant(struct net_device* dev) priv->RegHwSwRfOffD3 = 2; priv->RegSupportPciASPM = 2; - -#endif } @@ -2326,15 +2285,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb) spin_unlock_irqrestore(&priv->irq_th_lock,flags); dev->trans_start = jiffies; -#ifdef RTL8192CE - if (tcb_desc->queue_index == BEACON_QUEUE){ - write_nic_word(dev, REG_PCIE_CTRL_REG, BIT4); - }else{ - write_nic_word(dev, REG_PCIE_CTRL_REG, BIT0<<(tcb_desc->queue_index)); - } -#else - write_nic_word(dev,TPPoll,0x01<queue_index); -#endif + write_nic_word(dev,TPPoll,0x01<queue_index); return 0; } @@ -2641,11 +2592,7 @@ void rtl8192_rx_normal(struct net_device *dev) skb_len = skb->len; -#ifdef RTL8192CE - if (!stats.bCRC) -#else if (1) -#endif { if (!rtllib_rx(priv->rtllib, skb, &stats)){ dev_kfree_skb_any(skb); @@ -2716,9 +2663,7 @@ void rtl8192_irq_rx_tasklet(struct r8192_priv *priv) if (MAX_RX_QUEUE > 1) rtl8192_rx_cmd(priv->rtllib->dev); -#ifndef RTL8192CE write_nic_dword(priv->rtllib->dev, INTA_MASK,read_nic_dword(priv->rtllib->dev, INTA_MASK) | IMR_RDU); -#endif } /**************************************************************************** @@ -3100,12 +3045,10 @@ irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs) spin_lock_irqsave(&priv->irq_th_lock,flags); } -#ifndef RTL8192CE if (inta & IMR_COMDOK) { priv->stats.txcmdpktokint++; rtl8192_tx_isr(dev,TXCMD_QUEUE); } -#endif if (inta & IMR_HIGHDOK) { rtl8192_tx_isr(dev,HIGH_QUEUE); @@ -3128,9 +3071,7 @@ irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs) if (inta & IMR_RDU) { RT_TRACE(COMP_INTR, "rx descriptor unavailable!\n"); priv->stats.rxrdu++; -#ifndef RTL8192CE write_nic_dword(dev,INTA_MASK,read_nic_dword(dev, INTA_MASK) & ~IMR_RDU); -#endif tasklet_schedule(&priv->irq_rx_tasklet); } @@ -3256,15 +3197,9 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev, else priv->rtllib->bSupportRemoteWakeUp = 0; -#ifdef RTL8192CE - pmem_start = pci_resource_start(pdev, 2); - pmem_len = pci_resource_len(pdev, 2); - pmem_flags = pci_resource_flags (pdev, 2); -#else pmem_start = pci_resource_start(pdev, 1); pmem_len = pci_resource_len(pdev, 1); pmem_flags = pci_resource_flags (pdev, 1); -#endif if (!(pmem_flags & IORESOURCE_MEM)) { RT_TRACE(COMP_ERR,"region #1 not a MMIO resource, aborting"); diff --git a/drivers/staging/rtl8192e/rtl_debug.h b/drivers/staging/rtl8192e/rtl_debug.h index 201279266623..511d96c9141b 100644 --- a/drivers/staging/rtl8192e/rtl_debug.h +++ b/drivers/staging/rtl8192e/rtl_debug.h @@ -277,10 +277,6 @@ void print_buffer(u32 *buffer, int len); void dump_eprom(struct net_device *dev); void rtl8192_dump_reg(struct net_device *dev); -#ifdef RTL8192CE -void rtl8192ce_dump_tx_desc(struct _TX_DESC_8192CE *pDesc); -#endif - /* debugfs stuff */ #ifdef CONFIG_RTLWIFI_DEBUGFS int rtl_debug_module_init(struct r8192_priv *priv, const char *name); -- cgit v1.2.3-59-g8ed1b From 9ab2da30490c095834332aeb3c0a01d1f1ed0fb9 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 14 Jul 2011 18:41:10 -0500 Subject: staging: rtl8192e: Remove dead code associated with RTL819x_DEBUG Signed-off-by: Larry Finger --- drivers/staging/rtl8192e/rtl_debug.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'drivers/staging/rtl8192e/rtl_debug.h') diff --git a/drivers/staging/rtl8192e/rtl_debug.h b/drivers/staging/rtl8192e/rtl_debug.h index 511d96c9141b..2e23bf65a8d7 100644 --- a/drivers/staging/rtl8192e/rtl_debug.h +++ b/drivers/staging/rtl8192e/rtl_debug.h @@ -237,8 +237,6 @@ do { if (rt_global_debug_component & component) \ ##args);\ }while(0); -#define RTL819x_DEBUG -#ifdef RTL819x_DEBUG #define assert(expr) \ if (!(expr)) { \ printk( "Assertion failed! %s,%s,%s,line=%d\n", \ @@ -258,10 +256,6 @@ do { if (rt_global_debug_component & component) \ printk("\n"); \ } \ } while (0) -#else -#define assert(expr) do {} while (0) -#define RT_DEBUG_DATA(level, data, datalen) do {} while(0) -#endif typedef struct _rtl_fs_debug { -- cgit v1.2.3-59-g8ed1b From 5c9e4285b5dac303d0ceffbab5f56d400f6aab1b Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 14 Jul 2011 19:03:29 -0500 Subject: staging: rtl8192e: Remove dead code associated with CONFIG_RTLWIFI_DEBUGFS Signed-off-by: Larry Finger --- drivers/staging/rtl8192e/rtl_core.c | 3 - drivers/staging/rtl8192e/rtl_core.h | 4 - drivers/staging/rtl8192e/rtl_debug.c | 174 ----------------------------------- drivers/staging/rtl8192e/rtl_debug.h | 7 -- drivers/staging/rtl8192e/rtl_ps.c | 5 - 5 files changed, 193 deletions(-) (limited to 'drivers/staging/rtl8192e/rtl_debug.h') diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c index 217b298a9e86..babaf27e8f42 100644 --- a/drivers/staging/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl_core.c @@ -1718,9 +1718,6 @@ void rtl819x_watchdog_wqcallback(void *data) if ((ieee->iw_mode == IW_MODE_INFRA) && (ieee->state == RTLLIB_NOLINK) &&\ (ieee->eRFPowerState == eRfOn)&&!ieee->is_set_key &&\ (!ieee->proto_stoppping) && !ieee->wx_set_enc -#ifdef CONFIG_RTLWIFI_DEBUGFS - && (!priv->debug->hw_holding) -#endif ){ if ((ieee->PowerSaveControl.ReturnPoint == IPS_CALLBACK_NONE)&& (!ieee->bNetPromiscuousMode)) diff --git a/drivers/staging/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl_core.h index 99a40a00d312..c7e2f87268ef 100644 --- a/drivers/staging/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl_core.h @@ -590,10 +590,6 @@ typedef struct r8192_priv struct rtl819x_ops *ops; struct rtllib_device *rtllib; -#ifdef CONFIG_RTLWIFI_DEBUGFS - rtl_fs_debug *debug; -#endif /* CONFIG_IWLWIFI_DEBUGFS */ - work_struct_rsl reset_wq; LOG_INTERRUPT_8190_T InterruptLog; diff --git a/drivers/staging/rtl8192e/rtl_debug.c b/drivers/staging/rtl8192e/rtl_debug.c index 7381fd6a3bc0..91b2daa523a1 100644 --- a/drivers/staging/rtl8192e/rtl_debug.c +++ b/drivers/staging/rtl8192e/rtl_debug.c @@ -109,180 +109,6 @@ void rtl8192_dump_reg(struct net_device *dev) printk("\n"); } -#ifdef CONFIG_RTLWIFI_DEBUGFS -/* debugfs related stuff */ -static struct dentry *rtl_debugfs_root; -static int rtl_dbgfs_open(struct inode *inode, struct file *file) -{ - file->private_data = inode->i_private; - return 0; -} - -static ssize_t rtl_dbgfs_register_write(struct file *file, - const char __user *user_buf, - size_t count, - loff_t *ppos) -{ - struct r8192_priv *priv = (struct r8192_priv *)file->private_data; - char buf[32]; - int buf_size; - u32 type, offset; - - memset(buf, 0, sizeof(buf)); - buf_size = min(count, sizeof(buf) - 1); - if (copy_from_user(buf, user_buf, buf_size)) - return -EFAULT; - - if (sscanf(buf, "%x,%x", &type, &offset ) == 2) { - priv->debug->hw_type = type; - priv->debug->hw_offset = offset; - } else { - priv->debug->hw_type = 0; - priv->debug->hw_offset = 0; - } - - return count; -} - -void rtl_hardware_grab(struct net_device *dev) -{ - struct r8192_priv *priv = rtllib_priv(dev); - int t = 0; - int timeout = 20; - u32 mask = RF_CHANGE_BY_HW|RF_CHANGE_BY_PS|RF_CHANGE_BY_IPS; - - priv->debug->hw_holding = true; - rtllib_ips_leave_wq(dev); - do { - if ((priv->rtllib->RfOffReason & mask)) { - msleep(100); - t++; - } else { - return; - } - } while (t < timeout); - - return; -} - -static ssize_t rtl_dbgfs_register_read(struct file *file, - char __user *user_buf, - size_t count, - loff_t *ppos) -{ - struct r8192_priv *priv = (struct r8192_priv *)file->private_data; - struct net_device *dev = priv->rtllib->dev; - ssize_t ret = 0; - char buf[2048]; - int n,i; - u32 len = 0; - u32 max = 0xff; - u32 page_no, path; - - rtl_hardware_grab(dev); - - if (!priv->debug->hw_type) { - page_no = (priv->debug->hw_offset > 0x0f)? 0x0f: priv->debug->hw_offset; - { - len += snprintf(buf + len,count - len, - "\n#################### MAC page- %x##################\n ", page_no); - for (n=0;n<=max;) { - len += snprintf(buf + len, count - len, "\nD: %2x > ",n); - for (i=0;i<16 && n<=max;i++,n++) - len += snprintf(buf + len, count - len, - "%2.2x ",read_nic_byte(dev,((page_no<<8)|n))); - } - } - } else { - path = (priv->debug->hw_offset < RF90_PATH_MAX)? priv->debug->hw_offset:(RF90_PATH_MAX - 1); - len += snprintf(buf + len, count - len, - "\n#################### RF-PATH-%x ##################\n ", 0x0a+path); - for (n=0;n<=max;) { - len += snprintf(buf+ len, count - len, "\nD: %2x > ",n); - for (i=0;i<4 && n<=max;n+=4,i++) - len += snprintf(buf + len, count - len, - "%8.8x ",rtl8192_phy_QueryRFReg(dev, (RF90_RADIO_PATH_E)path,\ - n, bMaskDWord)); - } - } - - priv->debug->hw_holding = false; - - len += snprintf(buf + len, count - len, "\n"); - ret = simple_read_from_buffer(user_buf, count, ppos, buf, len); - return ret; -} - -static const struct file_operations rtl_register_debug = { - .read = rtl_dbgfs_register_read, - .write = rtl_dbgfs_register_write, - .open = rtl_dbgfs_open, - .owner = THIS_MODULE -}; - -int rtl_debug_module_init(struct r8192_priv *priv, const char *name) -{ - rtl_fs_debug *debug; - int ret = 0; - - if (!rtl_debugfs_root) - return -ENOENT; - - debug = kzalloc(sizeof(rtl_fs_debug), GFP_KERNEL); - if (!debug) { - ret = -ENOMEM; - goto err; - } - priv->debug = debug; - - debug->name = name; - debug->dir_drv = debugfs_create_dir(name, rtl_debugfs_root); - if (!debug->dir_drv ) { - ret = -ENOENT; - goto err; - } - - debug->debug_register = debugfs_create_file("debug_register", S_IRUGO, - debug->dir_drv, priv, &rtl_register_debug); - if (!debug->debug_register) { - ret = -ENOENT; - goto err; - } - - return 0; -err: - RT_TRACE(COMP_DBG, "Can't open the debugfs directory\n"); - rtl_debug_module_remove(priv); - return ret; - -} - -void rtl_debug_module_remove(struct r8192_priv *priv) -{ - if (!priv->debug) - return; - debugfs_remove(priv->debug->debug_register); - debugfs_remove(priv->debug->dir_drv); - kfree(priv->debug); - priv->debug = NULL; -} - -int rtl_create_debugfs_root(void) -{ - rtl_debugfs_root = debugfs_create_dir(DRV_NAME, NULL); - if (!rtl_debugfs_root) - return -ENOENT; - - return 0; -} - -void rtl_remove_debugfs_root(void) -{ - debugfs_remove(rtl_debugfs_root); - rtl_debugfs_root = NULL; -} -#endif - /**************************************************************************** -----------------------------PROCFS STUFF------------------------- *****************************************************************************/ diff --git a/drivers/staging/rtl8192e/rtl_debug.h b/drivers/staging/rtl8192e/rtl_debug.h index 2e23bf65a8d7..db8be0e3435a 100644 --- a/drivers/staging/rtl8192e/rtl_debug.h +++ b/drivers/staging/rtl8192e/rtl_debug.h @@ -272,12 +272,6 @@ void dump_eprom(struct net_device *dev); void rtl8192_dump_reg(struct net_device *dev); /* debugfs stuff */ -#ifdef CONFIG_RTLWIFI_DEBUGFS -int rtl_debug_module_init(struct r8192_priv *priv, const char *name); -void rtl_debug_module_remove(struct r8192_priv *priv); -int rtl_create_debugfs_root(void); -void rtl_remove_debugfs_root(void); -#else static inline int rtl_debug_module_init(struct r8192_priv *priv, const char *name) { return 0; } @@ -289,7 +283,6 @@ static inline int rtl_create_debugfs_root(void) { } static inline void rtl_remove_debugfs_root(void) { } -#endif /* proc stuff */ void rtl8192_proc_init_one(struct net_device *dev); diff --git a/drivers/staging/rtl8192e/rtl_ps.c b/drivers/staging/rtl8192e/rtl_ps.c index 39baa596e293..00306293f77d 100644 --- a/drivers/staging/rtl8192e/rtl_ps.c +++ b/drivers/staging/rtl8192e/rtl_ps.c @@ -42,11 +42,6 @@ void rtl8192_hw_sleep_down(struct net_device *dev) spin_unlock_irqrestore(&priv->rf_ps_lock,flags); RT_TRACE(COMP_DBG, "%s()============>come to sleep down\n", __func__); -#ifdef CONFIG_RTLWIFI_DEBUGFS - if (priv->debug->hw_holding) { - return; - } -#endif MgntActSet_RF_State(dev, eRfSleep, RF_CHANGE_BY_PS,false); } -- cgit v1.2.3-59-g8ed1b From 2278a29d7a05a3fad9b07f3b84b14da8dd588031 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Mon, 18 Jul 2011 23:42:24 -0500 Subject: staging: rtl8192e: Convert typedef rtl_fs_debug to struct rtl_fs_debug Remove typedef from struct. Rename struct. Rename uses. Signed-off-by: Larry Finger --- drivers/staging/rtl8192e/rtl_debug.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'drivers/staging/rtl8192e/rtl_debug.h') diff --git a/drivers/staging/rtl8192e/rtl_debug.h b/drivers/staging/rtl8192e/rtl_debug.h index db8be0e3435a..1d4177ef1317 100644 --- a/drivers/staging/rtl8192e/rtl_debug.h +++ b/drivers/staging/rtl8192e/rtl_debug.h @@ -257,15 +257,14 @@ do { if (rt_global_debug_component & component) \ } \ } while (0) -typedef struct _rtl_fs_debug -{ +struct rtl_fs_debug { const char *name; struct dentry *dir_drv; struct dentry *debug_register; u32 hw_type; u32 hw_offset; bool hw_holding; -} rtl_fs_debug; +}; void print_buffer(u32 *buffer, int len); void dump_eprom(struct net_device *dev); -- cgit v1.2.3-59-g8ed1b From d3b2c172518dceed0d1d68f5b90dde5a2f6a438d Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 19 Jul 2011 12:50:41 -0500 Subject: staging: rtl8192e: Prepare header files to ease use of typedef enum conversion The tool that I am using fails for certain conditions. This patch makes trivial changes to the source to allow the tool to work for all cases. I also remove some artifacts left from the typedef struct conversion. Signed-off-by: Larry Finger --- drivers/staging/rtl8192e/r8190P_def.h | 30 ++++++++-------- drivers/staging/rtl8192e/r8192E_cmdpkt.h | 12 +++---- drivers/staging/rtl8192e/r8192E_firmware.h | 20 +++++------ drivers/staging/rtl8192e/r8192E_phy.h | 6 ++-- drivers/staging/rtl8192e/rtl819x_HT.h | 40 +++++++++++----------- drivers/staging/rtl8192e/rtl819x_Qos.h | 18 +++++----- drivers/staging/rtl8192e/rtl_core.h | 30 ++++++++-------- drivers/staging/rtl8192e/rtl_debug.h | 4 +-- drivers/staging/rtl8192e/rtl_dm.h | 55 +++++++++++++++--------------- drivers/staging/rtl8192e/rtllib.h | 55 +++++++++++++++--------------- 10 files changed, 136 insertions(+), 134 deletions(-) (limited to 'drivers/staging/rtl8192e/rtl_debug.h') diff --git a/drivers/staging/rtl8192e/r8190P_def.h b/drivers/staging/rtl8192e/r8190P_def.h index 8fcb9ce19961..a1b49674d96c 100644 --- a/drivers/staging/rtl8192e/r8190P_def.h +++ b/drivers/staging/rtl8192e/r8190P_def.h @@ -29,12 +29,12 @@ #define RX_CMD_QUEUE 1 -typedef enum _rtl819x_loopback{ +typedef enum _rtl819x_loopback_e{ RTL819X_NO_LOOPBACK = 0, RTL819X_MAC_LOOPBACK = 1, RTL819X_DMA_LOOPBACK = 2, RTL819X_CCK_LOOPBACK = 3, -}rtl819x_loopback_e; +} rtl819x_loopback_e; #define RESET_DELAY_8185 20 @@ -132,7 +132,7 @@ typedef enum _rtl819x_loopback{ typedef enum _VERSION_8190{ VERSION_8190_BD=0x3, VERSION_8190_BE -}VERSION_8190,*PVERSION_8190; +} VERSION_8190,*PVERSION_8190; #define IC_VersionCut_C 0x2 #define IC_VersionCut_D 0x3 @@ -143,14 +143,14 @@ typedef enum tag_Rf_OpType RF_OP_By_SW_3wire = 0, RF_OP_By_FW, RF_OP_MAX -}RF_OpType_E; +} RF_OpType_E; typedef enum _POWER_SAVE_MODE { POWER_SAVE_MODE_ACTIVE, POWER_SAVE_MODE_SAVE, -}POWER_SAVE_MODE; +} POWER_SAVE_MODE; typedef enum _INTERFACE_SELECT_8190PCI{ INTF_SEL1_MINICARD = 0, @@ -178,7 +178,7 @@ struct bb_reg_definition { u32 rfTxAFE; u32 rfLSSIReadBack; u32 rfLSSIReadBackPi; -};//, *struct bb_reg_definition *; +}; struct tx_fwinfo { u8 TxRate:7; @@ -205,7 +205,7 @@ struct tx_fwinfo { u32 TxAGCSign:1; u32 Tx_INFO_RSVD:6; u32 PacketID:13; -};//; +}; struct tx_fwinfo_8190pci { u8 TxRate:7; @@ -237,7 +237,7 @@ struct tx_fwinfo_8190pci { u32 PacketID:13; -};//, *struct tx_fwinfo_8190pci *; +}; #define TX_DESC_SIZE 32 @@ -276,7 +276,7 @@ struct phy_ofdm_rx_status_rxsc_sgien_exintfflag { u8 rxsc:2; u8 sgi_en:1; u8 ex_intf_flag:1; -};//; +}; struct phy_sts_ofdm_819xpci { u8 trsw_gain_X[4]; @@ -292,13 +292,13 @@ struct phy_sts_ofdm_819xpci { u8 max_ex_pwr; u8 sgi_en; u8 rxsc_sgien_exflg; -};//; +}; struct phy_sts_cck_819xpci { u8 adc_pwdb_X[4]; u8 sq_rpt; u8 cck_agc_rpt; -};//; +}; #define PHY_RSSI_SLID_WIN_MAX 100 @@ -340,7 +340,7 @@ struct tx_desc { u32 Reserved5; u32 Reserved6; u32 Reserved7; -};//, *ptx_desc; +}; struct tx_desc_cmd { @@ -364,7 +364,7 @@ struct tx_desc_cmd { u32 Reserved4; u32 Reserved5; u32 Reserved6; -};//, *ptx_desc_cmd; +}; struct rx_desc { u16 Length:14; @@ -385,7 +385,7 @@ struct rx_desc { u32 BufferAddress; -};//, *prx_desc; +}; struct rx_fwinfo { @@ -407,6 +407,6 @@ struct rx_fwinfo { u32 TSFL; -};//, *prx_fwinfo; +}; #endif diff --git a/drivers/staging/rtl8192e/r8192E_cmdpkt.h b/drivers/staging/rtl8192e/r8192E_cmdpkt.h index 6fc37b66c296..97cc7b3be734 100644 --- a/drivers/staging/rtl8192e/r8192E_cmdpkt.h +++ b/drivers/staging/rtl8192e/r8192E_cmdpkt.h @@ -55,14 +55,14 @@ struct cmpk_txfb { u16 reserve3; /* */ u16 duration; /* */ -};//; +}; struct cmpk_intr_sta { u8 element_id; u8 length; u16 reserve; u32 interrupt_status; -};//; +}; struct cmpk_set_cfg { @@ -79,7 +79,7 @@ struct cmpk_set_cfg { u8 cfg_offset; u32 value; u32 mask; -};//; +}; #define cmpk_query_cfg_t struct cmpk_set_cfg @@ -118,7 +118,7 @@ struct cmpk_rx_dbginfo { u8 element_id; -};//; +}; struct cmpk_tx_rahis { u8 element_id; @@ -137,7 +137,7 @@ struct cmpk_tx_rahis { } __packed; -typedef enum tag_command_packet_directories +typedef enum _cmpk_element_e { RX_TX_FEEDBACK = 0, RX_INTERRUPT_STATUS = 1, @@ -148,7 +148,7 @@ typedef enum tag_command_packet_directories RX_TX_PER_PKT_FEEDBACK = 6, RX_TX_RATE_HISTORY = 7, RX_CMD_ELE_MAX -}cmpk_element_e; +} cmpk_element_e; extern u32 cmpk_message_handle_rx(struct net_device *dev, struct rtllib_rx_stats * pstats); extern bool cmpk_message_handle_tx(struct net_device *dev, u8* codevirtualaddress, u32 packettype, u32 buffer_len); diff --git a/drivers/staging/rtl8192e/r8192E_firmware.h b/drivers/staging/rtl8192e/r8192E_firmware.h index cb34b2bee196..64cc3627d1b0 100644 --- a/drivers/staging/rtl8192e/r8192E_firmware.h +++ b/drivers/staging/rtl8192e/r8192E_firmware.h @@ -23,40 +23,40 @@ #define GET_COMMAND_PACKET_FRAG_THRESHOLD(v) (4*(v/4) - 8 ) -typedef enum _firmware_init_step{ +typedef enum _firmware_init_step_e{ FW_INIT_STEP0_BOOT = 0, FW_INIT_STEP1_MAIN = 1, FW_INIT_STEP2_DATA = 2, -}firmware_init_step_e; +} firmware_init_step_e; -typedef enum _opt_rst_type{ +typedef enum _opt_rst_type_e{ OPT_SYSTEM_RESET = 0, OPT_FIRMWARE_RESET = 1, -}opt_rst_type_e; +} opt_rst_type_e; typedef enum _desc_packet_type_e{ DESC_PACKET_TYPE_INIT = 0, DESC_PACKET_TYPE_NORMAL = 1, -}desc_packet_type_e; +} desc_packet_type_e; -typedef enum _firmware_source{ +typedef enum _firmware_source_e{ FW_SOURCE_IMG_FILE = 0, FW_SOURCE_HEADER_FILE = 1, -}firmware_source_e, *pfirmware_source_e; +} firmware_source_e, *pfirmware_source_e; -typedef enum _firmware_status{ +typedef enum _firmware_status_e{ FW_STATUS_0_INIT = 0, FW_STATUS_1_MOVE_BOOT_CODE = 1, FW_STATUS_2_MOVE_MAIN_CODE = 2, FW_STATUS_3_TURNON_CPU = 3, FW_STATUS_4_MOVE_DATA_CODE = 4, FW_STATUS_5_READY = 5, -}firmware_status_e; +} firmware_status_e; struct fw_seg_container { u16 seg_size; u8 *seg_ptr; -};//, *pfw_seg_container; +}; struct rt_firmware { firmware_status_e firmware_status; diff --git a/drivers/staging/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/r8192E_phy.h index 8a9b49140850..29bf6c683a21 100644 --- a/drivers/staging/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/r8192E_phy.h @@ -73,7 +73,7 @@ extern u32 rtl819XRadioB_Array[]; extern u32 rtl819XRadioC_Array[]; extern u32 rtl819XRadioD_Array[]; -typedef enum _HW90_BLOCK { +typedef enum _HW90_BLOCK_E { HW90_BLOCK_MAC = 0, HW90_BLOCK_PHY0 = 1, HW90_BLOCK_PHY1 = 2, @@ -81,13 +81,13 @@ typedef enum _HW90_BLOCK { HW90_BLOCK_MAXIMUM = 4, } HW90_BLOCK_E, *PHW90_BLOCK_E; -typedef enum _RF90_RADIO_PATH{ +typedef enum _RF90_RADIO_PATH_E{ RF90_PATH_A = 0, RF90_PATH_B = 1, RF90_PATH_C = 2, RF90_PATH_D = 3, RF90_PATH_MAX -}RF90_RADIO_PATH_E, *PRF90_RADIO_PATH_E; +} RF90_RADIO_PATH_E, *PRF90_RADIO_PATH_E; #define bMaskByte0 0xff #define bMaskByte1 0xff00 diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index eeee72ac1f57..7a538723102e 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -56,19 +56,19 @@ typedef enum _HT_MCS_RATE{ HT_MCS13 = 0x00002000, HT_MCS14 = 0x00004000, HT_MCS15 = 0x00008000, -}HT_MCS_RATE,*PHT_MCS_RATE; +} HT_MCS_RATE,*PHT_MCS_RATE; typedef enum _HT_CHANNEL_WIDTH{ HT_CHANNEL_WIDTH_20 = 0, HT_CHANNEL_WIDTH_20_40 = 1, -}HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH; +} HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH; typedef enum _HT_EXTCHNL_OFFSET{ HT_EXTCHNL_OFFSET_NO_EXT = 0, HT_EXTCHNL_OFFSET_UPPER = 1, HT_EXTCHNL_OFFSET_NO_DEF = 2, HT_EXTCHNL_OFFSET_LOWER = 3, -}HT_EXTCHNL_OFFSET, *PHT_EXTCHNL_OFFSET; +} HT_EXTCHNL_OFFSET, *PHT_EXTCHNL_OFFSET; typedef enum _CHNLOP{ CHNLOP_NONE = 0, @@ -204,13 +204,13 @@ struct mimops_ctrl { typedef enum _HT_SPEC_VER{ HT_SPEC_VER_IEEE = 0, HT_SPEC_VER_EWC = 1, -}HT_SPEC_VER, *PHT_SPEC_VER; +} HT_SPEC_VER, *PHT_SPEC_VER; typedef enum _HT_AGGRE_MODE_E{ HT_AGG_AUTO = 0, HT_AGG_FORCE_ENABLE = 1, HT_AGG_FORCE_DISABLE = 2, -}HT_AGGRE_MODE_E, *PHT_AGGRE_MODE_E; +} HT_AGGRE_MODE_E, *PHT_AGGRE_MODE_E; struct rt_hi_throughput { @@ -327,7 +327,7 @@ struct rt_htinfo_sta_entry { u16 nAMSDU_MaxSize; -};//, *struct rt_htinfo_sta_entry *; +}; @@ -359,12 +359,12 @@ struct mimo_rssi { u32 AntennaC; u32 AntennaD; u32 Average; -};//, *struct mimo_rssi *; +}; struct mimo_evm { u32 EVM1; u32 EVM2; -};//, *struct mimo_evm *; +}; struct false_alarm_stats { u32 Cnt_Parity_Fail; @@ -374,7 +374,7 @@ struct false_alarm_stats { u32 Cnt_Ofdm_fail; u32 Cnt_Cck_fail; u32 Cnt_all; -};//, *struct false_alarm_stats *; +}; extern u8 MCS_FILTER_ALL[16]; @@ -397,14 +397,14 @@ extern u8 MCS_FILTER_1SS[16]; #define IS_11N_MCS_RATE(rate) (rate&0x80) -typedef enum _HT_AGGRE_SIZE{ +typedef enum _HT_AGGRE_SIZE_E{ HT_AGG_SIZE_8K = 0, HT_AGG_SIZE_16K = 1, HT_AGG_SIZE_32K = 2, HT_AGG_SIZE_64K = 3, -}HT_AGGRE_SIZE_E, *PHT_AGGRE_SIZE_E; +} HT_AGGRE_SIZE_E, *PHT_AGGRE_SIZE_E; -typedef enum _HT_IOT_PEER +typedef enum _HT_IOT_PEER_E { HT_IOT_PEER_UNKNOWN = 0, HT_IOT_PEER_REALTEK = 1, @@ -418,14 +418,14 @@ typedef enum _HT_IOT_PEER HT_IOT_PEER_SELF_SOFTAP = 9, HT_IOT_PEER_AIRGO = 10, HT_IOT_PEER_MAX = 11, -}HT_IOT_PEER_E, *PHTIOT_PEER_E; +} HT_IOT_PEER_E, *PHTIOT_PEER_E; -typedef enum _HT_IOT_PEER_SUBTYPE +typedef enum _HT_IOT_PEER_SUBTYPE_E { HT_IOT_PEER_ATHEROS_DIR635 = 0, -}HT_IOT_PEER_SUBTYPE_E, *PHTIOT_PEER_SUBTYPE_E; +} HT_IOT_PEER_SUBTYPE_E, *PHTIOT_PEER_SUBTYPE_E; -typedef enum _HT_IOT_ACTION{ +typedef enum _HT_IOT_ACTION_E{ HT_IOT_ACT_TX_USE_AMSDU_4K = 0x00000001, HT_IOT_ACT_TX_USE_AMSDU_8K = 0x00000002, HT_IOT_ACT_DISABLE_MCS14 = 0x00000004, @@ -458,21 +458,21 @@ typedef enum _HT_IOT_ACTION{ HT_IOT_ACT_DISABLE_RX_40MHZ_SHORT_GI = 0x08000000, -}HT_IOT_ACTION_E, *PHT_IOT_ACTION_E; +} HT_IOT_ACTION_E, *PHT_IOT_ACTION_E; typedef enum _HT_IOT_RAFUNC{ HT_IOT_RAFUNC_DISABLE_ALL = 0x00, HT_IOT_RAFUNC_PEER_1R = 0x01, HT_IOT_RAFUNC_TX_AMSDU = 0x02, -}HT_IOT_RAFUNC, *PHT_IOT_RAFUNC; +} HT_IOT_RAFUNC, *PHT_IOT_RAFUNC; -typedef enum _RT_HT_CAP{ +typedef enum _RT_HT_CAPBILITY{ RT_HT_CAP_USE_TURBO_AGGR = 0x01, RT_HT_CAP_USE_LONG_PREAMBLE = 0x02, RT_HT_CAP_USE_AMPDU = 0x04, RT_HT_CAP_USE_WOW = 0x8, RT_HT_CAP_USE_SOFTAP = 0x10, RT_HT_CAP_USE_92SE = 0x20, -}RT_HT_CAPBILITY, *PRT_HT_CAPBILITY; +} RT_HT_CAPBILITY, *PRT_HT_CAPBILITY; #endif diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl8192e/rtl819x_Qos.h index d4902d81d57e..1a8267d708dd 100644 --- a/drivers/staging/rtl8192e/rtl819x_Qos.h +++ b/drivers/staging/rtl8192e/rtl819x_Qos.h @@ -107,7 +107,7 @@ struct wmm_tspec { struct octet_string { u8 *Octet; u16 Length; -};//, *struct octet_string *; +}; #define MAX_WMMELE_LENGTH 64 typedef u32 QOS_MODE, *PQOS_MODE; @@ -139,7 +139,7 @@ typedef u32 QOS_MODE, *PQOS_MODE; typedef enum _ACK_POLICY{ eAckPlc0_ACK = 0x00, eAckPlc1_NoACK = 0x01, -}ACK_POLICY,*PACK_POLICY; +} ACK_POLICY,*PACK_POLICY; #define SET_WMM_QOS_INFO_FIELD(_pStart, _val) WriteEF1Byte(_pStart, _val) @@ -165,7 +165,7 @@ typedef enum _ACK_POLICY{ #define GET_WMM_QOS_INFO_FIELD_STA_MAX_SP_LEN(_pStart) LE_BITS_TO_1BYTE(_pStart, 5, 2) #define SET_WMM_QOS_INFO_FIELD_STA_MAX_SP_LEN(_pStart, _val) SET_BITS_TO_LE_1BYTE(_pStart, 5, 2, _val) -typedef enum { +typedef enum _QOSIE_SOURCE{ QOSIE_SRC_ADDTSREQ, QOSIE_SRC_ADDTSRSP, QOSIE_SRC_REASOCREQ, @@ -212,7 +212,7 @@ typedef u32 AC_CODING; typedef enum _QOS_ELE_SUBTYPE{ QOSELE_TYPE_INFO = 0x00, QOSELE_TYPE_PARAM = 0x01, -}QOS_ELE_SUBTYPE,*PQOS_ELE_SUBTYPE; +} QOS_ELE_SUBTYPE,*PQOS_ELE_SUBTYPE; typedef enum _DIRECTION_VALUE{ @@ -220,20 +220,20 @@ typedef enum _DIRECTION_VALUE{ DIR_DOWN = 1, DIR_DIRECT = 2, DIR_BI_DIR = 3, -}DIRECTION_VALUE,*PDIRECTION_VALUE; +} DIRECTION_VALUE,*PDIRECTION_VALUE; typedef enum _ACM_METHOD{ eAcmWay0_SwAndHw = 0, eAcmWay1_HW = 1, eAcmWay2_SW = 2, -}ACM_METHOD,*PACM_METHOD; +} ACM_METHOD,*PACM_METHOD; struct acm { u64 UsedTime; u64 MediumTime; u8 HwAcmCtl; -};//, *struct acm *; +}; @@ -343,7 +343,7 @@ struct sta_qos { bool bEnableRxImmBA; -};//, *struct sta_qos *; +}; #define QBSS_LOAD_SIZE 5 #define GET_QBSS_LOAD_STA_COUNT(__pStart) ReadEF2Byte(__pStart) @@ -366,7 +366,7 @@ struct bss_qos { u8 QBssLoad[QBSS_LOAD_SIZE]; bool bQBssLoadValid; -};//, *struct bss_qos *; +}; #define sQoSCtlLng 2 #define QOS_CTRL_LEN(_QosMode) ( (_QosMode > QOS_DISABLE)? sQoSCtlLng : 0 ) diff --git a/drivers/staging/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl_core.h index 1038ed855627..16fbb933c76f 100644 --- a/drivers/staging/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl_core.h @@ -240,7 +240,7 @@ enum RTL_DEBUG { COMP_ERR = BIT31 }; -typedef enum{ +typedef enum _nic_t{ NIC_UNKNOWN = 0, NIC_8192E = 1, NIC_8190P = 2, @@ -255,9 +255,9 @@ typedef enum _RT_EEPROM_TYPE{ EEPROM_93C46, EEPROM_93C56, EEPROM_BOOT_EFUSE, -}RT_EEPROM_TYPE,*PRT_EEPROM_TYPE; +} RT_EEPROM_TYPE,*PRT_EEPROM_TYPE; -typedef enum _tag_TxCmd_Config_Index{ +typedef enum _DCMD_TXCMD_OP{ TXCMD_TXRA_HISTORY_CTRL = 0xFF900000, TXCMD_RESET_TX_PKT_BUFF = 0xFF900001, TXCMD_RESET_RX_PKT_BUFF = 0xFF900002, @@ -265,7 +265,7 @@ typedef enum _tag_TxCmd_Config_Index{ TXCMD_SET_RX_RSSI = 0xFF900004, TXCMD_SET_TX_PWR_TRACKING = 0xFF900005, TXCMD_XXXX_CTRL, -}DCMD_TXCMD_OP; +} DCMD_TXCMD_OP; typedef enum _RT_RF_TYPE_819xU{ RF_TYPE_MIN = 0, @@ -274,21 +274,21 @@ typedef enum _RT_RF_TYPE_819xU{ RF_8258, RF_6052=4, RF_PSEUDO_11N = 5, -}RT_RF_TYPE_819xU, *PRT_RF_TYPE_819xU; +} RT_RF_TYPE_819xU, *PRT_RF_TYPE_819xU; -typedef enum tag_Rf_Operatetion_State +typedef enum _RF_STEP_E { RF_STEP_INIT = 0, RF_STEP_NORMAL, RF_STEP_MAX -}RF_STEP_E; +} RF_STEP_E; typedef enum _RT_STATUS{ RT_STATUS_SUCCESS, RT_STATUS_FAILURE, RT_STATUS_PENDING, RT_STATUS_RESOURCE -}RT_STATUS,*PRT_STATUS; +} RT_STATUS,*PRT_STATUS; typedef enum _RT_CUSTOMER_ID { @@ -322,7 +322,7 @@ typedef enum _RT_CUSTOMER_ID RT_CID_819x_Arcadyan_Belkin = 29, RT_CID_819x_SAMSUNG = 30, RT_CID_819x_WNC_COREGA = 31, -}RT_CUSTOMER_ID, *PRT_CUSTOMER_ID; +} RT_CUSTOMER_ID, *PRT_CUSTOMER_ID; typedef enum _RESET_TYPE { RESET_TYPE_NORESET = 0x00, @@ -333,7 +333,7 @@ typedef enum _RESET_TYPE { typedef enum _IC_INFERIORITY_8192S{ IC_INFERIORITY_A = 0, IC_INFERIORITY_B = 1, -}IC_INFERIORITY_8192S, *PIC_INFERIORITY_8192S; +} IC_INFERIORITY_8192S, *PIC_INFERIORITY_8192S; typedef enum _PCI_BRIDGE_VENDOR { PCI_BRIDGE_VENDOR_INTEL = 0x0, @@ -360,20 +360,20 @@ struct rtl_reg_debug { unsigned char length; } head; unsigned char buf[0xff]; -};//; +}; struct rt_tx_rahis { u32 cck[4]; u32 ofdm[8]; u32 ht_mcs[4][16]; -};//, *prt_tx_rahis_t; +}; struct rt_smooth_data_4rf { char elements[4][100]; u32 index; u32 TotalNum; u32 TotalVal[4]; -};//, *struct rt_smooth_data_4rf *; +}; struct rt_stats { unsigned long txrdu; @@ -487,7 +487,7 @@ typedef enum _TWO_PORT_STATUS TWO_PORT_STATUS__DEFAULT_G_EXTENSION_N20, TWO_PORT_STATUS__ADHOC, TWO_PORT_STATUS__WITHOUT_ANY_ASSOCIATE -}TWO_PORT_STATUS; +} TWO_PORT_STATUS; struct txbbgain_struct { long txbb_iq_amplifygain; @@ -1015,7 +1015,7 @@ struct r8192_priv { u8 H2CTxCmdSeq; -};//; +}; extern const struct ethtool_ops rtl819x_ethtool_ops; diff --git a/drivers/staging/rtl8192e/rtl_debug.h b/drivers/staging/rtl8192e/rtl_debug.h index 1d4177ef1317..2c32ece2e58f 100644 --- a/drivers/staging/rtl8192e/rtl_debug.h +++ b/drivers/staging/rtl8192e/rtl_debug.h @@ -43,7 +43,7 @@ struct net_device; printk Fmt; \ } -typedef enum tag_DBGP_Flag_Type_Definition +typedef enum _DBGP_FLAG_E { FQoS = 0, FTX = 1, @@ -65,7 +65,7 @@ typedef enum tag_DBGP_Flag_Type_Definition FINIT = 17, FIOCTL = 18, DBGP_TYPE_MAX -}DBGP_FLAG_E; +} DBGP_FLAG_E; #define QoS_INIT BIT0 #define QoS_VISTA BIT1 diff --git a/drivers/staging/rtl8192e/rtl_dm.h b/drivers/staging/rtl8192e/rtl_dm.h index a9aa09f13f51..219e4af2b3d3 100644 --- a/drivers/staging/rtl8192e/rtl_dm.h +++ b/drivers/staging/rtl8192e/rtl_dm.h @@ -125,25 +125,25 @@ struct dig_t { bool initialgain_lowerbound_state; long rssi_val; -};//; +}; -typedef enum tag_dynamic_init_gain_state_definition +typedef enum _dm_dig_sta_e { DM_STA_DIG_OFF = 0, DM_STA_DIG_ON, DM_STA_DIG_MAX -}dm_dig_sta_e; +} dm_dig_sta_e; -typedef enum tag_dynamic_ratr_state_definition +typedef enum _dm_ratr_sta_e { DM_RATR_STA_HIGH = 0, DM_RATR_STA_MIDDLE = 1, DM_RATR_STA_LOW = 2, DM_RATR_STA_MAX -}dm_ratr_sta_e; +} dm_ratr_sta_e; -typedef enum tag_dynamic_init_gain_operation_type_definition +typedef enum _dm_dig_op_e { DIG_TYPE_THRESH_HIGH = 0, DIG_TYPE_THRESH_LOW = 1, @@ -159,41 +159,41 @@ typedef enum tag_dynamic_init_gain_operation_type_definition DIG_TYPE_ENABLE = 20, DIG_TYPE_DISABLE = 30, DIG_OP_TYPE_MAX -}dm_dig_op_e; +} dm_dig_op_e; -typedef enum tag_dig_algorithm_definition +typedef enum _dm_dig_alg_e { DIG_ALGO_BY_FALSE_ALARM = 0, DIG_ALGO_BY_RSSI = 1, DIG_ALGO_BEFORE_CONNECT_BY_RSSI_AND_ALARM = 2, DIG_ALGO_BY_TOW_PORT = 3, DIG_ALGO_MAX -}dm_dig_alg_e; +} dm_dig_alg_e; -typedef enum tag_DIG_TWO_PORT_ALGO_Definition +typedef enum _DM_DIG_TWO_PORT_ALG_E { DIG_TWO_PORT_ALGO_RSSI = 0, DIG_TWO_PORT_ALGO_FALSE_ALARM = 1, -}DM_DIG_TWO_PORT_ALG_E; +} DM_DIG_TWO_PORT_ALG_E; -typedef enum tag_DIG_EXT_PORT_ALGO_Definition +typedef enum _DM_DIG_EXT_PORT_ALG_E { DIG_EXT_PORT_STAGE_0 = 0, DIG_EXT_PORT_STAGE_1 = 1, DIG_EXT_PORT_STAGE_2 = 2, DIG_EXT_PORT_STAGE_3 = 3, DIG_EXT_PORT_STAGE_MAX = 4, -}DM_DIG_EXT_PORT_ALG_E; +} DM_DIG_EXT_PORT_ALG_E; -typedef enum tag_dig_dbgmode_definition +typedef enum _dm_dig_dbg_e { DIG_DBG_OFF = 0, DIG_DBG_ON = 1, DIG_DBG_MAX -}dm_dig_dbg_e; +} dm_dig_dbg_e; -typedef enum tag_dig_connect_definition +typedef enum _dm_dig_connect_e { DIG_STA_DISCONNECT = 0, DIG_STA_CONNECT = 1, @@ -202,22 +202,23 @@ typedef enum tag_dig_connect_definition DIG_AP_CONNECT = 4, DIG_AP_ADD_STATION = 5, DIG_CONNECT_MAX -}dm_dig_connect_e; +} dm_dig_connect_e; -typedef enum tag_dig_packetdetection_threshold_definition +typedef enum _dm_dig_pd_th_e { DIG_PD_AT_LOW_POWER = 0, DIG_PD_AT_NORMAL_POWER = 1, DIG_PD_AT_HIGH_POWER = 2, DIG_PD_MAX -}dm_dig_pd_th_e; +} dm_dig_pd_th_e; -typedef enum tag_dig_cck_cs_ratio_state_definition +typedef enum _dm_dig_cs_ratio_e { DIG_CS_RATIO_LOWER = 0, DIG_CS_RATIO_HIGHER = 1, DIG_CS_MAX -}dm_dig_cs_ratio_e; +} dm_dig_cs_ratio_e; + struct drx_path_sel { u8 Enable; u8 DbgMode; @@ -232,28 +233,28 @@ struct drx_path_sel { u8 rf_rssi[4]; u8 rf_enable_rssi_th[4]; long cck_pwdb_sta[4]; -};//; +}; -typedef enum tag_CCK_Rx_Path_Method_Definition +typedef enum _DM_CCK_Rx_Path_Method { CCK_Rx_Version_1 = 0, CCK_Rx_Version_2= 1, CCK_Rx_Version_MAX -}DM_CCK_Rx_Path_Method; +} DM_CCK_Rx_Path_Method; -typedef enum tag_DM_DbgMode_Definition +typedef enum _DM_DBG_E { DM_DBG_OFF = 0, DM_DBG_ON = 1, DM_DBG_MAX -}DM_DBG_E; +} DM_DBG_E; struct dcmd_txcmd { u32 Op; u32 Length; u32 Value; -};//, *struct dcmd_txcmd *; +}; /*------------------------------Define structure----------------------------*/ diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index aadaa951685c..b5ee8e565a48 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -200,7 +200,7 @@ struct cb_desc { u8 bBTTxPacket; u8 bIsBTProbRsp; -};//, *pcb_desc; +}; /*--------------------------Define -------------------------------------------*/ #define MGN_1M 0x02 @@ -309,7 +309,7 @@ typedef enum _HAL_DEF_VARIABLE{ HAL_DEF_PCI_SUPPORT_ASPM, HAL_DEF_THERMAL_VALUE, HAL_DEF_USB_IN_TOKEN_REV, -}HAL_DEF_VARIABLE; +} HAL_DEF_VARIABLE; typedef enum _HW_VARIABLES{ @@ -401,14 +401,14 @@ typedef enum _HW_VARIABLES{ HW_VAR_INT_MIGRATION, HW_VAR_INT_AC, HW_VAR_RF_TIMING, -}HW_VARIABLES; +} HW_VARIABLES; typedef enum _RT_OP_MODE{ RT_OP_MODE_AP, RT_OP_MODE_INFRASTRUCTURE, RT_OP_MODE_IBSS, RT_OP_MODE_NO_LINK, -}RT_OP_MODE, *PRT_OP_MODE; +} RT_OP_MODE, *PRT_OP_MODE; #define aSifsTime (((priv->rtllib->current_network.mode == IEEE_A)||(priv->rtllib->current_network.mode == IEEE_N_24G)||(priv->rtllib->current_network.mode == IEEE_N_5G))? 16 : 10) @@ -482,7 +482,7 @@ struct ieee_param { u8 key[0]; } crypt; } u; -};//; +}; #if WIRELESS_EXT < 17 @@ -619,7 +619,8 @@ typedef enum _InitialGainOpType{ IG_Backup=0, IG_Restore, IG_Max -}InitialGainOpType; +} InitialGainOpType; + typedef enum _LED_CTL_MODE{ LED_CTL_POWER_ON = 1, LED_CTL_LINK = 2, @@ -634,7 +635,7 @@ typedef enum _LED_CTL_MODE{ LED_CTL_START_WPS_BOTTON = 11, LED_CTL_STOP_WPS_FAIL = 12, LED_CTL_STOP_WPS_FAIL_OVERLAP = 13, -}LED_CTL_MODE; +} LED_CTL_MODE; typedef enum _RT_RF_TYPE_DEF { @@ -644,7 +645,7 @@ typedef enum _RT_RF_TYPE_DEF RF_1T1R, RF_2T2R_GREEN, RF_819X_MAX_TYPE -}RT_RF_TYPE_DEF; +} RT_RF_TYPE_DEF; typedef enum _WIRELESS_MODE { WIRELESS_MODE_UNKNOWN = 0x00, @@ -656,7 +657,7 @@ typedef enum _WIRELESS_MODE { WIRELESS_MODE_N_5G = 0x20 } WIRELESS_MODE; -typedef enum _NETWORK_TYPE{ +typedef enum _WIRELESS_NETWORK_TYPE{ WIRELESS_11B = 1, WIRELESS_11G = 2, WIRELESS_11A = 4, @@ -1775,14 +1776,14 @@ enum rtllib_state { struct tx_pending { int frag; struct rtllib_txb *txb; -};//; +}; struct bandwidth_autoswitch { long threshold_20Mhzto40Mhz; long threshold_40Mhzto20Mhz; bool bforced_tx20Mhz; bool bautoswitch_enable; -};//,*pbandwidth_autoswitch; +}; @@ -1797,7 +1798,7 @@ typedef enum _Fsync_State{ Default_Fsync, HW_Fsync, SW_Fsync -}Fsync_State; +} Fsync_State; typedef enum _RT_PS_MODE { @@ -1805,25 +1806,25 @@ typedef enum _RT_PS_MODE eMaxPs, eFastPs, eAutoPs, -}RT_PS_MODE; +} RT_PS_MODE; typedef enum _IPS_CALLBACK_FUNCION { IPS_CALLBACK_NONE = 0, IPS_CALLBACK_MGNT_LINK_REQUEST = 1, IPS_CALLBACK_JOIN_REQUEST = 2, -}IPS_CALLBACK_FUNCION; +} IPS_CALLBACK_FUNCION; typedef enum _RT_JOIN_ACTION{ RT_JOIN_INFRA = 1, RT_JOIN_IBSS = 2, RT_START_IBSS = 3, RT_NO_ACTION = 4, -}RT_JOIN_ACTION; +} RT_JOIN_ACTION; struct ibss_parms { u16 atimWin; -};//, *struct ibss_parms *; +}; #define MAX_NUM_RATES 264 typedef enum _RT_RF_POWER_STATE @@ -1831,7 +1832,7 @@ typedef enum _RT_RF_POWER_STATE eRfOn, eRfSleep, eRfOff -}RT_RF_POWER_STATE; +} RT_RF_POWER_STATE; #define MAX_SUPPORT_WOL_PATTERN_NUM 8 @@ -1845,7 +1846,7 @@ typedef enum _WOLPATTERN_TYPE eIPv4IPv6TCPSYN, eMACIDOnly, eNoDefined, -}WOLPATTERN_TYPE; +} WOLPATTERN_TYPE; struct rt_pm_wol_info { u32 PatternId; @@ -1853,7 +1854,7 @@ struct rt_pm_wol_info { u16 CrcRemainder; u8 WFMIndex; WOLPATTERN_TYPE PatternType; -};//, *struct rt_pm_wol_info *; +}; struct rt_pwr_save_ctrl { @@ -1912,7 +1913,7 @@ struct rt_pwr_save_ctrl { u8 oWLANMode; struct rt_pm_wol_info PmWoLPatternInfo[MAX_SUPPORT_WOL_PATTERN_NUM]; -};//,*struct rt_pwr_save_ctrl *; +}; typedef u32 RT_RF_CHANGE_SOURCE; #define RF_CHANGE_BY_SW BIT31 @@ -1921,7 +1922,7 @@ typedef u32 RT_RF_CHANGE_SOURCE; #define RF_CHANGE_BY_IPS BIT28 #define RF_CHANGE_BY_INIT 0 -typedef enum +typedef enum _country_code_type_t { COUNTRY_CODE_FCC = 0, COUNTRY_CODE_IC = 1, @@ -1937,13 +1938,13 @@ typedef enum COUNTRY_CODE_WORLD_WIDE_13 = 11, COUNTRY_CODE_TELEC_NETGEAR = 12, COUNTRY_CODE_MAX -}country_code_type_t; +} country_code_type_t; typedef enum _SCAN_OPERATION_BACKUP_OPT{ SCAN_OPT_BACKUP=0, SCAN_OPT_RESTORE, SCAN_OPT_MAX -}SCAN_OPERATION_BACKUP_OPT; +} SCAN_OPERATION_BACKUP_OPT; typedef enum _FW_CMD_IO_TYPE{ FW_CMD_DIG_ENABLE = 0, @@ -1977,7 +1978,7 @@ typedef enum _FW_CMD_IO_TYPE{ FW_CMD_CTRL_DM_BY_DRIVER_NEW = 28, FW_CMD_PAPE_CONTROL = 29, FW_CMD_CHAN_SET = 30, -}FW_CMD_IO_TYPE,*PFW_CMD_IO_TYPE; +} FW_CMD_IO_TYPE,*PFW_CMD_IO_TYPE; #define RT_MAX_LD_SLOT_NUM 10 struct rt_link_detect { @@ -2000,7 +2001,7 @@ struct rt_link_detect { u32 NumTxUnicastOkInPeriod; u32 LastNumTxUnicast; u32 LastNumRxUnicast; -};//, *struct rt_link_detect *; +}; struct sw_cam_table { @@ -2011,7 +2012,7 @@ struct sw_cam_table { u8 useDK; u8 key_index; -};//,*struct sw_cam_table *; +}; #define TOTAL_CAM_ENTRY 32 struct rate_adaptive { u8 rate_adaptive_disabled; @@ -2046,7 +2047,7 @@ typedef enum _RATR_TABLE_MODE_8192S{ RATR_INX_WIRELESS_B = 6, RATR_INX_WIRELESS_MC = 7, RATR_INX_WIRELESS_A = 8, -}RATR_TABLE_MODE_8192S, *PRATR_TABLE_MODE_8192S; +} RATR_TABLE_MODE_8192S, *PRATR_TABLE_MODE_8192S; #define NUM_PMKID_CACHE 16 struct rt_pmkid_list { -- cgit v1.2.3-59-g8ed1b From 85cdd997c82383b9df2ece60584d878499f9060a Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 19 Jul 2011 19:57:24 -0500 Subject: staging: rtl8192e: Convert typedef DBGP_FLAG_E to enum dbgp_flag Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger --- drivers/staging/rtl8192e/rtl_debug.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'drivers/staging/rtl8192e/rtl_debug.h') diff --git a/drivers/staging/rtl8192e/rtl_debug.h b/drivers/staging/rtl8192e/rtl_debug.h index 2c32ece2e58f..415dfca6b37d 100644 --- a/drivers/staging/rtl8192e/rtl_debug.h +++ b/drivers/staging/rtl8192e/rtl_debug.h @@ -43,8 +43,7 @@ struct net_device; printk Fmt; \ } -typedef enum _DBGP_FLAG_E -{ +enum dbgp_flag { FQoS = 0, FTX = 1, FRX = 2, @@ -65,7 +64,7 @@ typedef enum _DBGP_FLAG_E FINIT = 17, FIOCTL = 18, DBGP_TYPE_MAX -} DBGP_FLAG_E; +}; #define QoS_INIT BIT0 #define QoS_VISTA BIT1 -- cgit v1.2.3-59-g8ed1b From cffa5bd956cb65f68de8fa3fe8d0188fca196bf4 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 25 Aug 2011 11:48:21 -0500 Subject: staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part IX Signed-off-by: Larry Finger Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192e/rtl_crypto.h | 80 ++-- drivers/staging/rtl8192e/rtl_debug.c | 718 +++++++++++++++++----------------- drivers/staging/rtl8192e/rtl_debug.h | 236 +++++------ 3 files changed, 514 insertions(+), 520 deletions(-) (limited to 'drivers/staging/rtl8192e/rtl_debug.h') diff --git a/drivers/staging/rtl8192e/rtl_crypto.h b/drivers/staging/rtl8192e/rtl_crypto.h index 7b4551db961d..ee57c0f4fa69 100644 --- a/drivers/staging/rtl8192e/rtl_crypto.h +++ b/drivers/staging/rtl8192e/rtl_crypto.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include #define crypto_register_alg crypto_register_alg_rsl #define crypto_unregister_alg crypto_unregister_alg_rsl @@ -73,7 +73,7 @@ struct cipher_alg { unsigned int cia_min_keysize; unsigned int cia_max_keysize; int (*cia_setkey)(void *ctx, const u8 *key, - unsigned int keylen, u32 *flags); + unsigned int keylen, u32 *flags); void (*cia_encrypt)(void *ctx, u8 *dst, const u8 *src); void (*cia_decrypt)(void *ctx, u8 *dst, const u8 *src); }; @@ -84,16 +84,16 @@ struct digest_alg { void (*dia_update)(void *ctx, const u8 *data, unsigned int len); void (*dia_final)(void *ctx, u8 *out); int (*dia_setkey)(void *ctx, const u8 *key, - unsigned int keylen, u32 *flags); + unsigned int keylen, u32 *flags); }; struct compress_alg { int (*coa_init)(void *ctx); void (*coa_exit)(void *ctx); int (*coa_compress)(void *ctx, const u8 *src, unsigned int slen, - u8 *dst, unsigned int *dlen); + u8 *dst, unsigned int *dlen); int (*coa_decompress)(void *ctx, const u8 *src, unsigned int slen, - u8 *dst, unsigned int *dlen); + u8 *dst, unsigned int *dlen); }; #define cra_cipher cra_u.cipher @@ -139,15 +139,15 @@ struct cipher_tfm { unsigned int cit_ivsize; u32 cit_mode; int (*cit_setkey)(struct crypto_tfm *tfm, - const u8 *key, unsigned int keylen); + const u8 *key, unsigned int keylen); int (*cit_encrypt)(struct crypto_tfm *tfm, struct scatterlist *dst, struct scatterlist *src, unsigned int nbytes); int (*cit_encrypt_iv)(struct crypto_tfm *tfm, - struct scatterlist *dst, - struct scatterlist *src, - unsigned int nbytes, u8 *iv); + struct scatterlist *dst, + struct scatterlist *src, + unsigned int nbytes, u8 *iv); int (*cit_decrypt)(struct crypto_tfm *tfm, struct scatterlist *dst, struct scatterlist *src, @@ -162,21 +162,21 @@ struct cipher_tfm { struct digest_tfm { void (*dit_init)(struct crypto_tfm *tfm); void (*dit_update)(struct crypto_tfm *tfm, - struct scatterlist *sg, unsigned int nsg); + struct scatterlist *sg, unsigned int nsg); void (*dit_final)(struct crypto_tfm *tfm, u8 *out); void (*dit_digest)(struct crypto_tfm *tfm, struct scatterlist *sg, - unsigned int nsg, u8 *out); + unsigned int nsg, u8 *out); int (*dit_setkey)(struct crypto_tfm *tfm, - const u8 *key, unsigned int keylen); + const u8 *key, unsigned int keylen); }; struct compress_tfm { int (*cot_compress)(struct crypto_tfm *tfm, - const u8 *src, unsigned int slen, - u8 *dst, unsigned int *dlen); + const u8 *src, unsigned int slen, + u8 *dst, unsigned int *dlen); int (*cot_decompress)(struct crypto_tfm *tfm, - const u8 *src, unsigned int slen, - u8 *dst, unsigned int *dlen); + const u8 *src, unsigned int slen, + u8 *dst, unsigned int *dlen); }; #define crt_cipher crt_u.cipher @@ -274,8 +274,8 @@ static inline void crypto_digest_init(struct crypto_tfm *tfm) } static inline void crypto_digest_update(struct crypto_tfm *tfm, - struct scatterlist *sg, - unsigned int nsg) + struct scatterlist *sg, + unsigned int nsg) { BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST); tfm->crt_digest.dit_update(tfm, sg, nsg); @@ -288,15 +288,15 @@ static inline void crypto_digest_final(struct crypto_tfm *tfm, u8 *out) } static inline void crypto_digest_digest(struct crypto_tfm *tfm, - struct scatterlist *sg, - unsigned int nsg, u8 *out) + struct scatterlist *sg, + unsigned int nsg, u8 *out) { BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST); tfm->crt_digest.dit_digest(tfm, sg, nsg, out); } static inline int crypto_digest_setkey(struct crypto_tfm *tfm, - const u8 *key, unsigned int keylen) + const u8 *key, unsigned int keylen) { BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST); if (tfm->crt_digest.dit_setkey == NULL) @@ -305,25 +305,25 @@ static inline int crypto_digest_setkey(struct crypto_tfm *tfm, } static inline int crypto_cipher_setkey(struct crypto_tfm *tfm, - const u8 *key, unsigned int keylen) + const u8 *key, unsigned int keylen) { BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); return tfm->crt_cipher.cit_setkey(tfm, key, keylen); } static inline int crypto_cipher_encrypt(struct crypto_tfm *tfm, - struct scatterlist *dst, - struct scatterlist *src, - unsigned int nbytes) + struct scatterlist *dst, + struct scatterlist *src, + unsigned int nbytes) { BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); return tfm->crt_cipher.cit_encrypt(tfm, dst, src, nbytes); } static inline int crypto_cipher_encrypt_iv(struct crypto_tfm *tfm, - struct scatterlist *dst, - struct scatterlist *src, - unsigned int nbytes, u8 *iv) + struct scatterlist *dst, + struct scatterlist *src, + unsigned int nbytes, u8 *iv) { BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB); @@ -331,18 +331,18 @@ static inline int crypto_cipher_encrypt_iv(struct crypto_tfm *tfm, } static inline int crypto_cipher_decrypt(struct crypto_tfm *tfm, - struct scatterlist *dst, - struct scatterlist *src, - unsigned int nbytes) + struct scatterlist *dst, + struct scatterlist *src, + unsigned int nbytes) { BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); return tfm->crt_cipher.cit_decrypt(tfm, dst, src, nbytes); } static inline int crypto_cipher_decrypt_iv(struct crypto_tfm *tfm, - struct scatterlist *dst, - struct scatterlist *src, - unsigned int nbytes, u8 *iv) + struct scatterlist *dst, + struct scatterlist *src, + unsigned int nbytes, u8 *iv) { BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB); @@ -350,30 +350,30 @@ static inline int crypto_cipher_decrypt_iv(struct crypto_tfm *tfm, } static inline void crypto_cipher_set_iv(struct crypto_tfm *tfm, - const u8 *src, unsigned int len) + const u8 *src, unsigned int len) { BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); memcpy(tfm->crt_cipher.cit_iv, src, len); } static inline void crypto_cipher_get_iv(struct crypto_tfm *tfm, - u8 *dst, unsigned int len) + u8 *dst, unsigned int len) { BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); memcpy(dst, tfm->crt_cipher.cit_iv, len); } static inline int crypto_comp_compress(struct crypto_tfm *tfm, - const u8 *src, unsigned int slen, - u8 *dst, unsigned int *dlen) + const u8 *src, unsigned int slen, + u8 *dst, unsigned int *dlen) { BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS); return tfm->crt_compress.cot_compress(tfm, src, slen, dst, dlen); } static inline int crypto_comp_decompress(struct crypto_tfm *tfm, - const u8 *src, unsigned int slen, - u8 *dst, unsigned int *dlen) + const u8 *src, unsigned int slen, + u8 *dst, unsigned int *dlen) { BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS); return tfm->crt_compress.cot_decompress(tfm, src, slen, dst, dlen); diff --git a/drivers/staging/rtl8192e/rtl_debug.c b/drivers/staging/rtl8192e/rtl_debug.c index 5c2d01c8b457..22bc2dd6e438 100644 --- a/drivers/staging/rtl8192e/rtl_debug.c +++ b/drivers/staging/rtl8192e/rtl_debug.c @@ -53,12 +53,10 @@ u32 DBGP_Type[DBGP_TYPE_MAX]; *---------------------------------------------------------------------------*/ void rtl8192_dbgp_flag_init(struct net_device *dev) { - u8 i; + u8 i; for (i = 0; i < DBGP_TYPE_MAX; i++) - { DBGP_Type[i] = 0; - } } /* DBGP_Flag_Init */ @@ -67,19 +65,19 @@ void rtl8192_dbgp_flag_init(struct net_device *dev) void print_buffer(u32 *buffer, int len) { int i; - u8 *buf =(u8*)buffer; + u8 *buf = (u8 *)buffer; - printk("ASCII BUFFER DUMP (len: %x):\n",len); + printk(KERN_INFO "ASCII BUFFER DUMP (len: %x):\n", len); - for (i=0;i ", n); + printk(KERN_INFO "\nD: %2x> ", n); for (i = 0; i < 16 && n <= max; i++, n++) - printk("%2x ", read_nic_byte(dev, n)); + printk(KERN_INFO "%2x ", read_nic_byte(dev, n)); } - printk("\n"); + printk(KERN_INFO "\n"); } /**************************************************************************** -----------------------------PROCFS STUFF------------------------- *****************************************************************************/ /*This part is related to PROC, which will record some statistics. */ -static struct proc_dir_entry *rtl8192_proc = NULL; +static struct proc_dir_entry *rtl8192_proc; static int proc_get_stats_ap(char *page, char **start, off_t offset, int count, @@ -123,24 +121,21 @@ static int proc_get_stats_ap(char *page, char **start, struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct rtllib_device *ieee = priv->rtllib; struct rtllib_network *target; - int len = 0; - list_for_each_entry(target, &ieee->network_list, list) { + list_for_each_entry(target, &ieee->network_list, list) { len += snprintf(page + len, count - len, - "%s ", target->ssid); + "%s ", target->ssid); - if (target->wpa_ie_len>0 || target->rsn_ie_len>0){ - len += snprintf(page + len, count - len, - "WPA\n"); - } - else{ - len += snprintf(page + len, count - len, - "non_WPA\n"); - } + if (target->wpa_ie_len > 0 || target->rsn_ie_len > 0) + len += snprintf(page + len, count - len, + "WPA\n"); + else + len += snprintf(page + len, count - len, + "non_WPA\n"); - } + } *eof = 1; return len; @@ -153,25 +148,25 @@ static int proc_get_registers_0(char *page, char **start, struct net_device *dev = data; int len = 0; - int i,n,page0; + int i, n, page0; - int max=0xff; + int max = 0xff; page0 = 0x000; - { - len += snprintf(page + len, count - len, - "\n####################page %x##################\n ", (page0>>8)); - len += snprintf(page + len, count - len, - "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F"); - for (n=0;n<=max;) - { - len += snprintf(page + len, count - len, "\nD: %2x > ",n); - for (i=0;i<16 && n<=max;n++,i++) - len += snprintf(page + len, count - len, - "%2.2x ",read_nic_byte(dev,(page0|n))); - } + len += snprintf(page + len, count - len, + "\n####################page %x##################\n ", + (page0>>8)); + len += snprintf(page + len, count - len, + "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B " + "0C 0D 0E 0F"); + for (n = 0; n <= max;) { + len += snprintf(page + len, count - len, "\nD: %2x > ", n); + for (i = 0; i < 16 && n <= max; n++, i++) + len += snprintf(page + len, count - len, + "%2.2x ", read_nic_byte(dev, + (page0 | n))); } - len += snprintf(page + len, count - len,"\n"); + len += snprintf(page + len, count - len, "\n"); *eof = 1; return len; @@ -183,25 +178,27 @@ static int proc_get_registers_1(char *page, char **start, struct net_device *dev = data; int len = 0; - int i,n,page0; + int i, n, page0; - int max=0xff; + int max = 0xff; page0 = 0x100; /* This dump the current register page */ len += snprintf(page + len, count - len, - "\n####################page %x##################\n ", (page0>>8)); + "\n####################page %x##################\n ", + (page0>>8)); len += snprintf(page + len, count - len, - "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F"); - for (n=0;n<=max;) - { + "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B " + "0C 0D 0E 0F"); + for (n = 0; n <= max;) { len += snprintf(page + len, count - len, - "\nD: %2x > ",n); - for (i=0;i<16 && n<=max;i++,n++) + "\nD: %2x > ", n); + for (i = 0; i < 16 && n <= max; i++, n++) len += snprintf(page + len, count - len, - "%2.2x ",read_nic_byte(dev,(page0|n))); + "%2.2x ", read_nic_byte(dev, + (page0 | n))); } - len += snprintf(page + len, count - len,"\n"); + len += snprintf(page + len, count - len, "\n"); *eof = 1; return len; @@ -213,25 +210,27 @@ static int proc_get_registers_2(char *page, char **start, struct net_device *dev = data; int len = 0; - int i,n,page0; + int i, n, page0; - int max=0xff; + int max = 0xff; page0 = 0x200; /* This dump the current register page */ len += snprintf(page + len, count - len, - "\n####################page %x##################\n ", (page0>>8)); + "\n####################page %x##################\n ", + (page0 >> 8)); len += snprintf(page + len, count - len, - "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F"); - for (n=0;n<=max;) - { + "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C " + "0D 0E 0F"); + for (n = 0; n <= max;) { len += snprintf(page + len, count - len, - "\nD: %2x > ",n); - for (i=0;i<16 && n<=max;i++,n++) + "\nD: %2x > ", n); + for (i = 0; i < 16 && n <= max; i++, n++) len += snprintf(page + len, count - len, - "%2.2x ",read_nic_byte(dev,(page0|n))); + "%2.2x ", read_nic_byte(dev, + (page0 | n))); } - len += snprintf(page + len, count - len,"\n"); + len += snprintf(page + len, count - len, "\n"); *eof = 1; return len; @@ -243,25 +242,27 @@ static int proc_get_registers_3(char *page, char **start, struct net_device *dev = data; int len = 0; - int i,n,page0; + int i, n, page0; - int max=0xff; + int max = 0xff; page0 = 0x300; /* This dump the current register page */ len += snprintf(page + len, count - len, - "\n####################page %x##################\n ", (page0>>8)); + "\n####################page %x##################\n ", + (page0>>8)); len += snprintf(page + len, count - len, - "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F"); - for (n=0;n<=max;) - { + "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B " + "0C 0D 0E 0F"); + for (n = 0; n <= max;) { len += snprintf(page + len, count - len, - "\nD: %2x > ",n); - for (i=0;i<16 && n<=max;i++,n++) + "\nD: %2x > ", n); + for (i = 0; i < 16 && n <= max; i++, n++) len += snprintf(page + len, count - len, - "%2.2x ",read_nic_byte(dev,(page0|n))); + "%2.2x ", read_nic_byte(dev, + (page0 | n))); } - len += snprintf(page + len, count - len,"\n"); + len += snprintf(page + len, count - len, "\n"); *eof = 1; return len; @@ -273,117 +274,125 @@ static int proc_get_registers_4(char *page, char **start, struct net_device *dev = data; int len = 0; - int i,n,page0; + int i, n, page0; - int max=0xff; + int max = 0xff; page0 = 0x400; /* This dump the current register page */ len += snprintf(page + len, count - len, - "\n####################page %x##################\n ", (page0>>8)); + "\n####################page %x##################\n ", + (page0>>8)); len += snprintf(page + len, count - len, - "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F"); - for (n=0;n<=max;) - { + "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B " + "0C 0D 0E 0F"); + for (n = 0; n <= max;) { len += snprintf(page + len, count - len, - "\nD: %2x > ",n); - for (i=0;i<16 && n<=max;i++,n++) + "\nD: %2x > ", n); + for (i = 0; i < 16 && n <= max; i++, n++) len += snprintf(page + len, count - len, - "%2.2x ",read_nic_byte(dev,(page0|n))); + "%2.2x ", read_nic_byte(dev, + (page0 | n))); } - len += snprintf(page + len, count - len,"\n"); + len += snprintf(page + len, count - len, "\n"); *eof = 1; return len; } static int proc_get_registers_5(char *page, char **start, - off_t offset, int count, - int *eof, void *data) + off_t offset, int count, + int *eof, void *data) { - struct net_device *dev = data; + struct net_device *dev = data; - int len = 0; - int i,n,page0; + int len = 0; + int i, n, page0; - int max=0xff; - page0 = 0x500; + int max = 0xff; + page0 = 0x500; - /* This dump the current register page */ - len += snprintf(page + len, count - len, - "\n####################page %x##################\n ", (page0>>8)); + /* This dump the current register page */ + len += snprintf(page + len, count - len, + "\n####################page %x##################\n ", + (page0 >> 8)); len += snprintf(page + len, count - len, - "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F"); - for (n=0;n<=max;) - { - len += snprintf(page + len, count - len, - "\nD: %2x > ",n); - for (i=0;i<16 && n<=max;i++,n++) - len += snprintf(page + len, count - len, - "%2.2x ",read_nic_byte(dev,(page0|n))); - } - len += snprintf(page + len, count - len,"\n"); - *eof = 1; - return len; + "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B " + "0C 0D 0E 0F"); + for (n = 0; n <= max;) { + len += snprintf(page + len, count - len, + "\nD: %2x > ", n); + for (i = 0; i < 16 && n <= max; i++, n++) + len += snprintf(page + len, count - len, + "%2.2x ", read_nic_byte(dev, + (page0 | n))); + } + len += snprintf(page + len, count - len, "\n"); + *eof = 1; + return len; } static int proc_get_registers_6(char *page, char **start, - off_t offset, int count, - int *eof, void *data) + off_t offset, int count, + int *eof, void *data) { - struct net_device *dev = data; + struct net_device *dev = data; - int len = 0; - int i,n,page0; + int len = 0; + int i, n, page0; - int max=0xff; - page0 = 0x600; + int max = 0xff; + page0 = 0x600; - /* This dump the current register page */ - len += snprintf(page + len, count - len, - "\n####################page %x##################\n ", (page0>>8)); + /* This dump the current register page */ len += snprintf(page + len, count - len, - "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F"); - for (n=0;n<=max;) - { - len += snprintf(page + len, count - len, - "\nD: %2x > ",n); - for (i=0;i<16 && n<=max;i++,n++) - len += snprintf(page + len, count - len, - "%2.2x ",read_nic_byte(dev,(page0|n))); - } - len += snprintf(page + len, count - len,"\n"); - *eof = 1; - return len; + "\n####################page %x##################\n ", + (page0>>8)); + len += snprintf(page + len, count - len, + "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B " + "0C 0D 0E 0F"); + for (n = 0; n <= max;) { + len += snprintf(page + len, count - len, + "\nD: %2x > ", n); + for (i = 0; i < 16 && n <= max; i++, n++) + len += snprintf(page + len, count - len, + "%2.2x ", read_nic_byte(dev, + (page0 | n))); + } + len += snprintf(page + len, count - len, "\n"); + *eof = 1; + return len; } static int proc_get_registers_7(char *page, char **start, - off_t offset, int count, - int *eof, void *data) + off_t offset, int count, + int *eof, void *data) { - struct net_device *dev = data; + struct net_device *dev = data; - int len = 0; - int i,n,page0; + int len = 0; + int i, n, page0; - int max=0xff; - page0 = 0x700; + int max = 0xff; + page0 = 0x700; - /* This dump the current register page */ - len += snprintf(page + len, count - len, - "\n####################page %x##################\n ", (page0>>8)); + /* This dump the current register page */ + len += snprintf(page + len, count - len, + "\n####################page %x##################\n ", + (page0 >> 8)); len += snprintf(page + len, count - len, - "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F"); - for (n=0;n<=max;) - { - len += snprintf(page + len, count - len, - "\nD: %2x > ",n); - for (i=0;i<16 && n<=max;i++,n++) - len += snprintf(page + len, count - len, - "%2.2x ",read_nic_byte(dev,(page0|n))); - } - len += snprintf(page + len, count - len,"\n"); - *eof = 1; - return len; + "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C " + "0D 0E 0F"); + for (n = 0; n <= max;) { + len += snprintf(page + len, count - len, + "\nD: %2x > ", n); + for (i = 0; i < 16 && n <= max; i++, n++) + len += snprintf(page + len, count - len, + "%2.2x ", read_nic_byte(dev, + (page0 | n))); + } + len += snprintf(page + len, count - len, "\n"); + *eof = 1; + return len; } static int proc_get_registers_8(char *page, char **start, @@ -393,22 +402,23 @@ static int proc_get_registers_8(char *page, char **start, struct net_device *dev = data; int len = 0; - int i,n,page0; + int i, n, page0; - int max=0xff; + int max = 0xff; page0 = 0x800; /* This dump the current register page */ len += snprintf(page + len, count - len, - "\n####################page %x##################\n ", (page0>>8)); - for (n=0;n<=max;) - { - len += snprintf(page + len, count - len, "\nD: %2x > ",n); - for (i=0;i<4 && n<=max;n+=4,i++) + "\n####################page %x##################\n", + (page0 >> 8)); + for (n = 0; n <= max;) { + len += snprintf(page + len, count - len, "\nD: %2x > ", n); + for (i = 0; i < 4 && n <= max; n += 4, i++) len += snprintf(page + len, count - len, - "%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord)); + "%8.8x ", rtl8192_QueryBBReg(dev, + (page0 | n), bMaskDWord)); } - len += snprintf(page + len, count - len,"\n"); + len += snprintf(page + len, count - len, "\n"); *eof = 1; return len; @@ -420,22 +430,23 @@ static int proc_get_registers_9(char *page, char **start, struct net_device *dev = data; int len = 0; - int i,n,page0; + int i, n, page0; - int max=0xff; + int max = 0xff; page0 = 0x900; /* This dump the current register page */ len += snprintf(page + len, count - len, - "\n####################page %x##################\n ", (page0>>8)); - for (n=0;n<=max;) - { - len += snprintf(page + len, count - len, "\nD: %2x > ",n); - for (i=0;i<4 && n<=max;n+=4,i++) + "\n####################page %x##################\n", + (page0>>8)); + for (n = 0; n <= max;) { + len += snprintf(page + len, count - len, "\nD: %2x > ", n); + for (i = 0; i < 4 && n <= max; n += 4, i++) len += snprintf(page + len, count - len, - "%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord)); + "%8.8x ", rtl8192_QueryBBReg(dev, + (page0 | n), bMaskDWord)); } - len += snprintf(page + len, count - len,"\n"); + len += snprintf(page + len, count - len, "\n"); *eof = 1; return len; } @@ -446,22 +457,23 @@ static int proc_get_registers_a(char *page, char **start, struct net_device *dev = data; int len = 0; - int i,n,page0; + int i, n, page0; - int max=0xff; + int max = 0xff; page0 = 0xa00; /* This dump the current register page */ len += snprintf(page + len, count - len, - "\n####################page %x##################\n ", (page0>>8)); - for (n=0;n<=max;) - { - len += snprintf(page + len, count - len, "\nD: %2x > ",n); - for (i=0;i<4 && n<=max;n+=4,i++) + "\n####################page %x##################\n", + (page0>>8)); + for (n = 0; n <= max;) { + len += snprintf(page + len, count - len, "\nD: %2x > ", n); + for (i = 0; i < 4 && n <= max; n += 4, i++) len += snprintf(page + len, count - len, - "%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord)); + "%8.8x ", rtl8192_QueryBBReg(dev, + (page0 | n), bMaskDWord)); } - len += snprintf(page + len, count - len,"\n"); + len += snprintf(page + len, count - len, "\n"); *eof = 1; return len; } @@ -472,22 +484,23 @@ static int proc_get_registers_b(char *page, char **start, struct net_device *dev = data; int len = 0; - int i,n,page0; + int i, n, page0; - int max=0xff; + int max = 0xff; page0 = 0xb00; /* This dump the current register page */ len += snprintf(page + len, count - len, - "\n####################page %x##################\n ", (page0>>8)); - for (n=0;n<=max;) - { - len += snprintf(page + len, count - len, "\nD: %2x > ",n); - for (i=0;i<4 && n<=max;n+=4,i++) + "\n####################page %x##################\n", + (page0 >> 8)); + for (n = 0; n <= max;) { + len += snprintf(page + len, count - len, "\nD: %2x > ", n); + for (i = 0; i < 4 && n <= max; n += 4, i++) len += snprintf(page + len, count - len, - "%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord)); + "%8.8x ", rtl8192_QueryBBReg(dev, + (page0 | n), bMaskDWord)); } - len += snprintf(page + len, count - len,"\n"); + len += snprintf(page + len, count - len, "\n"); *eof = 1; return len; } @@ -498,22 +511,23 @@ static int proc_get_registers_c(char *page, char **start, struct net_device *dev = data; int len = 0; - int i,n,page0; + int i, n, page0; - int max=0xff; + int max = 0xff; page0 = 0xc00; /* This dump the current register page */ len += snprintf(page + len, count - len, - "\n####################page %x##################\n ", (page0>>8)); - for (n=0;n<=max;) - { - len += snprintf(page + len, count - len, "\nD: %2x > ",n); - for (i=0;i<4 && n<=max;n+=4,i++) + "\n####################page %x##################\n", + (page0>>8)); + for (n = 0; n <= max;) { + len += snprintf(page + len, count - len, "\nD: %2x > ", n); + for (i = 0; i < 4 && n <= max; n += 4, i++) len += snprintf(page + len, count - len, - "%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord)); + "%8.8x ", rtl8192_QueryBBReg(dev, + (page0 | n), bMaskDWord)); } - len += snprintf(page + len, count - len,"\n"); + len += snprintf(page + len, count - len, "\n"); *eof = 1; return len; } @@ -524,22 +538,23 @@ static int proc_get_registers_d(char *page, char **start, struct net_device *dev = data; int len = 0; - int i,n,page0; + int i, n, page0; - int max=0xff; + int max = 0xff; page0 = 0xd00; /* This dump the current register page */ len += snprintf(page + len, count - len, - "\n####################page %x##################\n ", (page0>>8)); - for (n=0;n<=max;) - { - len += snprintf(page + len, count - len, "\nD: %2x > ",n); - for (i=0;i<4 && n<=max;n+=4,i++) + "\n####################page %x##################\n", + (page0>>8)); + for (n = 0; n <= max;) { + len += snprintf(page + len, count - len, "\nD: %2x > ", n); + for (i = 0; i < 4 && n <= max; n += 4, i++) len += snprintf(page + len, count - len, - "%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord)); + "%8.8x ", rtl8192_QueryBBReg(dev, + (page0 | n), bMaskDWord)); } - len += snprintf(page + len, count - len,"\n"); + len += snprintf(page + len, count - len, "\n"); *eof = 1; return len; } @@ -550,22 +565,23 @@ static int proc_get_registers_e(char *page, char **start, struct net_device *dev = data; int len = 0; - int i,n,page0; + int i, n, page0; - int max=0xff; + int max = 0xff; page0 = 0xe00; /* This dump the current register page */ len += snprintf(page + len, count - len, - "\n####################page %x##################\n ", (page0>>8)); - for (n=0;n<=max;) - { - len += snprintf(page + len, count - len, "\nD: %2x > ",n); - for (i=0;i<4 && n<=max;n+=4,i++) + "\n####################page %x##################\n", + (page0>>8)); + for (n = 0; n <= max;) { + len += snprintf(page + len, count - len, "\nD: %2x > ", n); + for (i = 0; i < 4 && n <= max; n += 4, i++) len += snprintf(page + len, count - len, - "%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord)); + "%8.8x ", rtl8192_QueryBBReg(dev, + (page0 | n), bMaskDWord)); } - len += snprintf(page + len, count - len,"\n"); + len += snprintf(page + len, count - len, "\n"); *eof = 1; return len; } @@ -577,21 +593,22 @@ static int proc_get_reg_rf_a(char *page, char **start, struct net_device *dev = data; int len = 0; - int i,n; + int i, n; - int max=0xff; + int max = 0xff; /* This dump the current register page */ len += snprintf(page + len, count - len, "\n#################### RF-A ##################\n "); - for (n=0;n<=max;) - { - len += snprintf(page + len, count - len, "\nD: %2x > ",n); - for (i=0;i<4 && n<=max;n+=4,i++) + for (n = 0; n <= max;) { + len += snprintf(page + len, count - len, "\nD: %2x > ", n); + for (i = 0; i < 4 && n <= max; n += 4, i++) len += snprintf(page + len, count - len, - "%8.8x ",rtl8192_phy_QueryRFReg(dev, (enum rf90_radio_path)RF90_PATH_A,n, bMaskDWord)); + "%8.8x ", rtl8192_phy_QueryRFReg(dev, + (enum rf90_radio_path)RF90_PATH_A, n, + bMaskDWord)); } - len += snprintf(page + len, count - len,"\n"); + len += snprintf(page + len, count - len, "\n"); *eof = 1; return len; } @@ -603,21 +620,22 @@ static int proc_get_reg_rf_b(char *page, char **start, struct net_device *dev = data; int len = 0; - int i,n; + int i, n; - int max=0xff; + int max = 0xff; /* This dump the current register page */ len += snprintf(page + len, count - len, "\n#################### RF-B ##################\n "); - for (n=0;n<=max;) - { - len += snprintf(page + len, count - len, "\nD: %2x > ",n); - for (i=0;i<4 && n<=max;n+=4,i++) + for (n = 0; n <= max;) { + len += snprintf(page + len, count - len, "\nD: %2x > ", n); + for (i = 0; i < 4 && n <= max; n += 4, i++) len += snprintf(page + len, count - len, - "%8.8x ",rtl8192_phy_QueryRFReg(dev, (enum rf90_radio_path)RF90_PATH_B, n, bMaskDWord)); + "%8.8x ", rtl8192_phy_QueryRFReg(dev, + (enum rf90_radio_path)RF90_PATH_B, n, + bMaskDWord)); } - len += snprintf(page + len, count - len,"\n"); + len += snprintf(page + len, count - len, "\n"); *eof = 1; return len; } @@ -629,21 +647,22 @@ static int proc_get_reg_rf_c(char *page, char **start, struct net_device *dev = data; int len = 0; - int i,n; + int i, n; - int max=0xff; + int max = 0xff; /* This dump the current register page */ len += snprintf(page + len, count - len, - "\n#################### RF-C ##################\n "); - for (n=0;n<=max;) - { - len += snprintf(page + len, count - len, "\nD: %2x > ",n); - for (i=0;i<4 && n<=max;n+=4,i++) + "\n#################### RF-C ##################\n"); + for (n = 0; n <= max;) { + len += snprintf(page + len, count - len, "\nD: %2x > ", n); + for (i = 0; i < 4 && n <= max; n += 4, i++) len += snprintf(page + len, count - len, - "%8.8x ",rtl8192_phy_QueryRFReg(dev, (enum rf90_radio_path)RF90_PATH_C, n, bMaskDWord)); + "%8.8x ", rtl8192_phy_QueryRFReg(dev, + (enum rf90_radio_path)RF90_PATH_C, n, + bMaskDWord)); } - len += snprintf(page + len, count - len,"\n"); + len += snprintf(page + len, count - len, "\n"); *eof = 1; return len; } @@ -655,21 +674,22 @@ static int proc_get_reg_rf_d(char *page, char **start, struct net_device *dev = data; int len = 0; - int i,n; + int i, n; - int max=0xff; + int max = 0xff; /* This dump the current register page */ len += snprintf(page + len, count - len, "\n#################### RF-D ##################\n "); - for (n=0;n<=max;) - { - len += snprintf(page + len, count - len, "\nD: %2x > ",n); - for (i=0;i<4 && n<=max;n+=4,i++) + for (n = 0; n <= max;) { + len += snprintf(page + len, count - len, "\nD: %2x > ", n); + for (i = 0; i < 4 && n <= max; n += 4, i++) len += snprintf(page + len, count - len, - "%8.8x ",rtl8192_phy_QueryRFReg(dev, (enum rf90_radio_path)RF90_PATH_D, n, bMaskDWord)); + "%8.8x ", rtl8192_phy_QueryRFReg(dev, + (enum rf90_radio_path)RF90_PATH_D, n, + bMaskDWord)); } - len += snprintf(page + len, count - len,"\n"); + len += snprintf(page + len, count - len, "\n"); *eof = 1; return len; } @@ -679,41 +699,38 @@ static int proc_get_cam_register_1(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - u32 target_command=0; - u32 target_content=0; - u8 entry_i=0; + u32 target_command = 0; + u32 target_content = 0; + u8 entry_i = 0; u32 ulStatus; int len = 0; - int i=100, j = 0; + int i = 100, j = 0; /* This dump the current register page */ len += snprintf(page + len, count - len, - "\n#################### SECURITY CAM (0-10) ##################\n "); - for (j=0; j<11; j++) - { - len += snprintf(page + len, count - len, "\nD: %2x > ",j); - for (entry_i=0;entry_i=0) - { + "\n#################### SECURITY CAM (0-10) ######" + "############\n "); + for (j = 0; j < 11; j++) { + len += snprintf(page + len, count - len, "\nD: %2x > ", j); + for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++) { + target_command = entry_i+CAM_CONTENT_COUNT*j; + target_command = target_command | BIT31; + + while ((i--) >= 0) { ulStatus = read_nic_dword(dev, RWCAM); - if (ulStatus & BIT31){ + if (ulStatus & BIT31) continue; - } - else{ + else break; - } } write_nic_dword(dev, RWCAM, target_command); target_content = read_nic_dword(dev, RCAMO); - len += snprintf(page + len, count - len,"%8.8x ",target_content); + len += snprintf(page + len, count - len, "%8.8x ", + target_content); } } - len += snprintf(page + len, count - len,"\n"); + len += snprintf(page + len, count - len, "\n"); *eof = 1; return len; } @@ -723,41 +740,38 @@ static int proc_get_cam_register_2(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - u32 target_command=0; - u32 target_content=0; - u8 entry_i=0; + u32 target_command = 0; + u32 target_content = 0; + u8 entry_i = 0; u32 ulStatus; int len = 0; - int i=100, j = 0; + int i = 100, j = 0; /* This dump the current register page */ len += snprintf(page + len, count - len, - "\n#################### SECURITY CAM (11-21) ##################\n "); - for (j=11; j<22; j++) - { - len += snprintf(page + len, count - len, "\nD: %2x > ",j); - for (entry_i=0;entry_i=0) - { + "\n#################### SECURITY CAM (11-21) " + "##################\n "); + for (j = 11; j < 22; j++) { + len += snprintf(page + len, count - len, "\nD: %2x > ", j); + for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++) { + target_command = entry_i + CAM_CONTENT_COUNT * j; + target_command = target_command | BIT31; + + while ((i--) >= 0) { ulStatus = read_nic_dword(dev, RWCAM); - if (ulStatus & BIT31){ + if (ulStatus & BIT31) continue; - } - else{ + else break; - } } write_nic_dword(dev, RWCAM, target_command); target_content = read_nic_dword(dev, RCAMO); - len += snprintf(page + len, count - len,"%8.8x ",target_content); + len += snprintf(page + len, count - len, "%8.8x ", + target_content); } } - len += snprintf(page + len, count - len,"\n"); + len += snprintf(page + len, count - len, "\n"); *eof = 1; return len; } @@ -767,41 +781,38 @@ static int proc_get_cam_register_3(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - u32 target_command=0; - u32 target_content=0; - u8 entry_i=0; + u32 target_command = 0; + u32 target_content = 0; + u8 entry_i = 0; u32 ulStatus; int len = 0; - int i=100, j = 0; + int i = 100, j = 0; /* This dump the current register page */ len += snprintf(page + len, count - len, - "\n#################### SECURITY CAM (22-31) ##################\n "); - for (j=22; j ",j); - for (entry_i=0;entry_i=0) - { + "\n#################### SECURITY CAM (22-31) ######" + "############\n "); + for (j = 22; j < TOTAL_CAM_ENTRY; j++) { + len += snprintf(page + len, count - len, "\nD: %2x > ", j); + for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++) { + target_command = entry_i + CAM_CONTENT_COUNT * j; + target_command = target_command | BIT31; + + while ((i--) >= 0) { ulStatus = read_nic_dword(dev, RWCAM); - if (ulStatus & BIT31){ + if (ulStatus & BIT31) continue; - } - else{ + else break; - } } write_nic_dword(dev, RWCAM, target_command); target_content = read_nic_dword(dev, RCAMO); - len += snprintf(page + len, count - len,"%8.8x ",target_content); + len += snprintf(page + len, count - len, "%8.8x ", + target_content); } } - len += snprintf(page + len, count - len,"\n"); + len += snprintf(page + len, count - len, "\n"); *eof = 1; return len; } @@ -877,7 +888,7 @@ static int proc_get_stats_rx(char *page, char **start, void rtl8192_proc_module_init(void) { RT_TRACE(COMP_INIT, "Initializing proc filesystem"); - rtl8192_proc=create_proc_entry(DRV_NAME, S_IFDIR, init_net.proc_net); + rtl8192_proc = create_proc_entry(DRV_NAME, S_IFDIR, init_net.proc_net); } @@ -891,7 +902,7 @@ void rtl8192_proc_remove_one(struct net_device *dev) { struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); - printk("dev name %s\n",dev->name); + printk(KERN_INFO "dev name %s\n", dev->name); if (priv->dir_dev) { remove_proc_entry("stats-tx", priv->dir_dev); @@ -929,194 +940,169 @@ void rtl8192_proc_init_one(struct net_device *dev) { struct proc_dir_entry *e; struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); + priv->dir_dev = create_proc_entry(dev->name, S_IFDIR | S_IRUGO | S_IXUGO, rtl8192_proc); if (!priv->dir_dev) { - RT_TRACE(COMP_ERR, "Unable to initialize /proc/net/rtl8192/%s\n", - dev->name); + RT_TRACE(COMP_ERR, "Unable to initialize /proc/net/rtl8192" + "/%s\n", dev->name); return; } e = create_proc_read_entry("stats-rx", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_stats_rx, dev); - if (!e) { - RT_TRACE(COMP_ERR,"Unable to initialize " + if (!e) + RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/stats-rx\n", dev->name); - } - e = create_proc_read_entry("stats-tx", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_stats_tx, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/stats-tx\n", dev->name); - } e = create_proc_read_entry("stats-ap", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_stats_ap, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/stats-ap\n", dev->name); - } e = create_proc_read_entry("registers-0", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_registers_0, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/registers-0\n", dev->name); - } e = create_proc_read_entry("registers-1", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_registers_1, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/registers-1\n", dev->name); - } e = create_proc_read_entry("registers-2", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_registers_2, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/registers-2\n", dev->name); - } e = create_proc_read_entry("registers-3", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_registers_3, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/registers-3\n", dev->name); - } e = create_proc_read_entry("registers-4", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_registers_4, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/registers-4\n", dev->name); - } e = create_proc_read_entry("registers-5", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_registers_5, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/registers-5\n", dev->name); - } e = create_proc_read_entry("registers-6", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_registers_6, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/registers-6\n", dev->name); - } e = create_proc_read_entry("registers-7", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_registers_7, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/registers-7\n", dev->name); - } e = create_proc_read_entry("registers-8", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_registers_8, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/registers-8\n", dev->name); - } e = create_proc_read_entry("registers-9", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_registers_9, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/registers-9\n", dev->name); - } e = create_proc_read_entry("registers-a", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_registers_a, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/registers-a\n", dev->name); - } e = create_proc_read_entry("registers-b", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_registers_b, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/registers-b\n", dev->name); - } e = create_proc_read_entry("registers-c", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_registers_c, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/registers-c\n", dev->name); - } e = create_proc_read_entry("registers-d", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_registers_d, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/registers-d\n", dev->name); - } e = create_proc_read_entry("registers-e", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_registers_e, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/registers-e\n", dev->name); - } e = create_proc_read_entry("RF-A", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_reg_rf_a, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/RF-A\n", dev->name); - } e = create_proc_read_entry("RF-B", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_reg_rf_b, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/RF-B\n", dev->name); - } e = create_proc_read_entry("RF-C", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_reg_rf_c, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/RF-C\n", dev->name); - } e = create_proc_read_entry("RF-D", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_reg_rf_d, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/RF-D\n", dev->name); - } e = create_proc_read_entry("SEC-CAM-1", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_cam_register_1, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/SEC-CAM-1\n", dev->name); - } e = create_proc_read_entry("SEC-CAM-2", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_cam_register_2, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/SEC-CAM-2\n", dev->name); - } e = create_proc_read_entry("SEC-CAM-3", S_IFREG | S_IRUGO, priv->dir_dev, proc_get_cam_register_3, dev); - if (!e) { + if (!e) RT_TRACE(COMP_ERR, "Unable to initialize " "/proc/net/rtl8192/%s/SEC-CAM-3\n", dev->name); - } } diff --git a/drivers/staging/rtl8192e/rtl_debug.h b/drivers/staging/rtl8192e/rtl_debug.h index 415dfca6b37d..50fb9a9b828a 100644 --- a/drivers/staging/rtl8192e/rtl_debug.h +++ b/drivers/staging/rtl8192e/rtl_debug.h @@ -36,31 +36,30 @@ struct net_device; #define DBG_LOUD 4 -#define RT_ASSERT(_Exp,Fmt) \ - if (!(_Exp)) \ - { \ - printk("Rtl819x: "); \ - printk Fmt; \ +#define RT_ASSERT(_Exp, Fmt) \ + if (!(_Exp)) { \ + printk("Rtl819x: "); \ + printk Fmt; \ } enum dbgp_flag { FQoS = 0, - FTX = 1, - FRX = 2, + FTX = 1, + FRX = 2, FSEC = 3, FMGNT = 4, FMLME = 5, FRESOURCE = 6, - FBEACON = 7, + FBEACON = 7, FISR = 8, FPHY = 9, - FMP = 10, - FEEPROM = 11, + FMP = 10, + FEEPROM = 11, FPWR = 12, - FDM = 13, - FDBGCtrl = 14, + FDM = 13, + FDBGCtrl = 14, FC2H = 15, - FBT = 16, + FBT = 16, FINIT = 17, FIOCTL = 18, DBGP_TYPE_MAX @@ -76,10 +75,10 @@ enum dbgp_flag { #define RX_PHY_STS BIT1 #define RX_PHY_SS BIT2 #define RX_PHY_SQ BIT3 -#define RX_PHY_ASTS BIT4 +#define RX_PHY_ASTS BIT4 #define RX_ERR_LEN BIT5 #define RX_DEFRAG BIT6 -#define RX_ERR_RATE BIT7 +#define RX_ERR_RATE BIT7 @@ -93,68 +92,68 @@ enum dbgp_flag { #define ISR_CHK BIT0 -#define PHY_BBR BIT0 -#define PHY_BBW BIT1 -#define PHY_RFR BIT2 -#define PHY_RFW BIT3 +#define PHY_BBR BIT0 +#define PHY_BBW BIT1 +#define PHY_RFR BIT2 +#define PHY_RFW BIT3 #define PHY_MACR BIT4 #define PHY_MACW BIT5 #define PHY_ALLR BIT6 #define PHY_ALLW BIT7 #define PHY_TXPWR BIT8 -#define PHY_PWRDIFF BIT9 +#define PHY_PWRDIFF BIT9 #define MP_RX BIT0 -#define MP_SWICH_CH BIT1 +#define MP_SWICH_CH BIT1 #define EEPROM_W BIT0 #define EFUSE_PG BIT1 -#define EFUSE_READ_ALL BIT2 +#define EFUSE_READ_ALL BIT2 -#define LPS BIT0 -#define IPS BIT1 +#define LPS BIT0 +#define IPS BIT1 #define PWRSW BIT2 #define PWRHW BIT3 #define PWRHAL BIT4 #define WA_IOT BIT0 -#define DM_PWDB BIT1 +#define DM_PWDB BIT1 #define DM_Monitor BIT2 #define DM_DIG BIT3 -#define DM_EDCA_Turbo BIT4 +#define DM_EDCA_Turbo BIT4 -#define DbgCtrl_Trace BIT0 -#define DbgCtrl_InbandNoise BIT1 +#define DbgCtrl_Trace BIT0 +#define DbgCtrl_InbandNoise BIT1 #define BT_TRACE BIT0 #define BT_RFPoll BIT1 -#define C2H_Summary BIT0 -#define C2H_PacketData BIT1 -#define C2H_ContentData BIT2 +#define C2H_Summary BIT0 +#define C2H_PacketData BIT1 +#define C2H_ContentData BIT2 #define BT_TRACE BIT0 #define BT_RFPoll BIT1 #define INIT_EEPROM BIT0 -#define INIT_TxPower BIT1 +#define INIT_TxPower BIT1 #define INIT_IQK BIT2 #define INIT_RF BIT3 -#define IOCTL_TRACE BIT0 -#define IOCTL_BT_EVENT BIT1 +#define IOCTL_TRACE BIT0 +#define IOCTL_BT_EVENT BIT1 #define IOCTL_BT_EVENT_DETAIL BIT2 #define IOCTL_BT_TX_ACLDATA BIT3 #define IOCTL_BT_TX_ACLDATA_DETAIL BIT4 #define IOCTL_BT_RX_ACLDATA BIT5 -#define IOCTL_BT_RX_ACLDATA_DETAIL BIT6 +#define IOCTL_BT_RX_ACLDATA_DETAIL BIT6 #define IOCTL_BT_HCICMD BIT7 #define IOCTL_BT_HCICMD_DETAIL BIT8 -#define IOCTL_IRP BIT9 -#define IOCTL_IRP_DETAIL BIT10 -#define IOCTL_CALLBACK_FUN BIT11 -#define IOCTL_STATE BIT12 -#define IOCTL_BT_TP BIT13 -#define IOCTL_BT_LOGO BIT14 +#define IOCTL_IRP BIT9 +#define IOCTL_IRP_DETAIL BIT10 +#define IOCTL_CALLBACK_FUN BIT11 +#define IOCTL_STATE BIT12 +#define IOCTL_BT_TP BIT13 +#define IOCTL_BT_LOGO BIT14 /* 2007/07/13 MH ------For DeBuG Print modeue------*/ /*------------------------------Define structure----------------------------*/ @@ -164,97 +163,98 @@ enum dbgp_flag { #define DEBUG_PRINT 1 #if (DEBUG_PRINT == 1) -#define RTPRINT(dbgtype, dbgflag, printstr) \ -{ \ - if (DBGP_Type[dbgtype] & dbgflag)\ - { \ +#define RTPRINT(dbgtype, dbgflag, printstr) \ +{ \ + if (DBGP_Type[dbgtype] & dbgflag) { \ printk printstr; \ - } \ + } \ } -#define RTPRINT_ADDR(dbgtype, dbgflag, printstr, _Ptr)\ -{\ - if (DBGP_Type[dbgtype] & dbgflag)\ - {\ - int __i; \ - u8* ptr = (u8*)_Ptr; \ - printk printstr; \ - printk(" "); \ - for ( __i=0; __i<6; __i++ ) \ - printk("%02X%s", ptr[__i], (__i==5)?"":"-"); \ - printk("\n"); \ - }\ +#define RTPRINT_ADDR(dbgtype, dbgflag, printstr, _Ptr) \ +{ \ + if (DBGP_Type[dbgtype] & dbgflag) { \ + int __i; \ + u8 *ptr = (u8 *)_Ptr; \ + printk printstr; \ + printk(" "); \ + for (__i = 0; __i < 6; __i++) \ + printk("%02X%s", ptr[__i], \ + (__i == 5) ? "" : "-"); \ + printk("\n"); \ + } \ } #define RTPRINT_DATA(dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen)\ -{\ - if (DBGP_Type[dbgtype] & dbgflag)\ - {\ - int __i; \ - u8* ptr = (u8*)_HexData; \ - printk(_TitleString); \ - for ( __i=0; __i<(int)_HexDataLen; __i++ ) \ - { \ - printk("%02X%s", ptr[__i], (((__i + 1) % 4) == 0)?" ":" ");\ - if (((__i + 1) % 16) == 0) printk("\n");\ - } \ - printk("\n"); \ - }\ +{ \ + if (DBGP_Type[dbgtype] & dbgflag) { \ + int __i; \ + u8 *ptr = (u8 *)_HexData; \ + printk(_TitleString); \ + for (__i = 0; __i < (int)_HexDataLen; __i++) { \ + printk("%02X%s", ptr[__i], (((__i + 1) \ + % 4) == 0) ? " " : " "); \ + if (((__i + 1) % 16) == 0) \ + printk("\n"); \ + } \ + printk("\n"); \ + } \ } #else #define RTPRINT(dbgtype, dbgflag, printstr) #define RTPRINT_ADDR(dbgtype, dbgflag, printstr, _Ptr) -#define RTPRINT_DATA(dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen) +#define RTPRINT_DATA(dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen) #endif extern u32 DBGP_Type[DBGP_TYPE_MAX]; -#define RT_PRINT_DATA(_Comp, _Level, _TitleString, _HexData, _HexDataLen) \ +#define RT_PRINT_DATA(_Comp, _Level, _TitleString, _HexData, _HexDataLen) \ do {\ - if (((_Comp) & rt_global_debug_component ) && (_Level <= rt_global_debug_component )) \ - { \ - int __i; \ - u8* ptr = (u8*)_HexData; \ - printk("Rtl819x: "); \ - printk(_TitleString); \ - for ( __i=0; __i<(int)_HexDataLen; __i++ ) \ - { \ - printk("%02X%s", ptr[__i], (((__i + 1) % 4) == 0)?" ":" "); \ - if (((__i + 1) % 16) == 0) printk("\n"); \ - } \ - printk("\n"); \ + if (((_Comp) & rt_global_debug_component) && \ + (_Level <= rt_global_debug_component)) { \ + int __i; \ + u8* ptr = (u8 *)_HexData; \ + printk(KERN_INFO "Rtl819x: "); \ + printk(_TitleString); \ + for (__i = 0; __i < (int)_HexDataLen; __i++) { \ + printk("%02X%s", ptr[__i], (((__i + 1) % \ + 4) == 0) ? " " : " "); \ + if (((__i + 1) % 16) == 0) \ + printk("\n"); \ + } \ + printk("\n"); \ } \ -}while(0); +} while (0); -#define DMESG(x,a...) -#define DMESGW(x,a...) -#define DMESGE(x,a...) +#define DMESG(x, a...) +#define DMESGW(x, a...) +#define DMESGE(x, a...) extern u32 rt_global_debug_component; #define RT_TRACE(component, x, args...) \ -do { if (rt_global_debug_component & component) \ - printk(KERN_DEBUG DRV_NAME ":" x "\n" , \ - ##args);\ -}while(0); +do { \ + if (rt_global_debug_component & component) \ + printk(KERN_DEBUG DRV_NAME ":" x "\n" , \ + ##args);\ +} while (0); #define assert(expr) \ - if (!(expr)) { \ - printk( "Assertion failed! %s,%s,%s,line=%d\n", \ - #expr,__FILE__,__func__,__LINE__); \ - } + if (!(expr)) { \ + printk(KERN_INFO "Assertion failed! %s,%s,%s,line=%d\n", \ + #expr, __FILE__, __func__, __LINE__); \ + } #define RT_DEBUG_DATA(level, data, datalen) \ - do{ if ((rt_global_debug_component & (level)) == (level)) \ - { \ - int _i; \ - u8* _pdata = (u8*) data; \ - printk(KERN_DEBUG DRV_NAME ": %s()\n", __func__); \ - for (_i=0; _i<(int)(datalen); _i++) \ - { \ - printk("%2x ", _pdata[_i]); \ - if ((_i+1)%16 == 0) printk("\n"); \ - } \ - printk("\n"); \ - } \ - } while (0) + do { \ + if ((rt_global_debug_component & (level)) == (level)) {\ + int _i; \ + u8 *_pdata = (u8 *)data; \ + printk(KERN_DEBUG DRV_NAME ": %s()\n", __func__); \ + for (_i = 0; _i < (int)(datalen); _i++) { \ + printk(KERN_INFO "%2x ", _pdata[_i]); \ + if ((_i+1) % 16 == 0) \ + printk("\n"); \ + } \ + printk(KERN_INFO "\n"); \ + } \ + } while (0) struct rtl_fs_debug { const char *name; @@ -270,16 +270,23 @@ void dump_eprom(struct net_device *dev); void rtl8192_dump_reg(struct net_device *dev); /* debugfs stuff */ -static inline int rtl_debug_module_init(struct r8192_priv *priv, const char *name) { +static inline int rtl_debug_module_init(struct r8192_priv *priv, + const char *name) +{ return 0; } -static inline void rtl_debug_module_remove(struct r8192_priv *priv) { +static inline void rtl_debug_module_remove(struct r8192_priv *priv) +{ } -static inline int rtl_create_debugfs_root(void) { + +static inline int rtl_create_debugfs_root(void) +{ return 0; } -static inline void rtl_remove_debugfs_root(void) { + +static inline void rtl_remove_debugfs_root(void) +{ } /* proc stuff */ @@ -288,4 +295,5 @@ void rtl8192_proc_remove_one(struct net_device *dev); void rtl8192_proc_module_init(void); void rtl8192_proc_module_remove(void); void rtl8192_dbgp_flag_init(struct net_device *dev); + #endif -- cgit v1.2.3-59-g8ed1b