X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=drivers%2Fstaging%2Frtl8723bs%2Fhal%2FHalHWImg8723B_MAC.c;h=cd4f90aeb6ad7cfac1085530d8b16639311a5b88;hb=837bc3dc713b2a876445614333cf844d6a5c4303;hp=c2f138bc4eea17ed5cefde163abf778a6121b5bc;hpb=7e3f85d9883e7f4aa508db679bd215974d81138d;p=android-x86%2Fkernel.git diff --git a/drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c b/drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c index c2f138bc4eea..cd4f90aeb6ad 100644 --- a/drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c +++ b/drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c @@ -11,11 +11,6 @@ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. * -* You should have received a copy of the GNU General Public License along with -* this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -* -* ******************************************************************************/ @@ -23,85 +18,79 @@ static bool CheckPositive( - IN PDM_ODM_T pDM_Odm, - IN const u4Byte Condition1, - IN const u4Byte Condition2 - ) + PDM_ODM_T pDM_Odm, + const u32 Condition1, + const u32 Condition2 + ) { - u1Byte _BoardType = ((pDM_Odm->BoardType & BIT4) >> 4) << 0 | // _GLNA - ((pDM_Odm->BoardType & BIT3) >> 3) << 1 | // _GPA - ((pDM_Odm->BoardType & BIT7) >> 7) << 2 | // _ALNA - ((pDM_Odm->BoardType & BIT6) >> 6) << 3 | // _APA - ((pDM_Odm->BoardType & BIT2) >> 2) << 4; // _BT + u8 _BoardType = ((pDM_Odm->BoardType & BIT4) >> 4) << 0 | /* _GLNA */ + ((pDM_Odm->BoardType & BIT3) >> 3) << 1 | /* _GPA */ + ((pDM_Odm->BoardType & BIT7) >> 7) << 2 | /* _ALNA */ + ((pDM_Odm->BoardType & BIT6) >> 6) << 3 | /* _APA */ + ((pDM_Odm->BoardType & BIT2) >> 2) << 4; /* _BT */ - u4Byte cond1 = Condition1, cond2 = Condition2; - u4Byte driver1 = pDM_Odm->CutVersion << 24 | + u32 cond1 = Condition1, cond2 = Condition2; + u32 driver1 = pDM_Odm->CutVersion << 24 | pDM_Odm->SupportPlatform << 16 | pDM_Odm->PackageType << 12 | pDM_Odm->SupportInterface << 8 | _BoardType; - u4Byte driver2 = pDM_Odm->TypeGLNA << 0 | + u32 driver2 = pDM_Odm->TypeGLNA << 0 | pDM_Odm->TypeGPA << 8 | pDM_Odm->TypeALNA << 16 | pDM_Odm->TypeAPA << 24; - ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_TRACE, + ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_TRACE, ("===> [8812A] CheckPositive (cond1, cond2) = (0x%X 0x%X)\n", cond1, cond2)); - ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_TRACE, + ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_TRACE, ("===> [8812A] CheckPositive (driver1, driver2) = (0x%X 0x%X)\n", driver1, driver2)); - ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_TRACE, + ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_TRACE, (" (Platform, Interface) = (0x%X, 0x%X)\n", pDM_Odm->SupportPlatform, pDM_Odm->SupportInterface)); - ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_TRACE, + ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_TRACE, (" (Board, Package) = (0x%X, 0x%X)\n", pDM_Odm->BoardType, pDM_Odm->PackageType)); - //============== Value Defined Check ===============// - //QFN Type [15:12] and Cut Version [27:24] need to do value check + /* Value Defined Check =============== */ + /* QFN Type [15:12] and Cut Version [27:24] need to do value check */ - if(((cond1 & 0x0000F000) != 0) &&((cond1 & 0x0000F000) != (driver1 & 0x0000F000))) + if (((cond1 & 0x0000F000) != 0) && ((cond1 & 0x0000F000) != (driver1 & 0x0000F000))) return false; - if(((cond1 & 0x0F000000) != 0) &&((cond1 & 0x0F000000) != (driver1 & 0x0F000000))) + if (((cond1 & 0x0F000000) != 0) && ((cond1 & 0x0F000000) != (driver1 & 0x0F000000))) return false; - //=============== Bit Defined Check ================// - // We don't care [31:28] and [23:20] - // + /* Bit Defined Check ================ */ + /* We don't care [31:28] and [23:20] */ + /* */ cond1 &= 0x000F0FFF; driver1 &= 0x000F0FFF; - if ((cond1 & driver1) == cond1) - { - u4Byte bitMask = 0; - if ((cond1 & 0x0F) == 0) // BoardType is DONTCARE - return true; + if ((cond1 & driver1) == cond1) { + u32 bitMask = 0; + if ((cond1 & 0x0F) == 0) /* BoardType is DONTCARE */ + return true; - if ((cond1 & BIT0) != 0) //GLNA - bitMask |= 0x000000FF; - if ((cond1 & BIT1) != 0) //GPA - bitMask |= 0x0000FF00; - if ((cond1 & BIT2) != 0) //ALNA - bitMask |= 0x00FF0000; - if ((cond1 & BIT3) != 0) //APA - bitMask |= 0xFF000000; + if ((cond1 & BIT0) != 0) /* GLNA */ + bitMask |= 0x000000FF; + if ((cond1 & BIT1) != 0) /* GPA */ + bitMask |= 0x0000FF00; + if ((cond1 & BIT2) != 0) /* ALNA */ + bitMask |= 0x00FF0000; + if ((cond1 & BIT3) != 0) /* APA */ + bitMask |= 0xFF000000; - if ((cond2 & bitMask) == (driver2 & bitMask)) // BoardType of each RF path is matched - return true; - else - return false; - } - else - { - return false; - } + if ((cond2 & bitMask) == (driver2 & bitMask)) /* BoardType of each RF path is matched */ + return true; + } + return false; } static bool CheckNegative( - IN PDM_ODM_T pDM_Odm, - IN const u4Byte Condition1, - IN const u4Byte Condition2 - ) + PDM_ODM_T pDM_Odm, + const u32 Condition1, + const u32 Condition2 + ) { return true; } @@ -110,7 +99,7 @@ CheckNegative( * MAC_REG.TXT ******************************************************************************/ -static u4Byte Array_MP_8723B_MAC_REG[] = { +static u32 Array_MP_8723B_MAC_REG[] = { 0x02F, 0x00000030, 0x035, 0x00000000, 0x039, 0x00000008, @@ -219,66 +208,66 @@ static u4Byte Array_MP_8723B_MAC_REG[] = { void ODM_ReadAndConfig_MP_8723B_MAC_REG( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { - u4Byte i = 0; - u4Byte ArrayLen = sizeof(Array_MP_8723B_MAC_REG)/sizeof(u4Byte); - pu4Byte Array = Array_MP_8723B_MAC_REG; + u32 i = 0; + u32 ArrayLen = sizeof(Array_MP_8723B_MAC_REG)/sizeof(u32); + u32 * Array = Array_MP_8723B_MAC_REG; ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD, ("===> ODM_ReadAndConfig_MP_8723B_MAC_REG\n")); - for (i = 0; i < ArrayLen; i += 2 ) + for (i = 0; i < ArrayLen; i += 2) { - u4Byte v1 = Array[i]; - u4Byte v2 = Array[i+1]; + u32 v1 = Array[i]; + u32 v2 = Array[i+1]; - // This (offset, data) pair doesn't care the condition. - if ( v1 < 0x40000000 ) + /* This (offset, data) pair doesn't care the condition. */ + if (v1 < 0x40000000) { - odm_ConfigMAC_8723B(pDM_Odm, v1, (u1Byte)v2); + odm_ConfigMAC_8723B(pDM_Odm, v1, (u8)v2); continue; } else - { // This line is the beginning of branch. + { /* This line is the beginning of branch. */ bool bMatched = true; - u1Byte cCond = (u1Byte)((v1 & (BIT29|BIT28)) >> 28); + u8 cCond = (u8)((v1 & (BIT29|BIT28)) >> 28); - if (cCond == COND_ELSE) { // ELSE, ENDIF + if (cCond == COND_ELSE) { /* ELSE, ENDIF */ bMatched = true; READ_NEXT_PAIR(v1, v2, i); - } else if ( ! CheckPositive(pDM_Odm, v1, v2) ) { + } else if (! CheckPositive(pDM_Odm, v1, v2)) { bMatched = false; READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i); } else { READ_NEXT_PAIR(v1, v2, i); - if ( ! CheckNegative(pDM_Odm, v1, v2) ) + if (! CheckNegative(pDM_Odm, v1, v2)) bMatched = false; else bMatched = true; READ_NEXT_PAIR(v1, v2, i); } - if ( bMatched == false ) - { // Condition isn't matched. Discard the following (offset, data) pairs. + if (bMatched == false) + { /* Condition isn't matched. Discard the following (offset, data) pairs. */ while (v1 < 0x40000000 && i < ArrayLen -2) READ_NEXT_PAIR(v1, v2, i); - i -= 2; // prevent from for-loop += 2 + i -= 2; /* prevent from for-loop += 2 */ } - else // Configure matched pairs and skip to end of if-else. + else /* Configure matched pairs and skip to end of if-else. */ { while (v1 < 0x40000000 && i < ArrayLen-2) { - odm_ConfigMAC_8723B(pDM_Odm, v1, (u1Byte)v2); + odm_ConfigMAC_8723B(pDM_Odm, v1, (u8)v2); READ_NEXT_PAIR(v1, v2, i); } - // Keeps reading until ENDIF. - cCond = (u1Byte)((v1 & (BIT29|BIT28)) >> 28); + /* Keeps reading until ENDIF. */ + cCond = (u8)((v1 & (BIT29|BIT28)) >> 28); while (cCond != COND_ENDIF && i < ArrayLen-2) { READ_NEXT_PAIR(v1, v2, i); - cCond = (u1Byte)((v1 & (BIT29|BIT28)) >> 28); + cCond = (u8)((v1 & (BIT29|BIT28)) >> 28); } } }