Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...

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

diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/OUTSRC/odm_AntDiv.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/OUTSRC/odm_AntDiv.c
index 4b361e2c5d5ec63b9915693d349453b8651b31e6..1f21d6c5c00e1c763a52fc49909b511f1ec445f6 100755 (executable)
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/OUTSRC/odm_AntDiv.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/OUTSRC/odm_AntDiv.c
@@ -163,12 +163,12 @@ odm_RX_HWAntDiv_Init_88E(
 \r
        pDM_Odm->AntType = ODM_AUTO_ANT;\r
 \r
-        #if (MP_DRIVER == 1)\r
+#if (MP_DRIVER == 1)\r
                pDM_Odm->AntDivType = CGCS_RX_SW_ANTDIV;\r
                ODM_SetBBReg(pDM_Odm, ODM_REG_IGI_A_11N , BIT7, 0); // disable HW AntDiv \r
                ODM_SetBBReg(pDM_Odm, ODM_REG_LNA_SWITCH_11N , BIT31, 1);  // 1:CG, 0:CS\r
                return;\r
-        #endif\r
+#else\r
        \r
        ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("***8188E AntDiv_Init =>  AntDivType=[CGCS_RX_HW_ANTDIV]\n"));\r
        \r
@@ -188,6 +188,7 @@ odm_RX_HWAntDiv_Init_88E(
        \r
        ODM_SetBBReg(pDM_Odm, ODM_REG_ANT_MAPPING1_11N , 0xFFFF, 0x0102);       //antenna mapping table\r
 \r
+#endif\r
 }\r
 \r
 VOID\r
@@ -197,12 +198,12 @@ odm_TRX_HWAntDiv_Init_88E(
 {\r
        u4Byte  value32;\r
        \r
-        #if (MP_DRIVER == 1)\r
+#if (MP_DRIVER == 1)\r
                pDM_Odm->AntDivType = CGCS_RX_SW_ANTDIV;\r
                ODM_SetBBReg(pDM_Odm, ODM_REG_IGI_A_11N , BIT7, 0); // disable HW AntDiv \r
                ODM_SetBBReg(pDM_Odm, ODM_REG_RX_ANT_CTRL_11N , BIT5|BIT4|BIT3, 0); //Default RX   (0/1)\r
                return;\r
-        #endif\r
+#else\r
 \r
        ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("***8188E AntDiv_Init =>  AntDivType=[CG_TRX_HW_ANTDIV (SPDT)]\n"));\r
        \r
@@ -228,6 +229,7 @@ odm_TRX_HWAntDiv_Init_88E(
        }\r
        else //MPchip\r
                ODM_SetBBReg(pDM_Odm, ODM_REG_ANT_MAPPING1_11N , bMaskDWord, 0x0201);   //Reg914=3'b010, Reg915=3'b001\r
+#endif\r
 }\r
 \r
 VOID\r
@@ -244,7 +246,7 @@ odm_Smart_HWAntDiv_Init_88E(
 #if (MP_DRIVER == 1)\r
     ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD, ("pDM_Odm->AntDivType: %d\n", pDM_Odm->AntDivType));\r
     return;\r
-#endif\r
+#else\r
 \r
        for(i=0; i<6; i++)\r
        {\r
@@ -335,6 +337,8 @@ odm_Smart_HWAntDiv_Init_88E(
        //PHY_SetBBReg(Adapter, 0x864 , BIT11, 1);\r
        //PHY_SetBBReg(Adapter, 0x860 , BIT9, 0);\r
        //PHY_SetBBReg(Adapter, 0x860 , BIT8, 0);\r
+\r
+#endif\r
 }\r
 #endif //#if (RTL8188E_SUPPORT == 1)\r
 \r
@@ -2017,7 +2021,7 @@ ODM_AntDiv(
        #if (RTL8821A_SUPPORT == 1)\r
        else if(pDM_Odm->SupportICType == ODM_RTL8821)\r
        {\r
-               if(pDM_Odm->bBtDisabled)  //BT disabled\r
+               if(!pDM_Odm->bBtEnabled)  //BT disabled\r
                {\r
                        if(pDM_Odm->AntDivType == S0S1_SW_ANTDIV)\r
                        {\r