rtl8188eu: Convert typedef statements in include/odm_types.h

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-26 15:25:06 -05:00
parent cf3dfeecf9
commit 75fa3f7c0b
15 changed files with 52 additions and 65 deletions

View file

@ -235,7 +235,6 @@ PHY_ScanOperationBackup8188E( PADAPTER Adapter,
//
// Switch bandwidth for 8192S
//
//extern void PHY_SetBWModeCallback8192C( PRT_TIMER pTimer );
void PHY_SetBWMode8188E( PADAPTER pAdapter,
HT_CHANNEL_WIDTH ChnlWidth,
unsigned char Offset );
@ -257,7 +256,6 @@ extern void FillA2Entry8192C( PADAPTER Adapter,
//
// channel switch related funciton
//
//extern void PHY_SwChnlCallback8192C( PRT_TIMER pTimer );
void PHY_SwChnl8188E( PADAPTER pAdapter,
u8 channel );
// Call after initialization

View file

@ -28,7 +28,7 @@
* AGC_TAB_1T.TXT
******************************************************************************/
HAL_STATUS
enum HAL_STATUS
ODM_ReadAndConfig_AGC_TAB_1T_8188E(
struct odm_dm_struct * pDM_Odm
);
@ -37,7 +37,7 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E(
* PHY_REG_1T.TXT
******************************************************************************/
HAL_STATUS
enum HAL_STATUS
ODM_ReadAndConfig_PHY_REG_1T_8188E(
struct odm_dm_struct * pDM_Odm
);

View file

@ -27,6 +27,6 @@
* MAC_REG.TXT
******************************************************************************/
HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E( struct odm_dm_struct *pDM_Odm);
enum HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E( struct odm_dm_struct *pDM_Odm);
#endif // end of HWIMG_SUPPORT

View file

@ -25,6 +25,6 @@
* RadioA_1T.TXT
******************************************************************************/
HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct * pDM_Odm);
enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct * pDM_Odm);
#endif // end of HWIMG_SUPPORT

View file

@ -210,7 +210,7 @@ struct rx_hpc {
bool First_time_enter;
bool RXHP_enable;
u1Byte TP_Mode;
RT_TIMER PSDTimer;
struct timer_list PSDTimer;
};
#define ASSOCIATE_ENTRY_NUM 32 // Max size of AsocEntry[].
@ -257,7 +257,7 @@ struct sw_ant_switch {
u8Byte RXByteCnt_A;
u8Byte RXByteCnt_B;
u1Byte TrafficLoad;
RT_TIMER SwAntennaSwitchTimer;
struct timer_list SwAntennaSwitchTimer;
//Hybrid Antenna Diversity
u4Byte CCK_Ant1_Cnt[ASSOCIATE_ENTRY_NUM];
u4Byte CCK_Ant2_Cnt[ASSOCIATE_ENTRY_NUM];
@ -361,7 +361,7 @@ enum odm_ability {
};
//
// 2011/20/20 MH For MP driver RT_WLAN_STA = STA_INFO_T
// 2011/20/20 MH For MP driver RT_WLAN_STA = struct sta_info
// Please declare below ODM relative info in your STA info structure.
//
struct odm_sta_info {
@ -927,7 +927,7 @@ struct odm_dm_struct {
//2 Define STA info.
// _ODM_STA_INFO
// 2012/01/12 MH For MP, we need to reduce one array pointer for default port.??
PSTA_INFO_T pODM_StaInfo[ODM_ASSOCIATE_ENTRY_NUM];
struct sta_info *pODM_StaInfo[ODM_ASSOCIATE_ENTRY_NUM];
#if (RATE_ADAPTIVE_SUPPORT == 1)
u2Byte CurrminRptTime;
@ -973,7 +973,7 @@ struct odm_dm_struct {
//PSD
bool bUserAssignLevel;
RT_TIMER PSDTimer;
struct timer_list PSDTimer;
u1Byte RSSI_BT; //come from BT
bool bPSDinProcess;
bool bDMInitialGainEnable;
@ -1003,10 +1003,10 @@ struct odm_dm_struct {
//
// ODM relative time.
RT_TIMER PathDivSwitchTimer;
struct timer_list PathDivSwitchTimer;
//2011.09.27 add for Path Diversity
RT_TIMER CCKPathDiversityTimer;
RT_TIMER FastAntTrainingTimer;
struct timer_list CCKPathDiversityTimer;
struct timer_list FastAntTrainingTimer;
}; // DM_Dynamic_Mechanism_Structure
#define ODM_RF_PATH_MAX 2

View file

@ -171,20 +171,20 @@ ODM_MacStatusQuery(
bool bPacketBeacon
);
HAL_STATUS
enum HAL_STATUS
ODM_ConfigRFWithHeaderFile(
struct odm_dm_struct * pDM_Odm,
enum ODM_RF_RADIO_PATH Content,
enum ODM_RF_RADIO_PATH eRFPath
);
HAL_STATUS
enum HAL_STATUS
ODM_ConfigBBWithHeaderFile(
struct odm_dm_struct * pDM_Odm,
enum odm_bb_config_type ConfigType
);
HAL_STATUS
enum HAL_STATUS
ODM_ConfigMACWithHeaderFile(
struct odm_dm_struct *pDM_Odm
);

View file

@ -118,9 +118,9 @@ s4Byte ODM_CompareMemory(struct odm_dm_struct *pDM_Odm, void *pBuf1, void *pBuf2
//
// ODM MISC-spin lock relative API.
//
void ODM_AcquireSpinLock(struct odm_dm_struct *pDM_Odm, RT_SPINLOCK_TYPE type);
void ODM_AcquireSpinLock(struct odm_dm_struct *pDM_Odm, enum RT_SPINLOCK_TYPE type);
void ODM_ReleaseSpinLock(struct odm_dm_struct *pDM_Odm, RT_SPINLOCK_TYPE type);
void ODM_ReleaseSpinLock(struct odm_dm_struct *pDM_Odm, enum RT_SPINLOCK_TYPE type);
//
// ODM MISC-workitem relative API.
@ -152,13 +152,13 @@ void ODM_sleep_ms(u4Byte ms);
void ODM_sleep_us(u4Byte us);
void ODM_SetTimer(struct odm_dm_struct *pDM_Odm, PRT_TIMER pTimer, u4Byte msDelay);
void ODM_SetTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer, u4Byte msDelay);
void ODM_InitializeTimer(struct odm_dm_struct *pDM_Odm, PRT_TIMER pTimer, RT_TIMER_CALL_BACK CallBackFunc, void *pContext, const char *szID);
void ODM_InitializeTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer, void *CallBackFunc, void *pContext, const char *szID);
void ODM_CancelTimer(struct odm_dm_struct *pDM_Odm, PRT_TIMER pTimer);
void ODM_CancelTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer);
void ODM_ReleaseTimer(struct odm_dm_struct *pDM_Odm, PRT_TIMER pTimer);
void ODM_ReleaseTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer);
//
// ODM FW relative API.

View file

@ -32,20 +32,14 @@
#define RT_USB_INTERFACE 2
#define RT_SDIO_INTERFACE 3
typedef enum _HAL_STATUS{
enum HAL_STATUS {
HAL_STATUS_SUCCESS,
HAL_STATUS_FAILURE,
/*RT_STATUS_PENDING,
RT_STATUS_RESOURCE,
RT_STATUS_INVALID_CONTEXT,
RT_STATUS_INVALID_PARAMETER,
RT_STATUS_NOT_SUPPORT,
RT_STATUS_OS_API_FAILED,*/
}HAL_STATUS,*PHAL_STATUS;
};
typedef enum _RT_SPINLOCK_TYPE{
enum RT_SPINLOCK_TYPE {
RT_TEMP =1,
}RT_SPINLOCK_TYPE;
};
#include <basic_types.h>
@ -75,11 +69,6 @@ typedef enum _RT_SPINLOCK_TYPE{
#define DEV_BUS_TYPE RT_USB_INTERFACE
typedef struct timer_list RT_TIMER, *PRT_TIMER;
typedef void * RT_TIMER_CALL_BACK;
#define STA_INFO_T struct sta_info
#define PSTA_INFO_T struct sta_info *
#define SET_TX_DESC_ANTSEL_A_88E(__pTxDesc, __Value) SET_BITS_TO_LE_4BYTE(__pTxDesc+8, 24, 1, __Value)
#define SET_TX_DESC_ANTSEL_B_88E(__pTxDesc, __Value) SET_BITS_TO_LE_4BYTE(__pTxDesc+8, 25, 1, __Value)
#define SET_TX_DESC_ANTSEL_C_88E(__pTxDesc, __Value) SET_BITS_TO_LE_4BYTE(__pTxDesc+28, 29, 1, __Value)