8723BU: Update 8723BU wifi driver to version v4.3.16_14189.20150519_BTCOEX2015119...

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / rockchip_wlan / rtl8723bu / hal / OUTSRC / phydm_AntDect.c

diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bu/hal/OUTSRC/phydm_AntDect.c b/drivers/net/wireless/rockchip_wlan/rtl8723bu/hal/OUTSRC/phydm_AntDect.c
index d6a1c5d86fafdd7e0345b2a954ed71502ee057bf..baa1fc4a06f3f3f1524fca8c7991ff25b444ee83 100755 (executable)
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bu/hal/OUTSRC/phydm_AntDect.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bu/hal/OUTSRC/phydm_AntDect.c
@@ -25,7 +25,8 @@
 #include "Mp_Precomp.h"\r
 #include "phydm_precomp.h"\r
 \r
-#if( DM_ODM_SUPPORT_TYPE & (ODM_WIN |ODM_CE))\r
+//#if( DM_ODM_SUPPORT_TYPE & (ODM_WIN |ODM_CE))\r
+#if(defined(CONFIG_ANT_DETECTION))\r
 \r
 //IS_ANT_DETECT_SUPPORT_SINGLE_TONE(Adapter)   \r
 //IS_ANT_DETECT_SUPPORT_RSSI(Adapter)          \r
