Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Staging: rtl8723bs: fix names in odm.h

This commit converts names of structs / enums
in hal/odm.h from ALL_CAPS format to lowercase

Signed-off-by: Marco Cesati <marcocesati@gmail.com>
Link: https://lore.kernel.org/r/20210317222130.29528-41-marcocesati@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Marco Cesati and committed by
Greg Kroah-Hartman
f8010da6 172dc47d

+270 -270
+3 -3
drivers/staging/rtl8723bs/core/rtw_odm.c
··· 152 152 void rtw_odm_adaptivity_parm_msg(void *sel, struct adapter *adapter) 153 153 { 154 154 struct hal_com_data *pHalData = GET_HAL_DATA(adapter); 155 - struct DM_ODM_T *odm = &pHalData->odmpriv; 155 + struct dm_odm_t *odm = &pHalData->odmpriv; 156 156 157 157 DBG_871X_SEL_NL(sel, "%10s %16s %8s %10s %11s %14s\n", 158 158 "TH_L2H_ini", "TH_EDCCA_HL_diff", "IGI_Base", ··· 173 173 u8 IGI_LowerBound) 174 174 { 175 175 struct hal_com_data *pHalData = GET_HAL_DATA(adapter); 176 - struct DM_ODM_T *odm = &pHalData->odmpriv; 176 + struct dm_odm_t *odm = &pHalData->odmpriv; 177 177 178 178 odm->TH_L2H_ini = TH_L2H_ini; 179 179 odm->TH_EDCCA_HL_diff = TH_EDCCA_HL_diff; ··· 186 186 void rtw_odm_get_perpkt_rssi(void *sel, struct adapter *adapter) 187 187 { 188 188 struct hal_com_data *hal_data = GET_HAL_DATA(adapter); 189 - struct DM_ODM_T *odm = &hal_data->odmpriv; 189 + struct dm_odm_t *odm = &hal_data->odmpriv; 190 190 191 191 DBG_871X_SEL_NL(sel, "RxRate = %s, RSSI_A = %d(%%), RSSI_B = %d(%%)\n", 192 192 HDATA_RATE(odm->RxRate), odm->RSSI_A, odm->RSSI_B);
+5 -5
drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c
··· 9 9 #include "odm_precomp.h" 10 10 11 11 static bool CheckPositive( 12 - struct DM_ODM_T *pDM_Odm, const u32 Condition1, const u32 Condition2 12 + struct dm_odm_t *pDM_Odm, const u32 Condition1, const u32 Condition2 13 13 ) 14 14 { 15 15 u8 _BoardType = ··· 112 112 } 113 113 114 114 static bool CheckNegative( 115 - struct DM_ODM_T *pDM_Odm, const u32 Condition1, const u32 Condition2 115 + struct dm_odm_t *pDM_Odm, const u32 Condition1, const u32 Condition2 116 116 ) 117 117 { 118 118 return true; ··· 257 257 258 258 }; 259 259 260 - void ODM_ReadAndConfig_MP_8723B_AGC_TAB(struct DM_ODM_T *pDM_Odm) 260 + void ODM_ReadAndConfig_MP_8723B_AGC_TAB(struct dm_odm_t *pDM_Odm) 261 261 { 262 262 u32 i = 0; 263 263 u32 ArrayLen = ARRAY_SIZE(Array_MP_8723B_AGC_TAB); ··· 526 526 527 527 }; 528 528 529 - void ODM_ReadAndConfig_MP_8723B_PHY_REG(struct DM_ODM_T *pDM_Odm) 529 + void ODM_ReadAndConfig_MP_8723B_PHY_REG(struct dm_odm_t *pDM_Odm) 530 530 { 531 531 u32 i = 0; 532 532 u32 ArrayLen = ARRAY_SIZE(Array_MP_8723B_PHY_REG); ··· 606 606 0, 0, 0, 0x00000e14, 0xffffffff, 0x26303436 607 607 }; 608 608 609 - void ODM_ReadAndConfig_MP_8723B_PHY_REG_PG(struct DM_ODM_T *pDM_Odm) 609 + void ODM_ReadAndConfig_MP_8723B_PHY_REG_PG(struct dm_odm_t *pDM_Odm) 610 610 { 611 611 u32 i = 0; 612 612 u32 *Array = Array_MP_8723B_PHY_REG_PG;
+3 -3
drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.h
··· 15 15 16 16 void 17 17 ODM_ReadAndConfig_MP_8723B_AGC_TAB(/* TC: Test Chip, MP: MP Chip */ 18 - struct DM_ODM_T *pDM_Odm 18 + struct dm_odm_t *pDM_Odm 19 19 ); 20 20 21 21 /****************************************************************************** ··· 24 24 25 25 void 26 26 ODM_ReadAndConfig_MP_8723B_PHY_REG(/* TC: Test Chip, MP: MP Chip */ 27 - struct DM_ODM_T *pDM_Odm 27 + struct dm_odm_t *pDM_Odm 28 28 ); 29 29 30 30 /****************************************************************************** ··· 33 33 34 34 void 35 35 ODM_ReadAndConfig_MP_8723B_PHY_REG_PG(/* TC: Test Chip, MP: MP Chip */ 36 - struct DM_ODM_T *pDM_Odm 36 + struct dm_odm_t *pDM_Odm 37 37 ); 38 38 u32 ODM_GetVersion_MP_8723B_PHY_REG_PG(void); 39 39
+3 -3
drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c
··· 9 9 #include "odm_precomp.h" 10 10 11 11 static bool CheckPositive( 12 - struct DM_ODM_T *pDM_Odm, const u32 Condition1, const u32 Condition2 12 + struct dm_odm_t *pDM_Odm, const u32 Condition1, const u32 Condition2 13 13 ) 14 14 { 15 15 u8 _BoardType = ··· 111 111 } 112 112 113 113 static bool CheckNegative( 114 - struct DM_ODM_T *pDM_Odm, const u32 Condition1, const u32 Condition2 114 + struct dm_odm_t *pDM_Odm, const u32 Condition1, const u32 Condition2 115 115 ) 116 116 { 117 117 return true; ··· 228 228 229 229 }; 230 230 231 - void ODM_ReadAndConfig_MP_8723B_MAC_REG(struct DM_ODM_T *pDM_Odm) 231 + void ODM_ReadAndConfig_MP_8723B_MAC_REG(struct dm_odm_t *pDM_Odm) 232 232 { 233 233 u32 i = 0; 234 234 u32 ArrayLen = ARRAY_SIZE(Array_MP_8723B_MAC_REG);
+1 -1
drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.h
··· 15 15 16 16 void 17 17 ODM_ReadAndConfig_MP_8723B_MAC_REG(/* TC: Test Chip, MP: MP Chip */ 18 - struct DM_ODM_T *pDM_Odm 18 + struct dm_odm_t *pDM_Odm 19 19 ); 20 20 #endif
+6 -6
drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c
··· 9 9 #include "odm_precomp.h" 10 10 11 11 static bool CheckPositive( 12 - struct DM_ODM_T *pDM_Odm, const u32 Condition1, const u32 Condition2 12 + struct dm_odm_t *pDM_Odm, const u32 Condition1, const u32 Condition2 13 13 ) 14 14 { 15 15 u8 _BoardType = ··· 121 121 } 122 122 123 123 static bool CheckNegative( 124 - struct DM_ODM_T *pDM_Odm, const u32 Condition1, const u32 Condition2 124 + struct dm_odm_t *pDM_Odm, const u32 Condition1, const u32 Condition2 125 125 ) 126 126 { 127 127 return true; ··· 259 259 260 260 }; 261 261 262 - void ODM_ReadAndConfig_MP_8723B_RadioA(struct DM_ODM_T *pDM_Odm) 262 + void ODM_ReadAndConfig_MP_8723B_RadioA(struct dm_odm_t *pDM_Odm) 263 263 { 264 264 u32 i = 0; 265 265 u32 ArrayLen = ARRAY_SIZE(Array_MP_8723B_RadioA); ··· 420 420 8, 8, 9, 9, 9, 10, 10, 11, 11, 12, 12, 13, 14, 15 421 421 }; 422 422 423 - void ODM_ReadAndConfig_MP_8723B_TxPowerTrack_SDIO(struct DM_ODM_T *pDM_Odm) 423 + void ODM_ReadAndConfig_MP_8723B_TxPowerTrack_SDIO(struct dm_odm_t *pDM_Odm) 424 424 { 425 - struct ODM_RF_CAL_T *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo; 425 + struct odm_rf_cal_t *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo; 426 426 427 427 ODM_RT_TRACE( 428 428 pDM_Odm, ··· 755 755 "MKK", "2.4G", "40M", "HT", "2T", "14", "63" 756 756 }; 757 757 758 - void ODM_ReadAndConfig_MP_8723B_TXPWR_LMT(struct DM_ODM_T *pDM_Odm) 758 + void ODM_ReadAndConfig_MP_8723B_TXPWR_LMT(struct dm_odm_t *pDM_Odm) 759 759 { 760 760 u32 i = 0; 761 761 u8 **Array = Array_MP_8723B_TXPWR_LMT;
+3 -3
drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.h
··· 15 15 16 16 void 17 17 ODM_ReadAndConfig_MP_8723B_RadioA(/* TC: Test Chip, MP: MP Chip */ 18 - struct DM_ODM_T *pDM_Odm 18 + struct dm_odm_t *pDM_Odm 19 19 ); 20 20 21 21 /****************************************************************************** ··· 24 24 25 25 void 26 26 ODM_ReadAndConfig_MP_8723B_TxPowerTrack_SDIO(/* TC: Test Chip, MP: MP Chip */ 27 - struct DM_ODM_T *pDM_Odm 27 + struct dm_odm_t *pDM_Odm 28 28 ); 29 29 u32 ODM_GetVersion_MP_8723B_TxPowerTrack_SDIO(void); 30 30 ··· 34 34 35 35 void 36 36 ODM_ReadAndConfig_MP_8723B_TXPWR_LMT(/* TC: Test Chip, MP: MP Chip */ 37 - struct DM_ODM_T *pDM_Odm 37 + struct dm_odm_t *pDM_Odm 38 38 ); 39 39 u32 ODM_GetVersion_MP_8723B_TXPWR_LMT(void); 40 40
+3 -3
drivers/staging/rtl8723bs/hal/HalPhyRf.c
··· 23 23 } while (0) 24 24 25 25 26 - void ConfigureTxpowerTrack(struct DM_ODM_T *pDM_Odm, struct txpwrtrack_cfg *pConfig) 26 + void ConfigureTxpowerTrack(struct dm_odm_t *pDM_Odm, struct txpwrtrack_cfg *pConfig) 27 27 { 28 28 ConfigureTxpowerTrack_8723B(pConfig); 29 29 } ··· 36 36 /* NOTE: If Tx BB swing or Tx scaling is varified during run-time, still */ 37 37 /* need to call this function. */ 38 38 /* */ 39 - void ODM_ClearTxPowerTrackingState(struct DM_ODM_T *pDM_Odm) 39 + void ODM_ClearTxPowerTrackingState(struct dm_odm_t *pDM_Odm) 40 40 { 41 41 struct hal_com_data *pHalData = GET_HAL_DATA(pDM_Odm->Adapter); 42 42 u8 p = 0; ··· 74 74 { 75 75 76 76 struct hal_com_data *pHalData = GET_HAL_DATA(Adapter); 77 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 77 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 78 78 79 79 u8 ThermalValue = 0, delta, delta_LCK, delta_IQK, p = 0, i = 0; 80 80 u8 ThermalValue_AVG_count = 0;
+6 -6
drivers/staging/rtl8723bs/hal/HalPhyRf.h
··· 19 19 MIX_MODE 20 20 }; 21 21 22 - typedef void (*FuncSetPwr)(struct DM_ODM_T *, enum pwrtrack_method, u8, u8); 23 - typedef void (*FuncIQK)(struct DM_ODM_T *, u8, u8, u8); 24 - typedef void (*FuncLCK)(struct DM_ODM_T *); 25 - typedef void (*FuncSwing)(struct DM_ODM_T *, u8 **, u8 **, u8 **, u8 **); 22 + typedef void (*FuncSetPwr)(struct dm_odm_t *, enum pwrtrack_method, u8, u8); 23 + typedef void (*FuncIQK)(struct dm_odm_t *, u8, u8, u8); 24 + typedef void (*FuncLCK)(struct dm_odm_t *); 25 + typedef void (*FuncSwing)(struct dm_odm_t *, u8 **, u8 **, u8 **, u8 **); 26 26 27 27 struct txpwrtrack_cfg { 28 28 u8 SwingTableSize_CCK; ··· 37 37 FuncSwing GetDeltaSwingTable; 38 38 }; 39 39 40 - void ConfigureTxpowerTrack(struct DM_ODM_T *pDM_Odm, struct txpwrtrack_cfg *pConfig); 40 + void ConfigureTxpowerTrack(struct dm_odm_t *pDM_Odm, struct txpwrtrack_cfg *pConfig); 41 41 42 42 43 - void ODM_ClearTxPowerTrackingState(struct DM_ODM_T *pDM_Odm); 43 + void ODM_ClearTxPowerTrackingState(struct dm_odm_t *pDM_Odm); 44 44 45 45 void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter); 46 46
+26 -26
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
··· 54 54 55 55 56 56 static void setIqkMatrix_8723B( 57 - struct DM_ODM_T *pDM_Odm, 57 + struct dm_odm_t *pDM_Odm, 58 58 u8 OFDM_index, 59 59 u8 RFPath, 60 60 s32 IqkResult_X, ··· 135 135 } 136 136 137 137 138 - static void setCCKFilterCoefficient(struct DM_ODM_T *pDM_Odm, u8 CCKSwingIndex) 138 + static void setCCKFilterCoefficient(struct dm_odm_t *pDM_Odm, u8 CCKSwingIndex) 139 139 { 140 140 if (!pDM_Odm->RFCalibrateInfo.bCCKinCH14) { 141 141 rtw_write8(pDM_Odm->Adapter, 0xa22, CCKSwingTable_Ch1_Ch13_New[CCKSwingIndex][0]); ··· 159 159 } 160 160 161 161 void DoIQK_8723B( 162 - struct DM_ODM_T *pDM_Odm, 162 + struct dm_odm_t *pDM_Odm, 163 163 u8 DeltaThermalIndex, 164 164 u8 ThermalValue, 165 165 u8 Threshold ··· 185 185 * 186 186 *---------------------------------------------------------------------------*/ 187 187 void ODM_TxPwrTrackSetPwr_8723B( 188 - struct DM_ODM_T *pDM_Odm, 188 + struct dm_odm_t *pDM_Odm, 189 189 enum pwrtrack_method Method, 190 190 u8 RFPath, 191 191 u8 ChannelMappedIndex ··· 360 360 } 361 361 362 362 static void GetDeltaSwingTable_8723B( 363 - struct DM_ODM_T *pDM_Odm, 363 + struct dm_odm_t *pDM_Odm, 364 364 u8 **TemperatureUP_A, 365 365 u8 **TemperatureDOWN_A, 366 366 u8 **TemperatureUP_B, ··· 368 368 ) 369 369 { 370 370 struct adapter *Adapter = pDM_Odm->Adapter; 371 - struct ODM_RF_CAL_T *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo; 371 + struct odm_rf_cal_t *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo; 372 372 struct hal_com_data *pHalData = GET_HAL_DATA(Adapter); 373 373 u16 rate = *(pDM_Odm->pForcedDataRate); 374 374 u8 channel = pHalData->CurrentChannel; ··· 437 437 u8 result = 0x00; 438 438 439 439 struct hal_com_data *pHalData = GET_HAL_DATA(padapter); 440 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 440 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 441 441 442 442 /* Save RF Path */ 443 443 Path_SEL_BB = PHY_QueryBBReg(pDM_Odm->Adapter, 0x948, bMaskDWord); ··· 548 548 u32 regEAC, regE94, regE9C, regEA4, u4tmp, tmp, Path_SEL_BB; 549 549 u8 result = 0x00; 550 550 struct hal_com_data *pHalData = GET_HAL_DATA(padapter); 551 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 551 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 552 552 553 553 /* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path A Rx IQK!\n")); */ 554 554 ··· 762 762 u32 regEAC, regE94, regE9C, tmp, Path_SEL_BB/*, regEC4, regECC, Path_SEL_BB*/; 763 763 u8 result = 0x00; 764 764 struct hal_com_data *pHalData = GET_HAL_DATA(padapter); 765 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 765 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 766 766 767 767 ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path B IQK!\n")); 768 768 ··· 869 869 u32 regE94, regE9C, regEA4, regEAC, u4tmp, tmp, Path_SEL_BB; 870 870 u8 result = 0x00; 871 871 struct hal_com_data *pHalData = GET_HAL_DATA(padapter); 872 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 872 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 873 873 874 874 /* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path B Rx IQK!\n")); */ 875 875 ··· 1092 1092 u32 Oldval_0, X, TX0_A, reg; 1093 1093 s32 Y, TX0_C; 1094 1094 struct hal_com_data *pHalData = GET_HAL_DATA(padapter); 1095 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 1095 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 1096 1096 1097 - struct ODM_RF_CAL_T *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo; 1097 + struct odm_rf_cal_t *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo; 1098 1098 1099 1099 ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path A IQ Calibration %s !\n", (bIQKOK)?"Success":"Failed")); 1100 1100 ··· 1172 1172 u32 Oldval_1, X, TX1_A, reg; 1173 1173 s32 Y, TX1_C; 1174 1174 struct hal_com_data *pHalData = GET_HAL_DATA(padapter); 1175 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 1175 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 1176 1176 1177 - struct ODM_RF_CAL_T *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo; 1177 + struct odm_rf_cal_t *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo; 1178 1178 1179 1179 ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path B IQ Calibration %s !\n", (bIQKOK)?"Success":"Failed")); 1180 1180 ··· 1247 1247 /* */ 1248 1248 /* MP Already declare in odm.c */ 1249 1249 1250 - void ODM_SetIQCbyRFpath(struct DM_ODM_T *pDM_Odm, u32 RFpath) 1250 + void ODM_SetIQCbyRFpath(struct dm_odm_t *pDM_Odm, u32 RFpath) 1251 1251 { 1252 1252 1253 - struct ODM_RF_CAL_T *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo; 1253 + struct odm_rf_cal_t *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo; 1254 1254 1255 1255 if ( 1256 1256 (pRFCalibrateInfo->TxIQC_8723B[PATH_S0][IDX_0xC80][VAL] != 0x0) && ··· 1292 1292 { 1293 1293 u32 i; 1294 1294 struct hal_com_data *pHalData = GET_HAL_DATA(padapter); 1295 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 1295 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 1296 1296 1297 1297 if (!ODM_CheckPowerStatus(padapter)) 1298 1298 return; ··· 1310 1310 { 1311 1311 u32 i; 1312 1312 struct hal_com_data *pHalData = GET_HAL_DATA(padapter); 1313 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 1313 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 1314 1314 1315 1315 ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Save MAC parameters.\n")); 1316 1316 for (i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++) { ··· 1330 1330 { 1331 1331 u32 i; 1332 1332 struct hal_com_data *pHalData = GET_HAL_DATA(padapter); 1333 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 1333 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 1334 1334 1335 1335 ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Reload ADDA power saving parameters !\n")); 1336 1336 for (i = 0 ; i < RegiesterNum; i++) { ··· 1360 1360 u32 pathOn; 1361 1361 u32 i; 1362 1362 struct hal_com_data *pHalData = GET_HAL_DATA(padapter); 1363 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 1363 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 1364 1364 1365 1365 ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("ADDA ON.\n")); 1366 1366 ··· 1384 1384 { 1385 1385 u32 i = 0; 1386 1386 struct hal_com_data *pHalData = GET_HAL_DATA(padapter); 1387 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 1387 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 1388 1388 1389 1389 ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("MAC settings for Calibration.\n")); 1390 1390 ··· 1489 1489 ) 1490 1490 { 1491 1491 struct hal_com_data *pHalData = GET_HAL_DATA(padapter); 1492 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 1492 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 1493 1493 1494 1494 u32 i; 1495 1495 u8 PathAOK, PathBOK; ··· 1697 1697 } 1698 1698 1699 1699 1700 - static void phy_LCCalibrate_8723B(struct DM_ODM_T *pDM_Odm, bool is2T) 1700 + static void phy_LCCalibrate_8723B(struct dm_odm_t *pDM_Odm, bool is2T) 1701 1701 { 1702 1702 u8 tmpReg; 1703 1703 u32 RF_Amode = 0, RF_Bmode = 0, LC_Cal; ··· 1784 1784 { 1785 1785 struct hal_com_data *pHalData = GET_HAL_DATA(padapter); 1786 1786 1787 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 1787 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 1788 1788 1789 1789 s32 result[4][8]; /* last is final result */ 1790 1790 u8 i, final_candidate; ··· 1830 1830 if (bRestore) { 1831 1831 u32 offset, data; 1832 1832 u8 path, bResult = SUCCESS; 1833 - struct ODM_RF_CAL_T *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo; 1833 + struct odm_rf_cal_t *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo; 1834 1834 1835 1835 path = (PHY_QueryBBReg(pDM_Odm->Adapter, rS0S1_PathSwitch, bMaskByte0) == 0x00) ? ODM_RF_PATH_A : ODM_RF_PATH_B; 1836 1836 ··· 2038 2038 } 2039 2039 2040 2040 2041 - void PHY_LCCalibrate_8723B(struct DM_ODM_T *pDM_Odm) 2041 + void PHY_LCCalibrate_8723B(struct dm_odm_t *pDM_Odm) 2042 2042 { 2043 2043 bool bSingleTone = false, bCarrierSuppression = false; 2044 2044 u32 timeout = 2000, timecount = 0;
+4 -4
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.h
··· 19 19 void ConfigureTxpowerTrack_8723B(struct txpwrtrack_cfg *pConfig); 20 20 21 21 void DoIQK_8723B( 22 - struct DM_ODM_T *pDM_Odm, 22 + struct dm_odm_t *pDM_Odm, 23 23 u8 DeltaThermalIndex, 24 24 u8 ThermalValue, 25 25 u8 Threshold 26 26 ); 27 27 28 28 void ODM_TxPwrTrackSetPwr_8723B( 29 - struct DM_ODM_T *pDM_Odm, 29 + struct dm_odm_t *pDM_Odm, 30 30 enum pwrtrack_method Method, 31 31 u8 RFPath, 32 32 u8 ChannelMappedIndex ··· 41 41 u8 RF_Path 42 42 ); 43 43 44 - void ODM_SetIQCbyRFpath(struct DM_ODM_T *pDM_Odm, u32 RFpath); 44 + void ODM_SetIQCbyRFpath(struct dm_odm_t *pDM_Odm, u32 RFpath); 45 45 46 46 /* */ 47 47 /* LC calibrate */ 48 48 /* */ 49 - void PHY_LCCalibrate_8723B(struct DM_ODM_T *pDM_Odm); 49 + void PHY_LCCalibrate_8723B(struct dm_odm_t *pDM_Odm); 50 50 51 51 /* */ 52 52 /* AP calibrate */
+5 -5
drivers/staging/rtl8723bs/hal/hal_com.c
··· 1006 1006 void SetHwReg(struct adapter *adapter, u8 variable, u8 *val) 1007 1007 { 1008 1008 struct hal_com_data *hal_data = GET_HAL_DATA(adapter); 1009 - struct DM_ODM_T *odm = &(hal_data->odmpriv); 1009 + struct dm_odm_t *odm = &(hal_data->odmpriv); 1010 1010 1011 1011 switch (variable) { 1012 1012 case HW_VAR_PORT_SWITCH: ··· 1086 1086 void GetHwReg(struct adapter *adapter, u8 variable, u8 *val) 1087 1087 { 1088 1088 struct hal_com_data *hal_data = GET_HAL_DATA(adapter); 1089 - struct DM_ODM_T *odm = &(hal_data->odmpriv); 1089 + struct dm_odm_t *odm = &(hal_data->odmpriv); 1090 1090 1091 1091 switch (variable) { 1092 1092 case HW_VAR_BASIC_RATE: ··· 1117 1117 ) 1118 1118 { 1119 1119 struct hal_com_data *hal_data = GET_HAL_DATA(adapter); 1120 - struct DM_ODM_T *odm = &(hal_data->odmpriv); 1120 + struct dm_odm_t *odm = &(hal_data->odmpriv); 1121 1121 u8 bResult = _SUCCESS; 1122 1122 1123 1123 switch (variable) { ··· 1202 1202 ) 1203 1203 { 1204 1204 struct hal_com_data *hal_data = GET_HAL_DATA(adapter); 1205 - struct DM_ODM_T *odm = &(hal_data->odmpriv); 1205 + struct dm_odm_t *odm = &(hal_data->odmpriv); 1206 1206 u8 bResult = _SUCCESS; 1207 1207 1208 1208 switch (variable) { ··· 1273 1273 ) 1274 1274 { 1275 1275 struct hal_com_data *pHalData = GET_HAL_DATA(Adapter); 1276 - struct DM_ODM_T *podmpriv = &pHalData->odmpriv; 1276 + struct dm_odm_t *podmpriv = &pHalData->odmpriv; 1277 1277 /* _irqL irqL; */ 1278 1278 switch (eVariable) { 1279 1279 case HAL_ODM_STA_INFO:
+3 -3
drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
··· 270 270 ) 271 271 { 272 272 struct hal_com_data *pHalData = GET_HAL_DATA(padapter); 273 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 273 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 274 274 u8 index = 0; 275 275 276 276 if (pDM_Odm->PhyRegPgVersion == 0) { ··· 795 795 ) 796 796 { 797 797 struct hal_com_data *pHalData = GET_HAL_DATA(padapter); 798 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 798 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 799 799 800 800 if (pDM_Odm->PhyRegPgVersion > 0) 801 801 PHY_StoreTxPowerByRateNew(padapter, Band, RfPath, TxNum, RegAddr, BitMask, Data); ··· 1188 1188 s8 PHY_GetTxPowerTrackingOffset(struct adapter *padapter, u8 RFPath, u8 Rate) 1189 1189 { 1190 1190 struct hal_com_data *pHalData = GET_HAL_DATA(padapter); 1191 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 1191 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 1192 1192 s8 offset = 0; 1193 1193 1194 1194 if (pDM_Odm->RFCalibrateInfo.TxPowerTrackControl == false)
+50 -50
drivers/staging/rtl8723bs/hal/odm.c
··· 282 282 /* Local Function predefine. */ 283 283 284 284 /* START------------COMMON INFO RELATED--------------- */ 285 - void odm_CommonInfoSelfInit(struct DM_ODM_T *pDM_Odm); 285 + void odm_CommonInfoSelfInit(struct dm_odm_t *pDM_Odm); 286 286 287 - void odm_CommonInfoSelfUpdate(struct DM_ODM_T *pDM_Odm); 287 + void odm_CommonInfoSelfUpdate(struct dm_odm_t *pDM_Odm); 288 288 289 - void odm_CmnInfoInit_Debug(struct DM_ODM_T *pDM_Odm); 289 + void odm_CmnInfoInit_Debug(struct dm_odm_t *pDM_Odm); 290 290 291 - void odm_BasicDbgMessage(struct DM_ODM_T *pDM_Odm); 291 + void odm_BasicDbgMessage(struct dm_odm_t *pDM_Odm); 292 292 293 293 /* END------------COMMON INFO RELATED--------------- */ 294 294 ··· 302 302 /* Remove BB power Saving by YuChen */ 303 303 /* END---------BB POWER SAVE----------------------- */ 304 304 305 - void odm_RefreshRateAdaptiveMaskCE(struct DM_ODM_T *pDM_Odm); 305 + void odm_RefreshRateAdaptiveMaskCE(struct dm_odm_t *pDM_Odm); 306 306 307 307 /* Remove by YuChen */ 308 308 309 - void odm_RSSIMonitorInit(struct DM_ODM_T *pDM_Odm); 309 + void odm_RSSIMonitorInit(struct dm_odm_t *pDM_Odm); 310 310 311 - void odm_RSSIMonitorCheckCE(struct DM_ODM_T *pDM_Odm); 311 + void odm_RSSIMonitorCheckCE(struct dm_odm_t *pDM_Odm); 312 312 313 - void odm_RSSIMonitorCheck(struct DM_ODM_T *pDM_Odm); 313 + void odm_RSSIMonitorCheck(struct dm_odm_t *pDM_Odm); 314 314 315 - void odm_SwAntDetectInit(struct DM_ODM_T *pDM_Odm); 315 + void odm_SwAntDetectInit(struct dm_odm_t *pDM_Odm); 316 316 317 317 void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext); 318 318 ··· 320 320 321 321 void odm_GlobalAdapterCheck(void); 322 322 323 - void odm_RefreshRateAdaptiveMask(struct DM_ODM_T *pDM_Odm); 323 + void odm_RefreshRateAdaptiveMask(struct dm_odm_t *pDM_Odm); 324 324 325 - void ODM_TXPowerTrackingCheck(struct DM_ODM_T *pDM_Odm); 325 + void ODM_TXPowerTrackingCheck(struct dm_odm_t *pDM_Odm); 326 326 327 - void odm_RateAdaptiveMaskInit(struct DM_ODM_T *pDM_Odm); 327 + void odm_RateAdaptiveMaskInit(struct dm_odm_t *pDM_Odm); 328 328 329 329 330 - void odm_TXPowerTrackingInit(struct DM_ODM_T *pDM_Odm); 330 + void odm_TXPowerTrackingInit(struct dm_odm_t *pDM_Odm); 331 331 332 332 /* Remove Edca by Yu Chen */ 333 333 ··· 335 335 #define RxDefaultAnt1 0x65a9 336 336 #define RxDefaultAnt2 0x569a 337 337 338 - void odm_InitHybridAntDiv(struct DM_ODM_T *pDM_Odm); 338 + void odm_InitHybridAntDiv(struct dm_odm_t *pDM_Odm); 339 339 340 340 bool odm_StaDefAntSel( 341 - struct DM_ODM_T *pDM_Odm, 341 + struct dm_odm_t *pDM_Odm, 342 342 u32 OFDM_Ant1_Cnt, 343 343 u32 OFDM_Ant2_Cnt, 344 344 u32 CCK_Ant1_Cnt, ··· 346 346 u8 *pDefAnt 347 347 ); 348 348 349 - void odm_SetRxIdleAnt(struct DM_ODM_T *pDM_Odm, u8 Ant, bool bDualPath); 349 + void odm_SetRxIdleAnt(struct dm_odm_t *pDM_Odm, u8 Ant, bool bDualPath); 350 350 351 351 352 352 353 - void odm_HwAntDiv(struct DM_ODM_T *pDM_Odm); 353 + void odm_HwAntDiv(struct dm_odm_t *pDM_Odm); 354 354 355 355 356 356 /* */ ··· 360 360 /* */ 361 361 /* 2011/09/21 MH Add to describe different team necessary resource allocate?? */ 362 362 /* */ 363 - void ODM_DMInit(struct DM_ODM_T *pDM_Odm) 363 + void ODM_DMInit(struct dm_odm_t *pDM_Odm) 364 364 { 365 365 366 366 odm_CommonInfoSelfInit(pDM_Odm); ··· 390 390 /* You can not add any dummy function here, be care, you can only use DM structure */ 391 391 /* to perform any new ODM_DM. */ 392 392 /* */ 393 - void ODM_DMWatchdog(struct DM_ODM_T *pDM_Odm) 393 + void ODM_DMWatchdog(struct dm_odm_t *pDM_Odm) 394 394 { 395 395 odm_CommonInfoSelfUpdate(pDM_Odm); 396 396 odm_BasicDbgMessage(pDM_Odm); ··· 445 445 /* */ 446 446 /* Init /.. Fixed HW value. Only init time. */ 447 447 /* */ 448 - void ODM_CmnInfoInit(struct DM_ODM_T *pDM_Odm, enum ODM_CMNINFO_E CmnInfo, u32 Value) 448 + void ODM_CmnInfoInit(struct dm_odm_t *pDM_Odm, enum odm_cmninfo_e CmnInfo, u32 Value) 449 449 { 450 450 /* */ 451 451 /* This section is used for init value */ ··· 519 519 break; 520 520 521 521 case ODM_CMNINFO_GPA: 522 - pDM_Odm->TypeGPA = (enum ODM_TYPE_GPA_E)Value; 522 + pDM_Odm->TypeGPA = (enum odm_type_gpa_e)Value; 523 523 break; 524 524 case ODM_CMNINFO_APA: 525 - pDM_Odm->TypeAPA = (enum ODM_TYPE_APA_E)Value; 525 + pDM_Odm->TypeAPA = (enum odm_type_apa_e)Value; 526 526 break; 527 527 case ODM_CMNINFO_GLNA: 528 - pDM_Odm->TypeGLNA = (enum ODM_TYPE_GLNA_E)Value; 528 + pDM_Odm->TypeGLNA = (enum odm_type_glna_e)Value; 529 529 break; 530 530 case ODM_CMNINFO_ALNA: 531 - pDM_Odm->TypeALNA = (enum ODM_TYPE_ALNA_E)Value; 531 + pDM_Odm->TypeALNA = (enum odm_type_alna_e)Value; 532 532 break; 533 533 534 534 case ODM_CMNINFO_EXT_TRSW: ··· 557 557 } 558 558 559 559 560 - void ODM_CmnInfoHook(struct DM_ODM_T *pDM_Odm, enum ODM_CMNINFO_E CmnInfo, void *pValue) 560 + void ODM_CmnInfoHook(struct dm_odm_t *pDM_Odm, enum odm_cmninfo_e CmnInfo, void *pValue) 561 561 { 562 562 /* */ 563 563 /* Hook call by reference pointer. */ ··· 686 686 687 687 688 688 void ODM_CmnInfoPtrArrayHook( 689 - struct DM_ODM_T *pDM_Odm, 690 - enum ODM_CMNINFO_E CmnInfo, 689 + struct dm_odm_t *pDM_Odm, 690 + enum odm_cmninfo_e CmnInfo, 691 691 u16 Index, 692 692 void *pValue 693 693 ) ··· 714 714 /* */ 715 715 /* Update Band/CHannel/.. The values are dynamic but non-per-packet. */ 716 716 /* */ 717 - void ODM_CmnInfoUpdate(struct DM_ODM_T *pDM_Odm, u32 CmnInfo, u64 Value) 717 + void ODM_CmnInfoUpdate(struct dm_odm_t *pDM_Odm, u32 CmnInfo, u64 Value) 718 718 { 719 719 /* */ 720 720 /* This init variable may be changed in run time. */ ··· 828 828 829 829 } 830 830 831 - void odm_CommonInfoSelfInit(struct DM_ODM_T *pDM_Odm) 831 + void odm_CommonInfoSelfInit(struct dm_odm_t *pDM_Odm) 832 832 { 833 833 pDM_Odm->bCckHighPower = (bool) PHY_QueryBBReg(pDM_Odm->Adapter, ODM_REG(CCK_RPT_FORMAT, pDM_Odm), ODM_BIT(CCK_RPT_FORMAT, pDM_Odm)); 834 834 pDM_Odm->RFPathRxEnable = (u8) PHY_QueryBBReg(pDM_Odm->Adapter, ODM_REG(BB_RX_PATH, pDM_Odm), ODM_BIT(BB_RX_PATH, pDM_Odm)); ··· 838 838 pDM_Odm->TxRate = 0xFF; 839 839 } 840 840 841 - void odm_CommonInfoSelfUpdate(struct DM_ODM_T *pDM_Odm) 841 + void odm_CommonInfoSelfUpdate(struct dm_odm_t *pDM_Odm) 842 842 { 843 843 u8 EntryCnt = 0; 844 844 u8 i; ··· 864 864 pDM_Odm->bOneEntryOnly = false; 865 865 } 866 866 867 - void odm_CmnInfoInit_Debug(struct DM_ODM_T *pDM_Odm) 867 + void odm_CmnInfoInit_Debug(struct dm_odm_t *pDM_Odm) 868 868 { 869 869 ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("odm_CmnInfoInit_Debug ==>\n")); 870 870 ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("SupportPlatform =%d\n", pDM_Odm->SupportPlatform)); ··· 885 885 886 886 } 887 887 888 - void odm_BasicDbgMessage(struct DM_ODM_T *pDM_Odm) 888 + void odm_BasicDbgMessage(struct dm_odm_t *pDM_Odm) 889 889 { 890 890 ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("odm_BasicDbgMsg ==>\n")); 891 891 ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("bLinked = %d, RSSI_Min = %d,\n", ··· 932 932 /* 3 Rate Adaptive */ 933 933 /* 3 ============================================================ */ 934 934 935 - void odm_RateAdaptiveMaskInit(struct DM_ODM_T *pDM_Odm) 935 + void odm_RateAdaptiveMaskInit(struct dm_odm_t *pDM_Odm) 936 936 { 937 - struct ODM_RATE_ADAPTIVE *pOdmRA = &pDM_Odm->RateAdaptive; 937 + struct odm_rate_adaptive *pOdmRA = &pDM_Odm->RateAdaptive; 938 938 939 939 pOdmRA->Type = DM_Type_ByDriver; 940 940 if (pOdmRA->Type == DM_Type_ByDriver) ··· 950 950 } 951 951 952 952 u32 ODM_Get_Rate_Bitmap( 953 - struct DM_ODM_T *pDM_Odm, 953 + struct dm_odm_t *pDM_Odm, 954 954 u32 macid, 955 955 u32 ra_mask, 956 956 u8 rssi_level ··· 1080 1080 * 1081 1081 * -------------------------------------------------------------------------- 1082 1082 */ 1083 - void odm_RefreshRateAdaptiveMask(struct DM_ODM_T *pDM_Odm) 1083 + void odm_RefreshRateAdaptiveMask(struct dm_odm_t *pDM_Odm) 1084 1084 { 1085 1085 1086 1086 ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_TRACE, ("odm_RefreshRateAdaptiveMask()---------->\n")); ··· 1091 1091 odm_RefreshRateAdaptiveMaskCE(pDM_Odm); 1092 1092 } 1093 1093 1094 - void odm_RefreshRateAdaptiveMaskCE(struct DM_ODM_T *pDM_Odm) 1094 + void odm_RefreshRateAdaptiveMaskCE(struct dm_odm_t *pDM_Odm) 1095 1095 { 1096 1096 u8 i; 1097 1097 struct adapter *padapter = pDM_Odm->Adapter; ··· 1128 1128 /* Return Value: bool */ 1129 1129 /* - true: RATRState is changed. */ 1130 1130 bool ODM_RAStateCheck( 1131 - struct DM_ODM_T *pDM_Odm, 1131 + struct dm_odm_t *pDM_Odm, 1132 1132 s32 RSSI, 1133 1133 bool bForceUpdate, 1134 1134 u8 *pRATRState 1135 1135 ) 1136 1136 { 1137 - struct ODM_RATE_ADAPTIVE *pRA = &pDM_Odm->RateAdaptive; 1137 + struct odm_rate_adaptive *pRA = &pDM_Odm->RateAdaptive; 1138 1138 const u8 GoUpGap = 5; 1139 1139 u8 HighRSSIThreshForRA = pRA->HighRSSIThresh; 1140 1140 u8 LowRSSIThreshForRA = pRA->LowRSSIThresh; ··· 1193 1193 /* 3 RSSI Monitor */ 1194 1194 /* 3 ============================================================ */ 1195 1195 1196 - void odm_RSSIMonitorInit(struct DM_ODM_T *pDM_Odm) 1196 + void odm_RSSIMonitorInit(struct dm_odm_t *pDM_Odm) 1197 1197 { 1198 - struct RA_T *pRA_Table = &pDM_Odm->DM_RA_Table; 1198 + struct ra_t *pRA_Table = &pDM_Odm->DM_RA_Table; 1199 1199 1200 1200 pRA_Table->firstconnect = false; 1201 1201 1202 1202 } 1203 1203 1204 - void odm_RSSIMonitorCheck(struct DM_ODM_T *pDM_Odm) 1204 + void odm_RSSIMonitorCheck(struct dm_odm_t *pDM_Odm) 1205 1205 { 1206 1206 if (!(pDM_Odm->SupportAbility & ODM_BB_RSSI_MONITOR)) 1207 1207 return; ··· 1214 1214 { 1215 1215 struct hal_com_data *pHalData = GET_HAL_DATA(padapter); 1216 1216 struct dm_priv *pdmpriv = &pHalData->dmpriv; 1217 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 1217 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 1218 1218 1219 1219 /* 1 1.Determine the minimum RSSI */ 1220 1220 ··· 1231 1231 /* ODM_RT_TRACE(pDM_Odm, COMP_DIG, DBG_LOUD, ("MinUndecoratedPWDBForDM =%d\n", pHalData->MinUndecoratedPWDBForDM)); */ 1232 1232 } 1233 1233 1234 - void odm_RSSIMonitorCheckCE(struct DM_ODM_T *pDM_Odm) 1234 + void odm_RSSIMonitorCheckCE(struct dm_odm_t *pDM_Odm) 1235 1235 { 1236 1236 struct adapter *Adapter = pDM_Odm->Adapter; 1237 1237 struct hal_com_data *pHalData = GET_HAL_DATA(Adapter); ··· 1240 1240 int tmpEntryMaxPWDB = 0, tmpEntryMinPWDB = 0xff; 1241 1241 u8 sta_cnt = 0; 1242 1242 u32 PWDB_rssi[NUM_STA] = {0};/* 0~15]:MACID, [16~31]:PWDB_rssi */ 1243 - struct RA_T *pRA_Table = &pDM_Odm->DM_RA_Table; 1243 + struct ra_t *pRA_Table = &pDM_Odm->DM_RA_Table; 1244 1244 1245 1245 if (pDM_Odm->bLinked != true) 1246 1246 return; ··· 1303 1303 /* 3 Tx Power Tracking */ 1304 1304 /* 3 ============================================================ */ 1305 1305 1306 - static u8 getSwingIndex(struct DM_ODM_T *pDM_Odm) 1306 + static u8 getSwingIndex(struct dm_odm_t *pDM_Odm) 1307 1307 { 1308 1308 struct adapter *Adapter = pDM_Odm->Adapter; 1309 1309 u8 i = 0; ··· 1327 1327 return i; 1328 1328 } 1329 1329 1330 - void odm_TXPowerTrackingInit(struct DM_ODM_T *pDM_Odm) 1330 + void odm_TXPowerTrackingInit(struct dm_odm_t *pDM_Odm) 1331 1331 { 1332 1332 u8 defaultSwingIndex = getSwingIndex(pDM_Odm); 1333 1333 u8 p = 0; ··· 1371 1371 1372 1372 } 1373 1373 1374 - void ODM_TXPowerTrackingCheck(struct DM_ODM_T *pDM_Odm) 1374 + void ODM_TXPowerTrackingCheck(struct dm_odm_t *pDM_Odm) 1375 1375 { 1376 1376 struct adapter *Adapter = pDM_Odm->Adapter; 1377 1377 ··· 1395 1395 /* 3 ============================================================ */ 1396 1396 /* 3 SW Antenna Diversity */ 1397 1397 /* 3 ============================================================ */ 1398 - void odm_SwAntDetectInit(struct DM_ODM_T *pDM_Odm) 1398 + void odm_SwAntDetectInit(struct dm_odm_t *pDM_Odm) 1399 1399 { 1400 - struct SWAT_T *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; 1400 + struct swat_t *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; 1401 1401 1402 1402 pDM_SWAT_Table->SWAS_NoLink_BK_Reg92c = rtw_read32(pDM_Odm->Adapter, rDPDT_control); 1403 1403 pDM_SWAT_Table->PreAntenna = MAIN_ANT;
+70 -70
drivers/staging/rtl8723bs/hal/odm.h
··· 92 92 u8 MF_state; 93 93 }; 94 94 95 - struct RA_T { 95 + struct ra_t { 96 96 u8 firstconnect; 97 97 }; 98 98 99 - struct RXHP_T { 99 + struct rxhp_t { 100 100 u8 RXHP_flag; 101 101 u8 PSD_func_trigger; 102 102 u8 PSD_bitmap_RXHP[80]; ··· 126 126 #define TRAFFIC_HIGH 1 127 127 #define TRAFFIC_UltraLOW 2 128 128 129 - struct SWAT_T { /* _SW_Antenna_Switch_ */ 129 + struct swat_t { /* _SW_Antenna_Switch_ */ 130 130 u8 Double_chk_flag; 131 131 u8 try_flag; 132 132 s32 PreRSSI; ··· 178 178 /* Remove Edca by YuChen */ 179 179 180 180 181 - struct ODM_RATE_ADAPTIVE { 181 + struct odm_rate_adaptive { 182 182 u8 Type; /* DM_Type_ByFW/DM_Type_ByDriver */ 183 183 u8 LdpcThres; /* if RSSI > LdpcThres => switch from LPDC to BCC */ 184 184 bool bUseLdpc; ··· 297 297 /* 2011/20/20 MH For MP driver RT_WLAN_STA = STA_INFO_T */ 298 298 /* Please declare below ODM relative info in your STA info structure. */ 299 299 /* */ 300 - struct ODM_STA_INFO_T { 300 + struct odm_sta_info_t { 301 301 /* Driver Write */ 302 302 bool bUsed; /* record the sta status link or not? */ 303 303 /* u8 WirelessMode; */ ··· 325 325 /* */ 326 326 /* 2011/10/20 MH Define Common info enum for all team. */ 327 327 /* */ 328 - enum ODM_CMNINFO_E { 328 + enum odm_cmninfo_e { 329 329 /* Fixed value: */ 330 330 331 331 /* HOOK BEFORE REG INIT----------- */ ··· 415 415 }; 416 416 417 417 /* 2011/10/20 MH Define ODM support ability. ODM_CMNINFO_ABILITY */ 418 - enum ODM_ABILITY_E { /* _ODM_Support_Ability_Definition */ 418 + enum odm_ability_e { /* _ODM_Support_Ability_Definition */ 419 419 /* */ 420 420 /* BB ODM section BIT 0-15 */ 421 421 /* */ ··· 446 446 }; 447 447 448 448 /* ODM_CMNINFO_INTERFACE */ 449 - enum ODM_INTERFACE_E { /* tag_ODM_Support_Interface_Definition */ 449 + enum odm_interface_e { /* tag_ODM_Support_Interface_Definition */ 450 450 ODM_ITRF_SDIO = 0x4, 451 451 ODM_ITRF_ALL = 0x7, 452 452 }; 453 453 454 454 /* ODM_CMNINFO_IC_TYPE */ 455 - enum ODM_IC_TYPE_E { /* tag_ODM_Support_IC_Type_Definition */ 455 + enum odm_ic_type_e { /* tag_ODM_Support_IC_Type_Definition */ 456 456 ODM_RTL8723B = BIT8, 457 457 }; 458 458 459 459 /* ODM_CMNINFO_CUT_VER */ 460 - enum ODM_CUT_VERSION_E { /* tag_ODM_Cut_Version_Definition */ 460 + enum odm_cut_version_e { /* tag_ODM_Cut_Version_Definition */ 461 461 ODM_CUT_A = 0, 462 462 ODM_CUT_B = 1, 463 463 ODM_CUT_C = 2, ··· 472 472 }; 473 473 474 474 /* ODM_CMNINFO_FAB_VER */ 475 - enum ODM_FAB_E { /* tag_ODM_Fab_Version_Definition */ 475 + enum odm_fab_e { /* tag_ODM_Fab_Version_Definition */ 476 476 ODM_TSMC = 0, 477 477 ODM_UMC = 1, 478 478 }; ··· 481 481 /* */ 482 482 /* For example 1T2R (A+AB = BIT0|BIT4|BIT5) */ 483 483 /* */ 484 - enum ODM_RF_PATH_E { /* tag_ODM_RF_Path_Bit_Definition */ 484 + enum odm_rf_path_e { /* tag_ODM_RF_Path_Bit_Definition */ 485 485 ODM_RF_TX_A = BIT0, 486 486 ODM_RF_TX_B = BIT1, 487 487 ODM_RF_TX_C = BIT2, ··· 492 492 ODM_RF_RX_D = BIT7, 493 493 }; 494 494 495 - enum ODM_RF_TYPE_E { /* tag_ODM_RF_Type_Definition */ 495 + enum odm_rf_type_e { /* tag_ODM_RF_Type_Definition */ 496 496 ODM_1T1R = 0, 497 497 ODM_1T2R = 1, 498 498 ODM_2T2R = 2, ··· 513 513 /* DUALMAC_SINGLEPHY, */ 514 514 /* MACPHY_MODE_8192D,*PMACPHY_MODE_8192D; */ 515 515 /* Above is the original define in MP driver. Please use the same define. THX. */ 516 - enum ODM_MAC_PHY_MODE_E { /* tag_ODM_MAC_PHY_Mode_Definition */ 516 + enum odm_mac_phy_mode_e { /* tag_ODM_MAC_PHY_Mode_Definition */ 517 517 ODM_SMSP = 0, 518 518 ODM_DMSP = 1, 519 519 ODM_DMDP = 2, 520 520 }; 521 521 522 - enum ODM_BT_COEXIST_E { /* tag_BT_Coexist_Definition */ 522 + enum odm_bt_coexist_e { /* tag_BT_Coexist_Definition */ 523 523 ODM_BT_BUSY = 1, 524 524 ODM_BT_ON = 2, 525 525 ODM_BT_OFF = 3, ··· 527 527 }; 528 528 529 529 /* ODM_CMNINFO_OP_MODE */ 530 - enum ODM_OPERATION_MODE_E { /* tag_Operation_Mode_Definition */ 530 + enum odm_operation_mode_e { /* tag_Operation_Mode_Definition */ 531 531 ODM_NO_LINK = BIT0, 532 532 ODM_LINK = BIT1, 533 533 ODM_SCAN = BIT2, ··· 540 540 }; 541 541 542 542 /* ODM_CMNINFO_WM_MODE */ 543 - enum ODM_WIRELESS_MODE_E { /* tag_Wireless_Mode_Definition */ 543 + enum odm_wireless_mode_e { /* tag_Wireless_Mode_Definition */ 544 544 ODM_WM_UNKNOWN = 0x0, 545 545 ODM_WM_B = BIT0, 546 546 ODM_WM_G = BIT1, ··· 552 552 }; 553 553 554 554 /* ODM_CMNINFO_BAND */ 555 - enum ODM_BAND_TYPE_E { /* tag_Band_Type_Definition */ 555 + enum odm_band_type_e { /* tag_Band_Type_Definition */ 556 556 ODM_BAND_2_4G = 0, 557 557 ODM_BAND_5G, 558 558 ODM_BAND_ON_BOTH, ··· 560 560 }; 561 561 562 562 /* ODM_CMNINFO_SEC_CHNL_OFFSET */ 563 - enum ODM_SEC_CHNL_OFFSET_E { /* tag_Secondary_Channel_Offset_Definition */ 563 + enum odm_sec_chnl_offset_e { /* tag_Secondary_Channel_Offset_Definition */ 564 564 ODM_DONT_CARE = 0, 565 565 ODM_BELOW = 1, 566 566 ODM_ABOVE = 2 567 567 }; 568 568 569 569 /* ODM_CMNINFO_SEC_MODE */ 570 - enum ODM_SECURITY_E { /* tag_Security_Definition */ 570 + enum odm_security_e { /* tag_Security_Definition */ 571 571 ODM_SEC_OPEN = 0, 572 572 ODM_SEC_WEP40 = 1, 573 573 ODM_SEC_TKIP = 2, ··· 579 579 }; 580 580 581 581 /* ODM_CMNINFO_BW */ 582 - enum ODM_BW_E { /* tag_Bandwidth_Definition */ 582 + enum odm_bw_e { /* tag_Bandwidth_Definition */ 583 583 ODM_BW20M = 0, 584 584 ODM_BW40M = 1, 585 585 ODM_BW80M = 2, ··· 590 590 /* ODM_CMNINFO_BOARD_TYPE */ 591 591 /* For non-AC-series IC , ODM_BOARD_5G_EXT_PA and ODM_BOARD_5G_EXT_LNA are ignored */ 592 592 /* For AC-series IC, external PA & LNA can be indivisuallly added on 2.4G and/or 5G */ 593 - enum ODM_BOARD_TYPE_E { /* tag_Board_Definition */ 593 + enum odm_board_type_e { /* tag_Board_Definition */ 594 594 ODM_BOARD_DEFAULT = 0, /* The DEFAULT case. */ 595 595 ODM_BOARD_MINICARD = BIT(0), /* 0 = non-mini card, 1 = mini card. */ 596 596 ODM_BOARD_SLIM = BIT(1), /* 0 = non-slim card, 1 = slim card */ ··· 609 609 ODM_PACKAGE_TFBGA79 = BIT(2), 610 610 }; 611 611 612 - enum ODM_TYPE_GPA_E { /* tag_ODM_TYPE_GPA_Definition */ 612 + enum odm_type_gpa_e { /* tag_ODM_TYPE_GPA_Definition */ 613 613 TYPE_GPA0 = 0, 614 614 TYPE_GPA1 = BIT(1)|BIT(0) 615 615 }; 616 616 617 - enum ODM_TYPE_APA_E { /* tag_ODM_TYPE_APA_Definition */ 617 + enum odm_type_apa_e { /* tag_ODM_TYPE_APA_Definition */ 618 618 TYPE_APA0 = 0, 619 619 TYPE_APA1 = BIT(1)|BIT(0) 620 620 }; 621 621 622 - enum ODM_TYPE_GLNA_E { /* tag_ODM_TYPE_GLNA_Definition */ 622 + enum odm_type_glna_e { /* tag_ODM_TYPE_GLNA_Definition */ 623 623 TYPE_GLNA0 = 0, 624 624 TYPE_GLNA1 = BIT(2)|BIT(0), 625 625 TYPE_GLNA2 = BIT(3)|BIT(1), 626 626 TYPE_GLNA3 = BIT(3)|BIT(2)|BIT(1)|BIT(0) 627 627 }; 628 628 629 - enum ODM_TYPE_ALNA_E { /* tag_ODM_TYPE_ALNA_Definition */ 629 + enum odm_type_alna_e { /* tag_ODM_TYPE_ALNA_Definition */ 630 630 TYPE_ALNA0 = 0, 631 631 TYPE_ALNA1 = BIT(2)|BIT(0), 632 632 TYPE_ALNA2 = BIT(3)|BIT(1), ··· 634 634 }; 635 635 636 636 /* ODM_CMNINFO_ONE_PATH_CCA */ 637 - enum ODM_CCA_PATH_E { /* tag_CCA_Path */ 637 + enum odm_cca_path_e { /* tag_CCA_Path */ 638 638 ODM_CCA_2R = 0, 639 639 ODM_CCA_1R_A = 1, 640 640 ODM_CCA_1R_B = 2, 641 641 }; 642 642 643 - struct ODM_RA_INFO_T { /* _ODM_RA_Info_ */ 643 + struct odm_ra_info_t { /* _ODM_RA_Info_ */ 644 644 u8 RateID; 645 645 u32 RateMask; 646 646 u32 RAUseRate; ··· 672 672 u8 PTSmoothFactor; 673 673 }; 674 674 675 - struct IQK_MATRIX_REGS_SETTING { /* _IQK_MATRIX_REGS_SETTING */ 675 + struct iqk_matrix_regs_setting { /* _IQK_MATRIX_REGS_SETTING */ 676 676 bool bIQKDone; 677 677 s32 Value[3][IQK_Matrix_REG_NUM]; 678 678 bool bBWIqkResultSaved[3]; ··· 680 680 681 681 /* Remove PATHDIV_PARA struct to odm_PathDiv.h */ 682 682 683 - struct ODM_RF_CAL_T { /* ODM_RF_Calibration_Structure */ 683 + struct odm_rf_cal_t { /* ODM_RF_Calibration_Structure */ 684 684 /* for tx power tracking */ 685 685 686 686 u32 RegA24; /* for TempCCK */ ··· 724 724 725 725 u8 ThermalValue_HP[HP_THERMAL_NUM]; 726 726 u8 ThermalValue_HP_index; 727 - struct IQK_MATRIX_REGS_SETTING IQKMatrixRegSetting[IQK_Matrix_Settings_NUM]; 727 + struct iqk_matrix_regs_setting IQKMatrixRegSetting[IQK_Matrix_Settings_NUM]; 728 728 bool bNeedIQK; 729 729 bool bIQKInProgress; 730 730 u8 Delta_IQK; ··· 785 785 /* ODM Dynamic common info value definition */ 786 786 /* */ 787 787 788 - struct FAT_T { /* _FAST_ANTENNA_TRAINNING_ */ 788 + struct fat_t { /* _FAST_ANTENNA_TRAINNING_ */ 789 789 u8 Bssid[6]; 790 790 u8 antsel_rx_keep_0; 791 791 u8 antsel_rx_keep_1; ··· 825 825 826 826 }; 827 827 828 - enum FAT_STATE_E { 828 + enum fat_state_e { 829 829 FAT_NORMAL_STATE = 0, 830 830 FAT_TRAINING_STATE = 1, 831 831 }; 832 832 833 - enum ANT_DIV_TYPE_E { 833 + enum ant_div_type_e { 834 834 NO_ANTDIV = 0xFF, 835 835 CG_TRX_HW_ANTDIV = 0x01, 836 836 CGCS_RX_HW_ANTDIV = 0x02, ··· 840 840 S0S1_SW_ANTDIV = 0x06 /* 8723B intrnal switch S0 S1 */ 841 841 }; 842 842 843 - struct PATHDIV_T { /* _ODM_PATH_DIVERSITY_ */ 843 + struct pathdiv_t { /* _ODM_PATH_DIVERSITY_ */ 844 844 u8 RespTxPath; 845 845 u8 PathSel[ODM_ASSOCIATE_ENTRY_NUM]; 846 846 u32 PathA_Sum[ODM_ASSOCIATE_ENTRY_NUM]; ··· 849 849 u32 PathB_Cnt[ODM_ASSOCIATE_ENTRY_NUM]; 850 850 }; 851 851 852 - enum PHY_REG_PG_TYPE { /* _BASEBAND_CONFIG_PHY_REG_PG_VALUE_TYPE */ 852 + enum phy_reg_pg_type { /* _BASEBAND_CONFIG_PHY_REG_PG_VALUE_TYPE */ 853 853 PHY_REG_PG_RELATIVE_VALUE = 0, 854 854 PHY_REG_PG_EXACT_VALUE = 1 855 855 }; ··· 857 857 /* */ 858 858 /* Antenna detection information from single tone mechanism, added by Roger, 2012.11.27. */ 859 859 /* */ 860 - struct ANT_DETECTED_INFO { 860 + struct ant_detected_info { 861 861 bool bAntDetected; 862 862 u32 dBForAntA; 863 863 u32 dBForAntB; ··· 867 867 /* */ 868 868 /* 2011/09/22 MH Copy from SD4 defined structure. We use to support PHY DM integration. */ 869 869 /* */ 870 - struct DM_ODM_T { /* DM_Out_Source_Dynamic_Mechanism_Structure */ 870 + struct dm_odm_t { /* DM_Out_Source_Dynamic_Mechanism_Structure */ 871 871 /* struct timer_list FastAntTrainingTimer; */ 872 872 /* */ 873 873 /* Add for different team use temporarily */ ··· 876 876 /* WHen you use Adapter or priv pointer, you must make sure the pointer is ready. */ 877 877 bool odm_ready; 878 878 879 - enum PHY_REG_PG_TYPE PhyRegPgValueType; 879 + enum phy_reg_pg_type PhyRegPgValueType; 880 880 u8 PhyRegPgVersion; 881 881 882 882 u64 DebugComponents; ··· 1109 1109 /* */ 1110 1110 /* ODM Structure */ 1111 1111 /* */ 1112 - struct FAT_T DM_FatTable; 1112 + struct fat_t DM_FatTable; 1113 1113 struct dig_t DM_DigTable; 1114 1114 struct PS_T DM_PSTable; 1115 1115 struct dynamic_primary_CCA DM_PriCCA; 1116 - struct RXHP_T DM_RXHP_Table; 1117 - struct RA_T DM_RA_Table; 1116 + struct rxhp_t dM_RXHP_Table; 1117 + struct ra_t DM_RA_Table; 1118 1118 struct false_ALARM_STATISTICS FalseAlmCnt; 1119 1119 struct false_ALARM_STATISTICS FlaseAlmCntBuddyAdapter; 1120 - struct SWAT_T DM_SWAT_Table; 1120 + struct swat_t DM_SWAT_Table; 1121 1121 bool RSSI_test; 1122 1122 struct cfo_tracking DM_CfoTrack; 1123 1123 1124 1124 struct edca_t DM_EDCA_Table; 1125 1125 u32 WMMEDCA_BE; 1126 - struct PATHDIV_T DM_PathDiv; 1126 + struct pathdiv_t DM_PathDiv; 1127 1127 /* Copy from SD4 structure */ 1128 1128 /* */ 1129 1129 /* ================================================== */ ··· 1158 1158 /* for rate adaptive, in fact, 88c/92c fw will handle this */ 1159 1159 u8 bUseRAMask; 1160 1160 1161 - struct ODM_RATE_ADAPTIVE RateAdaptive; 1161 + struct odm_rate_adaptive RateAdaptive; 1162 1162 1163 - struct ANT_DETECTED_INFO AntDetectedInfo; /* Antenna detected information for RSSI tool */ 1163 + struct ant_detected_info AntDetectedInfo; /* Antenna detected information for RSSI tool */ 1164 1164 1165 - struct ODM_RF_CAL_T RFCalibrateInfo; 1165 + struct odm_rf_cal_t RFCalibrateInfo; 1166 1166 1167 1167 /* */ 1168 1168 /* TX power tracking */ ··· 1208 1208 1209 1209 #define ODM_RF_PATH_MAX 2 1210 1210 1211 - enum ODM_RF_RADIO_PATH_E { 1211 + enum odm_rf_radio_path_e { 1212 1212 ODM_RF_PATH_A = 0, /* Radio Path A */ 1213 1213 ODM_RF_PATH_B = 1, /* Radio Path B */ 1214 1214 ODM_RF_PATH_C = 2, /* Radio Path C */ ··· 1226 1226 /* ODM_RF_PATH_MAX, Max RF number 90 support */ 1227 1227 }; 1228 1228 1229 - enum ODM_RF_CONTENT { 1229 + enum odm_rf_content { 1230 1230 odm_radioa_txt = 0x1000, 1231 1231 odm_radiob_txt = 0x1001, 1232 1232 odm_radioc_txt = 0x1002, ··· 1259 1259 }; 1260 1260 1261 1261 /* Status code */ 1262 - enum RT_STATUS { 1262 + enum rt_status { 1263 1263 RT_STATUS_SUCCESS, 1264 1264 RT_STATUS_FAILURE, 1265 1265 RT_STATUS_PENDING, ··· 1316 1316 /* 3 BB Power Save */ 1317 1317 /* 3 =========================================================== */ 1318 1318 1319 - enum DM_1R_CCA_E { /* tag_1R_CCA_Type_Definition */ 1319 + enum dm_1r_cca_e { /* tag_1R_CCA_Type_Definition */ 1320 1320 CCA_1R = 0, 1321 1321 CCA_2R = 1, 1322 1322 CCA_MAX = 2, 1323 1323 }; 1324 1324 1325 - enum DM_RF_E { /* tag_RF_Type_Definition */ 1325 + enum dm_rf_e { /* tag_RF_Type_Definition */ 1326 1326 RF_Save = 0, 1327 1327 RF_Normal = 1, 1328 1328 RF_MAX = 2, ··· 1331 1331 /* 3 =========================================================== */ 1332 1332 /* 3 Antenna Diversity */ 1333 1333 /* 3 =========================================================== */ 1334 - enum DM_SWAS_E { /* tag_SW_Antenna_Switch_Definition */ 1334 + enum dm_swas_e { /* tag_SW_Antenna_Switch_Definition */ 1335 1335 Antenna_A = 1, 1336 1336 Antenna_B = 2, 1337 1337 Antenna_MAX = 3, ··· 1368 1368 /* Remove BB power saving by Yuchen */ 1369 1369 1370 1370 #define dm_CheckTXPowerTracking ODM_TXPowerTrackingCheck 1371 - void ODM_TXPowerTrackingCheck(struct DM_ODM_T *pDM_Odm); 1371 + void ODM_TXPowerTrackingCheck(struct dm_odm_t *pDM_Odm); 1372 1372 1373 1373 bool ODM_RAStateCheck( 1374 - struct DM_ODM_T *pDM_Odm, 1374 + struct dm_odm_t *pDM_Odm, 1375 1375 s32 RSSI, 1376 1376 bool bForceUpdate, 1377 1377 u8 *pRATRState ··· 1379 1379 1380 1380 #define dm_SWAW_RSSI_Check ODM_SwAntDivChkPerPktRssi 1381 1381 void ODM_SwAntDivChkPerPktRssi( 1382 - struct DM_ODM_T *pDM_Odm, 1382 + struct dm_odm_t *pDM_Odm, 1383 1383 u8 StationID, 1384 1384 struct odm_phy_info *pPhyInfo 1385 1385 ); 1386 1386 1387 1387 u32 ODM_Get_Rate_Bitmap( 1388 - struct DM_ODM_T *pDM_Odm, 1388 + struct dm_odm_t *pDM_Odm, 1389 1389 u32 macid, 1390 1390 u32 ra_mask, 1391 1391 u8 rssi_level ··· 1395 1395 BEAMFORMING_CAP Beamforming_GetEntryBeamCapByMacId(PMGNT_INFO pMgntInfo, u8 MacId); 1396 1396 #endif 1397 1397 1398 - void odm_TXPowerTrackingInit(struct DM_ODM_T *pDM_Odm); 1398 + void odm_TXPowerTrackingInit(struct dm_odm_t *pDM_Odm); 1399 1399 1400 - void ODM_DMInit(struct DM_ODM_T *pDM_Odm); 1400 + void ODM_DMInit(struct dm_odm_t *pDM_Odm); 1401 1401 1402 - void ODM_DMWatchdog(struct DM_ODM_T *pDM_Odm); /* For common use in the future */ 1402 + void ODM_DMWatchdog(struct dm_odm_t *pDM_Odm); /* For common use in the future */ 1403 1403 1404 - void ODM_CmnInfoInit(struct DM_ODM_T *pDM_Odm, enum ODM_CMNINFO_E CmnInfo, u32 Value); 1404 + void ODM_CmnInfoInit(struct dm_odm_t *pDM_Odm, enum odm_cmninfo_e CmnInfo, u32 Value); 1405 1405 1406 - void ODM_CmnInfoHook(struct DM_ODM_T *pDM_Odm, enum ODM_CMNINFO_E CmnInfo, void *pValue); 1406 + void ODM_CmnInfoHook(struct dm_odm_t *pDM_Odm, enum odm_cmninfo_e CmnInfo, void *pValue); 1407 1407 1408 1408 void ODM_CmnInfoPtrArrayHook( 1409 - struct DM_ODM_T *pDM_Odm, 1410 - enum ODM_CMNINFO_E CmnInfo, 1409 + struct dm_odm_t *pDM_Odm, 1410 + enum odm_cmninfo_e CmnInfo, 1411 1411 u16 Index, 1412 1412 void *pValue 1413 1413 ); 1414 1414 1415 - void ODM_CmnInfoUpdate(struct DM_ODM_T *pDM_Odm, u32 CmnInfo, u64 Value); 1415 + void ODM_CmnInfoUpdate(struct dm_odm_t *pDM_Odm, u32 CmnInfo, u64 Value); 1416 1416 1417 - void ODM_InitAllTimers(struct DM_ODM_T *pDM_Odm); 1417 + void ODM_InitAllTimers(struct dm_odm_t *pDM_Odm); 1418 1418 1419 - void ODM_CancelAllTimers(struct DM_ODM_T *pDM_Odm); 1419 + void ODM_CancelAllTimers(struct dm_odm_t *pDM_Odm); 1420 1420 1421 - void ODM_ReleaseAllTimers(struct DM_ODM_T *pDM_Odm); 1421 + void ODM_ReleaseAllTimers(struct dm_odm_t *pDM_Odm); 1422 1422 1423 1423 void ODM_AntselStatistics_88C( 1424 - struct DM_ODM_T *pDM_Odm, 1424 + struct dm_odm_t *pDM_Odm, 1425 1425 u8 MacId, 1426 1426 u32 PWDBAll, 1427 1427 bool isCCKrate 1428 1428 ); 1429 1429 1430 - void ODM_DynamicARFBSelect(struct DM_ODM_T *pDM_Odm, u8 rate, bool Collision_State); 1430 + void ODM_DynamicARFBSelect(struct dm_odm_t *pDM_Odm, u8 rate, bool Collision_State); 1431 1431 1432 1432 #endif
+8 -8
drivers/staging/rtl8723bs/hal/odm_CfoTracking.c
··· 9 9 10 10 static void odm_SetCrystalCap(void *pDM_VOID, u8 CrystalCap) 11 11 { 12 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 12 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 13 13 struct cfo_tracking *pCfoTrack = &pDM_Odm->DM_CfoTrack; 14 14 15 15 if (pCfoTrack->CrystalCap == CrystalCap) ··· 39 39 40 40 static u8 odm_GetDefaultCrytaltalCap(void *pDM_VOID) 41 41 { 42 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 42 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 43 43 44 44 struct adapter *Adapter = pDM_Odm->Adapter; 45 45 struct hal_com_data *pHalData = GET_HAL_DATA(Adapter); ··· 49 49 50 50 static void odm_SetATCStatus(void *pDM_VOID, bool ATCStatus) 51 51 { 52 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 52 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 53 53 struct cfo_tracking *pCfoTrack = &pDM_Odm->DM_CfoTrack; 54 54 55 55 if (pCfoTrack->bATCStatus == ATCStatus) ··· 67 67 static bool odm_GetATCStatus(void *pDM_VOID) 68 68 { 69 69 bool ATCStatus; 70 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 70 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 71 71 72 72 ATCStatus = (bool)PHY_QueryBBReg( 73 73 pDM_Odm->Adapter, ··· 79 79 80 80 void ODM_CfoTrackingReset(void *pDM_VOID) 81 81 { 82 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 82 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 83 83 struct cfo_tracking *pCfoTrack = &pDM_Odm->DM_CfoTrack; 84 84 85 85 pCfoTrack->DefXCap = odm_GetDefaultCrytaltalCap(pDM_Odm); ··· 91 91 92 92 void ODM_CfoTrackingInit(void *pDM_VOID) 93 93 { 94 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 94 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 95 95 struct cfo_tracking *pCfoTrack = &pDM_Odm->DM_CfoTrack; 96 96 97 97 pCfoTrack->DefXCap = ··· 118 118 119 119 void ODM_CfoTracking(void *pDM_VOID) 120 120 { 121 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 121 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 122 122 struct cfo_tracking *pCfoTrack = &pDM_Odm->DM_CfoTrack; 123 123 int CFO_kHz_A, CFO_kHz_B, CFO_ave = 0; 124 124 int CFO_ave_diff; ··· 297 297 298 298 void ODM_ParsingCFO(void *pDM_VOID, void *pPktinfo_VOID, s8 *pcfotail) 299 299 { 300 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 300 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 301 301 struct odm_packet_info *pPktinfo = pPktinfo_VOID; 302 302 struct cfo_tracking *pCfoTrack = &pDM_Odm->DM_CfoTrack; 303 303 u8 i;
+20 -20
drivers/staging/rtl8723bs/hal/odm_DIG.c
··· 11 11 12 12 void odm_NHMCounterStatisticsInit(void *pDM_VOID) 13 13 { 14 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 14 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 15 15 16 16 /* PHY parameters initialize for n series */ 17 17 rtw_write16(pDM_Odm->Adapter, ODM_REG_NHM_TIMER_11N+2, 0x2710); /* 0x894[31:16]= 0x2710 Time duration for NHM unit: 4us, 0x2710 =40ms */ ··· 27 27 28 28 void odm_NHMCounterStatistics(void *pDM_VOID) 29 29 { 30 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 30 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 31 31 32 32 /* Get NHM report */ 33 33 odm_GetNHMCounterStatistics(pDM_Odm); ··· 38 38 39 39 void odm_GetNHMCounterStatistics(void *pDM_VOID) 40 40 { 41 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 41 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 42 42 u32 value32 = 0; 43 43 44 44 value32 = PHY_QueryBBReg(pDM_Odm->Adapter, ODM_REG_NHM_CNT_11N, bMaskDWord); ··· 48 48 49 49 void odm_NHMCounterStatisticsReset(void *pDM_VOID) 50 50 { 51 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 51 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 52 52 53 53 PHY_SetBBReg(pDM_Odm->Adapter, ODM_REG_NHM_TH9_TH10_11N, BIT1, 0); 54 54 PHY_SetBBReg(pDM_Odm->Adapter, ODM_REG_NHM_TH9_TH10_11N, BIT1, 1); ··· 56 56 57 57 void odm_NHMBBInit(void *pDM_VOID) 58 58 { 59 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 59 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 60 60 61 61 pDM_Odm->adaptivity_flag = 0; 62 62 pDM_Odm->tolerance_cnt = 3; ··· 69 69 /* */ 70 70 void odm_NHMBB(void *pDM_VOID) 71 71 { 72 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 72 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 73 73 /* u8 test_status; */ 74 74 /* struct false_ALARM_STATISTICS *pFalseAlmCnt = &pDM_Odm->FalseAlmCnt; */ 75 75 ··· 133 133 134 134 void odm_SearchPwdBLowerBound(void *pDM_VOID, u8 IGI_target) 135 135 { 136 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 136 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 137 137 u32 value32 = 0; 138 138 u8 cnt, IGI; 139 139 bool bAdjust = true; ··· 205 205 206 206 void odm_AdaptivityInit(void *pDM_VOID) 207 207 { 208 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 208 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 209 209 210 210 if (pDM_Odm->Carrier_Sense_enable == false) 211 211 pDM_Odm->TH_L2H_ini = 0xf7; /* -7 */ ··· 233 233 234 234 void odm_Adaptivity(void *pDM_VOID, u8 IGI) 235 235 { 236 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 236 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 237 237 s8 TH_L2H_dmc, TH_H2L_dmc; 238 238 s8 Diff, IGI_target; 239 239 bool EDCCA_State = false; ··· 322 322 323 323 void ODM_Write_DIG(void *pDM_VOID, u8 CurrentIGI) 324 324 { 325 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 325 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 326 326 struct dig_t *pDM_DigTable = &pDM_Odm->DM_DigTable; 327 327 328 328 if (pDM_DigTable->bStopDIG) { ··· 362 362 u8 IGIValue 363 363 ) 364 364 { 365 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 365 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 366 366 struct dig_t *pDM_DigTable = &pDM_Odm->DM_DigTable; 367 367 static bool bPaused; 368 368 ··· 435 435 436 436 bool odm_DigAbort(void *pDM_VOID) 437 437 { 438 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 438 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 439 439 440 440 /* SupportAbility */ 441 441 if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT)) { ··· 466 466 467 467 void odm_DIGInit(void *pDM_VOID) 468 468 { 469 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 469 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 470 470 struct dig_t *pDM_DigTable = &pDM_Odm->DM_DigTable; 471 471 472 472 pDM_DigTable->bStopDIG = false; ··· 504 504 505 505 void odm_DIG(void *pDM_VOID) 506 506 { 507 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 507 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 508 508 509 509 /* Common parameters */ 510 510 struct dig_t *pDM_DigTable = &pDM_Odm->DM_DigTable; ··· 823 823 824 824 void odm_DIGbyRSSI_LPS(void *pDM_VOID) 825 825 { 826 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 826 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 827 827 struct false_ALARM_STATISTICS *pFalseAlmCnt = &pDM_Odm->FalseAlmCnt; 828 828 829 829 u8 RSSI_Lower = DM_DIG_MIN_NIC; /* 0x1E or 0x1C */ ··· 892 892 893 893 void odm_FalseAlarmCounterStatistics(void *pDM_VOID) 894 894 { 895 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 895 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 896 896 struct false_ALARM_STATISTICS *FalseAlmCnt = &pDM_Odm->FalseAlmCnt; 897 897 u32 ret_value; 898 898 ··· 1062 1062 u32 *dm_FA_thres 1063 1063 ) 1064 1064 { 1065 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 1065 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 1066 1066 1067 1067 if (pDM_Odm->bLinked && (bPerformance || bDFSBand)) { 1068 1068 /* For NIC */ ··· 1078 1078 1079 1079 u8 odm_ForbiddenIGICheck(void *pDM_VOID, u8 DIG_Dynamic_MIN, u8 CurrentIGI) 1080 1080 { 1081 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 1081 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 1082 1082 struct dig_t *pDM_DigTable = &pDM_Odm->DM_DigTable; 1083 1083 struct false_ALARM_STATISTICS *pFalseAlmCnt = &pDM_Odm->FalseAlmCnt; 1084 1084 u8 rx_gain_range_min = pDM_DigTable->rx_gain_range_min; ··· 1134 1134 1135 1135 void odm_CCKPacketDetectionThresh(void *pDM_VOID) 1136 1136 { 1137 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 1137 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 1138 1138 struct false_ALARM_STATISTICS *FalseAlmCnt = &pDM_Odm->FalseAlmCnt; 1139 1139 u8 CurCCK_CCAThres; 1140 1140 ··· 1195 1195 1196 1196 void ODM_Write_CCK_CCA_Thres(void *pDM_VOID, u8 CurCCK_CCAThres) 1197 1197 { 1198 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 1198 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 1199 1199 struct dig_t *pDM_DigTable = &pDM_Odm->DM_DigTable; 1200 1200 1201 1201 /* modify by Guo.Mingzhi 2012-01-03 */
+2 -2
drivers/staging/rtl8723bs/hal/odm_DynamicBBPowerSaving.c
··· 9 9 10 10 void odm_DynamicBBPowerSavingInit(void *pDM_VOID) 11 11 { 12 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 12 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 13 13 struct PS_T *pDM_PSTable = &pDM_Odm->DM_PSTable; 14 14 15 15 pDM_PSTable->PreCCAState = CCA_MAX; ··· 22 22 23 23 void ODM_RF_Saving(void *pDM_VOID, u8 bForceInNormal) 24 24 { 25 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 25 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 26 26 struct PS_T *pDM_PSTable = &pDM_Odm->DM_PSTable; 27 27 u8 Rssi_Up_bound = 30; 28 28 u8 Rssi_Low_bound = 25;
+1 -1
drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.c
··· 9 9 10 10 void odm_DynamicTxPowerInit(void *pDM_VOID) 11 11 { 12 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 12 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 13 13 14 14 struct adapter *Adapter = pDM_Odm->Adapter; 15 15 struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
+3 -3
drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c
··· 31 31 32 32 void ODM_EdcaTurboInit(void *pDM_VOID) 33 33 { 34 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 34 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 35 35 struct adapter *Adapter = pDM_Odm->Adapter; 36 36 37 37 pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA = false; ··· 58 58 * operate at the same time. In stage2/3, we need to prove universal 59 59 * interface and merge all HW dynamic mechanism. 60 60 */ 61 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 61 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 62 62 63 63 ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD, 64 64 ("odm_EdcaTurboCheck ========================>\n")); ··· 73 73 74 74 void odm_EdcaTurboCheckCE(void *pDM_VOID) 75 75 { 76 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 76 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 77 77 struct adapter *Adapter = pDM_Odm->Adapter; 78 78 struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(Adapter); 79 79 struct recv_priv *precvpriv = &(Adapter->recvpriv);
+9 -9
drivers/staging/rtl8723bs/hal/odm_HWConfig.c
··· 23 23 24 24 } 25 25 26 - s32 odm_SignalScaleMapping(struct DM_ODM_T *pDM_Odm, s32 CurrSig) 26 + s32 odm_SignalScaleMapping(struct dm_odm_t *pDM_Odm, s32 CurrSig) 27 27 { 28 28 s32 RetSig = 0; 29 29 ··· 77 77 } 78 78 79 79 static void odm_RxPhyStatus92CSeries_Parsing( 80 - struct DM_ODM_T *pDM_Odm, 80 + struct dm_odm_t *pDM_Odm, 81 81 struct odm_phy_info *pPhyInfo, 82 82 u8 *pPhyStatus, 83 83 struct odm_packet_info *pPktinfo ··· 238 238 } 239 239 240 240 static void odm_Process_RSSIForDM( 241 - struct DM_ODM_T *pDM_Odm, struct odm_phy_info *pPhyInfo, struct odm_packet_info *pPktinfo 241 + struct dm_odm_t *pDM_Odm, struct odm_phy_info *pPhyInfo, struct odm_packet_info *pPktinfo 242 242 ) 243 243 { 244 244 ··· 392 392 /* Endianness before calling this API */ 393 393 /* */ 394 394 static void ODM_PhyStatusQuery_92CSeries( 395 - struct DM_ODM_T *pDM_Odm, 395 + struct dm_odm_t *pDM_Odm, 396 396 struct odm_phy_info *pPhyInfo, 397 397 u8 *pPhyStatus, 398 398 struct odm_packet_info *pPktinfo ··· 406 406 } 407 407 408 408 void ODM_PhyStatusQuery( 409 - struct DM_ODM_T *pDM_Odm, 409 + struct dm_odm_t *pDM_Odm, 410 410 struct odm_phy_info *pPhyInfo, 411 411 u8 *pPhyStatus, 412 412 struct odm_packet_info *pPktinfo ··· 422 422 /* */ 423 423 424 424 enum hal_status ODM_ConfigRFWithHeaderFile( 425 - struct DM_ODM_T *pDM_Odm, 425 + struct dm_odm_t *pDM_Odm, 426 426 enum ODM_RF_Config_Type ConfigType, 427 - enum ODM_RF_RADIO_PATH_E eRFPath 427 + enum odm_rf_radio_path_e eRFPath 428 428 ) 429 429 { 430 430 ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD, ··· 441 441 return HAL_STATUS_SUCCESS; 442 442 } 443 443 444 - enum hal_status ODM_ConfigRFWithTxPwrTrackHeaderFile(struct DM_ODM_T *pDM_Odm) 444 + enum hal_status ODM_ConfigRFWithTxPwrTrackHeaderFile(struct dm_odm_t *pDM_Odm) 445 445 { 446 446 ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD, 447 447 ("===>ODM_ConfigRFWithTxPwrTrackHeaderFile (%s)\n", (pDM_Odm->bIsMPChip) ? "MPChip" : "TestChip")); ··· 456 456 } 457 457 458 458 enum hal_status ODM_ConfigBBWithHeaderFile( 459 - struct DM_ODM_T *pDM_Odm, enum ODM_BB_Config_Type ConfigType 459 + struct dm_odm_t *pDM_Odm, enum ODM_BB_Config_Type ConfigType 460 460 ) 461 461 { 462 462 ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD,
+7 -7
drivers/staging/rtl8723bs/hal/odm_HWConfig.h
··· 122 122 123 123 124 124 void ODM_PhyStatusQuery( 125 - struct DM_ODM_T *pDM_Odm, 125 + struct dm_odm_t *pDM_Odm, 126 126 struct odm_phy_info *pPhyInfo, 127 127 u8 *pPhyStatus, 128 128 struct odm_packet_info *pPktinfo 129 129 ); 130 130 131 - enum hal_status ODM_ConfigRFWithTxPwrTrackHeaderFile(struct DM_ODM_T *pDM_Odm); 131 + enum hal_status ODM_ConfigRFWithTxPwrTrackHeaderFile(struct dm_odm_t *pDM_Odm); 132 132 133 133 enum hal_status ODM_ConfigRFWithHeaderFile( 134 - struct DM_ODM_T *pDM_Odm, 134 + struct dm_odm_t *pDM_Odm, 135 135 enum ODM_RF_Config_Type ConfigType, 136 - enum ODM_RF_RADIO_PATH_E eRFPath 136 + enum odm_rf_radio_path_e eRFPath 137 137 ); 138 138 139 139 enum hal_status ODM_ConfigBBWithHeaderFile( 140 - struct DM_ODM_T *pDM_Odm, enum ODM_BB_Config_Type ConfigType 140 + struct dm_odm_t *pDM_Odm, enum ODM_BB_Config_Type ConfigType 141 141 ); 142 142 143 143 enum hal_status ODM_ConfigFWWithHeaderFile( 144 - struct DM_ODM_T *pDM_Odm, 144 + struct dm_odm_t *pDM_Odm, 145 145 enum ODM_FW_Config_Type ConfigType, 146 146 u8 *pFirmware, 147 147 u32 *pSize 148 148 ); 149 149 150 - s32 odm_SignalScaleMapping(struct DM_ODM_T *pDM_Odm, s32 CurrSig); 150 + s32 odm_SignalScaleMapping(struct dm_odm_t *pDM_Odm, s32 CurrSig); 151 151 152 152 #endif
+1 -1
drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c
··· 19 19 #define ValidCnt 5 20 20 21 21 static s16 odm_InbandNoise_Monitor_NSeries( 22 - struct DM_ODM_T *pDM_Odm, 22 + struct dm_odm_t *pDM_Odm, 23 23 u8 bPauseDIG, 24 24 u8 IGIValue, 25 25 u32 max_time
+2 -2
drivers/staging/rtl8723bs/hal/odm_PathDiv.c
··· 9 9 10 10 void odm_PathDiversityInit(void *pDM_VOID) 11 11 { 12 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 12 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 13 13 14 14 if (!(pDM_Odm->SupportAbility & ODM_BB_PATH_DIV)) 15 15 ODM_RT_TRACE( ··· 22 22 23 23 void odm_PathDiversity(void *pDM_VOID) 24 24 { 25 - struct DM_ODM_T *pDM_Odm = (struct DM_ODM_T *)pDM_VOID; 25 + struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; 26 26 27 27 if (!(pDM_Odm->SupportAbility & ODM_BB_PATH_DIV)) 28 28 ODM_RT_TRACE(
+8 -8
drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c
··· 8 8 #include "odm_precomp.h" 9 9 10 10 void odm_ConfigRFReg_8723B( 11 - struct DM_ODM_T *pDM_Odm, 11 + struct dm_odm_t *pDM_Odm, 12 12 u32 Addr, 13 13 u32 Data, 14 - enum ODM_RF_RADIO_PATH_E RF_PATH, 14 + enum odm_rf_radio_path_e RF_PATH, 15 15 u32 RegAddr 16 16 ) 17 17 { ··· 106 106 } 107 107 108 108 109 - void odm_ConfigRF_RadioA_8723B(struct DM_ODM_T *pDM_Odm, u32 Addr, u32 Data) 109 + void odm_ConfigRF_RadioA_8723B(struct dm_odm_t *pDM_Odm, u32 Addr, u32 Data) 110 110 { 111 111 u32 content = 0x1000; /* RF_Content: radioa_txt */ 112 112 u32 maskforPhySet = (u32)(content&0xE000); ··· 131 131 ); 132 132 } 133 133 134 - void odm_ConfigMAC_8723B(struct DM_ODM_T *pDM_Odm, u32 Addr, u8 Data) 134 + void odm_ConfigMAC_8723B(struct dm_odm_t *pDM_Odm, u32 Addr, u8 Data) 135 135 { 136 136 rtw_write8(pDM_Odm->Adapter, Addr, Data); 137 137 ODM_RT_TRACE( ··· 147 147 } 148 148 149 149 void odm_ConfigBB_AGC_8723B( 150 - struct DM_ODM_T *pDM_Odm, 150 + struct dm_odm_t *pDM_Odm, 151 151 u32 Addr, 152 152 u32 Bitmask, 153 153 u32 Data ··· 170 170 } 171 171 172 172 void odm_ConfigBB_PHY_REG_PG_8723B( 173 - struct DM_ODM_T *pDM_Odm, 173 + struct dm_odm_t *pDM_Odm, 174 174 u32 Band, 175 175 u32 RfPath, 176 176 u32 TxNum, ··· 198 198 } 199 199 200 200 void odm_ConfigBB_PHY_8723B( 201 - struct DM_ODM_T *pDM_Odm, 201 + struct dm_odm_t *pDM_Odm, 202 202 u32 Addr, 203 203 u32 Bitmask, 204 204 u32 Data ··· 226 226 } 227 227 228 228 void odm_ConfigBB_TXPWR_LMT_8723B( 229 - struct DM_ODM_T *pDM_Odm, 229 + struct dm_odm_t *pDM_Odm, 230 230 u8 *Regulation, 231 231 u8 *Band, 232 232 u8 *Bandwidth,
+8 -8
drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h
··· 7 7 #ifndef __INC_ODM_REGCONFIG_H_8723B 8 8 #define __INC_ODM_REGCONFIG_H_8723B 9 9 10 - void odm_ConfigRFReg_8723B(struct DM_ODM_T *pDM_Odm, 10 + void odm_ConfigRFReg_8723B(struct dm_odm_t *pDM_Odm, 11 11 u32 Addr, 12 12 u32 Data, 13 - enum ODM_RF_RADIO_PATH_E RF_PATH, 13 + enum odm_rf_radio_path_e RF_PATH, 14 14 u32 RegAddr 15 15 ); 16 16 17 - void odm_ConfigRF_RadioA_8723B(struct DM_ODM_T *pDM_Odm, u32 Addr, u32 Data); 17 + void odm_ConfigRF_RadioA_8723B(struct dm_odm_t *pDM_Odm, u32 Addr, u32 Data); 18 18 19 - void odm_ConfigMAC_8723B(struct DM_ODM_T *pDM_Odm, u32 Addr, u8 Data); 19 + void odm_ConfigMAC_8723B(struct dm_odm_t *pDM_Odm, u32 Addr, u8 Data); 20 20 21 - void odm_ConfigBB_AGC_8723B(struct DM_ODM_T *pDM_Odm, 21 + void odm_ConfigBB_AGC_8723B(struct dm_odm_t *pDM_Odm, 22 22 u32 Addr, 23 23 u32 Bitmask, 24 24 u32 Data 25 25 ); 26 26 27 - void odm_ConfigBB_PHY_REG_PG_8723B(struct DM_ODM_T *pDM_Odm, 27 + void odm_ConfigBB_PHY_REG_PG_8723B(struct dm_odm_t *pDM_Odm, 28 28 u32 Band, 29 29 u32 RfPath, 30 30 u32 TxNum, ··· 33 33 u32 Data 34 34 ); 35 35 36 - void odm_ConfigBB_PHY_8723B(struct DM_ODM_T *pDM_Odm, 36 + void odm_ConfigBB_PHY_8723B(struct dm_odm_t *pDM_Odm, 37 37 u32 Addr, 38 38 u32 Bitmask, 39 39 u32 Data 40 40 ); 41 41 42 - void odm_ConfigBB_TXPWR_LMT_8723B(struct DM_ODM_T *pDM_Odm, 42 + void odm_ConfigBB_TXPWR_LMT_8723B(struct dm_odm_t *pDM_Odm, 43 43 u8 *Regulation, 44 44 u8 *Band, 45 45 u8 *Bandwidth,
+1 -1
drivers/staging/rtl8723bs/hal/odm_debug.c
··· 7 7 8 8 #include "odm_precomp.h" 9 9 10 - void ODM_InitDebugSetting(struct DM_ODM_T *pDM_Odm) 10 + void ODM_InitDebugSetting(struct dm_odm_t *pDM_Odm) 11 11 { 12 12 pDM_Odm->DebugLevel = ODM_DBG_LOUD; 13 13
+1 -1
drivers/staging/rtl8723bs/hal/odm_debug.h
··· 162 162 no_printk("%s %p", title_str, ptr) 163 163 #endif 164 164 165 - void ODM_InitDebugSetting(struct DM_ODM_T *pDM_Odm); 165 + void ODM_InitDebugSetting(struct dm_odm_t *pDM_Odm); 166 166 167 167 #endif /* __ODM_DBG_H__ */
+5 -5
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c
··· 25 25 { 26 26 27 27 struct hal_com_data *pHalData = GET_HAL_DATA(Adapter); 28 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 28 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 29 29 struct dm_priv *pdmpriv = &pHalData->dmpriv; 30 30 u8 cut_ver, fab_ver; 31 31 ··· 74 74 struct dvobj_priv *dvobj = adapter_to_dvobj(Adapter); 75 75 struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(Adapter); 76 76 struct hal_com_data *pHalData = GET_HAL_DATA(Adapter); 77 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 77 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 78 78 struct dm_priv *pdmpriv = &pHalData->dmpriv; 79 79 int i; 80 80 u8 zero = 0; ··· 126 126 { 127 127 struct hal_com_data *pHalData = GET_HAL_DATA(Adapter); 128 128 struct dm_priv *pdmpriv = &pHalData->dmpriv; 129 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 129 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 130 130 131 131 pdmpriv->DM_Type = DM_Type_ByDriver; 132 132 pdmpriv->DMFlag = DYNAMIC_FUNC_DISABLE; ··· 200 200 u32 PWDB_rssi = 0; 201 201 struct mlme_priv *pmlmepriv = &padapter->mlmepriv; 202 202 struct hal_com_data *pHalData = GET_HAL_DATA(padapter); 203 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 203 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 204 204 struct sta_priv *pstapriv = &padapter->stapriv; 205 205 struct sta_info *psta = NULL; 206 206 ··· 226 226 struct hal_com_data *pHalData = GET_HAL_DATA(Adapter); 227 227 struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; 228 228 struct dm_priv *pdmpriv = &pHalData->dmpriv; 229 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 229 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 230 230 struct dig_t *pDM_DigTable = &pDM_Odm->DM_DigTable; 231 231 struct sta_priv *pstapriv = &Adapter->stapriv; 232 232 struct sta_info *psta = NULL;
+2 -2
drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
··· 594 594 void PHY_SetTxPowerLevel8723B(struct adapter *Adapter, u8 Channel) 595 595 { 596 596 struct hal_com_data *pHalData = GET_HAL_DATA(Adapter); 597 - struct DM_ODM_T *pDM_Odm = &pHalData->odmpriv; 598 - struct FAT_T *pDM_FatTable = &pDM_Odm->DM_FatTable; 597 + struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; 598 + struct fat_t *pDM_FatTable = &pDM_Odm->DM_FatTable; 599 599 u8 RFPath = ODM_RF_PATH_A; 600 600 601 601 if (pHalData->AntDivCfg) {/* antenna diversity Enable */
+1 -1
drivers/staging/rtl8723bs/include/hal_data.h
··· 431 431 u32 sdio_tx_max_len[SDIO_MAX_TX_QUEUE];/* H, N, L, used for sdio tx aggregation max length per queue */ 432 432 433 433 struct dm_priv dmpriv; 434 - struct DM_ODM_T odmpriv; 434 + struct dm_odm_t odmpriv; 435 435 436 436 /* For bluetooth co-existance */ 437 437 struct bt_coexist bt_coexist;