staging: rtl8192e: Convert typedef HT_CHANNEL_WIDTH to enum ht_channel_width
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
parent
cc8abb261d
commit
6e579119b1
|
@ -22,7 +22,7 @@
|
|||
#include "r8192E_phy.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;
|
||||
struct r8192_priv *priv = rtllib_priv(dev);
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#define RTL8225H
|
||||
|
||||
#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_ParaFile(struct net_device* dev);
|
||||
extern void PHY_SetRF8256CCKTxPower(struct net_device* dev, u8 powerlevel);
|
||||
|
|
|
@ -1264,7 +1264,7 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev)
|
|||
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);
|
||||
|
||||
|
|
|
@ -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_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_SetBWModeWorkItem(struct net_device *dev);
|
||||
extern void InitialGain819xPci(struct net_device *dev, u8 Operation);
|
||||
|
|
|
@ -58,10 +58,10 @@ enum ht_mcs_rate {
|
|||
HT_MCS15 = 0x00008000,
|
||||
};
|
||||
|
||||
typedef enum _HT_CHANNEL_WIDTH{
|
||||
enum ht_channel_width {
|
||||
HT_CHANNEL_WIDTH_20 = 0,
|
||||
HT_CHANNEL_WIDTH_20_40 = 1,
|
||||
} HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH;
|
||||
};
|
||||
|
||||
typedef enum _HT_EXTCHNL_OFFSET{
|
||||
HT_EXTCHNL_OFFSET_NO_EXT = 0,
|
||||
|
@ -344,7 +344,7 @@ struct bss_ht {
|
|||
u16 bdHTInfoLen;
|
||||
|
||||
HT_SPEC_VER bdHTSpecVer;
|
||||
HT_CHANNEL_WIDTH bdBandWidth;
|
||||
enum ht_channel_width bdBandWidth;
|
||||
|
||||
u8 bdRT2RTAggregation;
|
||||
u8 bdRT2RTLongSlotTime;
|
||||
|
|
|
@ -831,7 +831,7 @@ u8 HTFilterMCSRate( struct rtllib_device* ieee, u8* pSupportMCS, u8* pOperateMCS
|
|||
|
||||
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)
|
||||
{
|
||||
struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;
|
||||
|
@ -861,7 +861,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
|
|||
pPeerHTInfo = (struct ht_info_ele *)(pHTInfo->PeerHTInfoBuf);
|
||||
|
||||
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->bCurShortGI20MHz=
|
||||
|
@ -1137,7 +1137,7 @@ u8 HTCCheck(struct rtllib_device* ieee, u8* pFrame)
|
|||
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;
|
||||
|
||||
|
|
|
@ -589,7 +589,7 @@ struct r8192_priv {
|
|||
|
||||
RT_RF_TYPE_819xU rf_chip;
|
||||
IC_INFERIORITY_8192S IC_Class;
|
||||
HT_CHANNEL_WIDTH CurrentChannelBW;
|
||||
enum ht_channel_width CurrentChannelBW;
|
||||
struct bb_reg_definition PHYRegDef[4];
|
||||
struct rate_adaptive rate_adaptive;
|
||||
|
||||
|
|
|
@ -2095,7 +2095,7 @@ struct rtllib_device {
|
|||
unsigned long status;
|
||||
short hwscan_ch_bk;
|
||||
HT_EXTCHNL_OFFSET chan_offset_bk;
|
||||
HT_CHANNEL_WIDTH bandwidth_bk;
|
||||
enum ht_channel_width bandwidth_bk;
|
||||
u8 hwscan_sem_up;
|
||||
u8 CntAfterLink;
|
||||
|
||||
|
@ -2512,7 +2512,7 @@ struct rtllib_device {
|
|||
/* check whether Tx hw resouce available */
|
||||
short (*check_nic_enough_desc)(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);
|
||||
void (*SetWirelessMode)(struct net_device* dev, u8 wireless_mode);
|
||||
bool (*GetHalfNmodeSupportByAPsHandler)(struct net_device* dev);
|
||||
|
@ -2884,7 +2884,7 @@ extern int rtllib_wx_get_rts(struct rtllib_device *ieee,
|
|||
extern void HTDebugHTCapability(u8* CapIE, 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 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);
|
||||
|
|
|
@ -2157,7 +2157,7 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
|
|||
network->bssht.bdSupportHT = true;
|
||||
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{
|
||||
network->bssht.bdSupportHT = false;
|
||||
|
|
|
@ -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);
|
||||
short chan;
|
||||
HT_EXTCHNL_OFFSET chan_offset=0;
|
||||
HT_CHANNEL_WIDTH bandwidth=0;
|
||||
enum ht_channel_width bandwidth=0;
|
||||
int b40M = 0;
|
||||
static int count = 0;
|
||||
|
||||
|
@ -351,7 +351,7 @@ void rtllib_wx_sync_scan_wq(void *data)
|
|||
if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT && ieee->pHTInfo->bCurBW40MHz) {
|
||||
b40M = 1;
|
||||
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);
|
||||
ieee->SetBWModeHandler(ieee->dev, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT);
|
||||
}
|
||||
|
|
Reference in New Issue