projects / firefly-linux-kernel-4.4.55.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 / rtl8723b / HalHWImg8723B_MAC.c
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bu/hal/OUTSRC/rtl8723b/HalHWImg8723B_MAC.c b/drivers/net/wireless/rockchip_wlan/rtl8723bu/hal/OUTSRC/rtl8723b/HalHWImg8723B_MAC.c
index 74c100e9f9317fcd7a80dcebddff1a2824426c6e..acb9952ce6893d5ce3372fb90f08e8e23f7ae751 100755 (executable)
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bu/hal/OUTSRC/rtl8723b/HalHWImg8723B_MAC.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bu/hal/OUTSRC/rtl8723b/HalHWImg8723B_MAC.c
@@ -18,6 +18,7 @@
 * \r
 ******************************************************************************/\r
 \r
+/*Image2HeaderVersion: 2.9*/\r
 #include "Mp_Precomp.h"\r
 #include "../phydm_precomp.h"\r
 \r
@@ -36,11 +37,12 @@ CheckPositive(
                            ((pDM_Odm->BoardType & BIT2) >> 2) << 4;  // _BT  \r
 \r
        u4Byte    cond1   = Condition1, cond2 = Condition2;\r
-       u4Byte    driver1 = pDM_Odm->CutVersion       << 24 |  \r
-                               pDM_Odm->SupportPlatform  << 16 | \r
-                               pDM_Odm->PackageType      << 12 | \r
-                               pDM_Odm->SupportInterface << 8  |\r
-                               _BoardType;\r
+       u4Byte    driver1 = pDM_Odm->CutVersion       << 24 | \r
+                               (pDM_Odm->SupportInterface & 0xF0) << 16 | \r
+                               pDM_Odm->SupportPlatform  << 16 | \r
+                               pDM_Odm->PackageType      << 12 | \r
+                               (pDM_Odm->SupportInterface & 0x0F) << 8  |\r
+                               _BoardType;\r
 \r
        u4Byte    driver2 = pDM_Odm->TypeGLNA <<  0 |  \r
                                pDM_Odm->TypeGPA  <<  8 | \r
@@ -58,44 +60,41 @@ CheckPositive(
                 ("     (Board, Package) = (0x%X, 0x%X)\n", pDM_Odm->BoardType, pDM_Odm->PackageType));\r
 \r
 \r
-       //============== Value Defined Check ===============//\r
-       //QFN Type [15:12] and Cut Version [27:24] need to do value check\r
+       /*============== Value Defined Check ===============*/\r
+       /*QFN Type [15:12] and Cut Version [27:24] need to do value check*/\r
        \r
-       if(((cond1 & 0x0000F000) != 0) &&((cond1 & 0x0000F000) != (driver1 & 0x0000F000)))\r
+       if (((cond1 & 0x0000F000) != 0) && ((cond1 & 0x0000F000) != (driver1 & 0x0000F000)))\r
                return FALSE;\r
-       if(((cond1 & 0x0F000000) != 0) &&((cond1 & 0x0F000000) != (driver1 & 0x0F000000)))\r
-               return FALSE;           \r
+       if (((cond1 & 0x0F000000) != 0) && ((cond1 & 0x0F000000) != (driver1 & 0x0F000000)))\r
+               return FALSE;\r
+\r
+       /*=============== Bit Defined Check ================*/\r
+       /* We don't care [31:28] */\r
+\r
+       cond1   &= 0x00FF0FFF; \r
+       driver1 &= 0x00FF0FFF; \r
 \r
-       //=============== Bit Defined Check ================//\r
-    // We don't care [31:28] and [23:20]\r
-    //\r
-       cond1   &= 0x000F0FFF; \r
-       driver1 &= 0x000F0FFF; \r
+       if ((cond1 & driver1) == cond1) {\r
+               u4Byte bitMask = 0;\r
 \r
-    if ((cond1 & driver1) == cond1) \r
-    {\r
-        u4Byte bitMask = 0;\r
-        if ((cond1 & 0x0F) == 0) // BoardType is DONTCARE\r
+               if ((cond1 & 0x0F) == 0) /* BoardType is DONTCARE*/\r
             return TRUE;\r
 \r
-        if ((cond1 & BIT0) != 0) //GLNA\r
+               if ((cond1 & BIT0) != 0) /*GLNA*/\r
             bitMask |= 0x000000FF;\r
-        if ((cond1 & BIT1) != 0) //GPA\r
+               if ((cond1 & BIT1) != 0) /*GPA*/\r
             bitMask |= 0x0000FF00;\r
-        if ((cond1 & BIT2) != 0) //ALNA\r
+               if ((cond1 & BIT2) != 0) /*ALNA*/\r
             bitMask |= 0x00FF0000;\r
-        if ((cond1 & BIT3) != 0) //APA\r
+               if ((cond1 & BIT3) != 0) /*APA*/\r
             bitMask |= 0xFF000000;\r
 \r
-        if ((cond2 & bitMask) == (driver2 & bitMask)) // BoardType of each RF path is matched\r
+               if ((cond2 & bitMask) == (driver2 & bitMask)) /* BoardType of each RF path is matched*/\r
             return TRUE;\r
-        else\r
+               else\r
             return FALSE;\r
-    }\r
-    else \r
-    {\r
+               } else\r
         return FALSE;\r
-    }\r
 }\r
 static BOOLEAN\r
 CheckNegative(\r
@@ -115,9 +114,9 @@ u4Byte Array_MP_8723B_MAC_REG[] = {
                0x02F, 0x00000030,\r
                0x035, 0x00000000,\r
                0x039, 0x00000008,\r
-               0x04E, 0x000000E0,\r
                0x064, 0x00000000,\r
                0x067, 0x00000020,\r
+               0x421, 0x0000000F,\r
                0x428, 0x0000000A,\r
                0x429, 0x00000010,\r
                0x430, 0x00000000,\r
@@ -226,58 +225,42 @@ ODM_ReadAndConfig_MP_8723B_MAC_REG(
     u4Byte     i         = 0;\r
     u1Byte     cCond;\r
     BOOLEAN bMatched = TRUE, bSkipped = FALSE;\r
-//ask by Luke.Lee\r
     u4Byte     ArrayLen    = sizeof(Array_MP_8723B_MAC_REG)/sizeof(u4Byte);\r
     pu4Byte    Array       = Array_MP_8723B_MAC_REG;\r
        \r
     ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD, ("===> ODM_ReadAndConfig_MP_8723B_MAC_REG\n"));\r
 \r
-       while(( i+1) < ArrayLen)\r
-       {\r
+       while ((i + 1) < ArrayLen) {\r
                u4Byte v1 = Array[i];\r
                u4Byte v2 = Array[i+1];\r
 \r
-               if(v1 & (BIT31|BIT30)) //positive & negative condition\r
-               {\r
-                       if(v1 & BIT31) // positive condition\r
-                       {\r
+               if (v1 & (BIT31 | BIT30)) {/*positive & negative condition*/\r
+                       if (v1 & BIT31) {/* positive condition*/\r
                                cCond  = (u1Byte)((v1 & (BIT29|BIT28)) >> 28);\r
-                               if(cCond == COND_ENDIF) //end\r
-                               {\r
+                               if (cCond == COND_ENDIF) {/*end*/\r
                                        bMatched = TRUE;\r
                                        bSkipped = FALSE;\r
-                               }\r
-                               else if(cCond == COND_ELSE) //else\r
-                               {\r
+                               } else if (cCond == COND_ELSE) /*else*/\r
                                        bMatched = bSkipped?FALSE:TRUE;\r
-                               }\r
-                               else //if , else if\r
-                               {\r
-                                       if(bSkipped)\r
+                               else {/*if , else if*/\r
+                                       if (bSkipped)\r
                                                bMatched = FALSE;\r
-                                       else\r
-                                       {\r
-                                               if(CheckPositive(pDM_Odm, v1, v2))\r
-                                               {\r
+                                       else {\r
+                                               if (CheckPositive(pDM_Odm, v1, v2)) {\r
                                                        bMatched = TRUE;\r
                                                        bSkipped = TRUE;\r
-                                               }\r
-                                               else\r
-                                               {\r
+                                               } else {\r
                                                        bMatched = FALSE;\r
                                                        bSkipped = FALSE;\r
                                                }\r
                                        }\r
                                }\r
+                       } else if (v1 & BIT30) { /*negative condition*/\r
+                       /*do nothing*/\r
                        }\r
-                       else if(v1 & BIT30){ //negative condition\r
-                       //do nothing\r
-                       }\r
-               }\r
-               else\r
-               {\r
-                       if(bMatched)\r
-                       odm_ConfigMAC_8723B(pDM_Odm, v1, (u1Byte)v2);\r
+               } else {\r
+                       if (bMatched)\r
+                               odm_ConfigMAC_8723B(pDM_Odm, v1, (u1Byte)v2);\r
                }\r
        i = i + 2;\r
        }\r
@@ -286,8 +269,8 @@ ODM_ReadAndConfig_MP_8723B_MAC_REG(
 u4Byte\r
 ODM_GetVersion_MP_8723B_MAC_REG(void)\r
 {\r
-          return 12;\r
+          return 18;\r
 }\r
 \r
-#endif // end of HWIMG_SUPPORT\r
+#endif /* end of HWIMG_SUPPORT*/\r
 \r
Unnamed repository; edit this file 'description' to name the repository.