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

rtl8188eu: Remove 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 2015-03-16 20:14:52 -05:00
parent 067adff3fd
commit 4547604302
2 changed files with 38 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hal/HalPhyRf_8188e.c
View file

@ -1578,7 +1578,7 @@ 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;
} }
@ -1917,7 +1917,7 @@ PHY_IQCalibrate_8188E(
PDM_ODM_T pDM_Odm = &pHalData->odmpriv; PDM_ODM_T 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) */
s32 result[4][8]; /* last is final result */ s32 result[4][8]; /* last is final result */
@ -2102,7 +2102,7 @@ PHY_LCCalibrate_8188E(
PDM_ODM_T pDM_Odm = &pHalData->odmpriv; PDM_ODM_T 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) */

105
include/rtw_mp.h
View file

@ -80,39 +80,34 @@
#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,
ANTENNA_CD , ANTENNA_CD,
ANTENNA_B , ANTENNA_B,
ANTENNA_BD , ANTENNA_BD,
ANTENNA_BC , ANTENNA_BC,
ANTENNA_BCD , ANTENNA_BCD,
ANTENNA_A , ANTENNA_A,
ANTENNA_AD , ANTENNA_AD,
ANTENNA_AC , ANTENNA_AC,
ANTENNA_ACD , ANTENNA_ACD,
ANTENNA_AB , ANTENNA_AB,
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
#define NR_MP_XMITFRAME 8 #define NR_MP_XMITFRAME 8
struct mp_xmit_frame struct mp_xmit_frame {
{
struct list_head list; struct list_head list;
struct pkt_attrib attrib; struct pkt_attrib attrib;
struct sk_buff *pkt; struct sk_buff *pkt;
int frame_tag; int frame_tag;
struct adapter *padapter; struct adapter *padapter;
/* insert urb, irp, and irpcnt info below... */ /* insert urb, irp, and irpcnt info below... */
@ -122,28 +117,22 @@ struct mp_xmit_frame
u32 sz[8]; u32 sz[8];
struct urb * pxmit_urb[8]; struct urb * pxmit_urb[8];
u8 bpending[8]; u8 bpending[8];
sint ac_tag[8]; sint ac_tag[8];
sint last[8]; sint last[8];
uint irpcnt; uint irpcnt;
uint fragcnt; uint fragcnt;
uint mem[(MAX_MP_XMITBUF_SZ >> 2)]; uint mem[(MAX_MP_XMITBUF_SZ >> 2)];
}; };
struct mp_wiparam struct mp_wiparam {
{
u32 bcompleted; u32 bcompleted;
u32 act_type; u32 act_type;
u32 io_offset; u32 io_offset;
u32 io_value; u32 io_value;
}; };
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;
@ -163,11 +152,7 @@ struct mp_tx
#define ULONG u32 #define ULONG u32
#define PULONG u32* #define PULONG u32*
struct mpt_context {
typedef void (*MPT_WORK_ITEM_HANDLER)(void * Adapter);
typedef struct _MPT_CONTEXT
{
/* Indicate if we have started Mass Production Test. */ /* Indicate if we have started Mass Production Test. */
bool bMassProdTest; bool bMassProdTest;
@ -182,18 +167,9 @@ typedef struct _MPT_CONTEXT
bool MptBtC2hEvent; bool MptBtC2hEvent;
bool bMPh2c_timeout; bool bMPh2c_timeout;
/* 8190 PCI does not support NDIS_WORK_ITEM. */
/* 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. */
/* NDIS_EVENT MptWorkItemEvent; */
/* To protect the following variables. */
/* NDIS_SPIN_LOCK MptWorkItemSpinLock; */
/* 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. */
MPT_WORK_ITEM_HANDLER CurrMptAct; void (*CurrMptAct)(void * Adapter);
/* 1=Start, 0=Stop from UI. */ /* 1=Start, 0=Stop from UI. */
ULONG MptTestStart; ULONG MptTestStart;
@ -263,8 +239,7 @@ typedef struct _MPT_CONTEXT
u8 btInBuf[100]; u8 btInBuf[100];
ULONG mptOutLen; ULONG mptOutLen;
u8 mptOutBuf[100]; u8 mptOutBuf[100];
};
}MPT_CONTEXT, *PMPT_CONTEXT;
enum { enum {
WRITE_REG = 1, WRITE_REG = 1,
@ -344,15 +319,9 @@ struct mp_priv {
u8 *pmp_xmtframe_buf; u8 *pmp_xmtframe_buf;
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_ {
u8 cmdclass;
u16 value;
u8 index;
}IOCMD_STRUCT;
struct rf_reg_param { struct rf_reg_param {
u32 path; u32 path;
u32 offset; u32 offset;
@ -372,7 +341,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,
@ -382,17 +351,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,
@ -427,26 +393,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; };
#define Mac_OFDM_OK 0x00000000 #define Mac_OFDM_OK 0x00000000
#define Mac_OFDM_Fail 0x10000000 #define Mac_OFDM_Fail 0x10000000
@ -459,10 +424,6 @@ typedef enum _ENCRY_CTRL_STATE_ {
#define Mac_HT_FasleAlarm 0x90000000 #define Mac_HT_FasleAlarm 0x90000000
#define Mac_DropPacket 0xA0000000 #define Mac_DropPacket 0xA0000000
/* */
/* struct mp_xmit_frame *alloc_mp_xmitframe(struct mp_priv *pmp_priv); */
/* int free_mp_xmitframe(struct xmit_priv *pxmitpriv, struct mp_xmit_frame *pmp_xmitframe); */
s32 init_mp_priv(struct adapter *padapter); s32 init_mp_priv(struct adapter *padapter);
void free_mp_priv(struct mp_priv *pmp_priv); void free_mp_priv(struct mp_priv *pmp_priv);
s32 MPT_InitializeAdapter(struct adapter *padapter, u8 Channel); s32 MPT_InitializeAdapter(struct adapter *padapter, u8 Channel);
@ -470,8 +431,6 @@ void MPT_DeInitAdapter(struct adapter *padapter);
s32 mp_start_test(struct adapter *padapter); s32 mp_start_test(struct adapter *padapter);
void mp_stop_test(struct adapter *padapter); void mp_stop_test(struct adapter *padapter);
/* */
u32 _read_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 bitmask); u32 _read_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 bitmask);
void _write_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 bitmask, u32 val); void _write_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 bitmask, u32 val);
@ -491,8 +450,6 @@ void SetDataRate(struct adapter *pAdapter);
void SetAntenna(struct adapter *pAdapter); void SetAntenna(struct adapter *pAdapter);
/* void SetCrystalCap(struct adapter *pAdapter); */
s32 SetThermalMeter(struct adapter *pAdapter, u8 target_ther); s32 SetThermalMeter(struct adapter *pAdapter, u8 target_ther);
void GetThermalMeter(struct adapter *pAdapter, u8 *value); void GetThermalMeter(struct adapter *pAdapter, u8 *value);