rtl8188eu: Remove "enum ODM_RF_RADIO_PATH" and ODM_RF_PATH_x

These are already expressed as "enum rf_radio_path" and RF_PATH_x. Having
two definitions is ridiculous.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2016-02-14 20:14:42 -06:00
parent 2936b46458
commit f8ec1962dd
17 changed files with 80 additions and 95 deletions

View file

@ -67,12 +67,12 @@ typedef enum _HW90_BLOCK{
HW90_BLOCK_MAXIMUM = 4, /* Never use this */
}HW90_BLOCK_E, *PHW90_BLOCK_E;
typedef enum _RF_RADIO_PATH{
enum rf_radio_path {
RF_PATH_A = 0, /* Radio Path A */
RF_PATH_B = 1, /* Radio Path B */
RF_PATH_C = 2, /* Radio Path C */
RF_PATH_D = 3, /* Radio Path D */
}RF_RADIO_PATH_E, *PRF_RADIO_PATH_E;
};
#define MAX_PG_GROUP 13
@ -217,11 +217,11 @@ void rtl8188e_PHY_SetBBReg( struct adapter *Adapter,
u32 BitMask,
u32 Data );
u32 rtl8188e_PHY_QueryRFReg( struct adapter * Adapter,
RF_RADIO_PATH_E eRFPath,
enum rf_radio_path eRFPath,
u32 RegAddr,
u32 BitMask );
void rtl8188e_PHY_SetRFReg( struct adapter * Adapter,
RF_RADIO_PATH_E eRFPath,
enum rf_radio_path eRFPath,
u32 RegAddr,
u32 BitMask,
u32 Data );
@ -235,9 +235,9 @@ int PHY_BBConfig8188E(struct adapter *Adapter );
int PHY_RFConfig8188E(struct adapter *Adapter );
/* RF config */
int rtl8188e_PHY_ConfigRFWithParaFile(struct adapter *Adapter, u8 * pFileName, RF_RADIO_PATH_E eRFPath);
int rtl8188e_PHY_ConfigRFWithParaFile(struct adapter *Adapter, u8 * pFileName, enum rf_radio_path eRFPath);
int rtl8188e_PHY_ConfigRFWithHeaderFile(struct adapter *Adapter,
RF_RADIO_PATH_E eRFPath);
enum rf_radio_path eRFPath);
/* Read initi reg value for tx power setting. */
void rtl8192c_PHY_GetHWRegOriginalValue(struct adapter * Adapter );

View file

@ -946,13 +946,6 @@ struct odm_dm_struct {
struct timer_list FastAntTrainingTimer;
}; /* DM_Dynamic_Mechanism_Structure */
enum ODM_RF_RADIO_PATH {
ODM_RF_PATH_A = 0, /* Radio Path A */
ODM_RF_PATH_B = 1, /* Radio Path B */
ODM_RF_PATH_C = 2, /* Radio Path C */
ODM_RF_PATH_D = 3, /* Radio Path D */
};
enum ODM_RF_CONTENT {
odm_radioa_txt = 0x1000,
odm_radiob_txt = 0x1001,

View file

@ -122,8 +122,8 @@ void ODM_MacStatusQuery(struct odm_dm_struct *pDM_Odm,
bool bPacketBeacon);
enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *pDM_Odm,
enum ODM_RF_RADIO_PATH Content,
enum ODM_RF_RADIO_PATH eRFPath);
enum rf_radio_path Content,
enum rf_radio_path eRFPath);
enum HAL_STATUS ODM_ConfigBBWithHeaderFile(struct odm_dm_struct *pDM_Odm,
enum odm_bb_config_type ConfigType);

View file

@ -21,7 +21,7 @@
#define __INC_ODM_REGCONFIG_H_8188E
void odm_ConfigRFReg_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32 Data,
enum ODM_RF_RADIO_PATH RF_PATH, u32 RegAddr);
enum rf_radio_path RF_PATH, u32 RegAddr);
void odm_ConfigRF_RadioA_8188E(struct odm_dm_struct *pDM_Odm,
u32 Addr, u32 Data);

View file

@ -99,10 +99,10 @@ void ODM_SetBBReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr,
u32 ODM_GetBBReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u32 BitMask);
void ODM_SetRFReg(struct odm_dm_struct *pDM_Odm, enum ODM_RF_RADIO_PATH eRFPath,
void ODM_SetRFReg(struct odm_dm_struct *pDM_Odm, enum rf_radio_path eRFPath,
u32 RegAddr, u32 BitMask, u32 Data);
u32 ODM_GetRFReg(struct odm_dm_struct *pDM_Odm, enum ODM_RF_RADIO_PATH eRFPath,
u32 ODM_GetRFReg(struct odm_dm_struct *pDM_Odm, enum rf_radio_path eRFPath,
u32 RegAddr, u32 BitMask);
/* Memory Relative Function. */

View file

@ -436,7 +436,7 @@ u32 read_macreg(struct adapter *padapter, u32 addr, u32 sz);
void write_macreg(struct adapter *padapter, u32 addr, u32 val, u32 sz);
u32 read_bbreg(struct adapter *padapter, u32 addr, u32 bitmask);
void write_bbreg(struct adapter *padapter, u32 addr, u32 bitmask, u32 val);
u32 read_rfreg(struct adapter *padapter, RF_RADIO_PATH_E rfpath, u32 addr);
u32 read_rfreg(struct adapter *padapter, enum rf_radio_path rfpath, u32 addr);
void write_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 val);
void SetChannel(struct adapter *pAdapter);