skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-09-20 16:17:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove most typedef statements from include/hal_intf.h

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-03-17 10:31:25 -05:00
parent fa43f604b9
commit 7460f4b22a
11 changed files with 55 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/rtw_efuse.c
View file

@ -962,7 +962,7 @@ efuse_ShadowRead1Byte(
u16 Offset, u16 Offset,
u8 *Value) u8 *Value)
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
*Value = pEEPROM->efuse_eeprom_data[Offset]; *Value = pEEPROM->efuse_eeprom_data[Offset];
@ -975,7 +975,7 @@ efuse_ShadowRead2Byte(
u16 Offset, u16 Offset,
u16 *Value) u16 *Value)
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
*Value = pEEPROM->efuse_eeprom_data[Offset]; *Value = pEEPROM->efuse_eeprom_data[Offset];
*Value |= pEEPROM->efuse_eeprom_data[Offset+1]<<8; *Value |= pEEPROM->efuse_eeprom_data[Offset+1]<<8;
@ -989,7 +989,7 @@ efuse_ShadowRead4Byte(
u16 Offset, u16 Offset,
u32 *Value) u32 *Value)
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
*Value = pEEPROM->efuse_eeprom_data[Offset]; *Value = pEEPROM->efuse_eeprom_data[Offset];
*Value |= pEEPROM->efuse_eeprom_data[Offset+1]<<8; *Value |= pEEPROM->efuse_eeprom_data[Offset+1]<<8;
@ -1030,7 +1030,7 @@ efuse_ShadowWrite1Byte(
u16 Offset, u16 Offset,
u8 Value) u8 Value)
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
pEEPROM->efuse_eeprom_data[Offset] = Value; pEEPROM->efuse_eeprom_data[Offset] = Value;
@ -1043,7 +1043,7 @@ efuse_ShadowWrite2Byte(
u16 Offset, u16 Offset,
u16 Value) u16 Value)
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
pEEPROM->efuse_eeprom_data[Offset] = Value&0x00FF; pEEPROM->efuse_eeprom_data[Offset] = Value&0x00FF;
pEEPROM->efuse_eeprom_data[Offset+1] = Value>>8; pEEPROM->efuse_eeprom_data[Offset+1] = Value>>8;
@ -1057,7 +1057,7 @@ efuse_ShadowWrite4Byte(
u16 Offset, u16 Offset,
u32 Value) u32 Value)
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
pEEPROM->efuse_eeprom_data[Offset] = (u8)(Value&0x000000FF); pEEPROM->efuse_eeprom_data[Offset] = (u8)(Value&0x000000FF);
pEEPROM->efuse_eeprom_data[Offset+1] = (u8)((Value>>8)&0x0000FF); pEEPROM->efuse_eeprom_data[Offset+1] = (u8)((Value>>8)&0x0000FF);
@ -1087,7 +1087,7 @@ void EFUSE_ShadowMapUpdate(
u8 efuseType, u8 efuseType,
bool bPseudoTest) bool bPseudoTest)
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
u16 mapLen=0; u16 mapLen=0;
EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, bPseudoTest); EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, bPseudoTest);

2
core/rtw_pwrctrl.c
View file

@ -841,7 +841,7 @@ void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv)
} }
#endif /* CONFIG_ANDROID_POWER */ #endif /* CONFIG_ANDROID_POWER */
u8 rtw_interface_ps_func(struct adapter *padapter,HAL_INTF_PS_FUNC efunc_id,u8* val) u8 rtw_interface_ps_func(struct adapter *padapter, enum HAL_INTF_PS_FUNC efunc_id,u8* val)
{ {
u8 bResult = true; u8 bResult = true;
rtw_hal_intf_ps_func(padapter,efunc_id,val); rtw_hal_intf_ps_func(padapter,efunc_id,val);

4
hal/hal_com.c
View file

@ -381,7 +381,7 @@ exit:
} }
u8 u8
SetHalDefVar(struct adapter *adapter, HAL_DEF_VARIABLE variable, void *value) SetHalDefVar(struct adapter *adapter, enum HAL_DEF_VARIABLE variable, void *value)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter);
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv); PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
@ -410,7 +410,7 @@ SetHalDefVar(struct adapter *adapter, HAL_DEF_VARIABLE variable, void *value)
} }
u8 u8
GetHalDefVar(struct adapter *adapter, HAL_DEF_VARIABLE variable, void *value) GetHalDefVar(struct adapter *adapter, enum HAL_DEF_VARIABLE variable, void *value)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter);
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv); PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);

