Staging: rtl8723bs: fix names in odm.h

[linux-2.6-block.git] / drivers / staging / rtl8723bs / hal / HalPhyRf_8723B.c

diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
index 30cbe125eb4c90f763e564288305650ede2dd71b..12f0e36015317583ea5e09cdf03abd8fbd9bc00c 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
+++ b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
@@ -54,7 +54,7 @@ static u8 DeltaSwingTableIdx_2GA_P_8188E[] = {
 
 
 static void setIqkMatrix_8723B(
-       struct DM_ODM_T *pDM_Odm,
+       struct dm_odm_t *pDM_Odm,
        u8 OFDM_index,
        u8 RFPath,
        s32 IqkResult_X,
@@ -135,7 +135,7 @@ static void setIqkMatrix_8723B(
 }
 
 
-static void setCCKFilterCoefficient(struct DM_ODM_T *pDM_Odm, u8 CCKSwingIndex)
+static void setCCKFilterCoefficient(struct dm_odm_t *pDM_Odm, u8 CCKSwingIndex)
 {
        if (!pDM_Odm->RFCalibrateInfo.bCCKinCH14) {
                rtw_write8(pDM_Odm->Adapter, 0xa22, CCKSwingTable_Ch1_Ch13_New[CCKSwingIndex][0]);
@@ -159,7 +159,7 @@ static void setCCKFilterCoefficient(struct DM_ODM_T *pDM_Odm, u8 CCKSwingIndex)
 }
 
 void DoIQK_8723B(
-       struct DM_ODM_T *pDM_Odm,
+       struct dm_odm_t *pDM_Odm,
        u8 DeltaThermalIndex,
        u8 ThermalValue,
        u8 Threshold
@@ -185,7 +185,7 @@ void DoIQK_8723B(
  *
  *---------------------------------------------------------------------------*/
 void ODM_TxPwrTrackSetPwr_8723B(
-       struct DM_ODM_T *pDM_Odm,
+       struct dm_odm_t *pDM_Odm,
        enum pwrtrack_method Method,
        u8 RFPath,
        u8 ChannelMappedIndex
@@ -360,7 +360,7 @@ void ODM_TxPwrTrackSetPwr_8723B(
 }
 
 static void GetDeltaSwingTable_8723B(
-       struct DM_ODM_T *pDM_Odm,
+       struct dm_odm_t *pDM_Odm,
        u8 **TemperatureUP_A,
        u8 **TemperatureDOWN_A,
        u8 **TemperatureUP_B,
@@ -368,7 +368,7 @@ static void GetDeltaSwingTable_8723B(
 )
 {
        struct adapter *Adapter = pDM_Odm->Adapter;
-       struct ODM_RF_CAL_T *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo;
+       struct odm_rf_cal_t *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo;
        struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
        u16 rate = *(pDM_Odm->pForcedDataRate);
        u8 channel = pHalData->CurrentChannel;
@@ -437,7 +437,7 @@ static u8 phy_PathA_IQK_8723B(
        u8 result = 0x00;
 
        struct hal_com_data     *pHalData = GET_HAL_DATA(padapter);
-       struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv;
+       struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
 
        /*  Save RF Path */
        Path_SEL_BB = PHY_QueryBBReg(pDM_Odm->Adapter, 0x948, bMaskDWord);
@@ -548,7 +548,7 @@ static u8 phy_PathA_RxIQK8723B(
        u32 regEAC, regE94, regE9C, regEA4, u4tmp, tmp, Path_SEL_BB;
        u8 result = 0x00;
        struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
-       struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv;
+       struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
 
 /*     ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path A Rx IQK!\n")); */
 
@@ -762,7 +762,7 @@ static u8 phy_PathB_IQK_8723B(struct adapter *padapter)
        u32 regEAC, regE94, regE9C, tmp, Path_SEL_BB/*, regEC4, regECC, Path_SEL_BB*/;
        u8 result = 0x00;
        struct hal_com_data     *pHalData = GET_HAL_DATA(padapter);
-       struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv;
+       struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
 
        ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,  ("Path B IQK!\n"));
 
@@ -869,7 +869,7 @@ static u8 phy_PathB_RxIQK8723B(struct adapter *padapter, bool configPathB)
        u32 regE94, regE9C, regEA4, regEAC, u4tmp, tmp, Path_SEL_BB;
        u8 result = 0x00;
        struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
-       struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv;
+       struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
 
 /*     ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path B Rx IQK!\n")); */
 
@@ -1092,9 +1092,9 @@ static void _PHY_PathAFillIQKMatrix8723B(
        u32 Oldval_0, X, TX0_A, reg;
        s32 Y, TX0_C;
        struct hal_com_data     *pHalData = GET_HAL_DATA(padapter);
-       struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv;
+       struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
 
-       struct ODM_RF_CAL_T *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo;
+       struct odm_rf_cal_t *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo;
 
        ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,  ("Path A IQ Calibration %s !\n", (bIQKOK)?"Success":"Failed"));
 
@@ -1172,9 +1172,9 @@ static void _PHY_PathBFillIQKMatrix8723B(
        u32 Oldval_1, X, TX1_A, reg;
        s32     Y, TX1_C;
        struct hal_com_data     *pHalData = GET_HAL_DATA(padapter);
-       struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv;
+       struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
 
-       struct ODM_RF_CAL_T *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo;
+       struct odm_rf_cal_t *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo;
 
        ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path B IQ Calibration %s !\n", (bIQKOK)?"Success":"Failed"));
 
@@ -1247,10 +1247,10 @@ static void _PHY_PathBFillIQKMatrix8723B(
 /*  */
 /*  MP Already declare in odm.c */
 
-void ODM_SetIQCbyRFpath(struct DM_ODM_T *pDM_Odm, u32 RFpath)
+void ODM_SetIQCbyRFpath(struct dm_odm_t *pDM_Odm, u32 RFpath)
 {
 
-       struct ODM_RF_CAL_T *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo;
+       struct odm_rf_cal_t *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo;
 
        if (
                (pRFCalibrateInfo->TxIQC_8723B[PATH_S0][IDX_0xC80][VAL] != 0x0) &&
@@ -1292,7 +1292,7 @@ static void _PHY_SaveADDARegisters8723B(
 {
        u32 i;
        struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
-       struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv;
+       struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
 
        if (!ODM_CheckPowerStatus(padapter))
                return;
@@ -1310,7 +1310,7 @@ static void _PHY_SaveMACRegisters8723B(
 {
        u32 i;
        struct hal_com_data     *pHalData = GET_HAL_DATA(padapter);
-       struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv;
+       struct dm_odm_t *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++) {
@@ -1330,7 +1330,7 @@ static void _PHY_ReloadADDARegisters8723B(
 {
        u32 i;
        struct hal_com_data     *pHalData = GET_HAL_DATA(padapter);
-       struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv;
+       struct dm_odm_t *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++) {
@@ -1360,7 +1360,7 @@ static void _PHY_PathADDAOn8723B(
        u32 pathOn;
        u32 i;
        struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
-       struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv;
+       struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
 
        ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("ADDA ON.\n"));
 
@@ -1384,7 +1384,7 @@ static void _PHY_MACSettingCalibration8723B(
 {
        u32 i = 0;
        struct hal_com_data     *pHalData = GET_HAL_DATA(padapter);
-       struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv;
+       struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
 
        ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("MAC settings for Calibration.\n"));
 
@@ -1489,7 +1489,7 @@ static void phy_IQCalibrate_8723B(
 )
 {
        struct hal_com_data     *pHalData = GET_HAL_DATA(padapter);
-       struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv;
+       struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
 
        u32 i;
        u8 PathAOK, PathBOK;
@@ -1697,7 +1697,7 @@ static void phy_IQCalibrate_8723B(
 }
 
 
-static void phy_LCCalibrate_8723B(struct DM_ODM_T *pDM_Odm, bool is2T)
+static void phy_LCCalibrate_8723B(struct dm_odm_t *pDM_Odm, bool is2T)
 {
        u8 tmpReg;
        u32 RF_Amode = 0, RF_Bmode = 0, LC_Cal;
@@ -1784,7 +1784,7 @@ void PHY_IQCalibrate_8723B(
 {
        struct hal_com_data     *pHalData = GET_HAL_DATA(padapter);
 
-       struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv;
+       struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
 
        s32 result[4][8];       /* last is final result */
        u8 i, final_candidate;
@@ -1830,7 +1830,7 @@ void PHY_IQCalibrate_8723B(
        if (bRestore) {
                u32 offset, data;
                u8 path, bResult = SUCCESS;
-               struct ODM_RF_CAL_T *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo;
+               struct odm_rf_cal_t *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo;
 
                path = (PHY_QueryBBReg(pDM_Odm->Adapter, rS0S1_PathSwitch, bMaskByte0) == 0x00) ? ODM_RF_PATH_A : ODM_RF_PATH_B;
 
@@ -2038,7 +2038,7 @@ void PHY_IQCalibrate_8723B(
 }
 
 
-void PHY_LCCalibrate_8723B(struct DM_ODM_T *pDM_Odm)
+void PHY_LCCalibrate_8723B(struct dm_odm_t *pDM_Odm)
 {
        bool            bSingleTone = false, bCarrierSuppression = false;
        u32             timeout = 2000, timecount = 0;