skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-28 23:23:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Convert most typedef statements in include/rtw_mp.h

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-26 16:08:55 -05:00
parent 7161cf35ba
commit 5cfecb6edc
4 changed files with 25 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/rtw_mp.c
View file

@ -252,7 +252,7 @@ MPT_InitializeAdapter(
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
s32 rtStatus = _SUCCESS; s32 rtStatus = _SUCCESS;
PMPT_CONTEXT pMptCtx = &pAdapter->mppriv.MptCtx; struct mpt_context * pMptCtx = &pAdapter->mppriv.MptCtx;
struct mlme_priv *pmlmepriv = &pAdapter->mlmepriv; struct mlme_priv *pmlmepriv = &pAdapter->mlmepriv;
/* */ /* */
@ -317,14 +317,14 @@ MPT_DeInitAdapter(
PADAPTER pAdapter PADAPTER pAdapter
) )
{ {
PMPT_CONTEXT pMptCtx = &pAdapter->mppriv.MptCtx; struct mpt_context * pMptCtx = &pAdapter->mppriv.MptCtx;
pMptCtx->bMptDrvUnload = true; pMptCtx->bMptDrvUnload = true;
} }
static u8 mpt_ProStartTest(PADAPTER padapter) static u8 mpt_ProStartTest(PADAPTER padapter)
{ {
PMPT_CONTEXT pMptCtx = &padapter->mppriv.MptCtx; struct mpt_context * pMptCtx = &padapter->mppriv.MptCtx;
pMptCtx->bMassProdTest = true; pMptCtx->bMassProdTest = true;
pMptCtx->bStartContTx = false; pMptCtx->bStartContTx = false;

6
hal/HalPhyRf_8188e.c
View file

@ -1551,7 +1551,7 @@ static void phy_APCalibrate_8188E(
#if MP_DRIVER == 1 #if MP_DRIVER == 1
if ( *(pDM_Odm->mp_mode) == 1) if ( *(pDM_Odm->mp_mode) == 1)
{ {
PMPT_CONTEXT pMptCtx = &(pAdapter->mppriv.MptCtx); struct mpt_context * pMptCtx = &(pAdapter->mppriv.MptCtx);
pMptCtx->APK_bound[0] = 45; pMptCtx->APK_bound[0] = 45;
pMptCtx->APK_bound[1] = 52; pMptCtx->APK_bound[1] = 52;
} }
@ -1890,7 +1890,7 @@ PHY_IQCalibrate_8188E(
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv; struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
#if (MP_DRIVER == 1) #if (MP_DRIVER == 1)
PMPT_CONTEXT pMptCtx = &(pAdapter->mppriv.MptCtx); struct mpt_context * pMptCtx = &(pAdapter->mppriv.MptCtx);
#endif/* MP_DRIVER == 1) */ #endif/* MP_DRIVER == 1) */
s4Byte result[4][8]; /* last is final result */ s4Byte result[4][8]; /* last is final result */
@ -2081,7 +2081,7 @@ PHY_LCCalibrate_8188E(
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv; struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
#if (MP_DRIVER == 1) #if (MP_DRIVER == 1)
PMPT_CONTEXT pMptCtx = &(pAdapter->mppriv.MptCtx); struct mpt_context *pMptCtx = &(pAdapter->mppriv.MptCtx);
#endif/* MP_DRIVER == 1) */ #endif/* MP_DRIVER == 1) */
#if MP_DRIVER == 1 #if MP_DRIVER == 1

4
hal/rtl8188e_mp.c
View file

@ -212,7 +212,7 @@ void Hal_MPT_CCKTxPowerAdjustbyIndex(PADAPTER pAdapter, bool beven)
u8 TimeOut = 100; u8 TimeOut = 100;
s32 i = 0; s32 i = 0;
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PMPT_CONTEXT pMptCtx = &pAdapter->mppriv.MptCtx; struct mpt_context * pMptCtx = &pAdapter->mppriv.MptCtx;
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
struct odm_dm_struct * pDM_Odm = &(pHalData->odmpriv); struct odm_dm_struct * pDM_Odm = &(pHalData->odmpriv);
@ -363,7 +363,7 @@ void Hal_SetOFDMTxPower(PADAPTER pAdapter, u8 *TxPower)
{ {
u32 TxAGC = 0; u32 TxAGC = 0;
u8 tmpval = 0; u8 tmpval = 0;
PMPT_CONTEXT pMptCtx = &pAdapter->mppriv.MptCtx; struct mpt_context *pMptCtx = &pAdapter->mppriv.MptCtx;
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);

46
include/rtw_mp.h
View file

@ -80,7 +80,7 @@
#define NDIS_STATUS_AAL_PARAMS_UNSUPPORTED ((NDIS_STATUS)0xC0010028L) // cause 93 #define NDIS_STATUS_AAL_PARAMS_UNSUPPORTED ((NDIS_STATUS)0xC0010028L) // cause 93
#define NDIS_STATUS_NO_ROUTE_TO_DESTINATION ((NDIS_STATUS)0xC0010029L) // cause 3 #define NDIS_STATUS_NO_ROUTE_TO_DESTINATION ((NDIS_STATUS)0xC0010029L) // cause 3
typedef enum _ANTENNA_PATH{ enum antenna_path {
ANTENNA_NONE = 0x00, ANTENNA_NONE = 0x00,
ANTENNA_D , ANTENNA_D ,
ANTENNA_C , ANTENNA_C ,
@ -97,7 +97,7 @@ typedef enum _ANTENNA_PATH{
ANTENNA_ABD , ANTENNA_ABD ,
ANTENNA_ABC , ANTENNA_ABC ,
ANTENNA_ABCD ANTENNA_ABCD
} ANTENNA_PATH; };
#define MAX_MP_XMITBUF_SZ 2048 #define MAX_MP_XMITBUF_SZ 2048
@ -137,8 +137,7 @@ struct mp_wiparam
typedef void(*wi_act_func)(void* padapter); typedef void(*wi_act_func)(void* padapter);
struct mp_tx struct mp_tx {
{
u8 stop; u8 stop;
u32 count, sended; u32 count, sended;
u8 payload; u8 payload;
@ -191,8 +190,8 @@ struct mp_tx
typedef void (*MPT_WORK_ITEM_HANDLER)(void *Adapter); typedef void (*MPT_WORK_ITEM_HANDLER)(void *Adapter);
typedef struct _MPT_CONTEXT
{ struct mpt_context {
// Indicate if we have started Mass Production Test. // Indicate if we have started Mass Production Test.
bool bMassProdTest; bool bMassProdTest;
@ -209,12 +208,7 @@ typedef struct _MPT_CONTEXT
/* 8190 PCI does not support NDIS_WORK_ITEM. */ /* 8190 PCI does not support NDIS_WORK_ITEM. */
// Work Item for Mass Production Test. // Work Item for Mass Production Test.
//NDIS_WORK_ITEM MptWorkItem;
// RT_WORK_ITEM MptWorkItem;
// Event used to sync the case unloading driver and MptWorkItem is still in progress. // Event used to sync the case unloading driver and MptWorkItem is still in progress.
// NDIS_EVENT MptWorkItemEvent;
// To protect the following variables.
// NDIS_SPIN_LOCK MptWorkItemSpinLock;
// Indicate a MptWorkItem is scheduled and not yet finished. // Indicate a MptWorkItem is scheduled and not yet finished.
bool bMptWorkItemInProgress; bool bMptWorkItemInProgress;
// An instance which implements function and context of MptWorkItem. // An instance which implements function and context of MptWorkItem.
@ -236,7 +230,6 @@ typedef struct _MPT_CONTEXT
enum wireless_mode MptWirelessModeToSw; // Wireless mode to switch. enum wireless_mode MptWirelessModeToSw; // Wireless mode to switch.
u8 MptChannelToSw; // Channel to switch. u8 MptChannelToSw; // Channel to switch.
u8 MptInitGainToSet; // Initial gain to set. u8 MptInitGainToSet; // Initial gain to set.
//ULONG bMptAntennaA; // true if we want to use antenna A.
ULONG MptBandWidth; // bandwidth to switch. ULONG MptBandWidth; // bandwidth to switch.
ULONG MptRateIndex; // rate index. ULONG MptRateIndex; // rate index.
// Register value kept for Single Carrier Tx test. // Register value kept for Single Carrier Tx test.
@ -290,7 +283,7 @@ typedef struct _MPT_CONTEXT
ULONG mptOutLen; ULONG mptOutLen;
u1Byte mptOutBuf[100]; u1Byte mptOutBuf[100];
}MPT_CONTEXT, *PMPT_CONTEXT; };
enum { enum {
WRITE_REG = 1, WRITE_REG = 1,
@ -374,14 +367,14 @@ struct mp_priv
struct __queue free_mp_xmitqueue; struct __queue free_mp_xmitqueue;
u32 free_mp_xmitframe_cnt; u32 free_mp_xmitframe_cnt;
MPT_CONTEXT MptCtx; struct mpt_context MptCtx;
}; };
typedef struct _IOCMD_STRUCT_ { struct iocmd_struct {
u8 cmdclass; u8 cmdclass;
u16 value; u16 value;
u8 index; u8 index;
}IOCMD_STRUCT; };
struct rf_reg_param { struct rf_reg_param {
u32 path; u32 path;
@ -402,7 +395,7 @@ struct bb_reg_param {
#define BB_REG_BASE_ADDR 0x800 #define BB_REG_BASE_ADDR 0x800
/* MP variables */ /* MP variables */
typedef enum _MP_MODE_ { enum mp_mode_{
MP_OFF, MP_OFF,
MP_ON, MP_ON,
MP_ERR, MP_ERR,
@ -412,17 +405,14 @@ typedef enum _MP_MODE_ {
MP_SINGLE_TONE_TX, MP_SINGLE_TONE_TX,
MP_PACKET_TX, MP_PACKET_TX,
MP_PACKET_RX MP_PACKET_RX
} MP_MODE; };
#define MAX_RF_PATH_NUMS RF_PATH_MAX #define MAX_RF_PATH_NUMS RF_PATH_MAX
extern u8 mpdatarate[NumRates]; extern u8 mpdatarate[NumRates];
/* MP set force data rate base on the definition. */ /* MP set force data rate base on the definition. */
typedef enum _MPT_RATE_INDEX enum mpt_rate_index {
{
/* CCK rate. */ /* CCK rate. */
MPT_RATE_1M, /* 0 */ MPT_RATE_1M, /* 0 */
MPT_RATE_2M, MPT_RATE_2M,
@ -457,27 +447,25 @@ typedef enum _MPT_RATE_INDEX
MPT_RATE_MCS14, MPT_RATE_MCS14,
MPT_RATE_MCS15, /* 27 */ MPT_RATE_MCS15, /* 27 */
MPT_RATE_LAST MPT_RATE_LAST
}MPT_RATE_E, *PMPT_RATE_E; };
#define MAX_TX_PWR_INDEX_N_MODE 64 // 0x3F #define MAX_TX_PWR_INDEX_N_MODE 64 // 0x3F
typedef enum _POWER_MODE_ { enum power_mode {
POWER_LOW = 0, POWER_LOW = 0,
POWER_NORMAL POWER_NORMAL
}POWER_MODE; };
#define RX_PKT_BROADCAST 1 #define RX_PKT_BROADCAST 1
#define RX_PKT_DEST_ADDR 2 #define RX_PKT_DEST_ADDR 2
#define RX_PKT_PHY_MATCH 3 #define RX_PKT_PHY_MATCH 3
typedef enum _ENCRY_CTRL_STATE_ { enum encry_ctrl_state {
HW_CONTROL, //hw encryption& decryption HW_CONTROL, //hw encryption& decryption
SW_CONTROL, //sw encryption& decryption SW_CONTROL, //sw encryption& decryption
HW_ENCRY_SW_DECRY, //hw encryption & sw decryption HW_ENCRY_SW_DECRY, //hw encryption & sw decryption
SW_ENCRY_HW_DECRY //sw encryption & hw decryption SW_ENCRY_HW_DECRY //sw encryption & hw decryption
}ENCRY_CTRL_STATE; };
//======================================================================= //=======================================================================
//extern struct mp_xmit_frame *alloc_mp_xmitframe(struct mp_priv *pmp_priv); //extern struct mp_xmit_frame *alloc_mp_xmitframe(struct mp_priv *pmp_priv);