10
hal/hal_intf.c
View file

@ -172,27 +172,27 @@ void rtw_hal_get_hwreg(struct adapter *padapter, u8 variable, u8 *val)
padapter->HalFunc.GetHwRegHandler(padapter, variable, val); padapter->HalFunc.GetHwRegHandler(padapter, variable, val);
} }
u8 rtw_hal_set_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue) u8 rtw_hal_set_def_var(struct adapter *padapter, enum HAL_DEF_VARIABLE eVariable, void * pValue)
{ {
if(padapter->HalFunc.SetHalDefVarHandler) if(padapter->HalFunc.SetHalDefVarHandler)
return padapter->HalFunc.SetHalDefVarHandler(padapter,eVariable,pValue); return padapter->HalFunc.SetHalDefVarHandler(padapter,eVariable,pValue);
return _FAIL; return _FAIL;
} }
u8 rtw_hal_get_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue) u8 rtw_hal_get_def_var(struct adapter *padapter, enum HAL_DEF_VARIABLE eVariable, void * pValue)
{ {
if(padapter->HalFunc.GetHalDefVarHandler) if(padapter->HalFunc.GetHalDefVarHandler)
return padapter->HalFunc.GetHalDefVarHandler(padapter,eVariable,pValue); return padapter->HalFunc.GetHalDefVarHandler(padapter,eVariable,pValue);
return _FAIL; return _FAIL;
} }
void rtw_hal_set_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet) void rtw_hal_set_odm_var(struct adapter *padapter, enum HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet)
{ {
if(padapter->HalFunc.SetHalODMVarHandler) if(padapter->HalFunc.SetHalODMVarHandler)
padapter->HalFunc.SetHalODMVarHandler(padapter,eVariable,pValue1,bSet); padapter->HalFunc.SetHalODMVarHandler(padapter,eVariable,pValue1,bSet);
} }
void rtw_hal_get_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet) void rtw_hal_get_odm_var(struct adapter *padapter, enum HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet)
{ {
if(padapter->HalFunc.GetHalODMVarHandler) if(padapter->HalFunc.GetHalODMVarHandler)
padapter->HalFunc.GetHalODMVarHandler(padapter,eVariable,pValue1,bSet); padapter->HalFunc.GetHalODMVarHandler(padapter,eVariable,pValue1,bSet);
@ -246,7 +246,7 @@ u32 rtw_hal_inirp_deinit(struct adapter *padapter)
} }
u8 rtw_hal_intf_ps_func(struct adapter *padapter,HAL_INTF_PS_FUNC efunc_id, u8* val) u8 rtw_hal_intf_ps_func(struct adapter *padapter, enum HAL_INTF_PS_FUNC efunc_id, u8* val)
{ {
if(padapter->HalFunc.interface_ps_func) if(padapter->HalFunc.interface_ps_func)
return padapter->HalFunc.interface_ps_func(padapter,efunc_id,val); return padapter->HalFunc.interface_ps_func(padapter,efunc_id,val);

8
hal/rtl8188e_hal_init.c
View file

@ -2543,7 +2543,7 @@ static void rtl8188e_read_chip_version(struct adapter *padapter)
static void rtl8188e_GetHalODMVar( static void rtl8188e_GetHalODMVar(
struct adapter * Adapter, struct adapter * Adapter,
HAL_ODM_VARIABLE eVariable, enum HAL_ODM_VARIABLE eVariable,
void * pValue1, void * pValue1,
bool bSet) bool bSet)
{ {
@ -2559,7 +2559,7 @@ static void rtl8188e_GetHalODMVar(
static void rtl8188e_SetHalODMVar( static void rtl8188e_SetHalODMVar(
struct adapter * Adapter, struct adapter * Adapter,
HAL_ODM_VARIABLE eVariable, enum HAL_ODM_VARIABLE eVariable,
void * pValue1, void * pValue1,
bool bSet) bool bSet)
{ {
@ -2791,7 +2791,7 @@ s32 InitLLTTable(struct adapter *padapter, u8 txpktbuf_bndy)
void void
Hal_InitPGData88E(struct adapter *padapter) Hal_InitPGData88E(struct adapter *padapter)
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
/* HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); */ /* HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); */
u32 i; u32 i;
u16 value16; u16 value16;
@ -2829,7 +2829,7 @@ Hal_EfuseParseIDCode88E(
u8 *hwinfo u8 *hwinfo
) )
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
/* HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); */ /* HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); */
u16 EEPROMId; u16 EEPROMId;

2
hal/rtl8188e_phycfg.c
View file

@ -1040,7 +1040,7 @@ phy_BB8188E_Config_ParaFile(
struct adapter *Adapter struct adapter *Adapter
) )
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter);
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
int rtStatus = _SUCCESS; int rtStatus = _SUCCESS;

13
hal/usb_halinit.c
View file

@ -1875,7 +1875,7 @@ Hal_EfuseParseMACAddr_8188EU(
{ {
u16 i, usValue; u16 i, usValue;
u8 sMacAddr[6] = {0x00, 0xE0, 0x4C, 0x81, 0x88, 0x02}; u8 sMacAddr[6] = {0x00, 0xE0, 0x4C, 0x81, 0x88, 0x02};
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
if (AutoLoadFail) if (AutoLoadFail)
{ {
@ -1916,7 +1916,7 @@ readAdapterInfo_8188EU(
struct adapter *padapter struct adapter *padapter
) )
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
/* parse the eeprom/efuse content */ /* parse the eeprom/efuse content */
Hal_EfuseParseIDCode88E(padapter, pEEPROM->efuse_eeprom_data); Hal_EfuseParseIDCode88E(padapter, pEEPROM->efuse_eeprom_data);
@ -1946,7 +1946,7 @@ static void _ReadPROMContent(
struct adapter * Adapter struct adapter * Adapter
) )
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter);
u8 eeValue; u8 eeValue;
/* check system boot selection */ /* check system boot selection */
@ -2939,7 +2939,7 @@ static void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
/* */ /* */
static u8 GetHalDefVar8188EUsb( static u8 GetHalDefVar8188EUsb(
struct adapter * Adapter, struct adapter * Adapter,
HAL_DEF_VARIABLE eVariable, enum HAL_DEF_VARIABLE eVariable,
void * pValue void * pValue
) )
{ {
@ -3064,7 +3064,7 @@ static u8 GetHalDefVar8188EUsb(
/* */ /* */
static u8 SetHalDefVar8188EUsb( static u8 SetHalDefVar8188EUsb(
struct adapter * Adapter, struct adapter * Adapter,
HAL_DEF_VARIABLE eVariable, enum HAL_DEF_VARIABLE eVariable,
void * pValue void * pValue
) )
{ {
@ -3274,7 +3274,6 @@ static void UpdateHalRAMask8188EUsb(struct adapter *padapter, u32 mac_id, u8 rss
static void SetBeaconRelatedRegisters8188EUsb(struct adapter *padapter) static void SetBeaconRelatedRegisters8188EUsb(struct adapter *padapter)
{ {
u32 value32; u32 value32;
/* HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); */
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
u32 bcn_ctrl_reg = REG_BCN_CTRL; u32 bcn_ctrl_reg = REG_BCN_CTRL;
@ -3353,7 +3352,7 @@ static void rtl8188eu_init_default_value(struct adapter * padapter)
pHalData->odmpriv.RFCalibrateInfo.ThermalValue_HP[i] = 0; pHalData->odmpriv.RFCalibrateInfo.ThermalValue_HP[i] = 0;
} }
static u8 rtl8188eu_ps_func(struct adapter *Adapter,HAL_INTF_PS_FUNC efunc_id, u8 *val) static u8 rtl8188eu_ps_func(struct adapter *Adapter, enum HAL_INTF_PS_FUNC efunc_id, u8 *val)
{ {
u8 bResult = true; u8 bResult = true;
switch(efunc_id){ switch(efunc_id){

4
include/hal_com.h
View file

@ -178,7 +178,7 @@ void hal_init_macaddr(struct adapter *adapter);
void c2h_evt_clear(struct adapter *adapter); void c2h_evt_clear(struct adapter *adapter);
s32 c2h_evt_read(struct adapter *adapter, u8 *buf); s32 c2h_evt_read(struct adapter *adapter, u8 *buf);
u8 SetHalDefVar(struct adapter *adapter, HAL_DEF_VARIABLE variable, void *value); u8 SetHalDefVar(struct adapter *adapter, enum HAL_DEF_VARIABLE variable, void *value);
u8 GetHalDefVar(struct adapter *adapter, HAL_DEF_VARIABLE variable, void *value); u8 GetHalDefVar(struct adapter *adapter, enum HAL_DEF_VARIABLE variable, void *value);
#endif /* __HAL_COMMON_H__ */ #endif /* __HAL_COMMON_H__ */

62
include/hal_intf.h
View file

@ -42,7 +42,7 @@ enum _CHIP_TYPE {
}; };
typedef enum _HW_VARIABLES{ enum HW_VARIABLES {
HW_VAR_MEDIA_STATUS, HW_VAR_MEDIA_STATUS,
HW_VAR_MEDIA_STATUS1, HW_VAR_MEDIA_STATUS1,
HW_VAR_SET_OPMODE, HW_VAR_SET_OPMODE,
@ -58,7 +58,7 @@ typedef enum _HW_VARIABLES{
HW_VAR_MLME_SITESURVEY, HW_VAR_MLME_SITESURVEY,
HW_VAR_MLME_JOIN, HW_VAR_MLME_JOIN,
HW_VAR_ON_RCR_AM, HW_VAR_ON_RCR_AM,
HW_VAR_OFF_RCR_AM, HW_VAR_OFF_RCR_AM,
HW_VAR_BEACON_INTERVAL, HW_VAR_BEACON_INTERVAL,
HW_VAR_SLOT_TIME, HW_VAR_SLOT_TIME,
HW_VAR_RESP_SIFS, HW_VAR_RESP_SIFS,
@ -118,9 +118,9 @@ typedef enum _HW_VARIABLES{
HW_VAR_READ_LLT_TAB, HW_VAR_READ_LLT_TAB,
HW_VAR_C2HEVT_CLEAR, HW_VAR_C2HEVT_CLEAR,
HW_VAR_C2HEVT_MSG_NORMAL, HW_VAR_C2HEVT_MSG_NORMAL,
}HW_VARIABLES; };
typedef enum _HAL_DEF_VARIABLE{ enum HAL_DEF_VARIABLE {
HAL_DEF_UNDERCORATEDSMOOTHEDPWDB, HAL_DEF_UNDERCORATEDSMOOTHEDPWDB,
HAL_DEF_IS_SUPPORT_ANT_DIV, HAL_DEF_IS_SUPPORT_ANT_DIV,
HAL_DEF_CURRENT_ANTENNA, HAL_DEF_CURRENT_ANTENNA,
@ -138,20 +138,19 @@ typedef enum _HAL_DEF_VARIABLE{
HW_DEF_FA_CNT_DUMP, HW_DEF_FA_CNT_DUMP,
HW_DEF_ODM_DBG_FLAG, HW_DEF_ODM_DBG_FLAG,
HW_DEF_ODM_DBG_LEVEL, HW_DEF_ODM_DBG_LEVEL,
}HAL_DEF_VARIABLE; };
typedef enum _HAL_ODM_VARIABLE{ enum HAL_ODM_VARIABLE {
HAL_ODM_STA_INFO, HAL_ODM_STA_INFO,
HAL_ODM_P2P_STATE, HAL_ODM_P2P_STATE,
HAL_ODM_WIFI_DISPLAY_STATE, HAL_ODM_WIFI_DISPLAY_STATE,
}HAL_ODM_VARIABLE; };
typedef enum _HAL_INTF_PS_FUNC{ enum HAL_INTF_PS_FUNC {
HAL_USB_SELECT_SUSPEND, HAL_USB_SELECT_SUSPEND,
HAL_MAX_ID, HAL_MAX_ID,
}HAL_INTF_PS_FUNC; };
typedef s32 (*c2h_id_filter)(u8 id);
struct hal_ops { struct hal_ops {
u32 (*hal_power_on)(struct adapter *padapter); u32 (*hal_power_on)(struct adapter *padapter);
@ -194,11 +193,11 @@ struct hal_ops {
void (*SetHwRegHandler)(struct adapter *padapter, u8 variable,u8* val); void (*SetHwRegHandler)(struct adapter *padapter, u8 variable,u8* val);
void (*GetHwRegHandler)(struct adapter *padapter, u8 variable,u8* val); void (*GetHwRegHandler)(struct adapter *padapter, u8 variable,u8* val);
u8 (*GetHalDefVarHandler)(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue); u8 (*GetHalDefVarHandler)(struct adapter *padapter, enum HAL_DEF_VARIABLE eVariable, void * pValue);
u8 (*SetHalDefVarHandler)(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue); u8 (*SetHalDefVarHandler)(struct adapter *padapter, enum HAL_DEF_VARIABLE eVariable, void * pValue);
void (*GetHalODMVarHandler)(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet); void (*GetHalODMVarHandler)(struct adapter *padapter, enum HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet);
void (*SetHalODMVarHandler)(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet); void (*SetHalODMVarHandler)(struct adapter *padapter, enum HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet);
void (*UpdateRAMaskHandler)(struct adapter *padapter, u32 mac_id, u8 rssi_level); void (*UpdateRAMaskHandler)(struct adapter *padapter, u32 mac_id, u8 rssi_level);
void (*SetBeaconRelatedRegistersHandler)(struct adapter *padapter); void (*SetBeaconRelatedRegistersHandler)(struct adapter *padapter);
@ -210,7 +209,7 @@ struct hal_ops {
u8 (*AntDivBeforeLinkHandler)(struct adapter *padapter); u8 (*AntDivBeforeLinkHandler)(struct adapter *padapter);
void (*AntDivCompareHandler)(struct adapter *padapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src); void (*AntDivCompareHandler)(struct adapter *padapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src);
u8 (*interface_ps_func)(struct adapter *padapter,HAL_INTF_PS_FUNC efunc_id, u8* val); u8 (*interface_ps_func)(struct adapter *padapter, enum HAL_INTF_PS_FUNC efunc_id, u8* val);
s32 (*hal_xmit)(struct adapter *padapter, struct xmit_frame *pxmitframe); s32 (*hal_xmit)(struct adapter *padapter, struct xmit_frame *pxmitframe);
s32 (*mgnt_xmit)(struct adapter *padapter, struct xmit_frame *pmgntframe); s32 (*mgnt_xmit)(struct adapter *padapter, struct xmit_frame *pmgntframe);
@ -246,7 +245,7 @@ struct hal_ops {
void (*hal_notch_filter)(struct adapter * adapter, bool enable); void (*hal_notch_filter)(struct adapter * adapter, bool enable);
void (*hal_reset_security_engine)(struct adapter * adapter); void (*hal_reset_security_engine)(struct adapter * adapter);
s32 (*c2h_handler)(struct adapter *padapter, struct c2h_evt_hdr *c2h_evt); s32 (*c2h_handler)(struct adapter *padapter, struct c2h_evt_hdr *c2h_evt);
c2h_id_filter c2h_id_filter_ccx; s32 (*c2h_id_filter_ccx)(u8 id);
#if defined(CONFIG_CHECK_BT_HANG) && defined(CONFIG_BT_COEXIST) #if defined(CONFIG_CHECK_BT_HANG) && defined(CONFIG_BT_COEXIST)
void (*hal_init_checkbthang_workqueue)(struct adapter * padapter); void (*hal_init_checkbthang_workqueue)(struct adapter * padapter);
void (*hal_free_checkbthang_workqueue)(struct adapter * padapter); void (*hal_free_checkbthang_workqueue)(struct adapter * padapter);
@ -255,13 +254,11 @@ struct hal_ops {
#endif #endif
}; };
typedef enum _RT_EEPROM_TYPE{ enum RT_EEPROM_TYPE {
EEPROM_93C46, EEPROM_93C46,
EEPROM_93C56, EEPROM_93C56,
EEPROM_BOOT_EFUSE, EEPROM_BOOT_EFUSE,
}RT_EEPROM_TYPE,*PRT_EEPROM_TYPE; };
#define RF_CHANGE_BY_INIT 0 #define RF_CHANGE_BY_INIT 0
#define RF_CHANGE_BY_IPS BIT28 #define RF_CHANGE_BY_IPS BIT28
@ -269,7 +266,7 @@ typedef enum _RT_EEPROM_TYPE{
#define RF_CHANGE_BY_HW BIT30 #define RF_CHANGE_BY_HW BIT30
#define RF_CHANGE_BY_SW BIT31 #define RF_CHANGE_BY_SW BIT31
typedef enum _HARDWARE_TYPE{ enum HARDWARE_TYPE {
HARDWARE_TYPE_RTL8180, HARDWARE_TYPE_RTL8180,
HARDWARE_TYPE_RTL8185, HARDWARE_TYPE_RTL8185,
HARDWARE_TYPE_RTL8187, HARDWARE_TYPE_RTL8187,
@ -290,44 +287,34 @@ typedef enum _HARDWARE_TYPE{
HARDWARE_TYPE_RTL8188EU, HARDWARE_TYPE_RTL8188EU,
HARDWARE_TYPE_RTL8188ES, HARDWARE_TYPE_RTL8188ES,
HARDWARE_TYPE_MAX, HARDWARE_TYPE_MAX,
}HARDWARE_TYPE; };
/* */
/* RTL8192C Series */ /* RTL8192C Series */
/* */
#define IS_HARDWARE_TYPE_8192CE(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192CE) #define IS_HARDWARE_TYPE_8192CE(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192CE)
#define IS_HARDWARE_TYPE_8192CU(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192CU) #define IS_HARDWARE_TYPE_8192CU(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192CU)
#define IS_HARDWARE_TYPE_8192C(_Adapter) \ #define IS_HARDWARE_TYPE_8192C(_Adapter) \
(IS_HARDWARE_TYPE_8192CE(_Adapter) || IS_HARDWARE_TYPE_8192CU(_Adapter)) (IS_HARDWARE_TYPE_8192CE(_Adapter) || IS_HARDWARE_TYPE_8192CU(_Adapter))
/* */
/* RTL8192D Series */ /* RTL8192D Series */
/* */
#define IS_HARDWARE_TYPE_8192DE(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192DE) #define IS_HARDWARE_TYPE_8192DE(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192DE)
#define IS_HARDWARE_TYPE_8192DU(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192DU) #define IS_HARDWARE_TYPE_8192DU(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192DU)
#define IS_HARDWARE_TYPE_8192D(_Adapter) \ #define IS_HARDWARE_TYPE_8192D(_Adapter) \
(IS_HARDWARE_TYPE_8192DE(_Adapter) || IS_HARDWARE_TYPE_8192DU(_Adapter)) (IS_HARDWARE_TYPE_8192DE(_Adapter) || IS_HARDWARE_TYPE_8192DU(_Adapter))
/* */
/* RTL8723A Series */ /* RTL8723A Series */
/* */
#define IS_HARDWARE_TYPE_8723AE(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8723AE) #define IS_HARDWARE_TYPE_8723AE(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8723AE)
#define IS_HARDWARE_TYPE_8723AU(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8723AU) #define IS_HARDWARE_TYPE_8723AU(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8723AU)
#define IS_HARDWARE_TYPE_8723AS(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8723AS) #define IS_HARDWARE_TYPE_8723AS(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8723AS)
#define IS_HARDWARE_TYPE_8723A(_Adapter) \ #define IS_HARDWARE_TYPE_8723A(_Adapter) \
(IS_HARDWARE_TYPE_8723AE(_Adapter) || IS_HARDWARE_TYPE_8723AU(_Adapter) || IS_HARDWARE_TYPE_8723AS(_Adapter)) (IS_HARDWARE_TYPE_8723AE(_Adapter) || IS_HARDWARE_TYPE_8723AU(_Adapter) || IS_HARDWARE_TYPE_8723AS(_Adapter))
/* */
/* RTL8188E Series */ /* RTL8188E Series */
/* */
#define IS_HARDWARE_TYPE_8188EE(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8188EE) #define IS_HARDWARE_TYPE_8188EE(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8188EE)
#define IS_HARDWARE_TYPE_8188EU(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8188EU) #define IS_HARDWARE_TYPE_8188EU(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8188EU)
#define IS_HARDWARE_TYPE_8188ES(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8188ES) #define IS_HARDWARE_TYPE_8188ES(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8188ES)
#define IS_HARDWARE_TYPE_8188E(_Adapter) \ #define IS_HARDWARE_TYPE_8188E(_Adapter) \
(IS_HARDWARE_TYPE_8188EE(_Adapter) || IS_HARDWARE_TYPE_8188EU(_Adapter) || IS_HARDWARE_TYPE_8188ES(_Adapter)) (IS_HARDWARE_TYPE_8188EE(_Adapter) || IS_HARDWARE_TYPE_8188EU(_Adapter) || IS_HARDWARE_TYPE_8188ES(_Adapter))
typedef struct eeprom_priv EEPROM_EFUSE_PRIV, *PEEPROM_EFUSE_PRIV;
#define GET_EEPROM_EFUSE_PRIV(adapter) (&adapter->eeprompriv) #define GET_EEPROM_EFUSE_PRIV(adapter) (&adapter->eeprompriv)
#define is_boot_from_eeprom(adapter) (adapter->eeprompriv.EepromOrEfuse) #define is_boot_from_eeprom(adapter) (adapter->eeprompriv.EepromOrEfuse)
@ -352,11 +339,11 @@ void rtw_hal_chip_configure(struct adapter *padapter);
void rtw_hal_read_chip_info(struct adapter *padapter); void rtw_hal_read_chip_info(struct adapter *padapter);
void rtw_hal_read_chip_version(struct adapter *padapter); void rtw_hal_read_chip_version(struct adapter *padapter);
u8 rtw_hal_set_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue); u8 rtw_hal_set_def_var(struct adapter *padapter, enum HAL_DEF_VARIABLE eVariable, void * pValue);
u8 rtw_hal_get_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue); u8 rtw_hal_get_def_var(struct adapter *padapter, enum HAL_DEF_VARIABLE eVariable, void * pValue);
void rtw_hal_set_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet); void rtw_hal_set_odm_var(struct adapter *padapter, enum HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet);
void rtw_hal_get_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet); void rtw_hal_get_odm_var(struct adapter *padapter, enum HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet);
void rtw_hal_enable_interrupt(struct adapter *padapter); void rtw_hal_enable_interrupt(struct adapter *padapter);
void rtw_hal_disable_interrupt(struct adapter *padapter); void rtw_hal_disable_interrupt(struct adapter *padapter);
@ -364,7 +351,7 @@ void rtw_hal_disable_interrupt(struct adapter *padapter);
u32 rtw_hal_inirp_init(struct adapter *padapter); u32 rtw_hal_inirp_init(struct adapter *padapter);
u32 rtw_hal_inirp_deinit(struct adapter *padapter); u32 rtw_hal_inirp_deinit(struct adapter *padapter);
u8 rtw_hal_intf_ps_func(struct adapter *padapter,HAL_INTF_PS_FUNC efunc_id, u8* val); u8 rtw_hal_intf_ps_func(struct adapter *padapter, enum HAL_INTF_PS_FUNC efunc_id, u8* val);
s32 rtw_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe); s32 rtw_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe);
s32 rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe); s32 rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe);
@ -415,6 +402,7 @@ void rtw_hal_notch_filter(struct adapter * adapter, bool enable);
void rtw_hal_reset_security_engine(struct adapter * adapter); void rtw_hal_reset_security_engine(struct adapter * adapter);
s32 rtw_hal_c2h_handler(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt); s32 rtw_hal_c2h_handler(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt);
typedef s32 (*c2h_id_filter)(u8 id);
c2h_id_filter rtw_hal_c2h_id_filter_ccx(struct adapter *adapter); c2h_id_filter rtw_hal_c2h_id_filter_ccx(struct adapter *adapter);
#endif /* __HAL_INTF_H__ */ #endif /* __HAL_INTF_H__ */

2
include/rtw_pwrctrl.h
View file

@ -312,7 +312,7 @@ void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv);
#define rtw_unregister_early_suspend(pwrpriv) do {} while (0) #define rtw_unregister_early_suspend(pwrpriv) do {} while (0)
#endif /* CONFIG_HAS_EARLYSUSPEND || CONFIG_ANDROID_POWER */ #endif /* CONFIG_HAS_EARLYSUSPEND || CONFIG_ANDROID_POWER */
u8 rtw_interface_ps_func(struct adapter *padapter,HAL_INTF_PS_FUNC efunc_id,u8* val); u8 rtw_interface_ps_func(struct adapter *padapter, enum HAL_INTF_PS_FUNC efunc_id,u8* val);
void rtw_set_ips_deny(struct adapter *padapter, u32 ms); void rtw_set_ips_deny(struct adapter *padapter, u32 ms);
int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *caller); int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *caller);
#define rtw_pwr_wakeup(adapter) _rtw_pwr_wakeup(adapter, RTW_PWR_STATE_CHK_INTERVAL, __FUNCTION__) #define rtw_pwr_wakeup(adapter) _rtw_pwr_wakeup(adapter, RTW_PWR_STATE_CHK_INTERVAL, __FUNCTION__)

2
os_dep/ioctl_linux.c
View file

@ -7627,7 +7627,7 @@ static int rtw_mp_efuse_get(struct net_device *dev,
{ {
struct adapter *padapter = rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
PHAL_DATA_TYPE pHalData = GET_HAL_DATA(padapter); PHAL_DATA_TYPE pHalData = GET_HAL_DATA(padapter);
PEFUSE_HAL pEfuseHal; PEFUSE_HAL pEfuseHal;
struct iw_point *wrqu; struct iw_point *wrqu;