@@ -36,12 +37,13 @@
 \r
 VOID\r
 odm_PHY_SaveAFERegisters(\r
-       IN      PDM_ODM_T       pDM_Odm,\r
+       IN      PVOID           pDM_VOID,\r
        IN      pu4Byte         AFEReg,\r
        IN      pu4Byte         AFEBackup,\r
        IN      u4Byte          RegisterNum\r
        )\r
 {\r
+       PDM_ODM_T               pDM_Odm = (PDM_ODM_T)pDM_VOID;\r
        u4Byte  i;\r
        \r
        //RT_DISP(FINIT, INIT_IQK, ("Save ADDA parameters.\n"));\r
@@ -52,12 +54,13 @@ odm_PHY_SaveAFERegisters(
 \r
 VOID\r
 odm_PHY_ReloadAFERegisters(\r
-       IN      PDM_ODM_T       pDM_Odm,\r
+       IN      PVOID           pDM_VOID,\r
        IN      pu4Byte         AFEReg,\r
        IN      pu4Byte         AFEBackup,\r
        IN      u4Byte          RegiesterNum\r
        )\r
 {\r
+       PDM_ODM_T               pDM_Odm = (PDM_ODM_T)pDM_VOID;\r
        u4Byte  i;\r
 \r
        //RT_DISP(FINIT, INIT_IQK, ("Reload ADDA power saving parameters !\n"));\r
@@ -76,9 +79,10 @@ odm_PHY_ReloadAFERegisters(
 //\r
 VOID\r
 ODM_SingleDualAntennaDefaultSetting(\r
-       IN              PDM_ODM_T               pDM_Odm\r
+       IN              PVOID           pDM_VOID\r
        )\r
 {\r
+       PDM_ODM_T               pDM_Odm = (PDM_ODM_T)pDM_VOID;\r
        pSWAT_T         pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;\r
        PADAPTER        pAdapter         =  pDM_Odm->Adapter;\r
 \r
@@ -113,10 +117,11 @@ ODM_SingleDualAntennaDefaultSetting(
 //\r
 BOOLEAN\r
 ODM_SingleDualAntennaDetection(\r
-       IN              PDM_ODM_T               pDM_Odm,\r
+       IN              PVOID           pDM_VOID,\r
        IN              u1Byte                  mode\r
        )\r
 {\r
+       PDM_ODM_T               pDM_Odm = (PDM_ODM_T)pDM_VOID;\r
        PADAPTER        pAdapter         =  pDM_Odm->Adapter;\r
        pSWAT_T         pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;\r
        u4Byte          CurrentChannel,RfLoopReg;\r
@@ -492,30 +497,17 @@ ODM_SingleDualAntennaDetection(
 //1 [2. Scan AP RSSI Method] ==================================================\r
 \r
 \r
-void\r
-odm_SwAntDetectInit(\r
-       IN              PDM_ODM_T               pDM_Odm\r
-       )\r
-{\r
-       pSWAT_T         pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;\r
-       \r
-       //pDM_SWAT_Table->SWAS_NoLink_BK_Reg92c = ODM_Read4Byte(pDM_Odm, rDPDT_control);\r
-       //pDM_SWAT_Table->PreAntenna = MAIN_ANT;\r
-       //pDM_SWAT_Table->CurAntenna = MAIN_ANT;\r
-       pDM_SWAT_Table->SWAS_NoLink_State = 0;\r
-       pDM_SWAT_Table->Pre_Aux_FailDetec = FALSE;\r
-       pDM_SWAT_Table->SWAS_NoLink_BK_Reg948 = 0xff;\r
-}\r
 \r
 \r
 BOOLEAN\r
 ODM_SwAntDivCheckBeforeLink(\r
-       IN              PDM_ODM_T               pDM_Odm\r
+       IN              PVOID           pDM_VOID\r
        )\r
 {\r
 \r
 #if (RT_MEM_SIZE_LEVEL != RT_MEM_SIZE_MINIMUM)\r
 \r
+       PDM_ODM_T               pDM_Odm = (PDM_ODM_T)pDM_VOID;\r
        PADAPTER                Adapter = pDM_Odm->Adapter;\r
        HAL_DATA_TYPE*  pHalData = GET_HAL_DATA(Adapter);\r
        PMGNT_INFO              pMgntInfo = &Adapter->MgntInfo;\r
@@ -971,10 +963,11 @@ return FALSE;
 \r
 u4Byte\r
 odm_GetPSDData(\r
-       IN PDM_ODM_T    pDM_Odm,\r
+       IN      PVOID                   pDM_VOID,\r
        IN u2Byte                       point,\r
        IN u1Byte               initial_gain)\r
 {\r
+       PDM_ODM_T               pDM_Odm = (PDM_ODM_T)pDM_VOID;\r
        u4Byte                  psd_report;\r
        \r
        ODM_SetBBReg(pDM_Odm, 0x808, 0x3FF, point);\r
@@ -983,7 +976,7 @@ odm_GetPSDData(
        ODM_SetBBReg(pDM_Odm, 0x808, BIT22, 0);//Stop PSD calculation,  Reg808[22]=1->0\r
        psd_report = ODM_GetBBReg(pDM_Odm,0x8B4, bMaskDWord) & 0x0000FFFF;//Read PSD report, Reg8B4[15:0]\r
        \r
-       psd_report = (u4Byte) (ConvertTo_dB(psd_report));//+(u4Byte)(initial_gain);\r
+       psd_report = (u4Byte) (odm_ConvertTo_dB(psd_report));//+(u4Byte)(initial_gain);\r
        return psd_report;\r
 }\r
 \r
@@ -991,9 +984,10 @@ odm_GetPSDData(
 \r
 VOID\r
 ODM_SingleDualAntennaDetection_PSD(\r
-       IN       PDM_ODM_T      pDM_Odm\r
+       IN       PVOID  pDM_VOID\r
 )\r
 {\r
+       PDM_ODM_T               pDM_Odm = (PDM_ODM_T)pDM_VOID;\r
        PADAPTER        pAdapter         =  pDM_Odm->Adapter;\r
        pSWAT_T         pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;\r
        u4Byte  Channel_ori;\r
@@ -1200,7 +1194,22 @@ ODM_SingleDualAntennaDetection_PSD(
 \r
 }\r
 \r
+#endif\r
+void\r
+odm_SwAntDetectInit(\r
+       IN              PVOID           pDM_VOID\r
+       )\r
+{\r
+#if(defined(CONFIG_ANT_DETECTION))\r
+       PDM_ODM_T               pDM_Odm = (PDM_ODM_T)pDM_VOID;\r
+       pSWAT_T         pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;\r
 \r
-\r
-\r
+       //pDM_SWAT_Table->SWAS_NoLink_BK_Reg92c = ODM_Read4Byte(pDM_Odm, rDPDT_control);\r
+       //pDM_SWAT_Table->PreAntenna = MAIN_ANT;\r
+       //pDM_SWAT_Table->CurAntenna = MAIN_ANT;\r
+       pDM_SWAT_Table->SWAS_NoLink_State = 0;\r
+       pDM_SWAT_Table->Pre_Aux_FailDetec = FALSE;\r
+       pDM_SWAT_Table->SWAS_NoLink_BK_Reg948 = 0xff;\r
 #endif\r
+}\r
+\r