skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-07 22:13:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Convert all typedef statements in include/odm.h

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-26 11:20:42 -05:00
parent d8af6fff83
commit f311a752bb
32 changed files with 603 additions and 710 deletions
Download patch file Download diff file Expand all files Collapse all files

78
hal/Hal8188ERateAdaptive.c
View file

@ -117,8 +117,8 @@ static u2Byte DynamicTxRPTTiming[6] = {
/* End Rate adaptive parameters */
static void odm_SetTxRPTTiming_8188E(
PDM_ODM_T pDM_Odm,
PODM_RA_INFO_T pRaInfo,
struct odm_dm_struct * pDM_Odm,
struct odm_ra_info *pRaInfo,
u1Byte extend
)
{
@ -145,8 +145,8 @@ static void odm_SetTxRPTTiming_8188E(
}
static int odm_RateDown_8188E(
PDM_ODM_T pDM_Odm,
PODM_RA_INFO_T pRaInfo
struct odm_dm_struct *pDM_Odm,
struct odm_ra_info *pRaInfo
)
{
u1Byte RateID, LowestRate, HighestRate;
@ -204,8 +204,8 @@ RateDownFinish:
}
static int odm_RateUp_8188E(
PDM_ODM_T pDM_Odm,
PODM_RA_INFO_T pRaInfo
struct odm_dm_struct * pDM_Odm,
struct odm_ra_info *pRaInfo
)
{
u1Byte RateID, HighestRate;
@ -259,15 +259,15 @@ RateUpfinish:
return 0;
}
static void odm_ResetRaCounter_8188E(PODM_RA_INFO_T pRaInfo){
static void odm_ResetRaCounter_8188E(struct odm_ra_info *pRaInfo){
u1Byte RateID;
RateID=pRaInfo->DecisionRate;
pRaInfo->NscUp=(N_THRESHOLD_HIGH[RateID]+N_THRESHOLD_LOW[RateID])>>1;
pRaInfo->NscDown=(N_THRESHOLD_HIGH[RateID]+N_THRESHOLD_LOW[RateID])>>1;
}
static void odm_RateDecision_8188E(PDM_ODM_T pDM_Odm,
PODM_RA_INFO_T pRaInfo
static void odm_RateDecision_8188E(struct odm_dm_struct * pDM_Odm,
struct odm_ra_info *pRaInfo
)
{
u1Byte RateID = 0, RtyPtID = 0, PenaltyID1 = 0, PenaltyID2 = 0;
@ -356,8 +356,8 @@ static void odm_RateDecision_8188E(PDM_ODM_T pDM_Odm,
static int
odm_ARFBRefresh_8188E(
PDM_ODM_T pDM_Odm,
PODM_RA_INFO_T pRaInfo
struct odm_dm_struct * pDM_Odm,
struct odm_ra_info *pRaInfo
)
{ /* Wilson 2011/10/26 */
u4Byte MaskFromReg;
@ -460,7 +460,7 @@ odm_ARFBRefresh_8188E(
#if POWER_TRAINING_ACTIVE == 1
static void
odm_PTTryState_8188E(
PODM_RA_INFO_T pRaInfo
struct odm_ra_info *pRaInfo
)
{
pRaInfo->PTTryState=0;
@ -520,7 +520,7 @@ odm_PTTryState_8188E(
static void
odm_PTDecision_8188E(
PODM_RA_INFO_T pRaInfo
struct odm_ra_info *pRaInfo
)
{
u1Byte j;
@ -561,7 +561,7 @@ odm_PTDecision_8188E(
static void
odm_RATxRPTTimerSetting(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct * pDM_Odm,
u2Byte minRptTime
)
{
@ -579,7 +579,7 @@ odm_RATxRPTTimerSetting(
void
ODM_RASupport_Init(
PDM_ODM_T pDM_Odm
struct odm_dm_struct *pDM_Odm
)
{
ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("=====>ODM_RASupport_Init()\n"));
@ -594,11 +594,11 @@ ODM_RASupport_Init(
int
ODM_RAInfo_Init(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
u1Byte MacID
)
{
PODM_RA_INFO_T pRaInfo = &pDM_Odm->RAInfo[MacID];
struct odm_ra_info *pRaInfo = &pDM_Odm->RAInfo[MacID];
#if 1
u1Byte WirelessMode=0xFF; /* invalid value */
u1Byte max_rate_idx = 0x13; /* MCS7 */
@ -664,7 +664,7 @@ ODM_RAInfo_Init(
int
ODM_RAInfo_Init_all(
PDM_ODM_T pDM_Odm
struct odm_dm_struct * pDM_Odm
)
{
u1Byte MacID = 0;
@ -681,7 +681,7 @@ ODM_RAInfo_Init_all(
u1Byte
ODM_RA_GetShortGI_8188E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
u1Byte MacID
)
{
@ -694,7 +694,7 @@ ODM_RA_GetShortGI_8188E(
u1Byte
ODM_RA_GetDecisionRate_8188E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
u1Byte MacID
)
{
@ -710,7 +710,7 @@ ODM_RA_GetDecisionRate_8188E(
u1Byte
ODM_RA_GetHwPwrStatus_8188E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
u1Byte MacID
)
{
@ -725,14 +725,14 @@ ODM_RA_GetHwPwrStatus_8188E(
void
ODM_RA_UpdateRateInfo_8188E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
u1Byte MacID,
u1Byte RateID,
u4Byte RateMask,
u1Byte SGIEnable
)
{
PODM_RA_INFO_T pRaInfo = NULL;
struct odm_ra_info *pRaInfo = NULL;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,
("MacID=%d RateID=0x%x RateMask=0x%x SGIEnable=%d\n",
@ -749,12 +749,12 @@ ODM_RA_UpdateRateInfo_8188E(
void
ODM_RA_SetRSSI_8188E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct * pDM_Odm,
u1Byte MacID,
u1Byte Rssi
)
{
PODM_RA_INFO_T pRaInfo = NULL;
struct odm_ra_info *pRaInfo = NULL;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,
(" MacID=%d Rssi=%d\n", MacID, Rssi));
@ -767,7 +767,7 @@ ODM_RA_SetRSSI_8188E(
void
ODM_RA_Set_TxRPT_Time(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct * pDM_Odm,
u2Byte minRptTime
)
{
@ -777,14 +777,14 @@ ODM_RA_Set_TxRPT_Time(
void
ODM_RA_TxRPT2Handle_8188E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct * pDM_Odm,
pu1Byte TxRPT_Buf,
u2Byte TxRPT_Len,
u4Byte MacIDValidEntry0,
u4Byte MacIDValidEntry1
)
{
PODM_RA_INFO_T pRAInfo = NULL;
struct odm_ra_info *pRAInfo = NULL;
u1Byte MacId = 0;
pu1Byte pBuffer = NULL;
u4Byte valid = 0, ItemNum = 0;
@ -894,7 +894,7 @@ ODM_RA_TxRPT2Handle_8188E(
static void
odm_RATxRPTTimerSetting(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct * pDM_Odm,
u2Byte minRptTime
)
{
@ -904,7 +904,7 @@ odm_RATxRPTTimerSetting(
void
ODM_RASupport_Init(
PDM_ODM_T pDM_Odm
struct odm_dm_struct *pDM_Odm
)
{
return;
@ -912,7 +912,7 @@ ODM_RASupport_Init(
int
ODM_RAInfo_Init(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
u1Byte MacID
)
{
@ -921,7 +921,7 @@ ODM_RAInfo_Init(
int
ODM_RAInfo_Init_all(
PDM_ODM_T pDM_Odm
struct odm_dm_struct * pDM_Odm
)
{
return 0;
@ -929,7 +929,7 @@ ODM_RAInfo_Init_all(
u1Byte
ODM_RA_GetShortGI_8188E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
u1Byte MacID
)
{
@ -938,7 +938,7 @@ ODM_RA_GetShortGI_8188E(
u1Byte
ODM_RA_GetDecisionRate_8188E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
u1Byte MacID
)
{
@ -946,7 +946,7 @@ ODM_RA_GetDecisionRate_8188E(
}
u1Byte
ODM_RA_GetHwPwrStatus_8188E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
u1Byte MacID
)
{
@ -955,7 +955,7 @@ ODM_RA_GetHwPwrStatus_8188E(
void
ODM_RA_UpdateRateInfo_8188E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
u1Byte MacID,
u1Byte RateID,
u4Byte RateMask,
@ -967,7 +967,7 @@ ODM_RA_UpdateRateInfo_8188E(
void
ODM_RA_SetRSSI_8188E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct * pDM_Odm,
u1Byte MacID,
u1Byte Rssi
)
@ -977,7 +977,7 @@ ODM_RA_SetRSSI_8188E(
void
ODM_RA_Set_TxRPT_Time(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct * pDM_Odm,
u2Byte minRptTime
)
{
@ -986,7 +986,7 @@ ODM_RA_Set_TxRPT_Time(
void
ODM_RA_TxRPT2Handle_8188E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct * pDM_Odm,
pu1Byte TxRPT_Buf,
u2Byte TxRPT_Len,
u4Byte MacIDValidEntry0,

6
hal/HalHWImg8188E_BB.c
View file

@ -191,7 +191,7 @@ static u4Byte Array_AGC_TAB_1T_8188E[] = {
HAL_STATUS
ODM_ReadAndConfig_AGC_TAB_1T_8188E(
PDM_ODM_T pDM_Odm
struct odm_dm_struct * pDM_Odm
)
{
#define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while (0)
@ -493,7 +493,7 @@ static u4Byte Array_PHY_REG_1T_8188E[] = {
HAL_STATUS
ODM_ReadAndConfig_PHY_REG_1T_8188E(
PDM_ODM_T pDM_Odm
struct odm_dm_struct * pDM_Odm
)
{
#define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while (0)
@ -742,7 +742,7 @@ static u4Byte Array_PHY_REG_PG_8188E[] = {
void
ODM_ReadAndConfig_PHY_REG_PG_8188E(
PDM_ODM_T pDM_Odm
struct odm_dm_struct * pDM_Odm
)
{
u4Byte hex = 0;

2
hal/HalHWImg8188E_MAC.c
View file

@ -151,7 +151,7 @@ static u4Byte Array_MAC_REG_8188E[] = {
HAL_STATUS
ODM_ReadAndConfig_MAC_REG_8188E(
PDM_ODM_T pDM_Odm
struct odm_dm_struct * pDM_Odm
)
{
#define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while (0)

2
hal/HalHWImg8188E_RF.c
View file

@ -160,7 +160,7 @@ static u4Byte Array_RadioA_1T_8188E[] = {
0x000, 0x00033E60,
};
HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(PDM_ODM_T pDM_Odm)
HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct * pDM_Odm)
{
#define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while (0)

4
hal/HalPhyRf.c
View file

@ -26,7 +26,7 @@
void
ODM_ResetIQKResult(
PDM_ODM_T pDM_Odm
struct odm_dm_struct *pDM_Odm
)
{
u1Byte i;
@ -34,7 +34,7 @@ ODM_ResetIQKResult(
if (!IS_HARDWARE_TYPE_8192D(Adapter))
return;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD,("PHY_ResetIQKResult:: settings regs %d default regs %d\n", (u32)(sizeof(pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting)/sizeof(IQK_MATRIX_REGS_SETTING)), IQK_Matrix_Settings_NUM));
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD,("PHY_ResetIQKResult:: settings regs %d default regs %d\n", (u32)(sizeof(pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting)/sizeof(struct ijk_matrix_regs_set)), IQK_Matrix_Settings_NUM));
/* 0xe94, 0xe9c, 0xea4, 0xeac, 0xeb4, 0xebc, 0xec4, 0xecc */
for (i = 0; i < IQK_Matrix_Settings_NUM; i++)

50
hal/HalPhyRf_8188e.c
View file

@ -53,7 +53,7 @@
*---------------------------------------------------------------------------*/
void
ODM_TxPwrTrackAdjust88E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
u1Byte Type, /* 0 = OFDM, 1 = CCK */
pu1Byte pDirection, /* 1 = +(increase) 2 = -(decrease) */
pu4Byte pOutWriteVal /* Tx tracking CCK/OFDM BB swing index adjust */
@ -132,7 +132,7 @@ ODM_TxPwrTrackAdjust88E(
*---------------------------------------------------------------------------*/
static void
odm_TxPwrTrackSetPwr88E(
PDM_ODM_T pDM_Odm
struct odm_dm_struct *pDM_Odm
)
{
if (pDM_Odm->BbSwingFlagOfdm == true || pDM_Odm->BbSwingFlagCck == true)
@ -181,7 +181,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
12, 14, 16, 18, 20, 22,
25, 25, 25},
};
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
/* 2012/04/25 MH Add for tx power tracking to set tx power in tx agc for 88E. */
odm_TxPwrTrackSetPwr88E(pDM_Odm);
@ -554,7 +554,7 @@ phy_PathA_IQK_8188E(
u4Byte regEAC, regE94, regE9C, regEA4;
u1Byte result = 0x00;
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path A IQK!\n"));
/* 1 Tx IQK */
@ -607,7 +607,7 @@ phy_PathA_RxIQK(
u4Byte regEAC, regE94, regE9C, regEA4, u4tmp;
u1Byte result = 0x00;
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path A Rx IQK!\n"));
/* 1 Get TXIMR setting */
@ -740,7 +740,7 @@ phy_PathB_IQK_8188E(
u4Byte regEAC, regEB4, regEBC, regEC4, regECC;
u1Byte result = 0x00;
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path B IQK!\n"));
/* One shot, path B LOK & IQK */
@ -796,7 +796,7 @@ _PHY_PathAFillIQKMatrix(
u4Byte Oldval_0, X, TX0_A, reg;
s4Byte Y, TX0_C;
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path A IQ Calibration %s !\n",(bIQKOK)?"Success":"Failed"));
if (final_candidate == 0xFF)
@ -856,7 +856,7 @@ _PHY_PathBFillIQKMatrix(
u4Byte Oldval_1, X, TX1_A, reg;
s4Byte Y, TX1_C;
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path B IQ Calibration %s !\n",(bIQKOK)?"Success":"Failed"));
if (final_candidate == 0xFF)
@ -921,7 +921,7 @@ _PHY_SaveADDARegisters(
{
u4Byte i;
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
if (ODM_CheckPowerStatus(pAdapter) == false)
return;
@ -941,7 +941,7 @@ static void _PHY_SaveMACRegisters(
{
u4Byte i;
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Save MAC parameters.\n"));
for ( i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++){
MACBackup[i] = ODM_Read1Byte(pDM_Odm, MACReg[i]);
@ -961,7 +961,7 @@ _PHY_ReloadADDARegisters(
{
u4Byte i;
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Reload ADDA power saving parameters !\n"));
for (i = 0 ; i < RegiesterNum; i++)
@ -979,7 +979,7 @@ _PHY_ReloadMACRegisters(
{
u4Byte i;
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Reload MAC parameters !\n"));
for (i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++){
@ -1000,7 +1000,7 @@ _PHY_PathADDAOn(
u4Byte pathOn;
u4Byte i;
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("ADDA ON.\n"));
pathOn = isPathAOn ? 0x04db25a4 : 0x0b1b25a4;
@ -1027,7 +1027,7 @@ _PHY_MACSettingCalibration(
{
u4Byte i = 0;
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("MAC settings for Calibration.\n"));
@ -1046,7 +1046,7 @@ _PHY_PathAStandBy(
)
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path-A standby mode!\n"));
@ -1062,7 +1062,7 @@ static void _PHY_PIModeSwitch(
{
u4Byte mode;
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("BB Switch to %s mode!\n", (PIMode ? "PI" : "SI")));
@ -1080,7 +1080,7 @@ static bool phy_SimularityCompare_8188E(
{
u4Byte i, j, diff, SimularityBitMap, bound = 0;
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
u1Byte final_candidate[2] = {0xFF, 0xFF}; /* for path A and path B */
bool bResult = true;
bool is2T;
@ -1199,7 +1199,7 @@ static void phy_IQCalibrate_8188E(
)
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
u4Byte i;
u1Byte PathAOK, PathBOK;
u4Byte ADDA_REG[IQK_ADDA_REG_NUM] = {
@ -1387,7 +1387,7 @@ static void phy_LCCalibrate_8188E(
u1Byte tmpReg;
u4Byte RF_Amode=0, RF_Bmode=0, LC_Cal;
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
/* Check continuous TX and Packet TX */
tmpReg = ODM_Read1Byte(pDM_Odm, 0xd03);
@ -1454,7 +1454,7 @@ static void phy_APCalibrate_8188E(
)
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
u4Byte regD[PATH_NUM];
u4Byte tmpReg, index, offset, apkbound;
u1Byte path, i, pathbound = PATH_NUM;
@ -1887,7 +1887,7 @@ PHY_IQCalibrate_8188E(
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
#if (MP_DRIVER == 1)
PMPT_CONTEXT pMptCtx = &(pAdapter->mppriv.MptCtx);
@ -2078,7 +2078,7 @@ PHY_LCCalibrate_8188E(
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
#if (MP_DRIVER == 1)
PMPT_CONTEXT pMptCtx = &(pAdapter->mppriv.MptCtx);
@ -2136,7 +2136,7 @@ PHY_APCalibrate_8188E(
)
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
#if DISABLE_BB_RF
return;
@ -2168,7 +2168,7 @@ static void phy_SetRFPathSwitch_8188E(
)
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
if (pAdapter->hw_init_completed == false)
{
@ -2200,7 +2200,7 @@ void PHY_SetRFPathSwitch_8188E(
)
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
#if DISABLE_BB_RF
return;

326
hal/odm.c
View file

File diff suppressed because it is too large Load diff

60
hal/odm_HWConfig.c
View file

@ -55,7 +55,7 @@ static u1Byte odm_QueryRxPwrPercentage(s1Byte AntPower)
/* IF other SW team do not support the feature, remove this section.?? */
/* */
static s4Byte odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Lenovo(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
s4Byte CurrSig
)
{
@ -64,7 +64,7 @@ static s4Byte odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Lenovo(
}
static s4Byte odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Netcore(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
s4Byte CurrSig
)
{
@ -74,7 +74,7 @@ static s4Byte odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Netcore(
static s4Byte
odm_SignalScaleMapping_92CSeries(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
s4Byte CurrSig
)
{
@ -167,7 +167,7 @@ odm_SignalScaleMapping_92CSeries(
}
static s4Byte
odm_SignalScaleMapping(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
s4Byte CurrSig
)
{
@ -191,7 +191,7 @@ odm_SignalScaleMapping(
/* pMgntInfo->CustomerID == RT_CID_819x_Lenovo */
static u1Byte odm_SQ_process_patch_RT_CID_819x_Lenovo(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
u1Byte isCCKrate,
u1Byte PWDB_ALL,
u1Byte path,
@ -235,13 +235,13 @@ odm_EVMdbToPercentage(
static void
odm_RxPhyStatus92CSeries_Parsing(
PDM_ODM_T pDM_Odm,
PODM_PHY_INFO_T pPhyInfo,
struct odm_dm_struct * pDM_Odm,
struct odm_phy_status_info *pPhyInfo,
pu1Byte pPhyStatus,
PODM_PACKET_INFO_T pPktinfo
struct odm_per_pkt_info *pPktinfo
)
{
SWAT_T *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;
struct sw_ant_switch *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;
u1Byte i, Max_spatial_stream;
s1Byte rx_pwr[4], rx_pwr_all=0;
u1Byte EVM, PWDB_ALL = 0, PWDB_ALL_BT;
@ -566,16 +566,16 @@ odm_RxPhyStatus92CSeries_Parsing(
void
odm_Init_RSSIForDM(
PDM_ODM_T pDM_Odm
struct odm_dm_struct *pDM_Odm
)
{
}
static void odm_Process_RSSIForDM(
PDM_ODM_T pDM_Odm,
PODM_PHY_INFO_T pPhyInfo,
PODM_PACKET_INFO_T pPktinfo
struct odm_dm_struct * pDM_Odm,
struct odm_phy_status_info *pPhyInfo,
struct odm_per_pkt_info *pPktinfo
)
{
@ -611,7 +611,7 @@ static void odm_Process_RSSIForDM(
if (pDM_Odm->SupportICType == ODM_RTL8188E)
{
u1Byte antsel_tr_mux;
pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable;
struct fast_ant_train *pDM_FatTable = &pDM_Odm->DM_FatTable;
if (pDM_Odm->AntDivType == CG_TRX_SMART_ANTDIV)
{
@ -778,10 +778,10 @@ static void odm_Process_RSSIForDM(
/* */
static void
ODM_PhyStatusQuery_92CSeries(
PDM_ODM_T pDM_Odm,
PODM_PHY_INFO_T pPhyInfo,
struct odm_dm_struct * pDM_Odm,
struct odm_phy_status_info *pPhyInfo,
pu1Byte pPhyStatus,
PODM_PACKET_INFO_T pPktinfo
struct odm_per_pkt_info *pPktinfo
)
{
@ -808,10 +808,10 @@ ODM_PhyStatusQuery_92CSeries(
/* */
static void
ODM_PhyStatusQuery_JaguarSeries(
PDM_ODM_T pDM_Odm,
PODM_PHY_INFO_T pPhyInfo,
struct odm_dm_struct * pDM_Odm,
struct odm_phy_status_info *pPhyInfo,
pu1Byte pPhyStatus,
PODM_PACKET_INFO_T pPktinfo
struct odm_per_pkt_info *pPktinfo
)
{
@ -820,10 +820,10 @@ ODM_PhyStatusQuery_JaguarSeries(
void
ODM_PhyStatusQuery(
PDM_ODM_T pDM_Odm,
PODM_PHY_INFO_T pPhyInfo,
struct odm_dm_struct * pDM_Odm,
struct odm_phy_status_info *pPhyInfo,
pu1Byte pPhyStatus,
PODM_PACKET_INFO_T pPktinfo
struct odm_per_pkt_info *pPktinfo
)
{
ODM_PhyStatusQuery_92CSeries(pDM_Odm,pPhyInfo,pPhyStatus,pPktinfo);
@ -832,7 +832,7 @@ ODM_PhyStatusQuery(
/* For future use. */
void
ODM_MacStatusQuery(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct * pDM_Odm,
pu1Byte pMacStatus,
u1Byte MacID,
bool bPacketMatchBSSID,
@ -846,9 +846,9 @@ ODM_MacStatusQuery(
HAL_STATUS
ODM_ConfigRFWithHeaderFile(
PDM_ODM_T pDM_Odm,
ODM_RF_RADIO_PATH_E Content,
ODM_RF_RADIO_PATH_E eRFPath
struct odm_dm_struct * pDM_Odm,
enum ODM_RF_RADIO_PATH Content,
enum ODM_RF_RADIO_PATH eRFPath
)
{
/* RT_STATUS rtStatus = RT_STATUS_SUCCESS; */
@ -875,8 +875,8 @@ ODM_ConfigRFWithHeaderFile(
HAL_STATUS
ODM_ConfigBBWithHeaderFile(
PDM_ODM_T pDM_Odm,
ODM_BB_Config_Type ConfigType
struct odm_dm_struct * pDM_Odm,
enum odm_bb_config_type ConfigType
)
{
@ -905,7 +905,7 @@ ODM_ConfigBBWithHeaderFile(
HAL_STATUS
ODM_ConfigMACWithHeaderFile(
PDM_ODM_T pDM_Odm
struct odm_dm_struct *pDM_Odm
)
{
u1Byte result = HAL_STATUS_SUCCESS;

64
hal/odm_RTL8188E.c
View file

@ -28,10 +28,10 @@
void
ODM_DIG_LowerBound_88E(
PDM_ODM_T pDM_Odm
struct odm_dm_struct * pDM_Odm
)
{
pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable;
struct rtw_dig * pDM_DigTable = &pDM_Odm->DM_DigTable;
if (pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV)
{
@ -46,7 +46,7 @@ ODM_DIG_LowerBound_88E(
static void
odm_RX_HWAntDivInit(
PDM_ODM_T pDM_Odm
struct odm_dm_struct * pDM_Odm
)
{
u4Byte value32;
@ -81,7 +81,7 @@ odm_RX_HWAntDivInit(
static void
odm_TRX_HWAntDivInit(
PDM_ODM_T pDM_Odm
struct odm_dm_struct * pDM_Odm
)
{
u4Byte value32;
@ -129,11 +129,11 @@ odm_TRX_HWAntDivInit(
static void
odm_FastAntTrainingInit(
PDM_ODM_T pDM_Odm
struct odm_dm_struct * pDM_Odm
)
{
u4Byte value32, i;
pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable;
struct fast_ant_train *pDM_FatTable = &pDM_Odm->DM_FatTable;
u4Byte AntCombination = 2;
PADAPTER Adapter = pDM_Odm->Adapter;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_FastAntTrainingInit()\n"));
@ -226,7 +226,7 @@ odm_FastAntTrainingInit(
void
ODM_AntennaDiversityInit_88E(
PDM_ODM_T pDM_Odm
struct odm_dm_struct * pDM_Odm
)
{
if (pDM_Odm->SupportICType != ODM_RTL8188E)
@ -245,9 +245,9 @@ ODM_AntennaDiversityInit_88E(
void
ODM_UpdateRxIdleAnt_88E(PDM_ODM_T pDM_Odm, u1Byte Ant)
ODM_UpdateRxIdleAnt_88E(struct odm_dm_struct *pDM_Odm, u1Byte Ant)
{
pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable;
struct fast_ant_train *pDM_FatTable = &pDM_Odm->DM_FatTable;
u4Byte DefaultAnt, OptionalAnt;
if (pDM_FatTable->RxIdleAnt != Ant)
@ -285,9 +285,9 @@ ODM_UpdateRxIdleAnt_88E(PDM_ODM_T pDM_Odm, u1Byte Ant)
static void
odm_UpdateTxAnt_88E(PDM_ODM_T pDM_Odm, u1Byte Ant, u4Byte MacId)
odm_UpdateTxAnt_88E(struct odm_dm_struct *pDM_Odm, u1Byte Ant, u4Byte MacId)
{
pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable;
struct fast_ant_train *pDM_FatTable = &pDM_Odm->DM_FatTable;
u1Byte TargetAnt;
if (Ant == MAIN_ANT)
@ -307,12 +307,12 @@ odm_UpdateTxAnt_88E(PDM_ODM_T pDM_Odm, u1Byte Ant, u4Byte MacId)
void
ODM_SetTxAntByTxInfo_88E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct * pDM_Odm,
pu1Byte pDesc,
u1Byte macId
)
{
pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable;
struct fast_ant_train *pDM_FatTable = &pDM_Odm->DM_FatTable;
if ((pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV)||(pDM_Odm->AntDivType == CG_TRX_SMART_ANTDIV))
{
@ -324,13 +324,13 @@ ODM_SetTxAntByTxInfo_88E(
void
ODM_AntselStatistics_88E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct * pDM_Odm,
u1Byte antsel_tr_mux,
u4Byte MacId,
u1Byte RxPWDBAll
)
{
pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable;
struct fast_ant_train *pDM_FatTable = &pDM_Odm->DM_FatTable;
if (pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV)
{
if (antsel_tr_mux == MAIN_ANT_CG_TRX)
@ -366,14 +366,14 @@ ODM_AntselStatistics_88E(
#define TX_BY_REG 0
static void
odm_HWAntDiv(
PDM_ODM_T pDM_Odm
struct odm_dm_struct * pDM_Odm
)
{
u4Byte i, MinRSSI=0xFF, AntDivMaxRSSI=0, MaxRSSI=0, LocalMinRSSI, LocalMaxRSSI;
u4Byte Main_RSSI, Aux_RSSI;
u1Byte RxIdleAnt=0, TargetAnt=7;
pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable;
pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable;
struct fast_ant_train *pDM_FatTable = &pDM_Odm->DM_FatTable;
struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable;
bool bMatchBSSID;
bool bPktFilterMacth = false;
PSTA_INFO_T pEntry;
@ -433,10 +433,10 @@ odm_HWAntDiv(
void
ODM_AntennaDiversity_88E(
PDM_ODM_T pDM_Odm
struct odm_dm_struct * pDM_Odm
)
{
pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable;
struct fast_ant_train *pDM_FatTable = &pDM_Odm->DM_FatTable;
if ((pDM_Odm->SupportICType != ODM_RTL8188E) || (!(pDM_Odm->SupportAbility & ODM_BB_ANT_DIV)))
return;
if (!pDM_Odm->bLinked)
@ -484,9 +484,9 @@ ODM_AntennaDiversity_88E(
void
odm_PrimaryCCA_Init(
PDM_ODM_T pDM_Odm)
struct odm_dm_struct * pDM_Odm)
{
pPri_CCA_T PrimaryCCA = &(pDM_Odm->DM_PriCCA);
struct dyn_primary_cca *PrimaryCCA = &(pDM_Odm->DM_PriCCA);
PrimaryCCA->DupRTS_flag = 0;
PrimaryCCA->intf_flag = 0;
PrimaryCCA->intf_type = 0;
@ -496,26 +496,26 @@ odm_PrimaryCCA_Init(
bool
ODM_DynamicPrimaryCCA_DupRTS(
PDM_ODM_T pDM_Odm
struct odm_dm_struct * pDM_Odm
)
{
pPri_CCA_T PrimaryCCA = &(pDM_Odm->DM_PriCCA);
struct dyn_primary_cca *PrimaryCCA = &(pDM_Odm->DM_PriCCA);
return PrimaryCCA->DupRTS_flag;
}
void
odm_DynamicPrimaryCCA(
PDM_ODM_T pDM_Odm
struct odm_dm_struct * pDM_Odm
)
{
PADAPTER Adapter = pDM_Odm->Adapter; /* for NIC */
prtl8192cd_priv priv = pDM_Odm->priv; /* for AP */
struct rtl8192cd_priv *priv = pDM_Odm->priv; /* for AP */
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
Pfalse_ALARM_STATISTICS FalseAlmCnt = &(pDM_Odm->FalseAlmCnt);
pPri_CCA_T PrimaryCCA = &(pDM_Odm->DM_PriCCA);
struct false_alarm_stats *FalseAlmCnt = &(pDM_Odm->FalseAlmCnt);
struct dyn_primary_cca *PrimaryCCA = &(pDM_Odm->DM_PriCCA);
bool Is40MHz;
bool Client_40MHz = false, Client_tmp = false; /* connected client BW */
@ -802,23 +802,23 @@ odm_DynamicPrimaryCCA(
}
#else /* if (RTL8188E_SUPPORT == 1) */
void
ODM_UpdateRxIdleAnt_88E(PDM_ODM_T pDM_Odm, u1Byte Ant)
ODM_UpdateRxIdleAnt_88E(struct odm_dm_struct *pDM_Odm, u1Byte Ant)
{
}
void
odm_PrimaryCCA_Init(
PDM_ODM_T pDM_Odm)
struct odm_dm_struct * pDM_Odm)
{
}
void
odm_DynamicPrimaryCCA(
PDM_ODM_T pDM_Odm
struct odm_dm_struct * pDM_Odm
)
{
}
bool
ODM_DynamicPrimaryCCA_DupRTS(
PDM_ODM_T pDM_Odm
struct odm_dm_struct * pDM_Odm
)
{
return false;

16
hal/odm_RegConfig8188E.c
View file

@ -24,10 +24,10 @@
void
odm_ConfigRFReg_8188E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct * pDM_Odm,
u4Byte Addr,
u4Byte Data,
ODM_RF_RADIO_PATH_E RF_PATH,
enum ODM_RF_RADIO_PATH RF_PATH,
u4Byte RegAddr
)
{
@ -66,7 +66,7 @@ odm_ConfigRFReg_8188E(
void
odm_ConfigRF_RadioA_8188E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct * pDM_Odm,
u4Byte Addr,
u4Byte Data
)
@ -81,7 +81,7 @@ odm_ConfigRF_RadioA_8188E(
void
odm_ConfigRF_RadioB_8188E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct * pDM_Odm,
u4Byte Addr,
u4Byte Data
)
@ -97,7 +97,7 @@ odm_ConfigRF_RadioB_8188E(
void
odm_ConfigMAC_8188E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
u4Byte Addr,
u1Byte Data
)
@ -108,7 +108,7 @@ odm_ConfigMAC_8188E(
void
odm_ConfigBB_AGC_8188E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
u4Byte Addr,
u4Byte Bitmask,
u4Byte Data
@ -123,7 +123,7 @@ odm_ConfigBB_AGC_8188E(
void
odm_ConfigBB_PHY_REG_PG_8188E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
u4Byte Addr,
u4Byte Bitmask,
u4Byte Data
@ -155,7 +155,7 @@ odm_ConfigBB_PHY_REG_PG_8188E(
void
odm_ConfigBB_PHY_8188E(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
u4Byte Addr,
u4Byte Bitmask,
u4Byte Data

2
hal/odm_debug.c
View file

@ -26,7 +26,7 @@
void
ODM_InitDebugSetting(
PDM_ODM_T pDM_Odm
struct odm_dm_struct * pDM_Odm
)
{
pDM_Odm->DebugLevel = ODM_DBG_TRACE;

48
hal/odm_interface.c
View file

@ -27,43 +27,43 @@
/* ODM IO Relative API. */
/* */
u1Byte ODM_Read1Byte(PDM_ODM_T pDM_Odm, u4Byte RegAddr)
u1Byte ODM_Read1Byte(struct odm_dm_struct *pDM_Odm, u4Byte RegAddr)
{
PADAPTER Adapter = pDM_Odm->Adapter;
return rtw_read8(Adapter,RegAddr);
}
u2Byte ODM_Read2Byte(PDM_ODM_T pDM_Odm, u4Byte RegAddr)
u2Byte ODM_Read2Byte(struct odm_dm_struct *pDM_Odm, u4Byte RegAddr)
{
PADAPTER Adapter = pDM_Odm->Adapter;
return rtw_read16(Adapter,RegAddr);
}
u4Byte ODM_Read4Byte(PDM_ODM_T pDM_Odm, u4Byte RegAddr)
u4Byte ODM_Read4Byte(struct odm_dm_struct *pDM_Odm, u4Byte RegAddr)
{
PADAPTER Adapter = pDM_Odm->Adapter;
return rtw_read32(Adapter,RegAddr);
}
void ODM_Write1Byte(PDM_ODM_T pDM_Odm, u4Byte RegAddr, u1Byte Data)
void ODM_Write1Byte(struct odm_dm_struct *pDM_Odm, u4Byte RegAddr, u1Byte Data)
{
PADAPTER Adapter = pDM_Odm->Adapter;
rtw_write8(Adapter,RegAddr, Data);
}
void ODM_Write2Byte(PDM_ODM_T pDM_Odm, u4Byte RegAddr, u2Byte Data)
void ODM_Write2Byte(struct odm_dm_struct *pDM_Odm, u4Byte RegAddr, u2Byte Data)
{
PADAPTER Adapter = pDM_Odm->Adapter;
rtw_write16(Adapter,RegAddr, Data);
}
void ODM_Write4Byte(PDM_ODM_T pDM_Odm, u4Byte RegAddr, u4Byte Data)
void ODM_Write4Byte(struct odm_dm_struct *pDM_Odm, u4Byte RegAddr, u4Byte Data)
{
PADAPTER Adapter = pDM_Odm->Adapter;
rtw_write32(Adapter,RegAddr, Data);
}
void ODM_SetMACReg(PDM_ODM_T pDM_Odm, u4Byte RegAddr, u4Byte BitMask, u4Byte Data)
void ODM_SetMACReg(struct odm_dm_struct *pDM_Odm, u4Byte RegAddr, u4Byte BitMask, u4Byte Data)
{
PADAPTER Adapter = pDM_Odm->Adapter;
PHY_SetBBReg(Adapter, RegAddr, BitMask, Data);
@ -71,7 +71,7 @@ void ODM_SetMACReg(PDM_ODM_T pDM_Odm, u4Byte RegAddr, u4Byte BitMask, u4Byte Dat
u4Byte
ODM_GetMACReg(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
u4Byte RegAddr,
u4Byte BitMask
)
@ -82,7 +82,7 @@ ODM_GetMACReg(
void
ODM_SetBBReg(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
u4Byte RegAddr,
u4Byte BitMask,
u4Byte Data
@ -94,7 +94,7 @@ ODM_SetBBReg(
u4Byte
ODM_GetBBReg(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
u4Byte RegAddr,
u4Byte BitMask
)
@ -106,8 +106,8 @@ ODM_GetBBReg(
void
ODM_SetRFReg(
PDM_ODM_T pDM_Odm,
ODM_RF_RADIO_PATH_E eRFPath,
struct odm_dm_struct *pDM_Odm,
enum ODM_RF_RADIO_PATH eRFPath,
u4Byte RegAddr,
u4Byte BitMask,
u4Byte Data
@ -120,8 +120,8 @@ ODM_SetRFReg(
u4Byte
ODM_GetRFReg(
PDM_ODM_T pDM_Odm,
ODM_RF_RADIO_PATH_E eRFPath,
struct odm_dm_struct *pDM_Odm,
enum ODM_RF_RADIO_PATH eRFPath,
u4Byte RegAddr,
u4Byte BitMask
)
@ -138,7 +138,7 @@ ODM_GetRFReg(
/* */
void
ODM_AllocateMemory(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
void * *pPtr,
u4Byte length
)
@ -149,7 +149,7 @@ ODM_AllocateMemory(
/* length could be ignored, used to detect memory leakage. */
void
ODM_FreeMemory(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
void * pPtr,
u4Byte length
)
@ -158,7 +158,7 @@ ODM_FreeMemory(
}
s4Byte ODM_CompareMemory(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
void * pBuf1,
void * pBuf2,
u4Byte length
@ -172,7 +172,7 @@ s4Byte ODM_CompareMemory(
/* */
void
ODM_AcquireSpinLock(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
RT_SPINLOCK_TYPE type
)
{
@ -180,7 +180,7 @@ ODM_AcquireSpinLock(
void
ODM_ReleaseSpinLock(
PDM_ODM_T pDM_Odm,
struct odm_dm_struct *pDM_Odm,
RT_SPINLOCK_TYPE type
)
{
@ -189,7 +189,7 @@ ODM_ReleaseSpinLock(
/* */
/* Work item relative API. FOr MP driver only~! */
/* */
void ODM_InitializeWorkItem(PDM_ODM_T pDM_Odm, void *pRtWorkItem,
void ODM_InitializeWorkItem(struct odm_dm_struct *pDM_Odm, void *pRtWorkItem,
RT_WORKITEM_CALL_BACK RtWorkItemCallback,
void *pContext, const char*szID)
{
@ -243,12 +243,12 @@ void ODM_sleep_us(u4Byte us)
rtw_usleep_os(us);
}
void ODM_SetTimer(PDM_ODM_T pDM_Odm, PRT_TIMER pTimer, u4Byte msDelay)
void ODM_SetTimer(struct odm_dm_struct *pDM_Odm, PRT_TIMER pTimer, u4Byte msDelay)
{
_set_timer(pTimer,msDelay ); /* ms */
}
void ODM_InitializeTimer(PDM_ODM_T pDM_Odm, PRT_TIMER pTimer,
void ODM_InitializeTimer(struct odm_dm_struct *pDM_Odm, PRT_TIMER pTimer,
RT_TIMER_CALL_BACK CallBackFunc, void *pContext,
const char *szID)
{
@ -256,12 +256,12 @@ void ODM_InitializeTimer(PDM_ODM_T pDM_Odm, PRT_TIMER pTimer,
_init_timer(pTimer,Adapter->pnetdev,CallBackFunc,pDM_Odm);
}
void ODM_CancelTimer(PDM_ODM_T pDM_Odm, PRT_TIMER pTimer)
void ODM_CancelTimer(struct odm_dm_struct *pDM_Odm, PRT_TIMER pTimer)
{
_cancel_timer_ex(pTimer);
}
void ODM_ReleaseTimer(PDM_ODM_T pDM_Odm, PRT_TIMER pTimer)
void ODM_ReleaseTimer(struct odm_dm_struct *pDM_Odm, PRT_TIMER pTimer)
{
}

16
hal/rtl8188e_dm.c
View file

@ -132,7 +132,7 @@ static void Init_ODM_ComInfo_88E(PADAPTER Adapter)
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv;
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
struct odm_dm_struct * pDM_Odm = &(pHalData->odmpriv);
u8 cut_ver,fab_ver;
/* */
@ -187,7 +187,7 @@ static void Update_ODM_ComInfo_88E(PADAPTER Adapter)
struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;
struct pwrctrl_priv *pwrctrlpriv = &Adapter->pwrctrlpriv;
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
struct odm_dm_struct * pDM_Odm = &(pHalData->odmpriv);
struct dm_priv *pdmpriv = &pHalData->dmpriv;
int i;
@ -238,7 +238,7 @@ rtl8188e_InitHalDm(
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv;
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
struct odm_dm_struct * pDM_Odm = &(pHalData->odmpriv);
u8 i;
dm_InitGPIOSetting(Adapter);
@ -264,7 +264,7 @@ rtl8188e_HalDmWatchDog(
u8 hw_init_completed = false;
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv;
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
struct odm_dm_struct * pDM_Odm = &(pHalData->odmpriv);
_func_enter_;
@ -326,7 +326,7 @@ void rtl8188e_init_dm_priv(PADAPTER Adapter)
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv;
PDM_ODM_T podmpriv = &pHalData->odmpriv;
struct odm_dm_struct * podmpriv = &pHalData->odmpriv;
_rtw_memset(pdmpriv, 0, sizeof(struct dm_priv));
Init_ODM_ComInfo_88E(Adapter);
ODM_InitDebugSetting(podmpriv);
@ -336,7 +336,7 @@ void rtl8188e_deinit_dm_priv(PADAPTER Adapter)
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv;
PDM_ODM_T podmpriv = &pHalData->odmpriv;
struct odm_dm_struct * podmpriv = &pHalData->odmpriv;
}
/* Add new function to reset the state of antenna diversity before link. */
@ -360,8 +360,8 @@ u8 AntDivBeforeLink8188E(PADAPTER Adapter )
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
PDM_ODM_T pDM_Odm =&pHalData->odmpriv;
SWAT_T *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;
struct odm_dm_struct *pDM_Odm =&pHalData->odmpriv;
struct sw_ant_switch *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;
struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv);
/* Condition that does not need to use antenna diversity. */

4
hal/rtl8188e_hal_init.c
View file

@ -2433,7 +2433,7 @@ static void rtl8188e_GetHalODMVar(
bool bSet)
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
PDM_ODM_T podmpriv = &pHalData->odmpriv;
struct odm_dm_struct *podmpriv = &pHalData->odmpriv;
switch (eVariable){
case HAL_ODM_STA_INFO:
break;
@ -2448,7 +2448,7 @@ static void rtl8188e_SetHalODMVar(
bool bSet)
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
PDM_ODM_T podmpriv = &pHalData->odmpriv;
struct odm_dm_struct *podmpriv = &pHalData->odmpriv;
switch (eVariable){
case HAL_ODM_STA_INFO:
{

10
hal/rtl8188e_mp.c
View file

@ -31,7 +31,7 @@ s32 Hal_SetPowerTracking(PADAPTER padapter, u8 enable)
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv;
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
struct odm_dm_struct * pDM_Odm = &(pHalData->odmpriv);
if (!netif_running(padapter->pnetdev)) {
@ -59,7 +59,7 @@ void Hal_GetPowerTracking(PADAPTER padapter, u8 *enable)
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv;
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
struct odm_dm_struct * pDM_Odm = &(pHalData->odmpriv);
*enable = pDM_Odm->RFCalibrateInfo.TxPowerTrackControl;
@ -71,7 +71,7 @@ static void Hal_disable_dm(PADAPTER padapter)
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv;
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
struct odm_dm_struct * pDM_Odm = &(pHalData->odmpriv);
/* 3 1. disable firmware dynamic mechanism */
@ -215,7 +215,7 @@ void Hal_MPT_CCKTxPowerAdjustbyIndex(PADAPTER pAdapter, bool beven)
PMPT_CONTEXT pMptCtx = &pAdapter->mppriv.MptCtx;
struct dm_priv *pdmpriv = &pHalData->dmpriv;
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
struct odm_dm_struct * pDM_Odm = &(pHalData->odmpriv);
if (!IS_92C_SERIAL(pHalData->VersionID))
@ -297,7 +297,7 @@ void Hal_SetChannel(PADAPTER pAdapter)
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
struct mp_priv *pmp = &pAdapter->mppriv;
struct dm_priv *pdmpriv = &pHalData->dmpriv;
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
struct odm_dm_struct * pDM_Odm = &(pHalData->odmpriv);
u8 channel = pmp->channel;
u8 bandwidth = pmp->bandwidth;

4
hal/rtl8188e_rf6052.c
View file

@ -615,11 +615,11 @@ phy_RF6052_Config_ParaFile(
/*----Initialize RF fom connfiguration file----*/
switch (eRFPath) {
case RF_PATH_A:
if (HAL_STATUS_FAILURE ==ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv,(ODM_RF_RADIO_PATH_E)eRFPath, (ODM_RF_RADIO_PATH_E)eRFPath))
if (HAL_STATUS_FAILURE ==ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv,(enum ODM_RF_RADIO_PATH)eRFPath, (enum ODM_RF_RADIO_PATH)eRFPath))
rtStatus= _FAIL;
break;
case RF_PATH_B:
if (HAL_STATUS_FAILURE ==ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv,(ODM_RF_RADIO_PATH_E)eRFPath, (ODM_RF_RADIO_PATH_E)eRFPath))
if (HAL_STATUS_FAILURE ==ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv,(enum ODM_RF_RADIO_PATH)eRFPath, (enum ODM_RF_RADIO_PATH)eRFPath))
rtStatus= _FAIL;
break;
case RF_PATH_C:

4
hal/rtl8188e_rxdesc.c
View file

@ -177,9 +177,9 @@ void update_recvframe_phyinfo_88e(
PADAPTER padapter = precvframe->u.hdr.adapter;
struct rx_pkt_attrib *pattrib = &precvframe->u.hdr.attrib;
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
PODM_PHY_INFO_T pPHYInfo = (PODM_PHY_INFO_T)(&pattrib->phy_info);
struct odm_phy_status_info *pPHYInfo = (struct odm_phy_status_info *)(&pattrib->phy_info);
u8 *wlanhdr;
ODM_PACKET_INFO_T pkt_info;
struct odm_per_pkt_info pkt_info;
u8 *sa;
struct sta_priv *pstapriv;
struct sta_info *psta;

16
hal/usb_halinit.c
View file

@ -2052,7 +2052,7 @@ static void SetHwReg8188EU(PADAPTER Adapter, u8 variable, u8* val)
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv;
DM_ODM_T *podmpriv = &pHalData->odmpriv;
struct odm_dm_struct *podmpriv = &pHalData->odmpriv;
_func_enter_;
switch (variable)
@ -2551,7 +2551,7 @@ _func_enter_;
break;
case HW_VAR_INITIAL_GAIN:
{
DIG_T *pDigTable = &podmpriv->DM_DigTable;
struct rtw_dig *pDigTable = &podmpriv->DM_DigTable;
u32 rx_gain = ((u32 *)(val))[0];
if (rx_gain == 0xff){/* restore rx gain */
@ -2758,7 +2758,7 @@ _func_exit_;
static void GetHwReg8188EU(PADAPTER Adapter, u8 variable, u8* val)
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
DM_ODM_T *podmpriv = &pHalData->odmpriv;
struct odm_dm_struct *podmpriv = &pHalData->odmpriv;
_func_enter_;
switch (variable)
@ -2925,7 +2925,7 @@ GetHalDefVar8188EUsb(
case HW_DEF_ODM_DBG_FLAG:
{
u8Byte DebugComponents = *((u32*)pValue);
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
struct odm_dm_struct *pDM_Odm = &(pHalData->odmpriv);
printk("pDM_Odm->DebugComponents = 0x%llx\n",pDM_Odm->DebugComponents );
}
break;
@ -2967,7 +2967,7 @@ static u8 SetHalDefVar8188EUsb(
{
u8 dm_func = *(( u8*)pValue);
struct dm_priv *pdmpriv = &pHalData->dmpriv;
DM_ODM_T *podmpriv = &pHalData->odmpriv;
struct odm_dm_struct *podmpriv = &pHalData->odmpriv;
if (dm_func == 0){ /* disable all dynamic func */
podmpriv->SupportAbility = DYNAMIC_FUNC_DISABLE;
@ -2990,7 +2990,7 @@ static u8 SetHalDefVar8188EUsb(
else if (dm_func == 6){/* turn on all dynamic func */
if (!(podmpriv->SupportAbility & DYNAMIC_BB_DIG))
{
DIG_T *pDigTable = &podmpriv->DM_DigTable;
struct rtw_dig *pDigTable = &podmpriv->DM_DigTable;
pDigTable->CurIGValue= rtw_read8(Adapter,0xc50);
}
podmpriv->SupportAbility = DYNAMIC_ALL_FUNC_ENABLE;
@ -3007,7 +3007,7 @@ static u8 SetHalDefVar8188EUsb(
case HW_DEF_FA_CNT_DUMP:
{
u8 bRSSIDump = *((u8*)pValue);
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
struct odm_dm_struct * pDM_Odm = &(pHalData->odmpriv);
if (bRSSIDump)
pDM_Odm->DebugComponents = ODM_COMP_DIG|ODM_COMP_FA_CNT ;
else
@ -3018,7 +3018,7 @@ static u8 SetHalDefVar8188EUsb(
case HW_DEF_ODM_DBG_FLAG:
{
u8Byte DebugComponents = *((u8Byte*)pValue);
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
struct odm_dm_struct *pDM_Odm = &(pHalData->odmpriv);
pDM_Odm->DebugComponents = DebugComponents;
}
break;