With this commit, all "typedef enum" statements are removed.
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
---
drivers/staging/rtl8192e/r8192E_dev.c | 10 +-
drivers/staging/rtl8192e/r8192E_phy.c | 14 +--
drivers/staging/rtl8192e/r8192E_phy.h | 2 +-
drivers/staging/rtl8192e/rtl819x_BAProc.c | 16 ++--
drivers/staging/rtl8192e/rtl819x_HT.h | 16 ++--
drivers/staging/rtl8192e/rtl819x_Qos.h | 28 +++---
drivers/staging/rtl8192e/rtl819x_TS.h | 4 +-
drivers/staging/rtl8192e/rtl819x_TSProc.c | 26 ++----
drivers/staging/rtl8192e/rtl_cam.c | 2 +-
drivers/staging/rtl8192e/rtl_core.c | 22 ++---
drivers/staging/rtl8192e/rtl_core.h | 83 ++++++++----------
drivers/staging/rtl8192e/rtl_debug.h | 5 +-
drivers/staging/rtl8192e/rtl_dm.c | 2 +-
drivers/staging/rtl8192e/rtl_dm.h | 62 ++++++--------
drivers/staging/rtl8192e/rtl_ps.c | 6 +-
drivers/staging/rtl8192e/rtl_wx.c | 4 +-
drivers/staging/rtl8192e/rtllib.h | 134 ++++++++++++++---------------
17 files changed, 196 insertions(+), 240 deletions(-)
diff --git a/drivers/staging/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/r8192E_dev.c
index f1e1c03..b2e46c3 100644
--- a/drivers/staging/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/r8192E_dev.c
@@ -61,7 +61,7 @@ void rtl8192e_update_msr(struct net_device *dev)
{
struct r8192_priv *priv = rtllib_priv(dev);
u8 msr;
- LED_CTL_MODE LedAction = LED_CTL_NO_LINK;
+ enum LED_CTL_MODE LedAction = LED_CTL_NO_LINK;
msr = read_nic_byte(dev, MSR);
msr &= ~ MSR_LINK_MASK;
@@ -109,9 +109,9 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val)
case HW_VAR_MEDIA_STATUS:
{
- RT_OP_MODE OpMode = *((RT_OP_MODE *)(val));
- LED_CTL_MODE LedAction = LED_CTL_NO_LINK;
- u8 btMsr = read_nic_byte(dev, MSR);
+ enum RT_OP_MODE OpMode = *((enum RT_OP_MODE *)(val));
+ enum LED_CTL_MODE LedAction = LED_CTL_NO_LINK;
+ u8 btMsr = read_nic_byte(dev, MSR);
btMsr &= 0xfc;
@@ -2282,7 +2282,7 @@ u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, cb_desc *tcb_desc)
void
ActUpdateChannelAccessSetting(
struct net_device* dev,
- WIRELESS_MODE WirelessMode,
+ enum WIRELESS_MODE WirelessMode,
PCHANNEL_ACCESS_SETTING ChnlAccessSetting
)
{
diff --git a/drivers/staging/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/r8192E_phy.c
index 36581b8..ed72fd6 100644
--- a/drivers/staging/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/r8192E_phy.c
@@ -1390,11 +1390,8 @@ PHY_SetRtl8192eRfOff(struct net_device* dev )
}
-bool
-SetRFPowerState8190(
- struct net_device* dev,
- RT_RF_POWER_STATE eRFPowerState
- )
+bool SetRFPowerState8190(struct net_device *dev,
+ enum RT_RF_POWER_STATE eRFPowerState)
{
struct r8192_priv *priv = rtllib_priv(dev);
PRT_POWER_SAVE_CONTROL pPSC = (PRT_POWER_SAVE_CONTROL)(&(priv->rtllib->PowerSaveControl));
@@ -1560,11 +1557,8 @@ SetRFPowerState8190(
-bool
-SetRFPowerState(
- struct net_device* dev,
- RT_RF_POWER_STATE eRFPowerState
- )
+bool SetRFPowerState(struct net_device *dev,
+ enum RT_RF_POWER_STATE eRFPowerState)
{
struct r8192_priv *priv = rtllib_priv(dev);
diff --git a/drivers/staging/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/r8192E_phy.h
index d874255..f885d9b 100644
--- a/drivers/staging/rtl8192e/r8192E_phy.h
+++ b/drivers/staging/rtl8192e/r8192E_phy.h
@@ -132,7 +132,7 @@ extern void PHY_SetRtl8192eRfOff(struct net_device *dev);
bool
SetRFPowerState(
struct net_device* dev,
- RT_RF_POWER_STATE eRFPowerState
+ enum RT_RF_POWER_STATE eRFPowerState
);
#define PHY_SetRFPowerState SetRFPowerState
diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c
index cf0209b..a469428 100644
--- a/drivers/staging/rtl8192e/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c
@@ -140,13 +140,9 @@ static struct sk_buff* rtllib_ADDBA(struct rtllib_device* ieee, u8* Dst,
return skb;
}
-static struct sk_buff* rtllib_DELBA(
- struct rtllib_device* ieee,
- u8* dst,
- struct BA_RECORD *pBA,
- TR_SELECT TxRxSelect,
- u16 ReasonCode
- )
+static struct sk_buff *rtllib_DELBA(struct rtllib_device *ieee, u8 *dst,
+ struct BA_RECORD *pBA,
+ enum TR_SELECT TxRxSelect, u16 ReasonCode)
{
union DELBA_PARAM_SET DelbaParamSet;
struct sk_buff *skb = NULL;
@@ -227,7 +223,7 @@ void rtllib_send_ADDBARsp(struct rtllib_device *ieee, u8 *dst,
}
void rtllib_send_DELBA(struct rtllib_device *ieee, u8 *dst,
- struct BA_RECORD *pBA, TR_SELECT TxRxSelect,
+ struct BA_RECORD *pBA, enum TR_SELECT TxRxSelect,
u16 ReasonCode)
{
struct sk_buff *skb = NULL;
@@ -534,8 +530,8 @@ TsInitAddBA(
rtllib_send_ADDBAReq(ieee, pTS->TsCommonInfo.Addr, pBA);
}
-void
-TsInitDelBA( struct rtllib_device* ieee, PTS_COMMON_INFO pTsCommonInfo, TR_SELECT TxRxSelect)
+void TsInitDelBA(struct rtllib_device *ieee, PTS_COMMON_INFO pTsCommonInfo,
+ enum TR_SELECT TxRxSelect)
{
if (TxRxSelect == TX_DIR)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index beb0fcd..47fe84d 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -166,16 +166,16 @@ typedef struct _MIMOPS_CTRL{
u8 Reserved:6;
} MIMOPS_CTRL, *PMIMOPS_CTRL;
-typedef enum _HT_SPEC_VER{
+enum HT_SPEC_VER {
HT_SPEC_VER_IEEE = 0,
HT_SPEC_VER_EWC = 1,
-}HT_SPEC_VER, *PHT_SPEC_VER;
+};
-typedef enum _HT_AGGRE_MODE_E{
+enum HT_AGGRE_MODE {
HT_AGG_AUTO = 0,
HT_AGG_FORCE_ENABLE = 1,
HT_AGG_FORCE_DISABLE = 2,
-}HT_AGGRE_MODE_E, *PHT_AGGRE_MODE_E;
+};
struct RT_HIGH_THROUGHPUT {
@@ -194,7 +194,7 @@ struct RT_HIGH_THROUGHPUT {
u8 bRegSuppCCK;
u8 bCurSuppCCK;
- HT_SPEC_VER ePeerHTSpecVer;
+ enum HT_SPEC_VER ePeerHTSpecVer;
struct HT_CAPABILITY_ELE SelfHTCap;
@@ -216,11 +216,11 @@ struct RT_HIGH_THROUGHPUT {
u8 MPDU_Density;
u8 CurrentMPDUDensity;
- HT_AGGRE_MODE_E ForcedAMPDUMode;
+ enum HT_AGGRE_MODE ForcedAMPDUMode;
u8 ForcedAMPDUFactor;
u8 ForcedMPDUDensity;
- HT_AGGRE_MODE_E ForcedAMSDUMode;
+ enum HT_AGGRE_MODE ForcedAMSDUMode;
u16 ForcedAMSDUMaxSize;
u8 bForcedShortGI;
@@ -307,7 +307,7 @@ struct BSS_HT {
u8 bdHTInfoBuf[32];
u16 bdHTInfoLen;
- HT_SPEC_VER bdHTSpecVer;
+ enum HT_SPEC_VER bdHTSpecVer;
enum HT_CHANNEL_WIDTH bdBandWidth;
u8 bdRT2RTAggregation;
diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl8192e/rtl819x_Qos.h
index 8f5e0fdd..ed1b338 100644
--- a/drivers/staging/rtl8192e/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192e/rtl819x_Qos.h
@@ -135,10 +135,10 @@ typedef u32 QOS_MODE, *PQOS_MODE;
#define ACM_TIMEOUT 1000
#define SESSION_REJECT_TIMEOUT 60000
-typedef enum _ACK_POLICY{
+enum ACK_POLICY {
eAckPlc0_ACK = 0x00,
eAckPlc1_NoACK = 0x01,
-}ACK_POLICY,*PACK_POLICY;
+};
#define SET_WMM_QOS_INFO_FIELD(_pStart, _val) WriteEF1Byte(_pStart, _val)
@@ -164,16 +164,16 @@ 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 {
+enum QOSIE_SOURCE {
QOSIE_SRC_ADDTSREQ,
QOSIE_SRC_ADDTSRSP,
QOSIE_SRC_REASOCREQ,
QOSIE_SRC_REASOCRSP,
QOSIE_SRC_DELTS,
-} QOSIE_SOURCE;
+};
-typedef u32 AC_CODING;
+#define AC_CODING u32
#define AC0_BE 0
#define AC1_BK 1
#define AC2_VI 2
@@ -208,24 +208,24 @@ typedef u32 AC_CODING;
#define WMM_PARAM_ELEMENT_SIZE (8+(4*AC_PARAM_SIZE))
-typedef enum _QOS_ELE_SUBTYPE{
- QOSELE_TYPE_INFO = 0x00,
+enum QOS_ELE_SUBTYPE {
+ QOSELE_TYPE_INFO = 0x00,
QOSELE_TYPE_PARAM = 0x01,
-}QOS_ELE_SUBTYPE,*PQOS_ELE_SUBTYPE;
+};
-typedef enum _DIRECTION_VALUE{
+enum DIRECTION_VALUE {
DIR_UP = 0,
DIR_DOWN = 1,
DIR_DIRECT = 2,
DIR_BI_DIR = 3,
-}DIRECTION_VALUE,*PDIRECTION_VALUE;
+};
-typedef enum _ACM_METHOD{
+enum ACM_METHOD {
eAcmWay0_SwAndHw = 0,
eAcmWay1_HW = 1,
eAcmWay2_SW = 2,
-}ACM_METHOD,*PACM_METHOD;
+};
typedef struct _ACM{
@@ -330,7 +330,7 @@ typedef struct _STA_QOS{
u8 WMMParamEle[WMM_PARAM_ELEMENT_SIZE];
ACM acm[4];
- ACM_METHOD AcmMethod;
+ enum ACM_METHOD AcmMethod;
QOS_TSTREAM StaTsArray[MAX_STA_TS_COUNT];
u8 DialogToken;
@@ -358,7 +358,7 @@ typedef struct _BSS_QOS{
u8 bdWMMIEBuf[MAX_WMMELE_LENGTH];
OCTET_STRING bdWMMIE;
- QOS_ELE_SUBTYPE EleSubType;
+ enum QOS_ELE_SUBTYPE EleSubType;
u8* pWMMInfoEle;
u8* pWMMParamEle;
diff --git a/drivers/staging/rtl8192e/rtl819x_TS.h b/drivers/staging/rtl8192e/rtl819x_TS.h
index 4587b24..ff39132 100644
--- a/drivers/staging/rtl8192e/rtl819x_TS.h
+++ b/drivers/staging/rtl8192e/rtl819x_TS.h
@@ -26,10 +26,10 @@
#define TOTAL_TS_NUM 16
#define TCLAS_NUM 4
-typedef enum _TR_SELECT {
+enum TR_SELECT {
TX_DIR = 0,
RX_DIR = 1,
-} TR_SELECT, *PTR_SELECT;
+};
typedef struct _TS_COMMON_INFO{
struct list_head List;
diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c
index 942c6f8..4f2643d 100644
--- a/drivers/staging/rtl8192e/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c
@@ -219,7 +219,8 @@ void AdmitTS(struct rtllib_device *ieee, PTS_COMMON_INFO pTsCommonInfo, u32 Inac
}
-PTS_COMMON_INFO SearchAdmitTRStream(struct rtllib_device *ieee, u8* Addr, u8 TID, TR_SELECT TxRxSelect)
+PTS_COMMON_INFO SearchAdmitTRStream(struct rtllib_device *ieee, u8 *Addr,
+ u8 TID, enum TR_SELECT TxRxSelect)
{
u8 dir;
bool search_dir[4] = {0, 0, 0, 0};
@@ -316,13 +317,8 @@ void MakeTSEntry(
pTsCommonInfo->TClasNum = TCLAS_Num;
}
-bool GetTs(
- struct rtllib_device* ieee,
- PTS_COMMON_INFO *ppTS,
- u8* Addr,
- u8 TID,
- TR_SELECT TxRxSelect,
- bool bAddNewTs)
+bool GetTs(struct rtllib_device *ieee, PTS_COMMON_INFO *ppTS,
+ u8 *Addr, u8 TID, enum TR_SELECT TxRxSelect, bool bAddNewTs)
{
u8 UP = 0;
if (is_broadcast_ether_addr(Addr) || is_multicast_ether_addr(Addr))
@@ -388,9 +384,10 @@ bool GetTs(
(&ieee->Tx_TS_Admit_List):
(&ieee->Rx_TS_Admit_List);
- DIRECTION_VALUE Dir = (ieee->iw_mode == IW_MODE_MASTER)?
- ((TxRxSelect==TX_DIR)?DIR_DOWN:DIR_UP):
- ((TxRxSelect==TX_DIR)?DIR_UP:DIR_DOWN);
+ enum DIRECTION_VALUE Dir =
+ (ieee->iw_mode == IW_MODE_MASTER) ?
+ ((TxRxSelect == TX_DIR)?DIR_DOWN : DIR_UP) :
+ ((TxRxSelect == TX_DIR) ? DIR_UP : DIR_DOWN);
RTLLIB_DEBUG(RTLLIB_DL_TS, "to add Ts\n");
if (!list_empty(pUnusedList))
{
@@ -432,11 +429,8 @@ bool GetTs(
}
}
-void RemoveTsEntry(
- struct rtllib_device* ieee,
- PTS_COMMON_INFO pTs,
- TR_SELECT TxRxSelect
- )
+void RemoveTsEntry(struct rtllib_device *ieee, PTS_COMMON_INFO pTs,
+ enum TR_SELECT TxRxSelect)
{
del_timer_sync(&pTs->SetupTimer);
del_timer_sync(&pTs->InactTimer);
diff --git a/drivers/staging/rtl8192e/rtl_cam.c b/drivers/staging/rtl8192e/rtl_cam.c
index 31f198c..3a2ddcf 100644
--- a/drivers/staging/rtl8192e/rtl_cam.c
+++ b/drivers/staging/rtl8192e/rtl_cam.c
@@ -119,7 +119,7 @@ void setKey(struct net_device *dev,
u16 usConfig = 0;
u8 i;
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
- RT_RF_POWER_STATE rtState;
+ enum RT_RF_POWER_STATE rtState;
rtState = priv->rtllib->eRFPowerState;
if (priv->rtllib->PowerSaveControl.bInactivePs){
if (rtState == eRfOff){
diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c
index ece05ba..28a3ca9 100644
--- a/drivers/staging/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl_core.c
@@ -349,7 +349,7 @@ void write_nic_word(struct net_device *dev, int x,u16 y)
bool
MgntActSet_RF_State(
struct net_device* dev,
- RT_RF_POWER_STATE StateToSet,
+ enum RT_RF_POWER_STATE StateToSet,
RT_RF_CHANGE_SOURCE ChangeSource,
bool ProtectOrNot
)
@@ -358,7 +358,7 @@ MgntActSet_RF_State(
struct rtllib_device * ieee = priv->rtllib;
bool bActionAllowed = false;
bool bConnectBySSID = false;
- RT_RF_POWER_STATE rtState;
+ enum RT_RF_POWER_STATE rtState;
u16 RFWaitCounter = 0;
unsigned long flag;
RT_TRACE((COMP_PS | COMP_RF), "===>MgntActSet_RF_State(): StateToSet(%d)\n",StateToSet);
@@ -1416,8 +1416,7 @@ short rtl8192_is_tx_queue_empty(struct net_device *dev)
return 1;
}
-RESET_TYPE
-rtl819x_TxCheckStuck(struct net_device *dev)
+enum RESET_TYPE rtl819x_TxCheckStuck(struct net_device *dev)
{
struct r8192_priv *priv = rtllib_priv(dev);
u8 QueueID;
@@ -1476,7 +1475,7 @@ rtl819x_TxCheckStuck(struct net_device *dev)
return RESET_TYPE_NORESET;
}
-RESET_TYPE rtl819x_RxCheckStuck(struct net_device *dev)
+enum RESET_TYPE rtl819x_RxCheckStuck(struct net_device *dev)
{
struct r8192_priv *priv = rtllib_priv(dev);
@@ -1489,13 +1488,12 @@ RESET_TYPE rtl819x_RxCheckStuck(struct net_device *dev)
return RESET_TYPE_NORESET;
}
-RESET_TYPE
-rtl819x_ifcheck_resetornot(struct net_device *dev)
+enum RESET_TYPE rtl819x_ifcheck_resetornot(struct net_device *dev)
{
struct r8192_priv *priv = rtllib_priv(dev);
- RESET_TYPE TxResetType = RESET_TYPE_NORESET;
- RESET_TYPE RxResetType = RESET_TYPE_NORESET;
- RT_RF_POWER_STATE rfState;
+ enum RESET_TYPE TxResetType = RESET_TYPE_NORESET;
+ enum RESET_TYPE RxResetType = RESET_TYPE_NORESET;
+ enum RT_RF_POWER_STATE rfState;
rfState = priv->rtllib->eRFPowerState;
@@ -1678,7 +1676,7 @@ void rtl819x_watchdog_wqcallback(void *data)
struct r8192_priv *priv = container_of_dwork_rsl(data,struct r8192_priv,watch_dog_wq);
struct net_device *dev = priv->rtllib->dev;
struct rtllib_device* ieee = priv->rtllib;
- RESET_TYPE ResetType = RESET_TYPE_NORESET;
+ enum RESET_TYPE ResetType = RESET_TYPE_NORESET;
static u8 check_reset_cnt = 0;
unsigned long flags;
PRT_POWER_SAVE_CONTROL pPSC = (PRT_POWER_SAVE_CONTROL)(&(priv->rtllib->PowerSaveControl));
@@ -2770,7 +2768,7 @@ void FairBeacon(struct net_device *dev)
}
-irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs)
+irqreturn_t rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs)
{
struct net_device *dev = (struct net_device *) netdev;
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
diff --git a/drivers/staging/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl_core.h
index e4dd2de..8a0a674 100644
--- a/drivers/staging/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl_core.h
@@ -79,7 +79,6 @@
.vendor = (vend), .device = (dev), \
.subvendor = PCI_ANY_ID, .subdevice =PCI_ANY_ID , \
.driver_data = (kernel_ulong_t)&(cfg)
- typedef irqreturn_t irqreturn_type;
#define rtl8192_interrupt(x,y,z) rtl8192_interrupt_rsl(x,y)
@@ -239,24 +238,24 @@ enum RTL_DEBUG {
COMP_ERR = BIT31
};
-typedef enum{
- NIC_UNKNOWN = 0,
- NIC_8192E = 1,
- NIC_8190P = 2,
- NIC_8192SE = 4,
+enum nic_t {
+ NIC_UNKNOWN = 0,
+ NIC_8192E = 1,
+ NIC_8190P = 2,
+ NIC_8192SE = 4,
NIC_8192CE = 5,
NIC_8192CU = 6,
NIC_8192DE = 7,
NIC_8192DU = 8,
- } nic_t;
+};
-typedef enum _RT_EEPROM_TYPE{
+enum RT_EEPROM_TYPE {
EEPROM_93C46,
EEPROM_93C56,
EEPROM_BOOT_EFUSE,
-}RT_EEPROM_TYPE,*PRT_EEPROM_TYPE;
+};
-typedef enum _tag_TxCmd_Config_Index{
+enum DCMD_TXCMD_OP {
TXCMD_TXRA_HISTORY_CTRL = 0xFF900000,
TXCMD_RESET_TX_PKT_BUFF = 0xFF900001,
TXCMD_RESET_RX_PKT_BUFF = 0xFF900002,
@@ -264,33 +263,31 @@ typedef enum _tag_TxCmd_Config_Index{
TXCMD_SET_RX_RSSI = 0xFF900004,
TXCMD_SET_TX_PWR_TRACKING = 0xFF900005,
TXCMD_XXXX_CTRL,
-}DCMD_TXCMD_OP;
+};
-typedef enum _RT_RF_TYPE_819xU{
+enum RT_RF_TYPE_819xU {
RF_TYPE_MIN = 0,
RF_8225,
RF_8256,
RF_8258,
RF_6052=4,
RF_PSEUDO_11N = 5,
-}RT_RF_TYPE_819xU, *PRT_RF_TYPE_819xU;
+};
-typedef enum tag_Rf_Operatetion_State
-{
+enum RF_STEP_E {
RF_STEP_INIT = 0,
RF_STEP_NORMAL,
RF_STEP_MAX
-}RF_STEP_E;
+};
-typedef enum _RT_STATUS{
+enum RT_STATUS {
RT_STATUS_SUCCESS,
RT_STATUS_FAILURE,
RT_STATUS_PENDING,
RT_STATUS_RESOURCE
-}RT_STATUS,*PRT_STATUS;
+};
-typedef enum _RT_CUSTOMER_ID
-{
+enum RT_CUSTOMER_ID {
RT_CID_DEFAULT = 0,
RT_CID_8187_ALPHA0 = 1,
RT_CID_8187_SERCOMM_PS = 2,
@@ -321,27 +318,27 @@ 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;
+};
-typedef enum _RESET_TYPE {
+enum RESET_TYPE {
RESET_TYPE_NORESET = 0x00,
RESET_TYPE_NORMAL = 0x01,
RESET_TYPE_SILENT = 0x02
-} RESET_TYPE;
+};
-typedef enum _IC_INFERIORITY_8192S{
+enum IC_INFERIORITY_8192S {
IC_INFERIORITY_A = 0,
IC_INFERIORITY_B = 1,
-}IC_INFERIORITY_8192S, *PIC_INFERIORITY_8192S;
+};
-typedef enum _PCI_BRIDGE_VENDOR {
+enum PCI_BRIDGE_VENDOR {
PCI_BRIDGE_VENDOR_INTEL = 0x0,
PCI_BRIDGE_VENDOR_ATI,
PCI_BRIDGE_VENDOR_AMD,
PCI_BRIDGE_VENDOR_SIS ,
PCI_BRIDGE_VENDOR_UNKNOWN,
PCI_BRIDGE_VENDOR_MAX ,
-} PCI_BRIDGE_VENDOR;
+};
typedef struct buffer
{
@@ -480,15 +477,14 @@ typedef struct ChnlAccessSetting {
u16 CWmaxIndex;
}*PCHANNEL_ACCESS_SETTING,CHANNEL_ACCESS_SETTING;
-typedef enum _TWO_PORT_STATUS
-{
+enum TWO_PORT_STATUS {
TWO_PORT_STATUS__DEFAULT_ONLY,
TWO_PORT_STATUS__EXTENSION_ONLY,
TWO_PORT_STATUS__EXTENSION_FOLLOW_DEFAULT,
TWO_PORT_STATUS__DEFAULT_G_EXTENSION_N20,
TWO_PORT_STATUS__ADHOC,
TWO_PORT_STATUS__WITHOUT_ANY_ASSOCIATE
-}TWO_PORT_STATUS;
+};
typedef struct _txbbgain_struct
{
@@ -528,7 +524,7 @@ struct rtl8192_tx_ring {
struct rtl819x_ops{
- nic_t nic_type;
+ enum nic_t nic_type;
void (* get_eeprom_size)(struct net_device* dev);
void (* init_adapter_variable)(struct net_device* dev);
void (* init_before_adapter_start)(struct net_device* dev);
@@ -599,11 +595,11 @@ typedef struct r8192_priv
struct LOG_INTERRUPT_8190 InterruptLog;
- RT_CUSTOMER_ID CustomerID;
+ enum RT_CUSTOMER_ID CustomerID;
- RT_RF_TYPE_819xU rf_chip;
- IC_INFERIORITY_8192S IC_Class;
+ enum RT_RF_TYPE_819xU rf_chip;
+ enum IC_INFERIORITY_8192S IC_Class;
enum HT_CHANNEL_WIDTH CurrentChannelBW;
struct BB_REGISTER_DEFINITION PHYRegDef[4];
rate_adaptive rate_adaptive;
@@ -613,7 +609,7 @@ typedef struct r8192_priv
txbbgain_struct txbbgain_table[TxBBGainTableLength];
- ACM_METHOD AcmMethod;
+ enum ACM_METHOD AcmMethod;
struct rt_firmware *pFirmware;
enum rtl819x_loopback LoopbackMode;
@@ -713,7 +709,7 @@ typedef struct r8192_priv
u32 irq_mask[2];
u8 Rf_Mode;
- nic_t card_8192;
+ enum nic_t card_8192;
u8 card_8192_version;
short enable_gpio0;
@@ -995,7 +991,7 @@ typedef struct r8192_priv
u32 ccktxpower_adjustcnt_not_ch14;
u32 ccktxpower_adjustcnt_ch14;
- RESET_TYPE ResetProgress;
+ enum RESET_TYPE ResetProgress;
bool bForcedSilentReset;
bool bDisableNormalResetCheck;
u16 TxCounter;
@@ -1074,7 +1070,7 @@ void rtl8192_set_chan(struct net_device *dev,short ch);
void check_rfctrl_gpio_timer(unsigned long data);
void rtl8192_hw_wakeup_wq(void *data);
-irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs);
+irqreturn_t rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs);
short rtl8192_pci_initdescring(struct net_device *dev);
@@ -1107,15 +1103,12 @@ bool NicIFDisableNIC(struct net_device* dev);
bool
MgntActSet_RF_State(
struct net_device* dev,
- RT_RF_POWER_STATE StateToSet,
+ enum RT_RF_POWER_STATE StateToSet,
RT_RF_CHANGE_SOURCE ChangeSource,
bool ProtectOrNot
);
-void
-ActUpdateChannelAccessSetting(
- struct net_device* dev,
- WIRELESS_MODE WirelessMode,
- PCHANNEL_ACCESS_SETTING ChnlAccessSetting
- );
+void ActUpdateChannelAccessSetting(struct net_device *dev,
+ enum WIRELESS_MODE WirelessMode,
+ PCHANNEL_ACCESS_SETTING ChnlAccessSetting);
#endif
diff --git a/drivers/staging/rtl8192e/rtl_debug.h b/drivers/staging/rtl8192e/rtl_debug.h
index db8be0e..b67af36 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 tag_DBGP_Flag_Type_Definition
-{
+enum DBGP_FLAG {
FQoS = 0,
FTX = 1,
FRX = 2,
@@ -65,7 +64,7 @@ typedef enum tag_DBGP_Flag_Type_Definition
FINIT = 17,
FIOCTL = 18,
DBGP_TYPE_MAX
-}DBGP_FLAG_E;
+};
#define QoS_INIT BIT0
#define QoS_VISTA BIT1
diff --git a/drivers/staging/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl_dm.c
index e5adf63..d551fd3 100644
--- a/drivers/staging/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl_dm.c
@@ -2671,7 +2671,7 @@ extern void dm_CheckRfCtrlGPIO(void *data)
struct r8192_priv *priv = container_of_dwork_rsl(data,struct r8192_priv,gpio_change_rf_wq);
struct net_device *dev = priv->rtllib->dev;
u8 tmp1byte;
- RT_RF_POWER_STATE eRfPowerStateToSet;
+ enum RT_RF_POWER_STATE eRfPowerStateToSet;
bool bActuallySet = false;
char *argv[3];
diff --git a/drivers/staging/rtl8192e/rtl_dm.h b/drivers/staging/rtl8192e/rtl_dm.h
index 6f59097..c7cb8eb 100644
--- a/drivers/staging/rtl8192e/rtl_dm.h
+++ b/drivers/staging/rtl8192e/rtl_dm.h
@@ -128,24 +128,21 @@ typedef struct _dynamic_initial_gain_threshold_
long rssi_val;
}dig_t;
-typedef enum tag_dynamic_init_gain_state_definition
-{
+enum dm_dig_sta {
DM_STA_DIG_OFF = 0,
DM_STA_DIG_ON,
DM_STA_DIG_MAX
-}dm_dig_sta_e;
+};
-typedef enum tag_dynamic_ratr_state_definition
-{
+enum dm_ratr_sta {
DM_RATR_STA_HIGH = 0,
DM_RATR_STA_MIDDLE = 1,
DM_RATR_STA_LOW = 2,
DM_RATR_STA_MAX
-}dm_ratr_sta_e;
+};
-typedef enum tag_dynamic_init_gain_operation_type_definition
-{
+enum dm_dig_op {
DIG_TYPE_THRESH_HIGH = 0,
DIG_TYPE_THRESH_LOW = 1,
DIG_TYPE_THRESH_HIGHPWR_HIGH = 2,
@@ -160,42 +157,37 @@ 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;
+};
-typedef enum tag_dig_algorithm_definition
-{
+enum dm_dig_alg {
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;
+};
-typedef enum tag_DIG_TWO_PORT_ALGO_Definition
-{
+enum DM_DIG_TWO_PORT_ALG {
DIG_TWO_PORT_ALGO_RSSI = 0,
DIG_TWO_PORT_ALGO_FALSE_ALARM = 1,
-}DM_DIG_TWO_PORT_ALG_E;
+};
-typedef enum tag_DIG_EXT_PORT_ALGO_Definition
-{
+enum DM_DIG_EXT_PORT_ALG {
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;
+};
-typedef enum tag_dig_dbgmode_definition
-{
+enum dm_dig_dbg {
DIG_DBG_OFF = 0,
DIG_DBG_ON = 1,
DIG_DBG_MAX
-}dm_dig_dbg_e;
+};
-typedef enum tag_dig_connect_definition
-{
+enum dm_dig_connect {
DIG_STA_DISCONNECT = 0,
DIG_STA_CONNECT = 1,
DIG_STA_BEFORE_CONNECT = 2,
@@ -203,22 +195,21 @@ typedef enum tag_dig_connect_definition
DIG_AP_CONNECT = 4,
DIG_AP_ADD_STATION = 5,
DIG_CONNECT_MAX
-}dm_dig_connect_e;
+};
-typedef enum tag_dig_packetdetection_threshold_definition
-{
+enum dm_dig_pd_th {
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;
+};
-typedef enum tag_dig_cck_cs_ratio_state_definition
-{
+enum dm_dig_cs_ratio {
DIG_CS_RATIO_LOWER = 0,
DIG_CS_RATIO_HIGHER = 1,
DIG_CS_MAX
-}dm_dig_cs_ratio_e;
+};
+
typedef struct _Dynamic_Rx_Path_Selection_
{
u8 Enable;
@@ -236,20 +227,17 @@ typedef struct _Dynamic_Rx_Path_Selection_
long cck_pwdb_sta[4];
}DRxPathSel;
-typedef enum tag_CCK_Rx_Path_Method_Definition
-{
+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;
-
+};
-typedef enum tag_DM_DbgMode_Definition
-{
+enum DM_DBG {
DM_DBG_OFF = 0,
DM_DBG_ON = 1,
DM_DBG_MAX
-}DM_DBG_E;
+};
typedef struct tag_Tx_Config_Cmd_Format
{
diff --git a/drivers/staging/rtl8192e/rtl_ps.c b/drivers/staging/rtl8192e/rtl_ps.c
index 0030629..bc6d8c1 100644
--- a/drivers/staging/rtl8192e/rtl_ps.c
+++ b/drivers/staging/rtl8192e/rtl_ps.c
@@ -134,7 +134,7 @@ IPSEnter(struct net_device *dev)
{
struct r8192_priv *priv = rtllib_priv(dev);
PRT_POWER_SAVE_CONTROL pPSC = (PRT_POWER_SAVE_CONTROL)(&(priv->rtllib->PowerSaveControl));
- RT_RF_POWER_STATE rtState;
+ enum RT_RF_POWER_STATE rtState;
if (pPSC->bInactivePs)
{
@@ -157,7 +157,7 @@ IPSLeave(struct net_device *dev)
{
struct r8192_priv *priv = rtllib_priv(dev);
PRT_POWER_SAVE_CONTROL pPSC = (PRT_POWER_SAVE_CONTROL)(&(priv->rtllib->PowerSaveControl));
- RT_RF_POWER_STATE rtState;
+ enum RT_RF_POWER_STATE rtState;
if (pPSC->bInactivePs)
{
@@ -184,7 +184,7 @@ void IPSLeave_wq(void *data)
void rtllib_ips_leave_wq(struct net_device *dev)
{
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
- RT_RF_POWER_STATE rtState;
+ enum RT_RF_POWER_STATE rtState;
rtState = priv->rtllib->eRFPowerState;
if (priv->rtllib->PowerSaveControl.bInactivePs){
diff --git a/drivers/staging/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl_wx.c
index c0ae0c4..84789aa 100644
--- a/drivers/staging/rtl8192e/rtl_wx.c
+++ b/drivers/staging/rtl8192e/rtl_wx.c
@@ -318,7 +318,7 @@ static int r8192_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
struct r8192_priv *priv = rtllib_priv(dev);
struct rtllib_device* ieee = netdev_priv_rsl(dev);
- RT_RF_POWER_STATE rtState;
+ enum RT_RF_POWER_STATE rtState;
int ret;
if (priv->bHwRadioOff == true)
@@ -449,7 +449,7 @@ static int r8192_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
{
struct r8192_priv *priv = rtllib_priv(dev);
struct rtllib_device* ieee = priv->rtllib;
- RT_RF_POWER_STATE rtState;
+ enum RT_RF_POWER_STATE rtState;
int ret;
if (!(ieee->softmac_features & IEEE_SOFTMAC_SCAN)){
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 7ad709c..0c15f48 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -290,7 +290,7 @@ enum _ReasonCode{
dest_not_QSTA = 0x32,
};
-typedef enum _HAL_DEF_VARIABLE{
+enum HAL_DEF_VARIABLE {
HAL_DEF_TPC_ENABLE,
HAL_DEF_INIT_GAIN,
HAL_DEF_PROT_IMP_MODE,
@@ -310,10 +310,9 @@ typedef enum _HAL_DEF_VARIABLE{
HAL_DEF_PCI_SUPPORT_ASPM,
HAL_DEF_THERMAL_VALUE,
HAL_DEF_USB_IN_TOKEN_REV,
-}HAL_DEF_VARIABLE;
-
+};
-typedef enum _HW_VARIABLES{
+enum HW_VARIABLES {
HW_VAR_ETHER_ADDR,
HW_VAR_MULTICAST_REG,
HW_VAR_BASIC_RATE,
@@ -402,14 +401,14 @@ typedef enum _HW_VARIABLES{
HW_VAR_INT_MIGRATION,
HW_VAR_INT_AC,
HW_VAR_RF_TIMING,
-}HW_VARIABLES;
+};
-typedef enum _RT_OP_MODE{
+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;
+};
#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)
@@ -595,33 +594,34 @@ typedef struct ieee_param {
#define SN_EQUAL(a, b) (a == b)
#define MAX_DEV_ADDR_SIZE 8
-typedef enum _ACT_CATEGORY{
+enum ACT_CATEGORY {
ACT_CAT_QOS = 1,
ACT_CAT_DLS = 2,
ACT_CAT_BA = 3,
ACT_CAT_HT = 7,
ACT_CAT_WMM = 17,
-} ACT_CATEGORY, *PACT_CATEGORY;
+};
-typedef enum _TS_ACTION{
+enum TS_ACTION {
ACT_ADDTSREQ = 0,
ACT_ADDTSRSP = 1,
ACT_DELTS = 2,
ACT_SCHEDULE = 3,
-} TS_ACTION, *PTS_ACTION;
+};
-typedef enum _BA_ACTION{
+enum BA_ACTION {
ACT_ADDBAREQ = 0,
ACT_ADDBARSP = 1,
ACT_DELBA = 2,
-} BA_ACTION, *PBA_ACTION;
+};
-typedef enum _InitialGainOpType{
+enum InitialGainOpType {
IG_Backup=0,
IG_Restore,
IG_Max
-}InitialGainOpType;
-typedef enum _LED_CTL_MODE{
+};
+
+enum LED_CTL_MODE {
LED_CTL_POWER_ON = 1,
LED_CTL_LINK = 2,
LED_CTL_NO_LINK = 3,
@@ -635,19 +635,18 @@ 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;
+};
-typedef enum _RT_RF_TYPE_DEF
-{
+enum RT_RF_TYPE_DEF {
RF_1T2R = 0,
RF_2T4R,
RF_2T2R,
RF_1T1R,
RF_2T2R_GREEN,
RF_819X_MAX_TYPE
-}RT_RF_TYPE_DEF;
+};
-typedef enum _WIRELESS_MODE {
+enum WIRELESS_MODE {
WIRELESS_MODE_UNKNOWN = 0x00,
WIRELESS_MODE_A = 0x01,
WIRELESS_MODE_B = 0x02,
@@ -655,14 +654,14 @@ typedef enum _WIRELESS_MODE {
WIRELESS_MODE_AUTO = 0x08,
WIRELESS_MODE_N_24G = 0x10,
WIRELESS_MODE_N_5G = 0x20
-} WIRELESS_MODE;
+};
-typedef enum _NETWORK_TYPE{
+enum WIRELESS_NETWORK_TYPE{
WIRELESS_11B = 1,
WIRELESS_11G = 2,
WIRELESS_11A = 4,
WIRELESS_11N = 8
-} WIRELESS_NETWORK_TYPE;
+};
#define OUI_SUBTYPE_WMM_INFO 0
#define OUI_SUBTYPE_WMM_PARAM 1
@@ -1628,11 +1627,11 @@ struct ether_header {
#endif
-typedef enum _erp_t{
+enum erp_t{
ERP_NonERPpresent = 0x01,
ERP_UseProtection = 0x02,
ERP_BarkerPreambleMode = 0x04,
-} erp_t;
+};
struct rtllib_network {
/* These entries are used to identify a unique network */
@@ -1796,59 +1795,56 @@ typedef struct _RX_REORDER_ENTRY
u16 SeqNum;
struct rtllib_rxb* prxb;
} RX_REORDER_ENTRY, *PRX_REORDER_ENTRY;
-typedef enum _Fsync_State{
+
+enum Fsync_State {
Default_Fsync,
HW_Fsync,
SW_Fsync
-}Fsync_State;
+};
-typedef enum _RT_PS_MODE
-{
+enum RT_PS_MODE {
eActive,
eMaxPs,
eFastPs,
eAutoPs,
-}RT_PS_MODE;
+};
-typedef enum _IPS_CALLBACK_FUNCION
-{
+enum IPS_CALLBACK_FUNCION {
IPS_CALLBACK_NONE = 0,
IPS_CALLBACK_MGNT_LINK_REQUEST = 1,
IPS_CALLBACK_JOIN_REQUEST = 2,
-}IPS_CALLBACK_FUNCION;
+};
-typedef enum _RT_JOIN_ACTION{
+enum RT_JOIN_ACTION {
RT_JOIN_INFRA = 1,
RT_JOIN_IBSS = 2,
RT_START_IBSS = 3,
RT_NO_ACTION = 4,
-}RT_JOIN_ACTION;
+};
typedef struct _IbssParms{
u16 atimWin;
}IbssParms, *PIbssParms;
#define MAX_NUM_RATES 264
-typedef enum _RT_RF_POWER_STATE
-{
+enum RT_RF_POWER_STATE {
eRfOn,
eRfSleep,
eRfOff
-}RT_RF_POWER_STATE;
+};
#define MAX_SUPPORT_WOL_PATTERN_NUM 8
#define MAX_WOL_BIT_MASK_SIZE 16
#define MAX_WOL_PATTERN_SIZE 128
-typedef enum _WOLPATTERN_TYPE
-{
+enum WOLPATTERN_TYPE {
eNetBIOS = 0,
eIPv4IPv6ARP,
eIPv4IPv6TCPSYN,
eMACIDOnly,
eNoDefined,
-}WOLPATTERN_TYPE;
+};
typedef struct _RT_PM_WOL_PATTERN_INFO
{
@@ -1856,7 +1852,7 @@ typedef struct _RT_PM_WOL_PATTERN_INFO
u32 Mask[4];
u16 CrcRemainder;
u8 WFMIndex;
- WOLPATTERN_TYPE PatternType;
+ enum WOLPATTERN_TYPE PatternType;
}RT_PM_WOL_PATTERN_INFO, *PRT_PM_WOL_PATTERN_INFO;
typedef struct _RT_POWER_SAVE_CONTROL
@@ -1866,14 +1862,14 @@ typedef struct _RT_POWER_SAVE_CONTROL
bool bIPSModeBackup;
bool bHaltAdapterClkRQ;
bool bSwRfProcessing;
- RT_RF_POWER_STATE eInactivePowerState;
+ enum RT_RF_POWER_STATE eInactivePowerState;
work_struct_rsl InactivePsWorkItem;
struct timer_list InactivePsTimer;
- IPS_CALLBACK_FUNCION ReturnPoint;
+ enum IPS_CALLBACK_FUNCION ReturnPoint;
bool bTmpBssDesc;
- RT_JOIN_ACTION tmpJoinAction;
+ enum RT_JOIN_ACTION tmpJoinAction;
struct rtllib_network tmpBssDesc;
bool bTmpScanOnly;
@@ -1926,8 +1922,7 @@ typedef u32 RT_RF_CHANGE_SOURCE;
#define RF_CHANGE_BY_IPS BIT28
#define RF_CHANGE_BY_INIT 0
-typedef enum
-{
+enum country_code_type_t {
COUNTRY_CODE_FCC = 0,
COUNTRY_CODE_IC = 1,
COUNTRY_CODE_ETSI = 2,
@@ -1942,15 +1937,15 @@ typedef enum
COUNTRY_CODE_WORLD_WIDE_13 = 11,
COUNTRY_CODE_TELEC_NETGEAR = 12,
COUNTRY_CODE_MAX
-}country_code_type_t;
+};
-typedef enum _SCAN_OPERATION_BACKUP_OPT{
+enum SCAN_OPERATION_BACKUP_OPT{
SCAN_OPT_BACKUP=0,
SCAN_OPT_RESTORE,
SCAN_OPT_MAX
-}SCAN_OPERATION_BACKUP_OPT;
+};
-typedef enum _FW_CMD_IO_TYPE{
+enum FW_CMD_IO_TYPE {
FW_CMD_DIG_ENABLE = 0,
FW_CMD_DIG_DISABLE = 1,
FW_CMD_DIG_HALT = 2,
@@ -1982,7 +1977,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;
+};
#define RT_MAX_LD_SLOT_NUM 10
typedef struct _RT_LINK_DETECT_T{
@@ -2042,7 +2037,8 @@ typedef struct _rate_adaptive
u8 PreRATRState;
} rate_adaptive, *prate_adaptive;
-typedef enum _RATR_TABLE_MODE_8192S{
+
+enum RATR_TABLE_MODE_8192S {
RATR_INX_WIRELESS_NGB = 0,
RATR_INX_WIRELESS_NG = 1,
RATR_INX_WIRELESS_NB = 2,
@@ -2052,7 +2048,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;
+};
#define NUM_PMKID_CACHE 16
typedef struct _RT_PMKID_LIST
@@ -2105,7 +2101,7 @@ struct rtllib_device {
u8 hwscan_sem_up;
u8 CntAfterLink;
- RT_OP_MODE OpMode;
+ enum RT_OP_MODE OpMode;
u8 VersionID;
/* The last AssocReq/Resp IEs */
@@ -2129,12 +2125,12 @@ struct rtllib_device {
bool ieee_up;
bool cannot_notify;
bool bSupportRemoteWakeUp;
- RT_PS_MODE dot11PowerSaveMode;
+ enum RT_PS_MODE dot11PowerSaveMode;
bool actscanning;
bool FirstIe_InScan;
bool be_scan_inprogress;
bool beinretry;
- RT_RF_POWER_STATE eRFPowerState;
+ enum RT_RF_POWER_STATE eRFPowerState;
RT_RF_CHANGE_SOURCE RfOffReason;
bool is_set_key;
bool wx_set_enc;
@@ -2384,7 +2380,7 @@ struct rtllib_device {
u8 fsync_multiple_timeinterval;
u32 fsync_firstdiff_ratethreshold;
u32 fsync_seconddiff_ratethreshold;
- Fsync_State fsync_state;
+ enum Fsync_State fsync_state;
bool bis_any_nonbepkts;
bandwidth_autoswitch bandwidth_auto_switch;
bool FwRWRF;
@@ -2527,13 +2523,15 @@ struct rtllib_device {
u8 (*rtllib_ap_sec_type)(struct rtllib_device *ieee);
void (*HalUsbRxAggrHandler)(struct net_device *dev, bool Value);
void (*InitialGainHandler)(struct net_device *dev, u8 Operation);
- bool (*SetFwCmdHandler)(struct net_device *dev, FW_CMD_IO_TYPE FwCmdIO);
+ bool (*SetFwCmdHandler)(struct net_device *dev,
+ enum FW_CMD_IO_TYPE FwCmdIO);
void (*UpdateHalRAMaskHandler)(struct net_device* dev, bool bMulticast, u8 macId, u8 MimoPs, u8 WirelessMode, u8 bCurTxBW40MHz, u8 rssi_level);
void (*UpdateBeaconInterruptHandler)(struct net_device* dev, bool start);
void (*UpdateInterruptMaskHandler)(struct net_device* dev, u32 AddMSR, u32 RemoveMSR);
u16 (*rtl_11n_user_show_rates)(struct net_device *dev);
void (*ScanOperationBackupHandler)(struct net_device *dev, u8 Operation);
- void (*LedControlHandler)(struct net_device * dev, LED_CTL_MODE LedAction);
+ void (*LedControlHandler)(struct net_device *dev,
+ enum LED_CTL_MODE LedAction);
void (*SetHwRegHandler)(struct net_device *dev,u8 variable,u8* val);
void (*GetHwRegHandler)(struct net_device *dev,u8 variable,u8* val);
@@ -2917,19 +2915,15 @@ extern int rtllib_rx_ADDBAReq( struct rtllib_device* ieee, struct sk_buff *skb);
extern int rtllib_rx_ADDBARsp( struct rtllib_device* ieee, struct sk_buff *skb);
extern int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb);
extern void TsInitAddBA( struct rtllib_device* ieee, PTX_TS_RECORD pTS, u8 Policy, u8 bOverwritePending);
-extern void TsInitDelBA( struct rtllib_device* ieee, PTS_COMMON_INFO pTsCommonInfo, TR_SELECT TxRxSelect);
+extern void TsInitDelBA(struct rtllib_device *ieee,
+ PTS_COMMON_INFO pTsCommonInfo,
+ enum TR_SELECT TxRxSelect);
extern void BaSetupTimeOut(unsigned long data);
extern void TxBaInactTimeout(unsigned long data);
extern void RxBaInactTimeout(unsigned long data);
extern void ResetBaEntry(struct BA_RECORD *pBA);
-extern bool GetTs(
- struct rtllib_device* ieee,
- PTS_COMMON_INFO *ppTS,
- u8* Addr,
- u8 TID,
- TR_SELECT TxRxSelect,
- bool bAddNewTs
- );
+extern bool GetTs(struct rtllib_device *ieee, PTS_COMMON_INFO *ppTS,
+ u8 *Addr, u8 TID, enum TR_SELECT TxRxSelect, bool bAddNewTs);
extern void TSInitialize(struct rtllib_device *ieee);
extern void TsStartAddBaProcess(struct rtllib_device* ieee, PTX_TS_RECORD pTxTS);
extern void RemovePeerTS(struct rtllib_device* ieee, u8* Addr);
--
1.7.3.4
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
