From: Jes Sorensen Date: Sun, 13 Jul 2014 07:32:06 +0000 (+0200) Subject: staging: rtl8723au: Remove unused ODM_ReadAndConfig_PHY_REG_PG_8723A() and related... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7bafabf2d939e72b56591939883a31c31b93a076;p=openwrt%2Fstaging%2Fblogic.git staging: rtl8723au: Remove unused ODM_ReadAndConfig_PHY_REG_PG_8723A() and related code+data Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723au/hal/HalHWImg8723A_BB.c b/drivers/staging/rtl8723au/hal/HalHWImg8723A_BB.c index 294e6a6c60db..9d4f6bed4269 100644 --- a/drivers/staging/rtl8723au/hal/HalHWImg8723A_BB.c +++ b/drivers/staging/rtl8723au/hal/HalHWImg8723A_BB.c @@ -564,163 +564,3 @@ void ODM_ReadAndConfig_PHY_REG_MP_8723A(struct dm_odm_t *pDM_Odm) } } } - -/****************************************************************************** -* PHY_REG_PG.TXT -******************************************************************************/ - -static u32 Array_PHY_REG_PG_8723A[] = { - 0xE00, 0xFFFFFFFF, 0x0A0C0C0C, - 0xE04, 0xFFFFFFFF, 0x02040608, - 0xE08, 0x0000FF00, 0x00000000, - 0x86C, 0xFFFFFF00, 0x00000000, - 0xE10, 0xFFFFFFFF, 0x0A0C0D0E, - 0xE14, 0xFFFFFFFF, 0x02040608, - 0xE18, 0xFFFFFFFF, 0x0A0C0D0E, - 0xE1C, 0xFFFFFFFF, 0x02040608, - 0x830, 0xFFFFFFFF, 0x0A0C0C0C, - 0x834, 0xFFFFFFFF, 0x02040608, - 0x838, 0xFFFFFF00, 0x00000000, - 0x86C, 0x000000FF, 0x00000000, - 0x83C, 0xFFFFFFFF, 0x0A0C0D0E, - 0x848, 0xFFFFFFFF, 0x02040608, - 0x84C, 0xFFFFFFFF, 0x0A0C0D0E, - 0x868, 0xFFFFFFFF, 0x02040608, - 0xE00, 0xFFFFFFFF, 0x00000000, - 0xE04, 0xFFFFFFFF, 0x00000000, - 0xE08, 0x0000FF00, 0x00000000, - 0x86C, 0xFFFFFF00, 0x00000000, - 0xE10, 0xFFFFFFFF, 0x00000000, - 0xE14, 0xFFFFFFFF, 0x00000000, - 0xE18, 0xFFFFFFFF, 0x00000000, - 0xE1C, 0xFFFFFFFF, 0x00000000, - 0x830, 0xFFFFFFFF, 0x00000000, - 0x834, 0xFFFFFFFF, 0x00000000, - 0x838, 0xFFFFFF00, 0x00000000, - 0x86C, 0x000000FF, 0x00000000, - 0x83C, 0xFFFFFFFF, 0x00000000, - 0x848, 0xFFFFFFFF, 0x00000000, - 0x84C, 0xFFFFFFFF, 0x00000000, - 0x868, 0xFFFFFFFF, 0x00000000, - 0xE00, 0xFFFFFFFF, 0x04040404, - 0xE04, 0xFFFFFFFF, 0x00020204, - 0xE08, 0x0000FF00, 0x00000000, - 0x86C, 0xFFFFFF00, 0x00000000, - 0xE10, 0xFFFFFFFF, 0x06060606, - 0xE14, 0xFFFFFFFF, 0x00020406, - 0xE18, 0xFFFFFFFF, 0x00000000, - 0xE1C, 0xFFFFFFFF, 0x00000000, - 0x830, 0xFFFFFFFF, 0x04040404, - 0x834, 0xFFFFFFFF, 0x00020204, - 0x838, 0xFFFFFF00, 0x00000000, - 0x86C, 0x000000FF, 0x00000000, - 0x83C, 0xFFFFFFFF, 0x06060606, - 0x848, 0xFFFFFFFF, 0x00020406, - 0x84C, 0xFFFFFFFF, 0x00000000, - 0x868, 0xFFFFFFFF, 0x00000000, - 0xE00, 0xFFFFFFFF, 0x00000000, - 0xE04, 0xFFFFFFFF, 0x00000000, - 0xE08, 0x0000FF00, 0x00000000, - 0x86C, 0xFFFFFF00, 0x00000000, - 0xE10, 0xFFFFFFFF, 0x00000000, - 0xE14, 0xFFFFFFFF, 0x00000000, - 0xE18, 0xFFFFFFFF, 0x00000000, - 0xE1C, 0xFFFFFFFF, 0x00000000, - 0x830, 0xFFFFFFFF, 0x00000000, - 0x834, 0xFFFFFFFF, 0x00000000, - 0x838, 0xFFFFFF00, 0x00000000, - 0x86C, 0x000000FF, 0x00000000, - 0x83C, 0xFFFFFFFF, 0x00000000, - 0x848, 0xFFFFFFFF, 0x00000000, - 0x84C, 0xFFFFFFFF, 0x00000000, - 0x868, 0xFFFFFFFF, 0x00000000, - 0xE00, 0xFFFFFFFF, 0x00000000, - 0xE04, 0xFFFFFFFF, 0x00000000, - 0xE08, 0x0000FF00, 0x00000000, - 0x86C, 0xFFFFFF00, 0x00000000, - 0xE10, 0xFFFFFFFF, 0x00000000, - 0xE14, 0xFFFFFFFF, 0x00000000, - 0xE18, 0xFFFFFFFF, 0x00000000, - 0xE1C, 0xFFFFFFFF, 0x00000000, - 0x830, 0xFFFFFFFF, 0x00000000, - 0x834, 0xFFFFFFFF, 0x00000000, - 0x838, 0xFFFFFF00, 0x00000000, - 0x86C, 0x000000FF, 0x00000000, - 0x83C, 0xFFFFFFFF, 0x00000000, - 0x848, 0xFFFFFFFF, 0x00000000, - 0x84C, 0xFFFFFFFF, 0x00000000, - 0x868, 0xFFFFFFFF, 0x00000000, - 0xE00, 0xFFFFFFFF, 0x04040404, - 0xE04, 0xFFFFFFFF, 0x00020204, - 0xE08, 0x0000FF00, 0x00000000, - 0x86C, 0xFFFFFF00, 0x00000000, - 0xE10, 0xFFFFFFFF, 0x00000000, - 0xE14, 0xFFFFFFFF, 0x00000000, - 0xE18, 0xFFFFFFFF, 0x00000000, - 0xE1C, 0xFFFFFFFF, 0x00000000, - 0x830, 0xFFFFFFFF, 0x04040404, - 0x834, 0xFFFFFFFF, 0x00020204, - 0x838, 0xFFFFFF00, 0x00000000, - 0x86C, 0x000000FF, 0x00000000, - 0x83C, 0xFFFFFFFF, 0x00000000, - 0x848, 0xFFFFFFFF, 0x00000000, - 0x84C, 0xFFFFFFFF, 0x00000000, - 0x868, 0xFFFFFFFF, 0x00000000, - 0xE00, 0xFFFFFFFF, 0x00000000, - 0xE04, 0xFFFFFFFF, 0x00000000, - 0xE08, 0x0000FF00, 0x00000000, - 0x86C, 0xFFFFFF00, 0x00000000, - 0xE10, 0xFFFFFFFF, 0x00000000, - 0xE14, 0xFFFFFFFF, 0x00000000, - 0xE18, 0xFFFFFFFF, 0x00000000, - 0xE1C, 0xFFFFFFFF, 0x00000000, - 0x830, 0xFFFFFFFF, 0x00000000, - 0x834, 0xFFFFFFFF, 0x00000000, - 0x838, 0xFFFFFF00, 0x00000000, - 0x86C, 0x000000FF, 0x00000000, - 0x83C, 0xFFFFFFFF, 0x00000000, - 0x848, 0xFFFFFFFF, 0x00000000, - 0x84C, 0xFFFFFFFF, 0x00000000, - 0x868, 0xFFFFFFFF, 0x00000000, -}; - -void ODM_ReadAndConfig_PHY_REG_PG_8723A(struct dm_odm_t *pDM_Odm) -{ - u32 hex = 0; - u32 i = 0; - u8 platform = 0x04; - u8 interfaceValue = pDM_Odm->SupportInterface; - u8 board = pDM_Odm->BoardType; - u32 ArrayLen = sizeof(Array_PHY_REG_PG_8723A)/sizeof(u32); - u32 *Array = Array_PHY_REG_PG_8723A; - - hex += board; - hex += interfaceValue << 8; - hex += platform << 16; - hex += 0xFF000000; - for (i = 0; i < ArrayLen; i += 3) { - u32 v1 = Array[i]; - u32 v2 = Array[i+1]; - u32 v3 = Array[i+2]; - - /* this line is a line of pure_body */ - if (v1 < 0xCDCDCDCD) { - odm_ConfigBB_PHY_REG_PG_8723A(pDM_Odm, v1, v2, v3); - continue; - } else { /* this line is the start of branch */ - if (!CheckCondition(Array[i], hex)) { - /* don't need the hw_body */ - i += 2; /* skip the pair of expression */ - v1 = Array[i]; - v2 = Array[i+1]; - v3 = Array[i+2]; - while (v2 != 0xDEAD) { - i += 3; - v1 = Array[i]; - v2 = Array[i+1]; - v3 = Array[i+1]; - } - } - } - } -} diff --git a/drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c b/drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c index bd86b6c526ee..88e0126e855a 100644 --- a/drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c +++ b/drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c @@ -71,34 +71,6 @@ odm_ConfigBB_AGC_8723A( Addr, Data)); } -void -odm_ConfigBB_PHY_REG_PG_8723A( - struct dm_odm_t *pDM_Odm, - u32 Addr, - u32 Bitmask, - u32 Data - ) -{ - if (Addr == 0xfe) - msleep(50); - else if (Addr == 0xfd) - mdelay(5); - else if (Addr == 0xfc) - mdelay(1); - else if (Addr == 0xfb) - udelay(50); - else if (Addr == 0xfa) - udelay(5); - else if (Addr == 0xf9) - udelay(1); - /* TODO: ODM_StorePwrIndexDiffRateOffset(...) */ - /* storePwrIndexDiffRateOffset(Adapter, Addr, Bitmask, Data); */ - - ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD, - ("===> ODM_ConfigBBWithHeaderFile23a: [PHY_REG] %08X %08X %08X\n", - Addr, Bitmask, Data)); -} - void odm_ConfigBB_PHY_8723A( struct dm_odm_t *pDM_Odm, diff --git a/drivers/staging/rtl8723au/include/HalHWImg8723A_BB.h b/drivers/staging/rtl8723au/include/HalHWImg8723A_BB.h index e99833cc7929..127609404652 100644 --- a/drivers/staging/rtl8723au/include/HalHWImg8723A_BB.h +++ b/drivers/staging/rtl8723au/include/HalHWImg8723A_BB.h @@ -35,10 +35,4 @@ void ODM_ReadAndConfig_PHY_REG_1T_8723A(struct dm_odm_t *pDM_Odm); void ODM_ReadAndConfig_PHY_REG_MP_8723A(struct dm_odm_t *pDM_Odm); -/****************************************************************************** -* PHY_REG_PG.TXT -******************************************************************************/ - -void ODM_ReadAndConfig_PHY_REG_PG_8723A(struct dm_odm_t *pDM_Odm); - #endif /* end of HWIMG_SUPPORT */ diff --git a/drivers/staging/rtl8723au/include/odm_RegConfig8723A.h b/drivers/staging/rtl8723au/include/odm_RegConfig8723A.h index 4117830b3a8a..a6cfb6df4cf7 100644 --- a/drivers/staging/rtl8723au/include/odm_RegConfig8723A.h +++ b/drivers/staging/rtl8723au/include/odm_RegConfig8723A.h @@ -23,8 +23,6 @@ void odm_ConfigMAC_8723A(struct dm_odm_t *pDM_Odm, u32 Addr, u8 Data); void odm_ConfigBB_AGC_8723A(struct dm_odm_t *pDM_Odm, u32 Addr, u32 Bitmask, u32 Data); -void odm_ConfigBB_PHY_REG_PG_8723A(struct dm_odm_t *pDM_Odm, u32 Addr, u32 Bitmask, u32 Data); - void odm_ConfigBB_PHY_8723A(struct dm_odm_t *pDM_Odm, u32 Addr, u32 Bitmask, u32 Data); #endif /* end of SUPPORT */