Skip to content

L
linux
Commit 6e579119 authored by Larry Finger's avatar Larry Finger
Browse files
Options

staging: rtl8192e: Convert typedef HT_CHANNEL_WIDTH to enum ht_channel_width 

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent cc8abb26
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 17 deletions
drivers/staging/rtl8192e/r8190P_rtl8256.c
View file @ 6e579119
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "r8192E_phy.h" #include "r8192E_phy.h"
#include "r8190P_rtl8256.h" #include "r8190P_rtl8256.h"
void PHY_SetRF8256Bandwidth(struct net_device* dev , HT_CHANNEL_WIDTH Bandwidth) void PHY_SetRF8256Bandwidth(struct net_device* dev , enum ht_channel_width Bandwidth)
{ {
u8 eRFPath; u8 eRFPath;
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
......
drivers/staging/rtl8192e/r8190P_rtl8256.h
View file @ 6e579119
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define RTL8225H #define RTL8225H
#define RTL819X_TOTAL_RF_PATH 2 #define RTL819X_TOTAL_RF_PATH 2
extern void PHY_SetRF8256Bandwidth(struct net_device* dev , HT_CHANNEL_WIDTH Bandwidth); extern void PHY_SetRF8256Bandwidth(struct net_device* dev , enum ht_channel_width Bandwidth);
extern bool PHY_RF8256_Config(struct net_device* dev); extern bool PHY_RF8256_Config(struct net_device* dev);
extern bool phy_RF8256_Config_ParaFile(struct net_device* dev); extern bool phy_RF8256_Config_ParaFile(struct net_device* dev);
extern void PHY_SetRF8256CCKTxPower(struct net_device* dev, u8 powerlevel); extern void PHY_SetRF8256CCKTxPower(struct net_device* dev, u8 powerlevel);
......
drivers/staging/rtl8192e/r8192E_phy.c
View file @ 6e579119
...@@ -1264,7 +1264,7 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev) ...@@ -1264,7 +1264,7 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev)
RT_TRACE(COMP_SWBW, "<==SetBWMode819xUsb()"); RT_TRACE(COMP_SWBW, "<==SetBWMode819xUsb()");
} }
void rtl8192_SetBWMode(struct net_device *dev, HT_CHANNEL_WIDTH Bandwidth, HT_EXTCHNL_OFFSET Offset) void rtl8192_SetBWMode(struct net_device *dev, enum ht_channel_width Bandwidth, HT_EXTCHNL_OFFSET Offset)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
......
drivers/staging/rtl8192e/r8192E_phy.h
View file @ 6e579119
...@@ -113,7 +113,7 @@ extern void rtl8192_phy_updateInitGain(struct net_device* dev); ...@@ -113,7 +113,7 @@ extern void rtl8192_phy_updateInitGain(struct net_device* dev);
extern u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device* dev, enum rf90_radio_path eRFPath); extern u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device* dev, enum rf90_radio_path eRFPath);
extern u8 rtl8192_phy_SwChnl(struct net_device* dev, u8 channel); extern u8 rtl8192_phy_SwChnl(struct net_device* dev, u8 channel);
extern void rtl8192_SetBWMode(struct net_device *dev, HT_CHANNEL_WIDTH Bandwidth, HT_EXTCHNL_OFFSET Offset); extern void rtl8192_SetBWMode(struct net_device *dev, enum ht_channel_width Bandwidth, HT_EXTCHNL_OFFSET Offset);
extern void rtl8192_SwChnl_WorkItem(struct net_device *dev); extern void rtl8192_SwChnl_WorkItem(struct net_device *dev);
extern void rtl8192_SetBWModeWorkItem(struct net_device *dev); extern void rtl8192_SetBWModeWorkItem(struct net_device *dev);
extern void InitialGain819xPci(struct net_device *dev, u8 Operation); extern void InitialGain819xPci(struct net_device *dev, u8 Operation);
......
drivers/staging/rtl8192e/rtl819x_HT.h
View file @ 6e579119
...@@ -58,10 +58,10 @@ enum ht_mcs_rate { ...@@ -58,10 +58,10 @@ enum ht_mcs_rate {
HT_MCS15 = 0x00008000, HT_MCS15 = 0x00008000,
}; };
typedef enum _HT_CHANNEL_WIDTH{ enum ht_channel_width {
HT_CHANNEL_WIDTH_20 = 0, HT_CHANNEL_WIDTH_20 = 0,
HT_CHANNEL_WIDTH_20_40 = 1, HT_CHANNEL_WIDTH_20_40 = 1,
} HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH; };
typedef enum _HT_EXTCHNL_OFFSET{ typedef enum _HT_EXTCHNL_OFFSET{
HT_EXTCHNL_OFFSET_NO_EXT = 0, HT_EXTCHNL_OFFSET_NO_EXT = 0,
...@@ -344,7 +344,7 @@ struct bss_ht { ...@@ -344,7 +344,7 @@ struct bss_ht {
u16 bdHTInfoLen; u16 bdHTInfoLen;
HT_SPEC_VER bdHTSpecVer; HT_SPEC_VER bdHTSpecVer;
HT_CHANNEL_WIDTH bdBandWidth; enum ht_channel_width bdBandWidth;
u8 bdRT2RTAggregation; u8 bdRT2RTAggregation;
u8 bdRT2RTLongSlotTime; u8 bdRT2RTLongSlotTime;
......
drivers/staging/rtl8192e/rtl819x_HTProc.c
View file @ 6e579119
...@@ -831,7 +831,7 @@ u8 HTFilterMCSRate( struct rtllib_device* ieee, u8* pSupportMCS, u8* pOperateMCS ...@@ -831,7 +831,7 @@ u8 HTFilterMCSRate( struct rtllib_device* ieee, u8* pSupportMCS, u8* pOperateMCS
return true; return true;
} }
void HTSetConnectBwMode(struct rtllib_device* ieee, HT_CHANNEL_WIDTH Bandwidth, HT_EXTCHNL_OFFSET Offset); void HTSetConnectBwMode(struct rtllib_device* ieee, enum ht_channel_width Bandwidth, HT_EXTCHNL_OFFSET Offset);
void HTOnAssocRsp(struct rtllib_device *ieee) void HTOnAssocRsp(struct rtllib_device *ieee)
{ {
struct rt_hi_throughput *pHTInfo = ieee->pHTInfo; struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;
...@@ -861,7 +861,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) ...@@ -861,7 +861,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
pPeerHTInfo = (struct ht_info_ele *)(pHTInfo->PeerHTInfoBuf); pPeerHTInfo = (struct ht_info_ele *)(pHTInfo->PeerHTInfoBuf);
RTLLIB_DEBUG_DATA(RTLLIB_DL_DATA|RTLLIB_DL_HT, pPeerHTCap, sizeof(struct ht_capab_ele)); RTLLIB_DEBUG_DATA(RTLLIB_DL_DATA|RTLLIB_DL_HT, pPeerHTCap, sizeof(struct ht_capab_ele));
HTSetConnectBwMode(ieee, (HT_CHANNEL_WIDTH)(pPeerHTCap->ChlWidth), (HT_EXTCHNL_OFFSET)(pPeerHTInfo->ExtChlOffset)); HTSetConnectBwMode(ieee, (enum ht_channel_width)(pPeerHTCap->ChlWidth), (HT_EXTCHNL_OFFSET)(pPeerHTInfo->ExtChlOffset));
pHTInfo->bCurTxBW40MHz = ((pPeerHTInfo->RecommemdedTxWidth == 1)?true:false); pHTInfo->bCurTxBW40MHz = ((pPeerHTInfo->RecommemdedTxWidth == 1)?true:false);
pHTInfo->bCurShortGI20MHz= pHTInfo->bCurShortGI20MHz=
...@@ -1137,7 +1137,7 @@ u8 HTCCheck(struct rtllib_device* ieee, u8* pFrame) ...@@ -1137,7 +1137,7 @@ u8 HTCCheck(struct rtllib_device* ieee, u8* pFrame)
return false; return false;
} }
void HTSetConnectBwMode(struct rtllib_device* ieee, HT_CHANNEL_WIDTH Bandwidth, HT_EXTCHNL_OFFSET Offset) void HTSetConnectBwMode(struct rtllib_device* ieee, enum ht_channel_width Bandwidth, HT_EXTCHNL_OFFSET Offset)
{ {
struct rt_hi_throughput *pHTInfo = ieee->pHTInfo; struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;
......
drivers/staging/rtl8192e/rtl_core.h
View file @ 6e579119
...@@ -589,7 +589,7 @@ struct r8192_priv { ...@@ -589,7 +589,7 @@ struct r8192_priv {
RT_RF_TYPE_819xU rf_chip; RT_RF_TYPE_819xU rf_chip;
IC_INFERIORITY_8192S IC_Class; IC_INFERIORITY_8192S IC_Class;
HT_CHANNEL_WIDTH CurrentChannelBW; enum ht_channel_width CurrentChannelBW;
struct bb_reg_definition PHYRegDef[4]; struct bb_reg_definition PHYRegDef[4];
struct rate_adaptive rate_adaptive; struct rate_adaptive rate_adaptive;
......
drivers/staging/rtl8192e/rtllib.h
View file @ 6e579119
...@@ -2095,7 +2095,7 @@ struct rtllib_device { ...@@ -2095,7 +2095,7 @@ struct rtllib_device {
unsigned long status; unsigned long status;
short hwscan_ch_bk; short hwscan_ch_bk;
HT_EXTCHNL_OFFSET chan_offset_bk; HT_EXTCHNL_OFFSET chan_offset_bk;
HT_CHANNEL_WIDTH bandwidth_bk; enum ht_channel_width bandwidth_bk;
u8 hwscan_sem_up; u8 hwscan_sem_up;
u8 CntAfterLink; u8 CntAfterLink;
...@@ -2512,7 +2512,7 @@ struct rtllib_device { ...@@ -2512,7 +2512,7 @@ struct rtllib_device {
/* check whether Tx hw resouce available */ /* check whether Tx hw resouce available */
short (*check_nic_enough_desc)(struct net_device *dev, int queue_index); short (*check_nic_enough_desc)(struct net_device *dev, int queue_index);
short (*get_nic_desc_num)(struct net_device *dev, int queue_index); short (*get_nic_desc_num)(struct net_device *dev, int queue_index);
void (*SetBWModeHandler)(struct net_device *dev, HT_CHANNEL_WIDTH Bandwidth, HT_EXTCHNL_OFFSET Offset); void (*SetBWModeHandler)(struct net_device *dev, enum ht_channel_width Bandwidth, HT_EXTCHNL_OFFSET Offset);
bool (*GetNmodeSupportBySecCfg)(struct net_device* dev); bool (*GetNmodeSupportBySecCfg)(struct net_device* dev);
void (*SetWirelessMode)(struct net_device* dev, u8 wireless_mode); void (*SetWirelessMode)(struct net_device* dev, u8 wireless_mode);
bool (*GetHalfNmodeSupportByAPsHandler)(struct net_device* dev); bool (*GetHalfNmodeSupportByAPsHandler)(struct net_device* dev);
...@@ -2884,7 +2884,7 @@ extern int rtllib_wx_get_rts(struct rtllib_device *ieee, ...@@ -2884,7 +2884,7 @@ extern int rtllib_wx_get_rts(struct rtllib_device *ieee,
extern void HTDebugHTCapability(u8* CapIE, u8* TitleString ); extern void HTDebugHTCapability(u8* CapIE, u8* TitleString );
extern void HTDebugHTInfo(u8* InfoIE, u8* TitleString); extern void HTDebugHTInfo(u8* InfoIE, u8* TitleString);
void HTSetConnectBwMode(struct rtllib_device* ieee, HT_CHANNEL_WIDTH Bandwidth, HT_EXTCHNL_OFFSET Offset); void HTSetConnectBwMode(struct rtllib_device* ieee, enum ht_channel_width Bandwidth, HT_EXTCHNL_OFFSET Offset);
extern void HTUpdateDefaultSetting(struct rtllib_device* ieee); extern void HTUpdateDefaultSetting(struct rtllib_device* ieee);
extern void HTConstructCapabilityElement(struct rtllib_device* ieee, u8* posHTCap, u8* len, u8 isEncrypt,bool bAssoc); extern void HTConstructCapabilityElement(struct rtllib_device* ieee, u8* posHTCap, u8* len, u8 isEncrypt,bool bAssoc);
extern void HTConstructInfoElement(struct rtllib_device* ieee, u8* posHTInfo, u8* len, u8 isEncrypt); extern void HTConstructInfoElement(struct rtllib_device* ieee, u8* posHTInfo, u8* len, u8 isEncrypt);
......
drivers/staging/rtl8192e/rtllib_rx.c
View file @ 6e579119
...@@ -2157,7 +2157,7 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, ...@@ -2157,7 +2157,7 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
network->bssht.bdSupportHT = true; network->bssht.bdSupportHT = true;
network->bssht.bdHT1R = ((((struct ht_capab_ele *)(network->bssht.bdHTCapBuf))->MCS[1]) == 0); network->bssht.bdHT1R = ((((struct ht_capab_ele *)(network->bssht.bdHTCapBuf))->MCS[1]) == 0);
network->bssht.bdBandWidth = (HT_CHANNEL_WIDTH)(((struct ht_capab_ele *)(network->bssht.bdHTCapBuf))->ChlWidth); network->bssht.bdBandWidth = (enum ht_channel_width)(((struct ht_capab_ele *)(network->bssht.bdHTCapBuf))->ChlWidth);
} }
else{ else{
network->bssht.bdSupportHT = false; network->bssht.bdSupportHT = false;
......
drivers/staging/rtl8192e/rtllib_softmac_wx.c
View file @ 6e579119
...@@ -318,7 +318,7 @@ void rtllib_wx_sync_scan_wq(void *data) ...@@ -318,7 +318,7 @@ void rtllib_wx_sync_scan_wq(void *data)
struct rtllib_device *ieee = container_of_work_rsl(data, struct rtllib_device, wx_sync_scan_wq); struct rtllib_device *ieee = container_of_work_rsl(data, struct rtllib_device, wx_sync_scan_wq);
short chan; short chan;
HT_EXTCHNL_OFFSET chan_offset=0; HT_EXTCHNL_OFFSET chan_offset=0;
HT_CHANNEL_WIDTH bandwidth=0; enum ht_channel_width bandwidth=0;
int b40M = 0; int b40M = 0;
static int count = 0; static int count = 0;
...@@ -351,7 +351,7 @@ void rtllib_wx_sync_scan_wq(void *data) ...@@ -351,7 +351,7 @@ void rtllib_wx_sync_scan_wq(void *data)
if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT && ieee->pHTInfo->bCurBW40MHz) { if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT && ieee->pHTInfo->bCurBW40MHz) {
b40M = 1; b40M = 1;
chan_offset = ieee->pHTInfo->CurSTAExtChnlOffset; chan_offset = ieee->pHTInfo->CurSTAExtChnlOffset;
bandwidth = (HT_CHANNEL_WIDTH)ieee->pHTInfo->bCurBW40MHz; bandwidth = (enum ht_channel_width)ieee->pHTInfo->bCurBW40MHz;
RT_TRACE(COMP_DBG, "Scan in 40M, force to 20M first:%d, %d\n", chan_offset, bandwidth); RT_TRACE(COMP_DBG, "Scan in 40M, force to 20M first:%d, %d\n", chan_offset, bandwidth);
ieee->SetBWModeHandler(ieee->dev, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); ieee->SetBWModeHandler(ieee->dev, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7