staging: rtl8188eu: Remove odm_debug.c
PATCH 1/13 staging: rtl8188eu: Remove odm_debug.c
Move a function and global variable from odm_debug.c to odm.c
--- drivers/staging/rtl8188eu/Makefile | 1 - drivers/staging/rtl8188eu/hal/odm.c | 8 ++++++++ drivers/staging/rtl8188eu/hal/odm_debug.c | 32 ----------------------------- 3 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 drivers/staging/rtl8188eu/hal/odm_debug.c
drivers/staging/rtl8188eu/Makefile +0 -1
@@ -27,7 +27,6 @@ r8188eu-y := \ hal/hal_intf.o \ hal/hal_com.o \ hal/odm.o \ - hal/odm_debug.o \ hal/odm_HWConfig.o \ hal/odm_RTL8188E.o \ hal/rtl8188e_cmd.o \
drivers/staging/rtl8188eu/hal/odm.c +8 -0
@@ -23,6 +23,7 @@#include "odm_precomp.h" #include "phy.h" +u32 GlobalDebugLevel;static const u16 dB_Invert_Table[8 ][12 ] = { {1 ,1 ,1 ,2 ,2 ,2 ,2 ,3 ,3 ,3 ,4 ,4 }, {4 ,5 ,6 ,6 ,7 ,8 ,9 ,10 ,11 ,13 ,14 ,16 },
@@ -172,6 +173,13 @@ u8 CCKSwingTable_Ch14[CCK_TABLE_SIZE][8] = {#define RxDefaultAnt1 0x65a9#define RxDefaultAnt2 0x569a +void ODM_InitDebugSetting (struct odm_dm_struct *pDM_Odm) +{ + pDM_Odm->DebugLevel =ODM_DBG_TRACE ; + + pDM_Odm->DebugComponents =0 ; +} +/* 3 Export Interface */ /* 2011/09/21 MH Add to describe different team necessary resource allocate?? */
drivers/staging/rtl8188eu/hal/odm_debug.c deleted +0 -32
@@ -1,32 +0,0 @@ -/****************************************************************************** -* -* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of version 2 of the GNU General Public License as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* 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 -* -* -******************************************************************************/ - -/* include files */ - -#include "odm_precomp.h" - -void ODM_InitDebugSetting (struct odm_dm_struct *pDM_Odm) -{ - pDM_Odm->DebugLevel =ODM_DBG_TRACE ; - - pDM_Odm->DebugComponents =0 ; -} - -u32 GlobalDebugLevel;
Signature · 1 line
1.7.10.4
PATCH 2/13 staging: rtl8188eu: Remove unused header file odm_RegDefine11AC.h
--- .../staging/rtl8188eu/include/odm_RegDefine11AC.h | 54 -------------------- drivers/staging/rtl8188eu/include/odm_precomp.h | 1 - 2 files changed, 55 deletions(-) delete mode 100644 drivers/staging/rtl8188eu/include/odm_RegDefine11AC.h
drivers/staging/rtl8188eu/include/odm_RegDefine11AC.h deleted +0 -54
@@ -1,54 +0,0 @@ -/****************************************************************************** -* -* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of version 2 of the GNU General Public License as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* 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 -* -* -******************************************************************************/ - -#ifndef __ODM_REGDEFINE11AC_H__ -#define __ODM_REGDEFINE11AC_H__ - -/* 2 RF REG LIST */ - - - -/* 2 BB REG LIST */ -/* PAGE 8 */ -/* PAGE 9 */ -#define ODM_REG_OFDM_FA_RST_11AC 0x9A4 -/* PAGE A */ -#define ODM_REG_CCK_CCA_11AC 0xA0A -#define ODM_REG_CCK_FA_RST_11AC 0xA2C -#define ODM_REG_CCK_FA_11AC 0xA5C -/* PAGE C */ -#define ODM_REG_IGI_A_11AC 0xC50 -/* PAGE E */ -#define ODM_REG_IGI_B_11AC 0xE50 -/* PAGE F */ -#define ODM_REG_OFDM_FA_11AC 0xF48 - - -/* 2 MAC REG LIST */ - - - - -/* DIG Related */ -#define ODM_BIT_IGI_11AC 0xFFFFFFFF - - - -#endif
drivers/staging/rtl8188eu/include/odm_precomp.h +0 -1
@@ -37,7 +37,6 @@#include "odm.h" #include "odm_HWConfig.h" #include "odm_debug.h" -#include "odm_RegDefine11AC.h" #include "odm_RegDefine11N.h" #include "Hal8188ERateAdaptive.h" /* for RA,Power training */
Signature · 1 line
1.7.10.4
PATCH 3/13 staging: rtl8188eu: Rework function odm_RX_HWAntDivInit()
In reply to navin patidarRename CamelCase function name.
Remove unnecessary comments.
--- drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 31 +++++++++++++------------- 1 file changed, 16 insertions(+), 15 deletions(-)
drivers/staging/rtl8188eu/hal/odm_RTL8188E.c +16 -15
@@ -21,34 +21,35 @@#include "odm_precomp.h" #include "phy.h" -static void odm_RX_HWAntDivInit (struct odm_dm_struct *dm_odm) +static void dm_rx_hw_antena_div_init (struct odm_dm_struct *dm_odm) {struct adapter *adapter = dm_odm->Adapter; -u32 value32; +u32 value32;if (*(dm_odm->mp_mode) ==1 ) { dm_odm->AntDivType =CGCS_RX_SW_ANTDIV ; -phy_set_bb_reg (adapter,ODM_REG_IGI_A_11N ,BIT7 ,0 );/* disable HW AntDiv */ -phy_set_bb_reg (adapter,ODM_REG_LNA_SWITCH_11N ,BIT31 ,1 );/* 1:CG, 0:CS */ +phy_set_bb_reg (adapter,ODM_REG_IGI_A_11N ,BIT7 ,0 ); +phy_set_bb_reg (adapter,ODM_REG_LNA_SWITCH_11N ,BIT31 ,1 );return ; } -ODM_RT_TRACE (dm_odm,ODM_COMP_ANT_DIV ,ODM_DBG_LOUD , ("odm_RX_HWAntDivInit()\n" ));/* MAC Setting */ value32 =phy_query_bb_reg (adapter,ODM_REG_ANTSEL_PIN_11N , bMaskDWord); -phy_set_bb_reg (adapter,ODM_REG_ANTSEL_PIN_11N , bMaskDWord, value32|(BIT23 |BIT25 ));/* Reg4C[25]=1, Reg4C[23]=1 for pin output */ +phy_set_bb_reg (adapter,ODM_REG_ANTSEL_PIN_11N , bMaskDWord, + value32|(BIT23 |BIT25 ));/* Pin Settings */ -phy_set_bb_reg (adapter,ODM_REG_PIN_CTRL_11N ,BIT9 |BIT8 ,0 );/* Reg870[8]=1'b0, Reg870[9]=1'b0 antsel antselb by HW */ -phy_set_bb_reg (adapter,ODM_REG_RX_ANT_CTRL_11N ,BIT10 ,0 );/* Reg864[10]=1'b0 antsel2 by HW */ -phy_set_bb_reg (adapter,ODM_REG_LNA_SWITCH_11N ,BIT22 ,1 );/* Regb2c[22]=1'b0 disable CS/CG switch */ -phy_set_bb_reg (adapter,ODM_REG_LNA_SWITCH_11N ,BIT31 ,1 );/* Regb2c[31]=1'b1 output at CG only */ +phy_set_bb_reg (adapter,ODM_REG_PIN_CTRL_11N ,BIT9 |BIT8 ,0 ); +phy_set_bb_reg (adapter,ODM_REG_RX_ANT_CTRL_11N ,BIT10 ,0 ); +phy_set_bb_reg (adapter,ODM_REG_LNA_SWITCH_11N ,BIT22 ,1 ); +phy_set_bb_reg (adapter,ODM_REG_LNA_SWITCH_11N ,BIT31 ,1 );/* OFDM Settings */ -phy_set_bb_reg (adapter,ODM_REG_ANTDIV_PARA1_11N , bMaskDWord,0x000000a0 ); +phy_set_bb_reg (adapter,ODM_REG_ANTDIV_PARA1_11N , bMaskDWord, +0x000000a0 );/* CCK Settings */ -phy_set_bb_reg (adapter,ODM_REG_BB_PWR_SAV4_11N ,BIT7 ,1 );/* Fix CCK PHY status report issue */ -phy_set_bb_reg (adapter,ODM_REG_CCK_ANTDIV_PARA2_11N ,BIT4 ,1 );/* CCK complete HW AntDiv within 64 samples */ +phy_set_bb_reg (adapter,ODM_REG_BB_PWR_SAV4_11N ,BIT7 ,1 ); +phy_set_bb_reg (adapter,ODM_REG_CCK_ANTDIV_PARA2_11N ,BIT4 ,1 );ODM_UpdateRxIdleAnt_88E (dm_odm,MAIN_ANT ); -phy_set_bb_reg (adapter,ODM_REG_ANT_MAPPING1_11N ,0xFFFF ,0x0201 );/* antenna mapping table */ +phy_set_bb_reg (adapter,ODM_REG_ANT_MAPPING1_11N ,0xFFFF ,0x0201 ); }static void odm_TRX_HWAntDivInit (struct odm_dm_struct *dm_odm)
@@ -177,7 +178,7 @@ void ODM_AntennaDiversityInit_88E(struct odm_dm_struct *dm_odm)ODM_RT_TRACE (dm_odm,ODM_COMP_ANT_DIV ,ODM_DBG_LOUD , ("dm_odm->bIsMPChip=%s\n" , (dm_odm->bIsMPChip ?"true" :"false" )));if (dm_odm->AntDivType ==CGCS_RX_HW_ANTDIV ) -odm_RX_HWAntDivInit (dm_odm); +dm_rx_hw_antena_div_init (dm_odm);else if (dm_odm->AntDivType ==CG_TRX_HW_ANTDIV )odm_TRX_HWAntDivInit (dm_odm);else if (dm_odm->AntDivType ==CG_TRX_SMART_ANTDIV )
Signature · 1 line
1.7.10.4
PATCH 4/13 staging: rtl8188eu: Rework function odm_TRX_HWAntDivInit()
In reply to navin patidarRename CamelCase function name.
Remove unnecessary comments.
--- drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 39 +++++++++++++++----------- 1 file changed, 22 insertions(+), 17 deletions(-)
drivers/staging/rtl8188eu/hal/odm_RTL8188E.c +22 -17
@@ -52,42 +52,47 @@ static void dm_rx_hw_antena_div_init(struct odm_dm_struct *dm_odm)phy_set_bb_reg (adapter,ODM_REG_ANT_MAPPING1_11N ,0xFFFF ,0x0201 ); } -static void odm_TRX_HWAntDivInit (struct odm_dm_struct *dm_odm) +static void dm_trx_hw_antenna_div_init (struct odm_dm_struct *dm_odm) {struct adapter *adapter = dm_odm->Adapter;u32 value32;if (*(dm_odm->mp_mode) ==1 ) { dm_odm->AntDivType =CGCS_RX_SW_ANTDIV ; -phy_set_bb_reg (adapter,ODM_REG_IGI_A_11N ,BIT7 ,0 );/* disable HW AntDiv */ -phy_set_bb_reg (adapter,ODM_REG_RX_ANT_CTRL_11N ,BIT5 |BIT4 |BIT3 ,0 );/* Default RX (0/1) */ +phy_set_bb_reg (adapter,ODM_REG_IGI_A_11N ,BIT7 ,0 ); +phy_set_bb_reg (adapter,ODM_REG_RX_ANT_CTRL_11N , +BIT5 |BIT4 |BIT3 ,0 );return ; } -ODM_RT_TRACE (dm_odm,ODM_COMP_ANT_DIV ,ODM_DBG_LOUD , ("odm_TRX_HWAntDivInit()\n" ));/* MAC Setting */ value32 =phy_query_bb_reg (adapter,ODM_REG_ANTSEL_PIN_11N , bMaskDWord); -phy_set_bb_reg (adapter,ODM_REG_ANTSEL_PIN_11N , bMaskDWord, value32|(BIT23 |BIT25 ));/* Reg4C[25]=1, Reg4C[23]=1 for pin output */ +phy_set_bb_reg (adapter,ODM_REG_ANTSEL_PIN_11N , bMaskDWord, + value32|(BIT23 |BIT25 ));/* Pin Settings */ -phy_set_bb_reg (adapter,ODM_REG_PIN_CTRL_11N ,BIT9 |BIT8 ,0 );/* Reg870[8]=1'b0, Reg870[9]=1'b0 antsel antselb by HW */ -phy_set_bb_reg (adapter,ODM_REG_RX_ANT_CTRL_11N ,BIT10 ,0 );/* Reg864[10]=1'b0 antsel2 by HW */ -phy_set_bb_reg (adapter,ODM_REG_LNA_SWITCH_11N ,BIT22 ,0 );/* Regb2c[22]=1'b0 disable CS/CG switch */ -phy_set_bb_reg (adapter,ODM_REG_LNA_SWITCH_11N ,BIT31 ,1 );/* Regb2c[31]=1'b1 output at CG only */ +phy_set_bb_reg (adapter,ODM_REG_PIN_CTRL_11N ,BIT9 |BIT8 ,0 ); +phy_set_bb_reg (adapter,ODM_REG_RX_ANT_CTRL_11N ,BIT10 ,0 ); +phy_set_bb_reg (adapter,ODM_REG_LNA_SWITCH_11N ,BIT22 ,0 ); +phy_set_bb_reg (adapter,ODM_REG_LNA_SWITCH_11N ,BIT31 ,1 );/* OFDM Settings */ -phy_set_bb_reg (adapter,ODM_REG_ANTDIV_PARA1_11N , bMaskDWord,0x000000a0 ); +phy_set_bb_reg (adapter,ODM_REG_ANTDIV_PARA1_11N , bMaskDWord, +0x000000a0 );/* CCK Settings */ -phy_set_bb_reg (adapter,ODM_REG_BB_PWR_SAV4_11N ,BIT7 ,1 );/* Fix CCK PHY status report issue */ -phy_set_bb_reg (adapter,ODM_REG_CCK_ANTDIV_PARA2_11N ,BIT4 ,1 );/* CCK complete HW AntDiv within 64 samples */ +phy_set_bb_reg (adapter,ODM_REG_BB_PWR_SAV4_11N ,BIT7 ,1 ); +phy_set_bb_reg (adapter,ODM_REG_CCK_ANTDIV_PARA2_11N ,BIT4 ,1 );/* Tx Settings */ -phy_set_bb_reg (adapter,ODM_REG_TX_ANT_CTRL_11N ,BIT21 ,0 );/* Reg80c[21]=1'b0 from TX Reg */ +phy_set_bb_reg (adapter,ODM_REG_TX_ANT_CTRL_11N ,BIT21 ,0 );ODM_UpdateRxIdleAnt_88E (dm_odm,MAIN_ANT );/* antenna mapping table */ if (!dm_odm->bIsMPChip) {/* testchip */ -phy_set_bb_reg (adapter,ODM_REG_RX_DEFUALT_A_11N ,BIT10 |BIT9 |BIT8 ,1 );/* Reg858[10:8]=3'b001 */ -phy_set_bb_reg (adapter,ODM_REG_RX_DEFUALT_A_11N ,BIT13 |BIT12 |BIT11 ,2 );/* Reg858[13:11]=3'b010 */ +phy_set_bb_reg (adapter,ODM_REG_RX_DEFUALT_A_11N , +BIT10 |BIT9 |BIT8 ,1 ); +phy_set_bb_reg (adapter,ODM_REG_RX_DEFUALT_A_11N , +BIT13 |BIT12 |BIT11 ,2 ); }else {/* MPchip */ -phy_set_bb_reg (adapter,ODM_REG_ANT_MAPPING1_11N , bMaskDWord,0x0201 );/* Reg914=3'b010, Reg915=3'b001 */ +phy_set_bb_reg (adapter,ODM_REG_ANT_MAPPING1_11N , bMaskDWord, +0x0201 ); } }
@@ -180,7 +185,7 @@ void ODM_AntennaDiversityInit_88E(struct odm_dm_struct *dm_odm)if (dm_odm->AntDivType ==CGCS_RX_HW_ANTDIV )dm_rx_hw_antena_div_init (dm_odm);else if (dm_odm->AntDivType ==CG_TRX_HW_ANTDIV ) -odm_TRX_HWAntDivInit (dm_odm); +dm_trx_hw_antenna_div_init (dm_odm);else if (dm_odm->AntDivType ==CG_TRX_SMART_ANTDIV )odm_FastAntTrainingInit (dm_odm); }
Signature · 1 line
1.7.10.4
PATCH 5/13 staging: rtl8188eu: Rework function odm_FastAntTrainingInit()
In reply to navin patidarRename CamelCase function name.
Remove unnecessary comments and debugging messages.
--- drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 53 ++++++++++++-------------- 1 file changed, 25 insertions(+), 28 deletions(-)
drivers/staging/rtl8188eu/hal/odm_RTL8188E.c +25 -28
@@ -96,17 +96,14 @@ static void dm_trx_hw_antenna_div_init(struct odm_dm_struct *dm_odm) } } -static void odm_FastAntTrainingInit (struct odm_dm_struct *dm_odm) +static void dm_fast_training_init (struct odm_dm_struct *dm_odm) {struct adapter *adapter = dm_odm->Adapter; -u32 value32, i; +u32 value32, i;struct fast_ant_train *dm_fat_tbl = &dm_odm->DM_FatTable; -u32 AntCombination =2 ; - -ODM_RT_TRACE (dm_odm,ODM_COMP_ANT_DIV ,ODM_DBG_LOUD , ("odm_FastAntTrainingInit()\n" )); +u32 AntCombination =2 ;if (*(dm_odm->mp_mode) ==1 ) { -ODM_RT_TRACE (dm_odm,ODM_COMP_INIT ,ODM_DBG_LOUD , ("dm_odm->AntDivType: %d\n" , dm_odm->AntDivType));return ; }
@@ -121,40 +118,40 @@ static void odm_FastAntTrainingInit(struct odm_dm_struct *dm_odm)/* MAC Setting */ value32 =phy_query_bb_reg (adapter,0x4c , bMaskDWord); -phy_set_bb_reg (adapter,0x4c , bMaskDWord, value32|(BIT23 |BIT25 ));/* Reg4C[25]=1, Reg4C[23]=1 for pin output */ +phy_set_bb_reg (adapter,0x4c , bMaskDWord, value32|(BIT23 |BIT25 )); value32 =phy_query_bb_reg (adapter,0x7B4 , bMaskDWord); -phy_set_bb_reg (adapter,0x7b4 , bMaskDWord, value32|(BIT16 |BIT17 ));/* Reg7B4[16]=1 enable antenna training, Reg7B4[17]=1 enable A2 match */ +phy_set_bb_reg (adapter,0x7b4 , bMaskDWord, value32|(BIT16 |BIT17 ));/* Match MAC ADDR */ phy_set_bb_reg (adapter,0x7b4 ,0xFFFF ,0 );phy_set_bb_reg (adapter,0x7b0 , bMaskDWord,0 ); -phy_set_bb_reg (adapter,0x870 ,BIT9 |BIT8 ,0 );/* Reg870[8]=1'b0, Reg870[9]=1'b0 antsel antselb by HW */ -phy_set_bb_reg (adapter,0x864 ,BIT10 ,0 );/* Reg864[10]=1'b0 antsel2 by HW */ -phy_set_bb_reg (adapter,0xb2c ,BIT22 ,0 );/* Regb2c[22]=1'b0 disable CS/CG switch */ -phy_set_bb_reg (adapter,0xb2c ,BIT31 ,1 );/* Regb2c[31]=1'b1 output at CG only */ +phy_set_bb_reg (adapter,0x870 ,BIT9 |BIT8 ,0 ); +phy_set_bb_reg (adapter,0x864 ,BIT10 ,0 ); +phy_set_bb_reg (adapter,0xb2c ,BIT22 ,0 ); +phy_set_bb_reg (adapter,0xb2c ,BIT31 ,1 );phy_set_bb_reg (adapter,0xca4 , bMaskDWord,0x000000a0 );/* antenna mapping table */ if (AntCombination ==2 ) {if (!dm_odm->bIsMPChip) {/* testchip */ -phy_set_bb_reg (adapter,0x858 ,BIT10 |BIT9 |BIT8 ,1 );/* Reg858[10:8]=3'b001 */ -phy_set_bb_reg (adapter,0x858 ,BIT13 |BIT12 |BIT11 ,2 );/* Reg858[13:11]=3'b010 */ +phy_set_bb_reg (adapter,0x858 ,BIT10 |BIT9 |BIT8 ,1 ); +phy_set_bb_reg (adapter,0x858 ,BIT13 |BIT12 |BIT11 ,2 ); }else {/* MPchip */ phy_set_bb_reg (adapter,0x914 , bMaskByte0,1 );phy_set_bb_reg (adapter,0x914 , bMaskByte1,2 ); } }else if (AntCombination ==7 ) {if (!dm_odm->bIsMPChip) {/* testchip */ -phy_set_bb_reg (adapter,0x858 ,BIT10 |BIT9 |BIT8 ,0 );/* Reg858[10:8]=3'b000 */ -phy_set_bb_reg (adapter,0x858 ,BIT13 |BIT12 |BIT11 ,1 );/* Reg858[13:11]=3'b001 */ +phy_set_bb_reg (adapter,0x858 ,BIT10 |BIT9 |BIT8 ,0 ); +phy_set_bb_reg (adapter,0x858 ,BIT13 |BIT12 |BIT11 ,1 );phy_set_bb_reg (adapter,0x878 ,BIT16 ,0 ); -phy_set_bb_reg (adapter,0x858 ,BIT15 |BIT14 ,2 );/* Reg878[0],Reg858[14:15])=3'b010 */ -phy_set_bb_reg (adapter,0x878 ,BIT19 |BIT18 |BIT17 ,3 );/* Reg878[3:1]=3b'011 */ -phy_set_bb_reg (adapter,0x878 ,BIT22 |BIT21 |BIT20 ,4 );/* Reg878[6:4]=3b'100 */ -phy_set_bb_reg (adapter,0x878 ,BIT25 |BIT24 |BIT23 ,5 );/* Reg878[9:7]=3b'101 */ -phy_set_bb_reg (adapter,0x878 ,BIT28 |BIT27 |BIT26 ,6 );/* Reg878[12:10]=3b'110 */ -phy_set_bb_reg (adapter,0x878 ,BIT31 |BIT30 |BIT29 ,7 );/* Reg878[15:13]=3b'111 */ +phy_set_bb_reg (adapter,0x858 ,BIT15 |BIT14 ,2 ); +phy_set_bb_reg (adapter,0x878 ,BIT19 |BIT18 |BIT17 ,3 ); +phy_set_bb_reg (adapter,0x878 ,BIT22 |BIT21 |BIT20 ,4 ); +phy_set_bb_reg (adapter,0x878 ,BIT25 |BIT24 |BIT23 ,5 ); +phy_set_bb_reg (adapter,0x878 ,BIT28 |BIT27 |BIT26 ,6 ); +phy_set_bb_reg (adapter,0x878 ,BIT31 |BIT30 |BIT29 ,7 ); }else {/* MPchip */ phy_set_bb_reg (adapter,0x914 , bMaskByte0,0 );phy_set_bb_reg (adapter,0x914 , bMaskByte1,1 );
@@ -168,13 +165,13 @@ static void odm_FastAntTrainingInit(struct odm_dm_struct *dm_odm) }/* Default Ant Setting when no fast training */ -phy_set_bb_reg (adapter,0x80c ,BIT21 ,1 );/* Reg80c[21]=1'b1 from TX Info */ -phy_set_bb_reg (adapter,0x864 ,BIT5 |BIT4 |BIT3 ,0 );/* Default RX */ -phy_set_bb_reg (adapter,0x864 ,BIT8 |BIT7 |BIT6 ,1 );/* Optional RX */ +phy_set_bb_reg (adapter,0x80c ,BIT21 ,1 ); +phy_set_bb_reg (adapter,0x864 ,BIT5 |BIT4 |BIT3 ,0 ); +phy_set_bb_reg (adapter,0x864 ,BIT8 |BIT7 |BIT6 ,1 );/* Enter Traing state */ -phy_set_bb_reg (adapter,0x864 ,BIT2 |BIT1 |BIT0 , (AntCombination-1 ));/* Reg864[2:0]=3'd6 ant combination=reg864[2:0]+1 */ -phy_set_bb_reg (adapter,0xc50 ,BIT7 ,1 );/* RegC50[7]=1'b1 enable HW AntDiv */ +phy_set_bb_reg (adapter,0x864 ,BIT2 |BIT1 |BIT0 , (AntCombination-1 )); +phy_set_bb_reg (adapter,0xc50 ,BIT7 ,1 ); }void ODM_AntennaDiversityInit_88E (struct odm_dm_struct *dm_odm)
@@ -187,7 +184,7 @@ void ODM_AntennaDiversityInit_88E(struct odm_dm_struct *dm_odm)else if (dm_odm->AntDivType ==CG_TRX_HW_ANTDIV )dm_trx_hw_antenna_div_init (dm_odm);else if (dm_odm->AntDivType ==CG_TRX_SMART_ANTDIV ) -odm_FastAntTrainingInit (dm_odm); +dm_fast_training_init (dm_odm); }void ODM_UpdateRxIdleAnt_88E (struct odm_dm_struct *dm_odm,u8 Ant)
Signature · 1 line
1.7.10.4
PATCH 6/13 staging: rtl8188eu: Rework function ODM_AntennaDiversityInit_88E()
In reply to navin patidarRename CamelCase function name.
Remove unnecessary debugging messages.
--- drivers/staging/rtl8188eu/hal/odm.c | 2 +- drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 5 +---- drivers/staging/rtl8188eu/include/odm_RTL8188E.h | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-)
drivers/staging/rtl8188eu/hal/odm.c +1 -1
@@ -1265,7 +1265,7 @@ void odm_InitHybridAntDiv(struct odm_dm_struct *pDM_Odm)return ; } -ODM_AntennaDiversityInit_88E (pDM_Odm); +rtl88eu_dm_antenna_div_init (pDM_Odm); }void odm_HwAntDiv (struct odm_dm_struct *pDM_Odm)
drivers/staging/rtl8188eu/hal/odm_RTL8188E.c +1 -4
@@ -174,11 +174,8 @@ static void dm_fast_training_init(struct odm_dm_struct *dm_odm)phy_set_bb_reg (adapter,0xc50 ,BIT7 ,1 ); } -void ODM_AntennaDiversityInit_88E (struct odm_dm_struct *dm_odm) +void rtl88eu_dm_antenna_div_init (struct odm_dm_struct *dm_odm) { -ODM_RT_TRACE (dm_odm,ODM_COMP_ANT_DIV ,ODM_DBG_LOUD , ("dm_odm->AntDivType=%d\n" , dm_odm->AntDivType)); -ODM_RT_TRACE (dm_odm,ODM_COMP_ANT_DIV ,ODM_DBG_LOUD , ("dm_odm->bIsMPChip=%s\n" , (dm_odm->bIsMPChip ?"true" :"false" ))); -if (dm_odm->AntDivType ==CGCS_RX_HW_ANTDIV )dm_rx_hw_antena_div_init (dm_odm);else if (dm_odm->AntDivType ==CG_TRX_HW_ANTDIV )
drivers/staging/rtl8188eu/include/odm_RTL8188E.h +1 -1
@@ -29,7 +29,7 @@void ODM_DIG_LowerBound_88E (struct odm_dm_struct *pDM_Odm); -void ODM_AntennaDiversityInit_88E (struct odm_dm_struct *pDM_Odm); +void rtl88eu_dm_antenna_div_init (struct odm_dm_struct *dm_odm);void ODM_AntennaDiversity_88E (struct odm_dm_struct *pDM_Odm);
Signature · 1 line
1.7.10.4
PATCH 7/13 staging: rtl8188eu: Rework function ODM_UpdateRxIdleAnt_88E()
In reply to navin patidarRename CamelCase function name and local variables. Remove unnecessary debugging messages and comments.
--- drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 51 ++++++++++++---------- drivers/staging/rtl8188eu/hal/usb_halinit.c | 2 +- drivers/staging/rtl8188eu/include/odm_RTL8188E.h | 2 +- 3 files changed, 31 insertions(+), 24 deletions(-)
drivers/staging/rtl8188eu/hal/odm_RTL8188E.c +29 -22
@@ -48,7 +48,7 @@ static void dm_rx_hw_antena_div_init(struct odm_dm_struct *dm_odm)/* CCK Settings */ phy_set_bb_reg (adapter,ODM_REG_BB_PWR_SAV4_11N ,BIT7 ,1 );phy_set_bb_reg (adapter,ODM_REG_CCK_ANTDIV_PARA2_11N ,BIT4 ,1 ); -ODM_UpdateRxIdleAnt_88E (dm_odm,MAIN_ANT ); +rtl88eu_dm_update_rx_idle_ant (dm_odm,MAIN_ANT );phy_set_bb_reg (adapter,ODM_REG_ANT_MAPPING1_11N ,0xFFFF ,0x0201 ); }
@@ -82,7 +82,7 @@ static void dm_trx_hw_antenna_div_init(struct odm_dm_struct *dm_odm)phy_set_bb_reg (adapter,ODM_REG_CCK_ANTDIV_PARA2_11N ,BIT4 ,1 );/* Tx Settings */ phy_set_bb_reg (adapter,ODM_REG_TX_ANT_CTRL_11N ,BIT21 ,0 ); -ODM_UpdateRxIdleAnt_88E (dm_odm,MAIN_ANT ); +rtl88eu_dm_update_rx_idle_ant (dm_odm,MAIN_ANT );/* antenna mapping table */ if (!dm_odm->bIsMPChip) {/* testchip */
@@ -184,35 +184,42 @@ void rtl88eu_dm_antenna_div_init(struct odm_dm_struct *dm_odm)dm_fast_training_init (dm_odm); } -void ODM_UpdateRxIdleAnt_88E (struct odm_dm_struct *dm_odm,u8 Ant) +void rtl88eu_dm_update_rx_idle_ant (struct odm_dm_struct *dm_odm,u8 ant) {struct fast_ant_train *dm_fat_tbl = &dm_odm->DM_FatTable;struct adapter *adapter = dm_odm->Adapter; -u32 DefaultAnt, OptionalAnt; - -if (dm_fat_tbl->RxIdleAnt != Ant) { -ODM_RT_TRACE (dm_odm,ODM_COMP_ANT_DIV ,ODM_DBG_LOUD , ("Need to Update Rx Idle Ant\n" )); -if (Ant ==MAIN_ANT ) { - DefaultAnt = (dm_odm->AntDivType ==CG_TRX_HW_ANTDIV ) ?MAIN_ANT_CG_TRX :MAIN_ANT_CGCS_RX ; - OptionalAnt = (dm_odm->AntDivType ==CG_TRX_HW_ANTDIV ) ?AUX_ANT_CG_TRX :AUX_ANT_CGCS_RX ; +u32 default_ant, optional_ant; + +if (dm_fat_tbl->RxIdleAnt != ant) { +if (ant ==MAIN_ANT ) { + default_ant = (dm_odm->AntDivType ==CG_TRX_HW_ANTDIV ) ? +MAIN_ANT_CG_TRX :MAIN_ANT_CGCS_RX ; + optional_ant = (dm_odm->AntDivType ==CG_TRX_HW_ANTDIV ) ? +AUX_ANT_CG_TRX :AUX_ANT_CGCS_RX ; }else { - DefaultAnt = (dm_odm->AntDivType ==CG_TRX_HW_ANTDIV ) ?AUX_ANT_CG_TRX :AUX_ANT_CGCS_RX ; - OptionalAnt = (dm_odm->AntDivType ==CG_TRX_HW_ANTDIV ) ?MAIN_ANT_CG_TRX :MAIN_ANT_CGCS_RX ; + default_ant = (dm_odm->AntDivType ==CG_TRX_HW_ANTDIV ) ? +AUX_ANT_CG_TRX :AUX_ANT_CGCS_RX ; + optional_ant = (dm_odm->AntDivType ==CG_TRX_HW_ANTDIV ) ? +MAIN_ANT_CG_TRX :MAIN_ANT_CGCS_RX ; }if (dm_odm->AntDivType ==CG_TRX_HW_ANTDIV ) { -phy_set_bb_reg (adapter,ODM_REG_RX_ANT_CTRL_11N ,BIT5 |BIT4 |BIT3 , DefaultAnt);/* Default RX */ -phy_set_bb_reg (adapter,ODM_REG_RX_ANT_CTRL_11N ,BIT8 |BIT7 |BIT6 , OptionalAnt);/* Optional RX */ -phy_set_bb_reg (adapter,ODM_REG_ANTSEL_CTRL_11N ,BIT14 |BIT13 |BIT12 , DefaultAnt);/* Default TX */ -phy_set_bb_reg (adapter,ODM_REG_RESP_TX_11N ,BIT6 |BIT7 , DefaultAnt);/* Resp Tx */ +phy_set_bb_reg (adapter,ODM_REG_RX_ANT_CTRL_11N , +BIT5 |BIT4 |BIT3 , default_ant); +phy_set_bb_reg (adapter,ODM_REG_RX_ANT_CTRL_11N , +BIT8 |BIT7 |BIT6 , optional_ant); +phy_set_bb_reg (adapter,ODM_REG_ANTSEL_CTRL_11N , +BIT14 |BIT13 |BIT12 , default_ant); +phy_set_bb_reg (adapter,ODM_REG_RESP_TX_11N , +BIT6 |BIT7 , default_ant); }else if (dm_odm->AntDivType ==CGCS_RX_HW_ANTDIV ) { -phy_set_bb_reg (adapter,ODM_REG_RX_ANT_CTRL_11N ,BIT5 |BIT4 |BIT3 , DefaultAnt);/* Default RX */ -phy_set_bb_reg (adapter,ODM_REG_RX_ANT_CTRL_11N ,BIT8 |BIT7 |BIT6 , OptionalAnt);/* Optional RX */ +phy_set_bb_reg (adapter,ODM_REG_RX_ANT_CTRL_11N , +BIT5 |BIT4 |BIT3 , default_ant); +phy_set_bb_reg (adapter,ODM_REG_RX_ANT_CTRL_11N , +BIT8 |BIT7 |BIT6 , optional_ant); } } - dm_fat_tbl->RxIdleAnt = Ant; -ODM_RT_TRACE (dm_odm,ODM_COMP_ANT_DIV ,ODM_DBG_LOUD , ("RxIdleAnt=%s\n" , (Ant ==MAIN_ANT ) ?"MAIN_ANT" :"AUX_ANT" )); -pr_info ("RxIdleAnt=%s\n" , (Ant ==MAIN_ANT ) ?"MAIN_ANT" :"AUX_ANT" ); + dm_fat_tbl->RxIdleAnt = ant; }static void odm_UpdateTxAnt_88E (struct odm_dm_struct *dm_odm,u8 Ant,u32 MacId)
@@ -324,7 +331,7 @@ static void odm_HWAntDiv(struct odm_dm_struct *dm_odm) }/* 2 Set RX Idle Antenna */ -ODM_UpdateRxIdleAnt_88E (dm_odm, RxIdleAnt); +rtl88eu_dm_update_rx_idle_ant (dm_odm, RxIdleAnt); pDM_DigTable->AntDiv_RSSI_max = AntDivMaxRSSI; pDM_DigTable->RSSI_max = MaxRSSI;
drivers/staging/rtl8188eu/hal/usb_halinit.c +1 -1
@@ -1745,7 +1745,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)/* switch antenna to Optimum_antenna */ if (haldata->CurAntenna != Optimum_antenna) { Ant = (Optimum_antenna ==2 ) ?MAIN_ANT :AUX_ANT ; -ODM_UpdateRxIdleAnt_88E (&haldata->odmpriv, Ant); +rtl88eu_dm_update_rx_idle_ant (&haldata->odmpriv, Ant); haldata->CurAntenna = Optimum_antenna; }
drivers/staging/rtl8188eu/include/odm_RTL8188E.h +1 -1
@@ -36,7 +36,7 @@ void ODM_AntennaDiversity_88E(struct odm_dm_struct *pDM_Odm);void ODM_SetTxAntByTxInfo_88E (struct odm_dm_struct *pDM_Odm,u8 *pDesc,u8 macId); -void ODM_UpdateRxIdleAnt_88E (struct odm_dm_struct *pDM_Odm,u8 Ant); +void rtl88eu_dm_update_rx_idle_ant (struct odm_dm_struct *dm_odm,u8 ant);void ODM_AntselStatistics_88E (struct odm_dm_struct *pDM_Odm,u8 antsel_tr_mux,u32 MacId,u8 RxPWDBAll);
Signature · 1 line
1.7.10.4
PATCH 8/13 staging: rtl8188eu: Rework function odm_UpdateTxAnt_88E()
In reply to navin patidarRename CamelCase function name and local variables. Remove unnecessary debugging messages.
--- drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-)
drivers/staging/rtl8188eu/hal/odm_RTL8188E.c +9 -16
@@ -222,25 +222,18 @@ void rtl88eu_dm_update_rx_idle_ant(struct odm_dm_struct *dm_odm, u8 ant) dm_fat_tbl->RxIdleAnt = ant; } -static void odm_UpdateTxAnt_88E (struct odm_dm_struct *dm_odm,u8 Ant,u32 MacId) +static void update_tx_ant_88eu (struct odm_dm_struct *dm_odm,u8 ant,u32 mac_id) {struct fast_ant_train *dm_fat_tbl = &dm_odm->DM_FatTable; -u8 TargetAnt; +u8 target_ant; -if (Ant ==MAIN_ANT ) - TargetAnt =MAIN_ANT_CG_TRX ; +if (ant ==MAIN_ANT ) + target_ant =MAIN_ANT_CG_TRX ;else - TargetAnt =AUX_ANT_CG_TRX ; - dm_fat_tbl->antsel_a[MacId] = TargetAnt&BIT0 ; - dm_fat_tbl->antsel_b[MacId] = (TargetAnt&BIT1 )>>1 ; - dm_fat_tbl->antsel_c[MacId] = (TargetAnt&BIT2 )>>2 ; - -ODM_RT_TRACE (dm_odm,ODM_COMP_ANT_DIV ,ODM_DBG_LOUD , - ("Tx from TxInfo, TargetAnt=%s\n" , - (Ant ==MAIN_ANT ) ?"MAIN_ANT" :"AUX_ANT" )); -ODM_RT_TRACE (dm_odm,ODM_COMP_ANT_DIV ,ODM_DBG_LOUD , - ("antsel_tr_mux=3'b%d%d%d\n" , - dm_fat_tbl->antsel_c[MacId], dm_fat_tbl->antsel_b[MacId], dm_fat_tbl->antsel_a[MacId])); + target_ant =AUX_ANT_CG_TRX ; + dm_fat_tbl->antsel_a[mac_id] = target_ant&BIT0 ; + dm_fat_tbl->antsel_b[mac_id] = (target_ant&BIT1 )>>1 ; + dm_fat_tbl->antsel_c[mac_id] = (target_ant&BIT2 )>>2 ; }void ODM_SetTxAntByTxInfo_88E (struct odm_dm_struct *dm_odm,u8 *pDesc,u8 macId)
@@ -322,7 +315,7 @@ static void odm_HWAntDiv(struct odm_dm_struct *dm_odm) }/* 2 Select TRX Antenna */ if (dm_odm->AntDivType ==CG_TRX_HW_ANTDIV ) -odm_UpdateTxAnt_88E (dm_odm, TargetAnt, i); +update_tx_ant_88eu (dm_odm, TargetAnt, i); } dm_fat_tbl->MainAnt_Sum[i] =0 ; dm_fat_tbl->AuxAnt_Sum[i] =0 ;
Signature · 1 line
1.7.10.4
PATCH 9/13 staging: rtl8188eu: Rework function ODM_SetTxAntByTxInfo_88E()
In reply to navin patidarRename CamelCase function name and local variables.
--- drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 12 +++++++----- drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 3 ++- drivers/staging/rtl8188eu/include/odm_RTL8188E.h | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-)
drivers/staging/rtl8188eu/hal/odm_RTL8188E.c +7 -5
@@ -236,14 +236,16 @@ static void update_tx_ant_88eu(struct odm_dm_struct *dm_odm, u8 ant, u32 mac_id) dm_fat_tbl->antsel_c[mac_id] = (target_ant&BIT2 )>>2 ; } -void ODM_SetTxAntByTxInfo_88E (struct odm_dm_struct *dm_odm,u8 *pDesc,u8 macId) +void rtl88eu_dm_set_tx_ant_by_tx_info (struct odm_dm_struct *dm_odm, +u8 *desc,u8 mac_id) {struct fast_ant_train *dm_fat_tbl = &dm_odm->DM_FatTable; -if ((dm_odm->AntDivType ==CG_TRX_HW_ANTDIV ) || (dm_odm->AntDivType ==CG_TRX_SMART_ANTDIV )) { -SET_TX_DESC_ANTSEL_A_88E (pDesc, dm_fat_tbl->antsel_a[macId]); -SET_TX_DESC_ANTSEL_B_88E (pDesc, dm_fat_tbl->antsel_b[macId]); -SET_TX_DESC_ANTSEL_C_88E (pDesc, dm_fat_tbl->antsel_c[macId]); +if ((dm_odm->AntDivType ==CG_TRX_HW_ANTDIV ) || + (dm_odm->AntDivType ==CG_TRX_SMART_ANTDIV )) { +SET_TX_DESC_ANTSEL_A_88E (desc, dm_fat_tbl->antsel_a[mac_id]); +SET_TX_DESC_ANTSEL_B_88E (desc, dm_fat_tbl->antsel_b[mac_id]); +SET_TX_DESC_ANTSEL_C_88E (desc, dm_fat_tbl->antsel_c[mac_id]); } }
drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c +2 -1
@@ -336,7 +336,8 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bag ptxdesc->txdw4 |=cpu_to_le32 (HW_SSN );/* Hw set sequence number */ } -ODM_SetTxAntByTxInfo_88E (&haldata->odmpriv, pmem, pattrib->mac_id); +rtl88eu_dm_set_tx_ant_by_tx_info (&haldata->odmpriv, pmem, + pattrib->mac_id);rtl8188eu_cal_txdesc_chksum (ptxdesc);_dbg_dump_tx_info (adapt, pxmitframe->frame_tag, ptxdesc);
drivers/staging/rtl8188eu/include/odm_RTL8188E.h +2 -2
@@ -33,8 +33,8 @@ void rtl88eu_dm_antenna_div_init(struct odm_dm_struct *dm_odm);void ODM_AntennaDiversity_88E (struct odm_dm_struct *pDM_Odm); -void ODM_SetTxAntByTxInfo_88E (struct odm_dm_struct *pDM_Odm,u8 *pDesc, -u8 macId); +void rtl88eu_dm_set_tx_ant_by_tx_info (struct odm_dm_struct *dm_odm,u8 *desc, +u8 mac_id);void rtl88eu_dm_update_rx_idle_ant (struct odm_dm_struct *dm_odm,u8 ant);
Signature · 1 line
1.7.10.4
PATCH 10/13 staging: rtl8188eu: Rework function ODM_AntselStatistics_88E()
In reply to navin patidarRename CamelCase function name and local variables.
--- drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 2 +- drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 19 ++++++++++--------- drivers/staging/rtl8188eu/include/odm_RTL8188E.h | 4 ++-- 3 files changed, 13 insertions(+), 12 deletions(-)
drivers/staging/rtl8188eu/hal/odm_HWConfig.c +1 -1
@@ -315,7 +315,7 @@ static void odm_Process_RSSIForDM(struct odm_dm_struct *dm_odm,if (pPktinfo->bPacketToSelf || pPktinfo->bPacketBeacon) { antsel_tr_mux = (pDM_FatTable->antsel_rx_keep_2<<2 ) | (pDM_FatTable->antsel_rx_keep_1<<1 ) | pDM_FatTable->antsel_rx_keep_0; -ODM_AntselStatistics_88E (dm_odm, antsel_tr_mux, pPktinfo->StationID, pPhyInfo->RxPWDBAll); +rtl88eu_dm_ant_sel_statistics (dm_odm, antsel_tr_mux, pPktinfo->StationID, pPhyInfo->RxPWDBAll); } }/* Smart Antenna Debug Message------------------ */
drivers/staging/rtl8188eu/hal/odm_RTL8188E.c +10 -9
@@ -249,24 +249,25 @@ void rtl88eu_dm_set_tx_ant_by_tx_info(struct odm_dm_struct *dm_odm, } } -void ODM_AntselStatistics_88E (struct odm_dm_struct *dm_odm,u8 antsel_tr_mux,u32 MacId,u8 RxPWDBAll) +void rtl88eu_dm_ant_sel_statistics (struct odm_dm_struct *dm_odm, +u8 antsel_tr_mux,u32 mac_id,u8 rx_pwdb_all) {struct fast_ant_train *dm_fat_tbl = &dm_odm->DM_FatTable;if (dm_odm->AntDivType ==CG_TRX_HW_ANTDIV ) {if (antsel_tr_mux ==MAIN_ANT_CG_TRX ) { - dm_fat_tbl->MainAnt_Sum[MacId] += RxPWDBAll; - dm_fat_tbl->MainAnt_Cnt[MacId]++; + dm_fat_tbl->MainAnt_Sum[mac_id] += rx_pwdb_all; + dm_fat_tbl->MainAnt_Cnt[mac_id]++; }else { - dm_fat_tbl->AuxAnt_Sum[MacId] += RxPWDBAll; - dm_fat_tbl->AuxAnt_Cnt[MacId]++; + dm_fat_tbl->AuxAnt_Sum[mac_id] += rx_pwdb_all; + dm_fat_tbl->AuxAnt_Cnt[mac_id]++; } }else if (dm_odm->AntDivType ==CGCS_RX_HW_ANTDIV ) {if (antsel_tr_mux ==MAIN_ANT_CGCS_RX ) { - dm_fat_tbl->MainAnt_Sum[MacId] += RxPWDBAll; - dm_fat_tbl->MainAnt_Cnt[MacId]++; + dm_fat_tbl->MainAnt_Sum[mac_id] += rx_pwdb_all; + dm_fat_tbl->MainAnt_Cnt[mac_id]++; }else { - dm_fat_tbl->AuxAnt_Sum[MacId] += RxPWDBAll; - dm_fat_tbl->AuxAnt_Cnt[MacId]++; + dm_fat_tbl->AuxAnt_Sum[mac_id] += rx_pwdb_all; + dm_fat_tbl->AuxAnt_Cnt[mac_id]++; } } }
drivers/staging/rtl8188eu/include/odm_RTL8188E.h +2 -2
@@ -38,8 +38,8 @@ void rtl88eu_dm_set_tx_ant_by_tx_info(struct odm_dm_struct *dm_odm, u8 *desc,void rtl88eu_dm_update_rx_idle_ant (struct odm_dm_struct *dm_odm,u8 ant); -void ODM_AntselStatistics_88E (struct odm_dm_struct *pDM_Odm,u8 antsel_tr_mux, -u32 MacId,u8 RxPWDBAll); +void rtl88eu_dm_ant_sel_statistics (struct odm_dm_struct *dm_odm,u8 antsel_tr_mux, +u32 mac_id,u8 rx_pwdb_all);void odm_FastAntTraining (struct odm_dm_struct *pDM_Odm);
Signature · 1 line
1.7.10.4
PATCH 11/13 staging: rtl8188eu: Rework function odm_HWAntDiv()
In reply to navin patidarRename CamelCase function name and local variables. Remove unnecessary debugging messages.
--- drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 78 +++++++++++++------------- 1 file changed, 38 insertions(+), 40 deletions(-)
drivers/staging/rtl8188eu/hal/odm_RTL8188E.c +38 -40
@@ -272,53 +272,51 @@ void rtl88eu_dm_ant_sel_statistics(struct odm_dm_struct *dm_odm, } } -static void odm_HWAntDiv (struct odm_dm_struct *dm_odm) +static void rtl88eu_dm_hw_ant_div (struct odm_dm_struct *dm_odm) { -u32 i, MinRSSI =0xFF , AntDivMaxRSSI =0 , MaxRSSI =0 , LocalMinRSSI, LocalMaxRSSI; -u32 Main_RSSI, Aux_RSSI; -u8 RxIdleAnt =0 , TargetAnt =7 ;struct fast_ant_train *dm_fat_tbl = &dm_odm->DM_FatTable; -struct rtw_dig *pDM_DigTable = &dm_odm->DM_DigTable; -struct sta_info *pEntry; +struct rtw_dig *dig_table = &dm_odm->DM_DigTable; +struct sta_info *entry; +u32 i, min_rssi =0xFF , ant_div_max_rssi =0 , max_rssi =0 ; +u32 local_min_rssi,local_max_rssi; +u32 main_rssi, aux_rssi; +u8 RxIdleAnt =0 , target_ant =7 ;for (i =0 ; i <ODM_ASSOCIATE_ENTRY_NUM ; i++) { - pEntry = dm_odm->pODM_StaInfo[i]; -if (IS_STA_VALID (pEntry)) { + entry = dm_odm->pODM_StaInfo[i]; +if (IS_STA_VALID (entry)) {/* 2 Caculate RSSI per Antenna */ - Main_RSSI = (dm_fat_tbl->MainAnt_Cnt[i] !=0 ) ? (dm_fat_tbl->MainAnt_Sum[i]/dm_fat_tbl->MainAnt_Cnt[i]) :0 ; - Aux_RSSI = (dm_fat_tbl->AuxAnt_Cnt[i] !=0 ) ? (dm_fat_tbl->AuxAnt_Sum[i]/dm_fat_tbl->AuxAnt_Cnt[i]) :0 ; - TargetAnt = (Main_RSSI >= Aux_RSSI) ?MAIN_ANT :AUX_ANT ; -ODM_RT_TRACE (dm_odm,ODM_COMP_ANT_DIV ,ODM_DBG_LOUD , - ("MacID=%d, MainAnt_Sum=%d, MainAnt_Cnt=%d\n" , - i, dm_fat_tbl->MainAnt_Sum[i], - dm_fat_tbl->MainAnt_Cnt[i])); -ODM_RT_TRACE (dm_odm,ODM_COMP_ANT_DIV ,ODM_DBG_LOUD , - ("MacID=%d, AuxAnt_Sum=%d, AuxAnt_Cnt=%d\n" , - i, dm_fat_tbl->AuxAnt_Sum[i], dm_fat_tbl->AuxAnt_Cnt[i])); -ODM_RT_TRACE (dm_odm,ODM_COMP_ANT_DIV ,ODM_DBG_LOUD , - ("MacID=%d, Main_RSSI= %d, Aux_RSSI= %d\n" , - i, Main_RSSI, Aux_RSSI)); -/* 2 Select MaxRSSI for DIG */ - LocalMaxRSSI = (Main_RSSI > Aux_RSSI) ? Main_RSSI : Aux_RSSI; -if ((LocalMaxRSSI > AntDivMaxRSSI) && (LocalMaxRSSI <40 )) - AntDivMaxRSSI = LocalMaxRSSI; -if (LocalMaxRSSI > MaxRSSI) - MaxRSSI = LocalMaxRSSI; + main_rssi = (dm_fat_tbl->MainAnt_Cnt[i] !=0 ) ? + (dm_fat_tbl->MainAnt_Sum[i]/dm_fat_tbl->MainAnt_Cnt[i]) :0 ; + aux_rssi = (dm_fat_tbl->AuxAnt_Cnt[i] !=0 ) ? + (dm_fat_tbl->AuxAnt_Sum[i]/dm_fat_tbl->AuxAnt_Cnt[i]) :0 ; + target_ant = (main_rssi >= aux_rssi) ?MAIN_ANT :AUX_ANT ; +/* 2 Select max_rssi for DIG */ + local_max_rssi = (main_rssi > aux_rssi) ? + main_rssi : aux_rssi; +if ((local_max_rssi > ant_div_max_rssi) && + (local_max_rssi <40 )) + ant_div_max_rssi = local_max_rssi; +if (local_max_rssi > max_rssi) + max_rssi = local_max_rssi;/* 2 Select RX Idle Antenna */ -if ((dm_fat_tbl->RxIdleAnt ==MAIN_ANT ) && (Main_RSSI ==0 )) - Main_RSSI = Aux_RSSI; -else if ((dm_fat_tbl->RxIdleAnt ==AUX_ANT ) && (Aux_RSSI ==0 )) - Aux_RSSI = Main_RSSI; - - LocalMinRSSI = (Main_RSSI > Aux_RSSI) ? Aux_RSSI : Main_RSSI; -if (LocalMinRSSI < MinRSSI) { - MinRSSI = LocalMinRSSI; - RxIdleAnt = TargetAnt; +if ((dm_fat_tbl->RxIdleAnt ==MAIN_ANT ) && + (main_rssi ==0 )) + main_rssi = aux_rssi; +else if ((dm_fat_tbl->RxIdleAnt ==AUX_ANT ) && + (aux_rssi ==0 )) + aux_rssi = main_rssi; + + local_min_rssi = (main_rssi > aux_rssi) ? + aux_rssi : main_rssi; +if (local_min_rssi < min_rssi) { + min_rssi = local_min_rssi; + RxIdleAnt = target_ant; }/* 2 Select TRX Antenna */ if (dm_odm->AntDivType ==CG_TRX_HW_ANTDIV ) -update_tx_ant_88eu (dm_odm, TargetAnt, i); +update_tx_ant_88eu (dm_odm, target_ant, i); } dm_fat_tbl->MainAnt_Sum[i] =0 ; dm_fat_tbl->AuxAnt_Sum[i] =0 ;
@@ -329,8 +327,8 @@ static void odm_HWAntDiv(struct odm_dm_struct *dm_odm)/* 2 Set RX Idle Antenna */ rtl88eu_dm_update_rx_idle_ant (dm_odm, RxIdleAnt); - pDM_DigTable->AntDiv_RSSI_max = AntDivMaxRSSI; - pDM_DigTable->RSSI_max = MaxRSSI; + dig_table->AntDiv_RSSI_max = ant_div_max_rssi; + dig_table->RSSI_max = max_rssi; }void ODM_AntennaDiversity_88E (struct odm_dm_struct *dm_odm)
@@ -363,7 +361,7 @@ void ODM_AntennaDiversity_88E(struct odm_dm_struct *dm_odm) } }if ((dm_odm->AntDivType ==CG_TRX_HW_ANTDIV ) || (dm_odm->AntDivType ==CGCS_RX_HW_ANTDIV )) -odm_HWAntDiv (dm_odm); +rtl88eu_dm_hw_ant_div (dm_odm); }/* 3============================================================ */
Signature · 1 line
1.7.10.4
PATCH 12/13 staging: rtl8188eu: Rework function ODM_AntennaDiversity_88E()
In reply to navin patidarRename CamelCase function name.
Remove unnecessary comments.
--- drivers/staging/rtl8188eu/hal/odm.c | 2 +- drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 31 +++++++++++++--------- drivers/staging/rtl8188eu/include/odm_RTL8188E.h | 2 +- 3 files changed, 21 insertions(+), 14 deletions(-)
drivers/staging/rtl8188eu/hal/odm.c +1 -1
@@ -1275,7 +1275,7 @@ void odm_HwAntDiv(struct odm_dm_struct *pDM_Odm)return ; } -ODM_AntennaDiversity_88E (pDM_Odm); +rtl88eu_dm_antenna_diversity (pDM_Odm); }/* EDCA Turbo */
drivers/staging/rtl8188eu/hal/odm_RTL8188E.c +19 -12
@@ -331,7 +331,7 @@ static void rtl88eu_dm_hw_ant_div(struct odm_dm_struct *dm_odm) dig_table->RSSI_max = max_rssi; } -void ODM_AntennaDiversity_88E (struct odm_dm_struct *dm_odm) +void rtl88eu_dm_antenna_diversity (struct odm_dm_struct *dm_odm) {struct fast_ant_train *dm_fat_tbl = &dm_odm->DM_FatTable;struct adapter *adapter = dm_odm->Adapter;
@@ -339,28 +339,35 @@ void ODM_AntennaDiversity_88E(struct odm_dm_struct *dm_odm)if (!(dm_odm->SupportAbility &ODM_BB_ANT_DIV ))return ;if (!dm_odm->bLinked) { -ODM_RT_TRACE (dm_odm,ODM_COMP_ANT_DIV ,ODM_DBG_LOUD , ("ODM_AntennaDiversity_88E(): No Link.\n" )); +ODM_RT_TRACE (dm_odm,ODM_COMP_ANT_DIV ,ODM_DBG_LOUD , + ("ODM_AntennaDiversity_88E(): No Link.\n" ));if (dm_fat_tbl->bBecomeLinked) { -ODM_RT_TRACE (dm_odm,ODM_COMP_ANT_DIV ,ODM_DBG_LOUD , ("Need to Turn off HW AntDiv\n" )); -phy_set_bb_reg (adapter,ODM_REG_IGI_A_11N ,BIT7 ,0 );/* RegC50[7]=1'b1 enable HW AntDiv */ -phy_set_bb_reg (adapter,ODM_REG_CCK_ANTDIV_PARA1_11N ,BIT15 ,0 );/* Enable CCK AntDiv */ +ODM_RT_TRACE (dm_odm,ODM_COMP_ANT_DIV ,ODM_DBG_LOUD , + ("Need to Turn off HW AntDiv\n" )); +phy_set_bb_reg (adapter,ODM_REG_IGI_A_11N ,BIT7 ,0 ); +phy_set_bb_reg (adapter,ODM_REG_CCK_ANTDIV_PARA1_11N , +BIT15 ,0 );if (dm_odm->AntDivType ==CG_TRX_HW_ANTDIV ) -phy_set_bb_reg (adapter,ODM_REG_TX_ANT_CTRL_11N ,BIT21 ,0 );/* Reg80c[21]=1'b0 from TX Reg */ +phy_set_bb_reg (adapter,ODM_REG_TX_ANT_CTRL_11N , +BIT21 ,0 ); dm_fat_tbl->bBecomeLinked = dm_odm->bLinked; }return ; }else {if (!dm_fat_tbl->bBecomeLinked) { -ODM_RT_TRACE (dm_odm,ODM_COMP_ANT_DIV ,ODM_DBG_LOUD , ("Need to Turn on HW AntDiv\n" )); -/* Because HW AntDiv is disabled before Link, we enable HW AntDiv after link */ -phy_set_bb_reg (adapter,ODM_REG_IGI_A_11N ,BIT7 ,1 );/* RegC50[7]=1'b1 enable HW AntDiv */ -phy_set_bb_reg (adapter,ODM_REG_CCK_ANTDIV_PARA1_11N ,BIT15 ,1 );/* Enable CCK AntDiv */ +ODM_RT_TRACE (dm_odm,ODM_COMP_ANT_DIV ,ODM_DBG_LOUD , + ("Need to Turn on HW AntDiv\n" )); +phy_set_bb_reg (adapter,ODM_REG_IGI_A_11N ,BIT7 ,1 ); +phy_set_bb_reg (adapter,ODM_REG_CCK_ANTDIV_PARA1_11N , +BIT15 ,1 );if (dm_odm->AntDivType ==CG_TRX_HW_ANTDIV ) -phy_set_bb_reg (adapter,ODM_REG_TX_ANT_CTRL_11N ,BIT21 ,1 );/* Reg80c[21]=1'b1 from TX Info */ +phy_set_bb_reg (adapter,ODM_REG_TX_ANT_CTRL_11N , +BIT21 ,1 ); dm_fat_tbl->bBecomeLinked = dm_odm->bLinked; } } -if ((dm_odm->AntDivType ==CG_TRX_HW_ANTDIV ) || (dm_odm->AntDivType ==CGCS_RX_HW_ANTDIV )) +if ((dm_odm->AntDivType ==CG_TRX_HW_ANTDIV ) || + (dm_odm->AntDivType ==CGCS_RX_HW_ANTDIV ))rtl88eu_dm_hw_ant_div (dm_odm); }
drivers/staging/rtl8188eu/include/odm_RTL8188E.h +1 -1
@@ -31,7 +31,7 @@ void ODM_DIG_LowerBound_88E(struct odm_dm_struct *pDM_Odm);void rtl88eu_dm_antenna_div_init (struct odm_dm_struct *dm_odm); -void ODM_AntennaDiversity_88E (struct odm_dm_struct *pDM_Odm); +void rtl88eu_dm_antenna_diversity (struct odm_dm_struct *dm_odm);void rtl88eu_dm_set_tx_ant_by_tx_info (struct odm_dm_struct *dm_odm,u8 *desc,u8 mac_id);
Signature · 1 line
1.7.10.4
PATCH 13/13 staging: rtl8188eu: odm.h: Remove unused struct dyn_primary_cca
In reply to navin patidarstruct odm_dm_struct has a member of struct dyn_primary_cca, which is initialized once and then never used by driver, so we can remove struct dyn_promary_cca and code which initialize it.
--- drivers/staging/rtl8188eu/hal/odm.c | 1 - drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 15 --------------- drivers/staging/rtl8188eu/include/odm.h | 9 --------- drivers/staging/rtl8188eu/include/odm_RTL8188E.h | 2 -- 4 files changed, 27 deletions(-)
drivers/staging/rtl8188eu/hal/odm.c +0 -1
@@ -191,7 +191,6 @@ void ODM_DMInit(struct odm_dm_struct *pDM_Odm)odm_DIGInit (pDM_Odm);odm_RateAdaptiveMaskInit (pDM_Odm); -odm_PrimaryCCA_Init (pDM_Odm);/* Gary */ odm_DynamicTxPowerInit (pDM_Odm);odm_TXPowerTrackingInit (pDM_Odm);ODM_EdcaTurboInit (pDM_Odm);
drivers/staging/rtl8188eu/hal/odm_RTL8188E.c +0 -15
@@ -370,18 +370,3 @@ void rtl88eu_dm_antenna_diversity(struct odm_dm_struct *dm_odm) (dm_odm->AntDivType == CGCS_RX_HW_ANTDIV))rtl88eu_dm_hw_ant_div (dm_odm); } - -/* 3============================================================ */ -/* 3 Dynamic Primary CCA */ -/* 3============================================================ */ - -void odm_PrimaryCCA_Init (struct odm_dm_struct *dm_odm) -{ -struct dyn_primary_cca *PrimaryCCA = &(dm_odm->DM_PriCCA); - - PrimaryCCA->DupRTS_flag =0 ; - PrimaryCCA->intf_flag =0 ; - PrimaryCCA->intf_type =0 ; - PrimaryCCA->Monitor_flag =0 ; - PrimaryCCA->PriCCA_flag =0 ; -}
drivers/staging/rtl8188eu/include/odm.h +0 -9
@@ -164,14 +164,6 @@ struct false_alarm_stats {u32 Cnt_BW_LSC;/* Gary */ }; -struct dyn_primary_cca { -u8 PriCCA_flag; -u8 intf_flag; -u8 intf_type; -u8 DupRTS_flag; -u8 Monitor_flag; -}; -struct rx_hpc {u8 RXHP_flag;u8 PSD_func_trigger;
@@ -867,7 +859,6 @@ struct odm_dm_struct {struct fast_ant_train DM_FatTable;struct rtw_dig DM_DigTable;struct rtl_ps DM_PSTable; -struct dyn_primary_cca DM_PriCCA;struct rx_hpc DM_RXHP_Table;struct false_alarm_stats FalseAlmCnt;struct false_alarm_stats FlaseAlmCntBuddyAdapter;
drivers/staging/rtl8188eu/include/odm_RTL8188E.h +0 -2
@@ -47,8 +47,6 @@ void odm_FastAntTrainingCallback(struct odm_dm_struct *pDM_Odm);void odm_FastAntTrainingWorkItemCallback (struct odm_dm_struct *pDM_Odm); -void odm_PrimaryCCA_Init (struct odm_dm_struct *pDM_Odm); -bool ODM_DynamicPrimaryCCA_DupRTS (struct odm_dm_struct *pDM_Odm);#endif
Signature · 1 line
1.7.10.4