staging: rtl8723bs: Replace function pointers starting with EFUSEGetEfuseDefinition
cover staging: rtl8723bs: Replace function pointers starting with EFUSEGetEfuseDefinition
Replace function pointers with functions to increase readability. Remove unused functions.
Tested with rtl8723bs in ODYS Trendbook Next 14
Philipp Hortmann (16):
staging: rtl8723bs: Remove function pointer EFUSEGetEfuseDefinition
staging: rtl8723bs: Remove function pointer EfuseGetCurrentSize
staging: rtl8723bs: Remove unused function Efuse_PgPacketRead
staging: rtl8723bs: Remove unused function Hal_EfusePgPacketRead
staging: rtl8723bs: Remove unused function Efuse_PgPacketWrite
staging: rtl8723bs: Remove unused function Hal_EfusePgPacketWrite
staging: rtl8723bs: Remove unused function Hal_EfusePgPacketWrite_BT
staging: rtl8723bs: Remove unused function hal_EfusePgPacketWriteData
staging: rtl8723bs: Remove unused function
hal_EfusePgPacketWriteHeader
staging: rtl8723bs: Remove unused function hal_EfusePartialWriteCheck
staging: rtl8723bs: Remove unused function hal_EfuseConstructPGPkt
staging: rtl8723bs: Remove unused function
hal_EfusePgCheckAvailableAddr
staging: rtl8723bs: Remove function hal_EfusePgPacketWrite2ByteHeader
staging: rtl8723bs: Remove function hal_EfusePgPacketWrite1ByteHeader
staging: rtl8723bs: Remove unused function efuse_WordEnableDataRead
staging: rtl8723bs: Remove unused function Efuse_GetCurrentSize
drivers/staging/rtl8723bs/core/rtw_efuse.c | 90 +---- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 353 +----------------- drivers/staging/rtl8723bs/include/hal_intf.h | 8 +- drivers/staging/rtl8723bs/include/rtw_efuse.h | 4 - 4 files changed, 6 insertions(+), 449 deletions(-)
Signature · 1 line
2.43.0
PATCH 1/16 staging: rtl8723bs: Remove function pointer EFUSEGetEfuseDefinition
Remove function pointer EFUSEGetEfuseDefinition and use Hal_GetEfuseDefinition directly to increase readability.
--- drivers/staging/rtl8723bs/core/rtw_efuse.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 3 +-- drivers/staging/rtl8723bs/include/hal_intf.h | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/core/rtw_efuse.c +1 -1
@@ -171,7 +171,7 @@ EFUSE_GetEfuseDefinition(bool bPseudoTest ) { - padapter->HalFunc.EFUSEGetEfuseDefinition (padapter, efuseType, type, pOut, bPseudoTest); +Hal_GetEfuseDefinition (padapter, efuseType, type, pOut, bPseudoTest); }/*-----------------------------------------------------------------------------
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
@@ -490,7 +490,7 @@ static u8 hal_EfuseSwitchToBank(return bRet; } -static void Hal_GetEfuseDefinition( +void Hal_GetEfuseDefinition( struct adapter *padapter, u8 efuseType, u8 type,
@@ -1745,7 +1745,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)void rtl8723b_set_hal_ops (struct hal_ops *pHalFunc) {/* Efuse related function */ - pHalFunc->EFUSEGetEfuseDefinition = &Hal_GetEfuseDefinition; pHalFunc->EfuseGetCurrentSize = &Hal_EfuseGetCurrentSize; pHalFunc->Efuse_PgPacketRead = &Hal_EfusePgPacketRead; pHalFunc->Efuse_PgPacketWrite = &Hal_EfusePgPacketWrite;
drivers/staging/rtl8723bs/include/hal_intf.h +2 -1
@@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);struct hal_ops {void (*SetHalODMVarHandler)(struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet); -void (*EFUSEGetEfuseDefinition)(struct adapter *padapter,u8 efuseType,u8 type,void *pOut,bool bPseudoTest);u16 (*EfuseGetCurrentSize)(struct adapter *padapter,u8 efuseType,bool bPseudoTest);int (*Efuse_PgPacketRead)(struct adapter *padapter,u8 offset,u8 *data,bool bPseudoTest);int (*Efuse_PgPacketWrite)(struct adapter *padapter,u8 offset,u8 word_en,u8 *data,bool bPseudoTest);
@@ -290,4 +289,6 @@ void rtl8723b_SetBeaconRelatedRegisters(struct adapter *padapter);void Hal_EfusePowerSwitch (struct adapter *padapter,u8 bWrite,u8 PwrState);void Hal_ReadEFuse (struct adapter *padapter,u8 efuseType,u16 _offset,u16 _size_byte,u8 *pbuf,bool bPseudoTest); +void Hal_GetEfuseDefinition (struct adapter *padapter,u8 efuseType,u8 type, +void *pOut,bool bPseudoTest);#endif /* __HAL_INTF_H__ */
Signature · 1 line
2.43.0
PATCH 2/16 staging: rtl8723bs: Remove function pointer EfuseGetCurrentSize
In reply to Philipp HortmannRemove function pointer EfuseGetCurrentSize and use Hal_EfuseGetCurrentSize directly to increase readability.
--- drivers/staging/rtl8723bs/core/rtw_efuse.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 3 +-- drivers/staging/rtl8723bs/include/hal_intf.h | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-)
drivers/staging/rtl8723bs/core/rtw_efuse.c +1 -2
@@ -102,8 +102,7 @@ Efuse_GetCurrentSize( u8 efuseType, bool bPseudoTest) { -return padapter->HalFunc.EfuseGetCurrentSize (padapter, efuseType, - bPseudoTest); +return Hal_EfuseGetCurrentSize (padapter, efuseType, bPseudoTest); }/* 11/16/2008 MH Add description. Get current efuse area enabled word!!. */
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
@@ -1072,7 +1072,7 @@ static u16 hal_EfuseGetCurrentSize_BT(struct adapter *padapter, u8 bPseudoTest)return retU2; } -static u16 Hal_EfuseGetCurrentSize ( +u16 Hal_EfuseGetCurrentSize (struct adapter *padapter,u8 efuseType,bool bPseudoTest ) {
@@ -1745,7 +1745,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)void rtl8723b_set_hal_ops (struct hal_ops *pHalFunc) {/* Efuse related function */ - pHalFunc->EfuseGetCurrentSize = &Hal_EfuseGetCurrentSize; pHalFunc->Efuse_PgPacketRead = &Hal_EfusePgPacketRead; pHalFunc->Efuse_PgPacketWrite = &Hal_EfusePgPacketWrite; pHalFunc->Efuse_WordEnableDataWrite = &Hal_EfuseWordEnableDataWrite;
drivers/staging/rtl8723bs/include/hal_intf.h +1 -1
@@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);struct hal_ops {void (*SetHalODMVarHandler)(struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet); -u16 (*EfuseGetCurrentSize)(struct adapter *padapter,u8 efuseType,bool bPseudoTest);int (*Efuse_PgPacketRead)(struct adapter *padapter,u8 offset,u8 *data,bool bPseudoTest);int (*Efuse_PgPacketWrite)(struct adapter *padapter,u8 offset,u8 word_en,u8 *data,bool bPseudoTest);u8 (*Efuse_WordEnableDataWrite)(struct adapter *padapter,u16 efuse_addr,u8 word_en,u8 *data,bool bPseudoTest);
@@ -291,4 +290,5 @@ void Hal_ReadEFuse(struct adapter *padapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf, bool bPseudoTest);void Hal_GetEfuseDefinition (struct adapter *padapter,u8 efuseType,u8 type,void *pOut,bool bPseudoTest); +u16 Hal_EfuseGetCurrentSize (struct adapter *padapter,u8 efuseType,bool bPseudoTest);#endif /* __HAL_INTF_H__ */
Signature · 1 line
2.43.0
PATCH 3/16 staging: rtl8723bs: Remove unused function Efuse_PgPacketRead
In reply to Philipp HortmannRemove unused function Efuse_PgPacketRead.
--- drivers/staging/rtl8723bs/core/rtw_efuse.c | 10 ---------- drivers/staging/rtl8723bs/include/rtw_efuse.h | 1 - 2 files changed, 11 deletions(-)
drivers/staging/rtl8723bs/core/rtw_efuse.c +0 -10
@@ -311,16 +311,6 @@ u8 efuse_OneByteWrite(struct adapter *padapter, u16 addr, u8 data, bool bPseudoTreturn bResult; } -int -Efuse_PgPacketRead (struct adapter *padapter, -u8 offset, -u8 *data, -bool bPseudoTest) -{ -return padapter->HalFunc.Efuse_PgPacketRead (padapter, offset, data, - bPseudoTest); -} - int Efuse_PgPacketWrite(struct adapter *padapter, u8 offset,
drivers/staging/rtl8723bs/include/rtw_efuse.h +0 -1
@@ -97,7 +97,6 @@ u8 efuse_OneByteRead(struct adapter *padapter, u16 addr, u8 *data, bool bPseudou8 efuse_OneByteWrite (struct adapter *padapter,u16 addr,u8 data,bool bPseudoTest);void Efuse_PowerSwitch (struct adapter *padapter,u8 bWrite,u8 PwrState); -int Efuse_PgPacketRead (struct adapter *padapter,u8 offset,u8 *data,bool bPseudoTest);int Efuse_PgPacketWrite (struct adapter *padapter,u8 offset,u8 word_en,u8 *data,bool bPseudoTest);void efuse_WordEnableDataRead (u8 word_en,u8 *sourdata,u8 *targetdata);u8 Efuse_WordEnableDataWrite (struct adapter *padapter,u16 efuse_addr,u8 word_en,u8 *data,bool bPseudoTest);
Signature · 1 line
2.43.0
PATCH 4/16 staging: rtl8723bs: Remove unused function Hal_EfusePgPacketRead
In reply to Philipp HortmannRemove unused function pointer Efuse_PgPacketRead and unused function Hal_EfusePgPacketRead.
--- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 73 ------------------- drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 2 files changed, 74 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -73
@@ -1151,78 +1151,6 @@ static u8 Hal_EfuseWordEnableDataWrite(return badworden; } -static s32 Hal_EfusePgPacketRead ( -struct adapter *padapter, -u8 offset, -u8 *data, -bool bPseudoTest -) -{ -u8 efuse_data, word_cnts =0 ; -u16 efuse_addr =0 ; -u8 hoffset =0 , hworden =0 ; -u8 i; -u8 max_section =0 ; -s32 ret; - - -if (!data) -return false; - -EFUSE_GetEfuseDefinition (padapter,EFUSE_WIFI ,TYPE_EFUSE_MAX_SECTION , &max_section, bPseudoTest); -if (offset > max_section) -return false; - -memset (data,0xFF ,PGPKT_DATA_SIZE ); - ret = true; - -/* */ -/* <Roger_TODO> Efuse has been pre-programmed dummy 5Bytes at the end of Efuse by CP. */ -/* Skip dummy parts to prevent unexpected data read from Efuse. */ -/* By pass right now. 2009.02.19. */ -/* */ -while (AVAILABLE_EFUSE_ADDR (efuse_addr)) { -if (efuse_OneByteRead (padapter, efuse_addr++, &efuse_data, bPseudoTest) == false) { - ret = false; -break ; - } - -if (efuse_data ==0xFF ) -break ; - -if (EXT_HEADER (efuse_data)) { - hoffset =GET_HDR_OFFSET_2_0 (efuse_data); -efuse_OneByteRead (padapter, efuse_addr++, &efuse_data, bPseudoTest); -if (ALL_WORDS_DISABLED (efuse_data)) -continue ; - - hoffset |= ((efuse_data &0xF0 ) >>1 ); - hworden = efuse_data &0x0F ; - }else { - hoffset = (efuse_data>>4 ) &0x0F ; - hworden = efuse_data &0x0F ; - } - -if (hoffset == offset) { -for (i =0 ; i <EFUSE_MAX_WORD_UNIT ; i++) { -/* Check word enable condition in the section */ -if (!(hworden & (0x01 <<i))) { -efuse_OneByteRead (padapter, efuse_addr++, &efuse_data, bPseudoTest); - data[i*2 ] = efuse_data; - -efuse_OneByteRead (padapter, efuse_addr++, &efuse_data, bPseudoTest); - data[(i*2 )+1 ] = efuse_data; - } - } - }else { - word_cnts =Efuse_CalculateWordCnts (hworden); - efuse_addr += word_cnts*2 ; - } - } - -return ret; -} -static u8 hal_EfusePgCheckAvailableAddr (struct adapter *padapter,u8 efuseType,u8 bPseudoTest )
@@ -1745,7 +1673,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)void rtl8723b_set_hal_ops (struct hal_ops *pHalFunc) {/* Efuse related function */ - pHalFunc->Efuse_PgPacketRead = &Hal_EfusePgPacketRead; pHalFunc->Efuse_PgPacketWrite = &Hal_EfusePgPacketWrite; pHalFunc->Efuse_WordEnableDataWrite = &Hal_EfuseWordEnableDataWrite; pHalFunc->Efuse_PgPacketWrite_BT = &Hal_EfusePgPacketWrite_BT;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);struct hal_ops {void (*SetHalODMVarHandler)(struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet); -int (*Efuse_PgPacketRead)(struct adapter *padapter,u8 offset,u8 *data,bool bPseudoTest);int (*Efuse_PgPacketWrite)(struct adapter *padapter,u8 offset,u8 word_en,u8 *data,bool bPseudoTest);u8 (*Efuse_WordEnableDataWrite)(struct adapter *padapter,u16 efuse_addr,u8 word_en,u8 *data,bool bPseudoTest);bool (*Efuse_PgPacketWrite_BT)(struct adapter *padapter,u8 offset,u8 word_en,u8 *data,bool bPseudoTest);
Signature · 1 line
2.43.0
PATCH 5/16 staging: rtl8723bs: Remove unused function Efuse_PgPacketWrite
In reply to Philipp HortmannRemove unused function Efuse_PgPacketWrite.
--- drivers/staging/rtl8723bs/core/rtw_efuse.c | 11 ----------- drivers/staging/rtl8723bs/include/rtw_efuse.h | 1 - 2 files changed, 12 deletions(-)
drivers/staging/rtl8723bs/core/rtw_efuse.c +0 -11
@@ -311,17 +311,6 @@ u8 efuse_OneByteWrite(struct adapter *padapter, u16 addr, u8 data, bool bPseudoTreturn bResult; } -int -Efuse_PgPacketWrite (struct adapter *padapter, -u8 offset, -u8 word_en, -u8 *data, -bool bPseudoTest) -{ -return padapter->HalFunc.Efuse_PgPacketWrite (padapter, offset, word_en, - data, bPseudoTest); -} -/*----------------------------------------------------------------------------- * Function: efuse_WordEnableDataRead *
drivers/staging/rtl8723bs/include/rtw_efuse.h +0 -1
@@ -97,7 +97,6 @@ u8 efuse_OneByteRead(struct adapter *padapter, u16 addr, u8 *data, bool bPseudou8 efuse_OneByteWrite (struct adapter *padapter,u16 addr,u8 data,bool bPseudoTest);void Efuse_PowerSwitch (struct adapter *padapter,u8 bWrite,u8 PwrState); -int Efuse_PgPacketWrite (struct adapter *padapter,u8 offset,u8 word_en,u8 *data,bool bPseudoTest);void efuse_WordEnableDataRead (u8 word_en,u8 *sourdata,u8 *targetdata);u8 Efuse_WordEnableDataWrite (struct adapter *padapter,u16 efuse_addr,u8 word_en,u8 *data,bool bPseudoTest);
Signature · 1 line
2.43.0
PATCH 6/16 staging: rtl8723bs: Remove unused function Hal_EfusePgPacketWrite
In reply to Philipp HortmannRemove unused function pointer Efuse_PgPacketWrite and unused function Hal_EfusePgPacketWrite.
--- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 30 ------------------- drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 2 files changed, 31 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -30
@@ -1365,35 +1365,6 @@ static u8 hal_EfusePgPacketWriteData(return true; } -static s32 Hal_EfusePgPacketWrite ( -struct adapter *padapter, -u8 offset, -u8 word_en, -u8 *pData, -bool bPseudoTest -) -{ -struct pgpkt_struct targetPkt; -u16 startAddr =0 ; -u8 efuseType =EFUSE_WIFI ; - -if (!hal_EfusePgCheckAvailableAddr (padapter, efuseType, bPseudoTest)) -return false; - -hal_EfuseConstructPGPkt (offset, word_en, pData, &targetPkt); - -if (!hal_EfusePartialWriteCheck (padapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) -return false; - -if (!hal_EfusePgPacketWriteHeader (padapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) -return false; - -if (!hal_EfusePgPacketWriteData (padapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) -return false; - -return true; -} - static bool Hal_EfusePgPacketWrite_BT( struct adapter *padapter, u8 offset,
@@ -1673,7 +1644,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)void rtl8723b_set_hal_ops (struct hal_ops *pHalFunc) {/* Efuse related function */ - pHalFunc->Efuse_PgPacketWrite = &Hal_EfusePgPacketWrite; pHalFunc->Efuse_WordEnableDataWrite = &Hal_EfuseWordEnableDataWrite; pHalFunc->Efuse_PgPacketWrite_BT = &Hal_EfusePgPacketWrite_BT;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);struct hal_ops {void (*SetHalODMVarHandler)(struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet); -int (*Efuse_PgPacketWrite)(struct adapter *padapter,u8 offset,u8 word_en,u8 *data,bool bPseudoTest);u8 (*Efuse_WordEnableDataWrite)(struct adapter *padapter,u16 efuse_addr,u8 word_en,u8 *data,bool bPseudoTest);bool (*Efuse_PgPacketWrite_BT)(struct adapter *padapter,u8 offset,u8 word_en,u8 *data,bool bPseudoTest);
Signature · 1 line
2.43.0
PATCH 7/16 staging: rtl8723bs: Remove unused function Hal_EfusePgPacketWrite_BT
In reply to Philipp HortmannRemove unused function pointer Efuse_PgPacketWrite_BT and unused function Hal_EfusePgPacketWrite_BT.
--- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 30 ------------------- drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 2 files changed, 31 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -30
@@ -1365,35 +1365,6 @@ static u8 hal_EfusePgPacketWriteData(return true; } -static bool Hal_EfusePgPacketWrite_BT ( -struct adapter *padapter, -u8 offset, -u8 word_en, -u8 *pData, -bool bPseudoTest -) -{ -struct pgpkt_struct targetPkt; -u16 startAddr =0 ; -u8 efuseType =EFUSE_BT ; - -if (!hal_EfusePgCheckAvailableAddr (padapter, efuseType, bPseudoTest)) -return false; - -hal_EfuseConstructPGPkt (offset, word_en, pData, &targetPkt); - -if (!hal_EfusePartialWriteCheck (padapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) -return false; - -if (!hal_EfusePgPacketWriteHeader (padapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) -return false; - -if (!hal_EfusePgPacketWriteData (padapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) -return false; - -return true; -} -static struct hal_version ReadChipVersion8723B (struct adapter *padapter) {u32 value32;
@@ -1645,7 +1616,6 @@ void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) {/* Efuse related function */ pHalFunc->Efuse_WordEnableDataWrite = &Hal_EfuseWordEnableDataWrite; - pHalFunc->Efuse_PgPacketWrite_BT = &Hal_EfusePgPacketWrite_BT; pHalFunc->SetHalODMVarHandler = &rtl8723b_SetHalODMVar;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -165,7 +165,6 @@ struct hal_ops {void (*SetHalODMVarHandler)(struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet);u8 (*Efuse_WordEnableDataWrite)(struct adapter *padapter,u16 efuse_addr,u8 word_en,u8 *data,bool bPseudoTest); -bool (*Efuse_PgPacketWrite_BT)(struct adapter *padapter,u8 offset,u8 word_en,u8 *data,bool bPseudoTest);s32 (*xmit_thread_handler)(struct adapter *padapter);void (*hal_notch_filter)(struct adapter *adapter,bool enable);
Signature · 1 line
2.43.0
PATCH 8/16 staging: rtl8723bs: Remove unused function hal_EfusePgPacketWriteData
In reply to Philipp HortmannRemove unused function hal_EfusePgPacketWriteData to shorten code.
--- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 20 ------------------- 1 file changed, 20 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -20
@@ -1345,26 +1345,6 @@ static u8 hal_EfusePgPacketWriteHeader(return bRet; } -static u8 hal_EfusePgPacketWriteData ( -struct adapter *padapter, -u8 efuseType, -u16 *pAddr, -struct pgpkt_struct *pTargetPkt, -u8 bPseudoTest -) -{ -u16 efuse_addr; -u8 badworden; - - - efuse_addr = *pAddr; - badworden =Efuse_WordEnableDataWrite (padapter, efuse_addr+1 , pTargetPkt->word_en, pTargetPkt->data, bPseudoTest); -if (badworden !=0x0F ) -return false; - -return true; -} -static struct hal_version ReadChipVersion8723B (struct adapter *padapter) {u32 value32;
Signature · 1 line
2.43.0
PATCH 9/16 staging: rtl8723bs: Remove unused function hal_EfusePgPacketWriteHeader
In reply to Philipp HortmannRemove unused function hal_EfusePgPacketWriteHeader to shorten code.
--- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 18 ------------------ 1 file changed, 18 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -18
@@ -1327,24 +1327,6 @@ static u8 hal_EfusePgPacketWrite2ByteHeader(return true; } -static u8 hal_EfusePgPacketWriteHeader ( -struct adapter *padapter, -u8 efuseType, -u16 *pAddr, -struct pgpkt_struct *pTargetPkt, -u8 bPseudoTest -) -{ -u8 bRet = false; - -if (pTargetPkt->offset >=EFUSE_MAX_SECTION_BASE ) - bRet =hal_EfusePgPacketWrite2ByteHeader (padapter, efuseType, pAddr, pTargetPkt, bPseudoTest); -else - bRet =hal_EfusePgPacketWrite1ByteHeader (padapter, efuseType, pAddr, pTargetPkt, bPseudoTest); - -return bRet; -} -static struct hal_version ReadChipVersion8723B (struct adapter *padapter) {u32 value32;
Signature · 1 line
2.43.0
PATCH 10/16 staging: rtl8723bs: Remove unused function hal_EfusePartialWriteCheck
In reply to Philipp HortmannRemove unused function hal_EfusePartialWriteCheck to shorten code.
--- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 58 ------------------- 1 file changed, 58 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -58
@@ -1182,64 +1182,6 @@ static void hal_EfuseConstructPGPkt( pTargetPkt->word_cnts =Efuse_CalculateWordCnts (pTargetPkt->word_en); } -static u8 hal_EfusePartialWriteCheck ( -struct adapter *padapter, -u8 efuseType, -u16 *pAddr, -struct pgpkt_struct *pTargetPkt, -u8 bPseudoTest -) -{ -struct hal_com_data *pHalData =GET_HAL_DATA (padapter); -struct efuse_hal *pEfuseHal = &pHalData->EfuseHal; -u8 bRet = false; -u16 startAddr =0 , efuse_max_available_len =0 , efuse_max =0 ; -u8 efuse_data =0 ; - -EFUSE_GetEfuseDefinition (padapter, efuseType,TYPE_AVAILABLE_EFUSE_BYTES_TOTAL , &efuse_max_available_len, bPseudoTest); -EFUSE_GetEfuseDefinition (padapter, efuseType,TYPE_EFUSE_CONTENT_LEN_BANK , &efuse_max, bPseudoTest); - -if (efuseType ==EFUSE_WIFI ) { -if (bPseudoTest) { -#ifdef HAL_EFUSE_MEMORY - startAddr = (u16 )pEfuseHal->fakeEfuseUsedBytes; -#else - startAddr = (u16 )fakeEfuseUsedBytes; -#endif - }else -rtw_hal_get_hwreg (padapter,HW_VAR_EFUSE_BYTES , (u8 *)&startAddr); - }else { -if (bPseudoTest) { -#ifdef HAL_EFUSE_MEMORY - startAddr = (u16 )pEfuseHal->fakeBTEfuseUsedBytes; -#else - startAddr = (u16 )fakeBTEfuseUsedBytes; -#endif - }else -rtw_hal_get_hwreg (padapter,HW_VAR_EFUSE_BT_BYTES , (u8 *)&startAddr); - } - startAddr %= efuse_max; - -while (1 ) { -if (startAddr >= efuse_max_available_len) { - bRet = false; -break ; - } - -if (efuse_OneByteRead (padapter, startAddr, &efuse_data, bPseudoTest) && (efuse_data !=0xFF )) { - bRet = false; -break ; - }else { -/* not used header, 0xff */ - *pAddr = startAddr; - bRet = true; -break ; - } - } - -return bRet; -} - static u8 hal_EfusePgPacketWrite1ByteHeader( struct adapter *padapter, u8 efuseType,
Signature · 1 line
2.43.0
PATCH 11/16 staging: rtl8723bs: Remove unused function hal_EfuseConstructPGPkt
In reply to Philipp HortmannRemove unused function hal_EfuseConstructPGPkt to shorten code.
--- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 14 -------------- 1 file changed, 14 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -14
@@ -1168,20 +1168,6 @@ static u8 hal_EfusePgCheckAvailableAddr(return true; } -static void hal_EfuseConstructPGPkt ( -u8 offset, -u8 word_en, -u8 *pData, -struct pgpkt_struct *pTargetPkt -) -{ -memset (pTargetPkt->data,0xFF ,PGPKT_DATA_SIZE ); - pTargetPkt->offset = offset; - pTargetPkt->word_en = word_en; -efuse_WordEnableDataRead (word_en, pData, pTargetPkt->data); - pTargetPkt->word_cnts =Efuse_CalculateWordCnts (pTargetPkt->word_en); -} - static u8 hal_EfusePgPacketWrite1ByteHeader( struct adapter *padapter, u8 efuseType,
Signature · 1 line
2.43.0
PATCH 12/16 staging: rtl8723bs: Remove unused function hal_EfusePgCheckAvailableAddr
In reply to Philipp HortmannRemove unused function hal_EfusePgCheckAvailableAddr to shorten code.
--- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 17 ----------------- 1 file changed, 17 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -17
@@ -1151,23 +1151,6 @@ static u8 Hal_EfuseWordEnableDataWrite(return badworden; } -static u8 hal_EfusePgCheckAvailableAddr ( -struct adapter *padapter,u8 efuseType,u8 bPseudoTest -) -{ -u16 max_available =0 ; -u16 current_size; - - -EFUSE_GetEfuseDefinition (padapter, efuseType,TYPE_AVAILABLE_EFUSE_BYTES_TOTAL , &max_available, bPseudoTest); - - current_size =Efuse_GetCurrentSize (padapter, efuseType, bPseudoTest); -if (current_size >= max_available) -return false; - -return true; -} - static u8 hal_EfusePgPacketWrite1ByteHeader( struct adapter *padapter, u8 efuseType,
Signature · 1 line
2.43.0
PATCH 13/16 staging: rtl8723bs: Remove function hal_EfusePgPacketWrite2ByteHeader
In reply to Philipp HortmannRemove unused function hal_EfusePgPacketWrite2ByteHeader to shorten code.
--- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 55 ------------------- 1 file changed, 55 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -55
@@ -1183,61 +1183,6 @@ static u8 hal_EfusePgPacketWrite1ByteHeader(return true; } -static u8 hal_EfusePgPacketWrite2ByteHeader ( -struct adapter *padapter, -u8 efuseType, -u16 *pAddr, -struct pgpkt_struct *pTargetPkt, -u8 bPseudoTest -) -{ -u16 efuse_addr, efuse_max_available_len =0 ; -u8 pg_header =0 , tmp_header =0 ; -u8 repeatcnt =0 ; - -EFUSE_GetEfuseDefinition (padapter, efuseType,TYPE_AVAILABLE_EFUSE_BYTES_BANK , &efuse_max_available_len, bPseudoTest); - - efuse_addr = *pAddr; -if (efuse_addr >= efuse_max_available_len) -return false; - - pg_header = ((pTargetPkt->offset &0x07 ) <<5 ) |0x0F ; - -do { -efuse_OneByteWrite (padapter, efuse_addr, pg_header, bPseudoTest); -efuse_OneByteRead (padapter, efuse_addr, &tmp_header, bPseudoTest); -if (tmp_header !=0xFF ) -break ; -if (repeatcnt++ >EFUSE_REPEAT_THRESHOLD_ ) -return false; - - }while (1 ); - -if (tmp_header != pg_header) -return false; - -/* to write ext_header */ - efuse_addr++; - pg_header = ((pTargetPkt->offset &0x78 ) <<1 ) | pTargetPkt->word_en; - -do { -efuse_OneByteWrite (padapter, efuse_addr, pg_header, bPseudoTest); -efuse_OneByteRead (padapter, efuse_addr, &tmp_header, bPseudoTest); -if (tmp_header !=0xFF ) -break ; -if (repeatcnt++ >EFUSE_REPEAT_THRESHOLD_ ) -return false; - - }while (1 ); - -if (tmp_header != pg_header)/* offset PG fail */ -return false; - - *pAddr = efuse_addr; - -return true; -} -static struct hal_version ReadChipVersion8723B (struct adapter *padapter) {u32 value32;
Signature · 1 line
2.43.0
PATCH 14/16 staging: rtl8723bs: Remove function hal_EfusePgPacketWrite1ByteHeader
In reply to Philipp HortmannRemove unused function hal_EfusePgPacketWrite1ByteHeader to shorten code.
--- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 32 ------------------- 1 file changed, 32 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -32
@@ -1151,38 +1151,6 @@ static u8 Hal_EfuseWordEnableDataWrite(return badworden; } -static u8 hal_EfusePgPacketWrite1ByteHeader ( -struct adapter *padapter, -u8 efuseType, -u16 *pAddr, -struct pgpkt_struct *pTargetPkt, -u8 bPseudoTest -) -{ -u8 pg_header =0 , tmp_header =0 ; -u16 efuse_addr = *pAddr; -u8 repeatcnt =0 ; - - pg_header = ((pTargetPkt->offset <<4 ) &0xf0 ) | pTargetPkt->word_en; - -do { -efuse_OneByteWrite (padapter, efuse_addr, pg_header, bPseudoTest); -efuse_OneByteRead (padapter, efuse_addr, &tmp_header, bPseudoTest); -if (tmp_header !=0xFF ) -break ; -if (repeatcnt++ >EFUSE_REPEAT_THRESHOLD_ ) -return false; - - }while (1 ); - -if (tmp_header != pg_header) -return false; - - *pAddr = efuse_addr; - -return true; -} -static struct hal_version ReadChipVersion8723B (struct adapter *padapter) {u32 value32;
Signature · 1 line
2.43.0
PATCH 15/16 staging: rtl8723bs: Remove unused function efuse_WordEnableDataRead
In reply to Philipp HortmannRemove unused function efuse_WordEnableDataRead to shorten code.
--- drivers/staging/rtl8723bs/core/rtw_efuse.c | 41 ------------------- drivers/staging/rtl8723bs/include/rtw_efuse.h | 1 - 2 files changed, 42 deletions(-)
drivers/staging/rtl8723bs/core/rtw_efuse.c +0 -41
@@ -311,47 +311,6 @@ u8 efuse_OneByteWrite(struct adapter *padapter, u16 addr, u8 data, bool bPseudoTreturn bResult; } -/*----------------------------------------------------------------------------- -* Function: efuse_WordEnableDataRead -* -* Overview: Read allowed word in current efuse section data. -* -* Input: NONE -* -* Output: NONE -* -* Return: NONE -* -* Revised History: -* When Who Remark -* 11/16/2008 MHC Create Version 0. -* 11/21/2008 MHC Fix Write bug when we only enable late word. -* -*---------------------------------------------------------------------------*/ -void -efuse_WordEnableDataRead (u8 word_en, -u8 *sourdata, -u8 *targetdata) -{ -if (!(word_en &BIT (0 ))) { - targetdata[0 ] = sourdata[0 ]; - targetdata[1 ] = sourdata[1 ]; - } -if (!(word_en &BIT (1 ))) { - targetdata[2 ] = sourdata[2 ]; - targetdata[3 ] = sourdata[3 ]; - } -if (!(word_en &BIT (2 ))) { - targetdata[4 ] = sourdata[4 ]; - targetdata[5 ] = sourdata[5 ]; - } -if (!(word_en &BIT (3 ))) { - targetdata[6 ] = sourdata[6 ]; - targetdata[7 ] = sourdata[7 ]; - } -} - - u8 Efuse_WordEnableDataWrite(struct adapter *padapter, u16 efuse_addr,
drivers/staging/rtl8723bs/include/rtw_efuse.h +0 -1
@@ -97,7 +97,6 @@ u8 efuse_OneByteRead(struct adapter *padapter, u16 addr, u8 *data, bool bPseudou8 efuse_OneByteWrite (struct adapter *padapter,u16 addr,u8 data,bool bPseudoTest);void Efuse_PowerSwitch (struct adapter *padapter,u8 bWrite,u8 PwrState); -void efuse_WordEnableDataRead (u8 word_en,u8 *sourdata,u8 *targetdata);u8 Efuse_WordEnableDataWrite (struct adapter *padapter,u16 efuse_addr,u8 word_en,u8 *data,bool bPseudoTest);u8 EFUSE_Read1Byte (struct adapter *padapter,u16 Address);
Signature · 1 line
2.43.0
PATCH 16/16 staging: rtl8723bs: Remove unused function Efuse_GetCurrentSize
In reply to Philipp HortmannRemove unused function Efuse_GetCurrentSize to shorten code.
--- drivers/staging/rtl8723bs/core/rtw_efuse.c | 25 ------------------- drivers/staging/rtl8723bs/include/rtw_efuse.h | 1 - 2 files changed, 26 deletions(-)
drivers/staging/rtl8723bs/core/rtw_efuse.c +0 -25
@@ -80,31 +80,6 @@ u8 PwrState)Hal_EfusePowerSwitch (padapter, bWrite, PwrState); } -/*----------------------------------------------------------------------------- -* Function: Efuse_GetCurrentSize -* -* Overview: Get current efuse size!!! -* -* Input: NONE -* -* Output: NONE -* -* Return: NONE -* -* Revised History: -* When Who Remark -* 11/16/2008 MHC Create Version 0. -* -*---------------------------------------------------------------------------*/ -u16 -Efuse_GetCurrentSize ( -struct adapter *padapter, -u8 efuseType, -bool bPseudoTest) -{ -return Hal_EfuseGetCurrentSize (padapter, efuseType, bPseudoTest); -} -/* 11/16/2008 MH Add description. Get current efuse area enabled word!!. */ u8 Efuse_CalculateWordCnts (u8 word_en)
drivers/staging/rtl8723bs/include/rtw_efuse.h +0 -1
@@ -90,7 +90,6 @@ extern u8 fakeBTEfuseInitMap[];extern u8 fakeBTEfuseModifiedMap[];/*------------------------Export global variable----------------------------*/ -u16 Efuse_GetCurrentSize (struct adapter *padapter,u8 efuseType,bool bPseudoTest);u8 Efuse_CalculateWordCnts (u8 word_en);void EFUSE_GetEfuseDefinition (struct adapter *padapter,u8 efuseType,u8 type,void *pOut,bool bPseudoTest);u8 efuse_OneByteRead (struct adapter *padapter,u16 addr,u8 *data,bool bPseudoTest);
Signature · 1 line
2.43.0