staging: rtl8192e: Join constants in r8192E_phy.h
cover staging: rtl8192e: Join constants in r8192E_phy.h
There are a number of constants that change the name with a similar line like:
#define AGCTAB_ArrayLength AGCTAB_ArrayLengthPciE
This makes code reading very unconfortable as there are always two searches required where one should do the job. Renaming the two variables to one to increase readability.
Tested with rtl8192e
Transferred this patch over wlan connection of rtl8192e
Philipp Hortmann (12):
staging: rtl8192e: Join constants AGCTAB_ArrayLength with ..LengthPciE
staging: rtl8192e: Join constants MACPHY_ArrayLength with ..LengthPciE
staging: rtl8192e: Join constants RadioA_ArrayLength with ..LengthPciE
staging: rtl8192e: Join constants RadioB_ArrayLength with ..LengthPciE
staging: rtl8192e: Join constants MACPHY_Array_PGLength with
..LengthPciE
staging: rtl8192e: Join constants PHY_REG_1T2RArray.. with
..LengthPciE
staging: rtl8192e: Join constants Rtl819XMACPHY_..PG with
Rtl8192PciE..
staging: rtl8192e: Join constants Rtl819XMACPHY_.. with Rtl8192PciE..
staging: rtl8192e: Join constants Rtl819XRadioA_.. with ..RadioA_..
staging: rtl8192e: Join constants Rtl819XRadioB_.. with ..RadioB_..
staging: rtl8192e: Join constants Rtl819XAGCTAB_.. with ..PciEAGCTAB..
staging: rtl8192e: Join constants Rtl819XPHY_REG_.. with
..PciEPHY_REG_...../staging/rtl8192e/rtl8192e/r8192E_phy.c | 32 +++++++++---------- .../staging/rtl8192e/rtl8192e/r8192E_phy.h | 14 -------- drivers/staging/rtl8192e/rtl8192e/table.c | 12 +++---- drivers/staging/rtl8192e/rtl8192e/table.h | 24 +++++++------- 4 files changed, 34 insertions(+), 48 deletions(-)
Signature · 1 line
2.39.2
PATCH 1/12 staging: rtl8192e: Join constants AGCTAB_ArrayLength with ..LengthPciE
Join constants AGCTAB_ArrayLength with AGCTAB_ArrayLengthPciE to RTL8192E_AGCTAB_ARR_LEN to improve readability.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - drivers/staging/rtl8192e/rtl8192e/table.c | 2 +- drivers/staging/rtl8192e/rtl8192e/table.h | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +1 -1
@@ -312,7 +312,7 @@ static void _rtl92e_phy_config_bb(struct net_device *dev, u8 ConfigType)u16 AGCTAB_ArrayLen, PHY_REGArrayLen =0 ;struct r8192_priv *priv =rtllib_priv (dev); - AGCTAB_ArrayLen = AGCTAB_ArrayLength; + AGCTAB_ArrayLen =RTL8192E_AGCTAB_ARR_LEN ; Rtl819XAGCTAB_Array_Table = Rtl819XAGCTAB_Array;if (priv->rf_type ==RF_1T2R ) { PHY_REGArrayLen = PHY_REG_1T2RArrayLength;
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +0 -1
@@ -9,7 +9,6 @@#define MAX_DOZE_WAITING_TIMES_9x 64 -#define AGCTAB_ArrayLength AGCTAB_ArrayLengthPciE#define MACPHY_ArrayLength MACPHY_ArrayLengthPciE#define RadioA_ArrayLength RadioA_ArrayLengthPciE#define RadioB_ArrayLength RadioB_ArrayLengthPciE
drivers/staging/rtl8192e/rtl8192e/table.c +1 -1
@@ -347,7 +347,7 @@ u32 Rtl8192PciEMACPHY_Array_PG[] = { 0x318, 0x00000fff, 0x00000800, }; -u32 Rtl8192PciEAGCTAB_Array[AGCTAB_ArrayLengthPciE] = { +u32 Rtl8192PciEAGCTAB_Array[RTL8192E_AGCTAB_ARR_LEN ] = {0xc78 ,0x7d000001 ,0xc78 ,0x7d010001 ,0xc78 ,0x7d020001 ,
drivers/staging/rtl8192e/rtl8192e/table.h +2 -2
@@ -21,7 +21,7 @@ extern u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE];extern u32 Rtl8192PciEMACPHY_Array[MACPHY_ArrayLengthPciE];#define MACPHY_Array_PGLengthPciE 30extern u32 Rtl8192PciEMACPHY_Array_PG[MACPHY_Array_PGLengthPciE]; -#define AGCTAB_ArrayLengthPciE 384 -extern u32 Rtl8192PciEAGCTAB_Array[AGCTAB_ArrayLengthPciE]; +#define RTL8192E_AGCTAB_ARR_LEN 384 +extern u32 Rtl8192PciEAGCTAB_Array[RTL8192E_AGCTAB_ARR_LEN ];#endif
Signature · 1 line
2.39.2
PATCH 2/12 staging: rtl8192e: Join constants MACPHY_ArrayLength with ..LengthPciE
In reply to Philipp HortmannJoin constants MACPHY_ArrayLength with MACPHY_ArrayLengthPciE to RTL8192E_MACPHY_ARR_LEN to improve readability.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - drivers/staging/rtl8192e/rtl8192e/table.h | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +1 -1
@@ -291,7 +291,7 @@ void rtl92e_config_mac(struct net_device *dev) pdwArray = Rtl819XMACPHY_Array_PG; }else { - dwArrayLen = MACPHY_ArrayLength; + dwArrayLen =RTL8192E_MACPHY_ARR_LEN ; pdwArray = Rtl819XMACPHY_Array; }for (i =0 ; i < dwArrayLen; i +=3 ) {
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +0 -1
@@ -9,7 +9,6 @@#define MAX_DOZE_WAITING_TIMES_9x 64 -#define MACPHY_ArrayLength MACPHY_ArrayLengthPciE#define RadioA_ArrayLength RadioA_ArrayLengthPciE#define RadioB_ArrayLength RadioB_ArrayLengthPciE#define MACPHY_Array_PGLength MACPHY_Array_PGLengthPciE
drivers/staging/rtl8192e/rtl8192e/table.h +2 -2
@@ -17,8 +17,8 @@ extern u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE];extern u32 Rtl8192PciERadioA_Array[RadioA_ArrayLengthPciE];#define RadioB_ArrayLengthPciE 78extern u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE]; -#define MACPHY_ArrayLengthPciE 18 -extern u32 Rtl8192PciEMACPHY_Array[MACPHY_ArrayLengthPciE]; +#define RTL8192E_MACPHY_ARR_LEN 18 +extern u32 Rtl8192PciEMACPHY_Array[RTL8192E_MACPHY_ARR_LEN ];#define MACPHY_Array_PGLengthPciE 30extern u32 Rtl8192PciEMACPHY_Array_PG[MACPHY_Array_PGLengthPciE];#define RTL8192E_AGCTAB_ARR_LEN 384
Signature · 1 line
2.39.2
PATCH 3/12 staging: rtl8192e: Join constants RadioA_ArrayLength with ..LengthPciE
In reply to Philipp HortmannJoin constants RadioA_ArrayLength with RadioA_ArrayLengthPciE to RTL8192E_RADIO_A_ARR_LEN to improve readability.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - drivers/staging/rtl8192e/rtl8192e/table.c | 2 +- drivers/staging/rtl8192e/rtl8192e/table.h | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +1 -1
@@ -542,7 +542,7 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath)switch (eRFPath) {case RF90_PATH_A : -for (i =0 ; i < RadioA_ArrayLength; i +=2 ) { +for (i =0 ; i <RTL8192E_RADIO_A_ARR_LEN ; i +=2 ) {if (Rtl819XRadioA_Array[i] ==0xfe ) {msleep (100 );continue ;
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +0 -1
@@ -9,7 +9,6 @@#define MAX_DOZE_WAITING_TIMES_9x 64 -#define RadioA_ArrayLength RadioA_ArrayLengthPciE#define RadioB_ArrayLength RadioB_ArrayLengthPciE#define MACPHY_Array_PGLength MACPHY_Array_PGLengthPciE#define PHY_REG_1T2RArrayLength PHY_REG_1T2RArrayLengthPciE
drivers/staging/rtl8192e/rtl8192e/table.c +1 -1
@@ -157,7 +157,7 @@ u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE] = { 0xe1c, 0x12121416, }; -u32 Rtl8192PciERadioA_Array[RadioA_ArrayLengthPciE] = { +u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_LEN ] = {0x019 ,0x00000003 ,0x000 ,0x000000bf ,0x001 ,0x00000ee0 ,
drivers/staging/rtl8192e/rtl8192e/table.h +2 -2
@@ -13,8 +13,8 @@#define PHY_REG_1T2RArrayLengthPciE 296extern u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE]; -#define RadioA_ArrayLengthPciE 246 -extern u32 Rtl8192PciERadioA_Array[RadioA_ArrayLengthPciE]; +#define RTL8192E_RADIO_A_ARR_LEN 246 +extern u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_LEN ];#define RadioB_ArrayLengthPciE 78extern u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE];#define RTL8192E_MACPHY_ARR_LEN 18
Signature · 1 line
2.39.2
PATCH 4/12 staging: rtl8192e: Join constants RadioB_ArrayLength with ..LengthPciE
In reply to Philipp HortmannJoin constants RadioB_ArrayLength with RadioB_ArrayLengthPciE to RTL8192E_RADIO_B_ARR_LEN to improve readability.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - drivers/staging/rtl8192e/rtl8192e/table.c | 2 +- drivers/staging/rtl8192e/rtl8192e/table.h | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +1 -1
@@ -554,7 +554,7 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath) }break ;case RF90_PATH_B : -for (i =0 ; i < RadioB_ArrayLength; i +=2 ) { +for (i =0 ; i <RTL8192E_RADIO_B_ARR_LEN ; i +=2 ) {if (Rtl819XRadioB_Array[i] ==0xfe ) {msleep (100 );continue ;
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +0 -1
@@ -9,7 +9,6 @@#define MAX_DOZE_WAITING_TIMES_9x 64 -#define RadioB_ArrayLength RadioB_ArrayLengthPciE#define MACPHY_Array_PGLength MACPHY_Array_PGLengthPciE#define PHY_REG_1T2RArrayLength PHY_REG_1T2RArrayLengthPciE
drivers/staging/rtl8192e/rtl8192e/table.c +1 -1
@@ -283,7 +283,7 @@ u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_LEN] = { 0x007, 0x00000700, }; -u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE] = { +u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_LEN ] = {0x019 ,0x00000003 ,0x000 ,0x000000bf ,0x001 ,0x000006e0 ,
drivers/staging/rtl8192e/rtl8192e/table.h +2 -2
@@ -15,8 +15,8 @@extern u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE];#define RTL8192E_RADIO_A_ARR_LEN 246extern u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_LEN ]; -#define RadioB_ArrayLengthPciE 78 -extern u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE]; +#define RTL8192E_RADIO_B_ARR_LEN 78 +extern u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_LEN ];#define RTL8192E_MACPHY_ARR_LEN 18extern u32 Rtl8192PciEMACPHY_Array[RTL8192E_MACPHY_ARR_LEN ];#define MACPHY_Array_PGLengthPciE 30
Signature · 1 line
2.39.2
PATCH 5/12 staging: rtl8192e: Join constants MACPHY_Array_PGLength with ..LengthPciE
In reply to Philipp HortmannJoin constants MACPHY_Array_PGLength with MACPHY_Array_PGLengthPciE to RTL8192E_MACPHY_ARR_PG_LEN to improve readability.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - drivers/staging/rtl8192e/rtl8192e/table.h | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +1 -1
@@ -287,7 +287,7 @@ void rtl92e_config_mac(struct net_device *dev)struct r8192_priv *priv =rtllib_priv (dev);if (priv->tx_pwr_data_read_from_eeprom) { - dwArrayLen = MACPHY_Array_PGLength; + dwArrayLen =RTL8192E_MACPHY_ARR_PG_LEN ; pdwArray = Rtl819XMACPHY_Array_PG; }else {
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +0 -1
@@ -9,7 +9,6 @@#define MAX_DOZE_WAITING_TIMES_9x 64 -#define MACPHY_Array_PGLength MACPHY_Array_PGLengthPciE#define PHY_REG_1T2RArrayLength PHY_REG_1T2RArrayLengthPciE#define Rtl819XMACPHY_Array_PG Rtl8192PciEMACPHY_Array_PG
drivers/staging/rtl8192e/rtl8192e/table.h +2 -2
@@ -19,8 +19,8 @@ extern u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_LEN];extern u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_LEN ];#define RTL8192E_MACPHY_ARR_LEN 18extern u32 Rtl8192PciEMACPHY_Array[RTL8192E_MACPHY_ARR_LEN ]; -#define MACPHY_Array_PGLengthPciE 30 -extern u32 Rtl8192PciEMACPHY_Array_PG[MACPHY_Array_PGLengthPciE]; +#define RTL8192E_MACPHY_ARR_PG_LEN 30 +extern u32 Rtl8192PciEMACPHY_Array_PG[RTL8192E_MACPHY_ARR_PG_LEN ];#define RTL8192E_AGCTAB_ARR_LEN 384extern u32 Rtl8192PciEAGCTAB_Array[RTL8192E_AGCTAB_ARR_LEN ];
Signature · 1 line
2.39.2
PATCH 6/12 staging: rtl8192e: Join constants PHY_REG_1T2RArray.. with ..LengthPciE
In reply to Philipp HortmannJoin constants PHY_REG_1T2RArrayLength with PHY_REG_1T2RArrayLengthPciE to RTL8192E_PHY_REG_1T2R_ARR_LEN to improve readability.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 2 -- drivers/staging/rtl8192e/rtl8192e/table.c | 2 +- drivers/staging/rtl8192e/rtl8192e/table.h | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +1 -1
@@ -315,7 +315,7 @@ static void _rtl92e_phy_config_bb(struct net_device *dev, u8 ConfigType) AGCTAB_ArrayLen =RTL8192E_AGCTAB_ARR_LEN ; Rtl819XAGCTAB_Array_Table = Rtl819XAGCTAB_Array;if (priv->rf_type ==RF_1T2R ) { - PHY_REGArrayLen = PHY_REG_1T2RArrayLength; + PHY_REGArrayLen =RTL8192E_PHY_REG_1T2R_ARR_LEN ; Rtl819XPHY_REGArray_Table = Rtl819XPHY_REG_1T2RArray; }
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +0 -2
@@ -9,8 +9,6 @@#define MAX_DOZE_WAITING_TIMES_9x 64 -#define PHY_REG_1T2RArrayLength PHY_REG_1T2RArrayLengthPciE -#define Rtl819XMACPHY_Array_PG Rtl8192PciEMACPHY_Array_PG#define Rtl819XMACPHY_Array Rtl8192PciEMACPHY_Array#define Rtl819XRadioA_Array Rtl8192PciERadioA_Array
drivers/staging/rtl8192e/rtl8192e/table.c +1 -1
@@ -6,7 +6,7 @@*/ #include "table.h" -u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE] = { +u32 Rtl8192PciEPHY_REG_1T2RArray[RTL8192E_PHY_REG_1T2R_ARR_LEN ] = {0x800 ,0x00000000 ,0x804 ,0x00000001 ,0x808 ,0x0000fc00 ,
drivers/staging/rtl8192e/rtl8192e/table.h +2 -2
@@ -11,8 +11,8 @@#include <linux/types.h> -#define PHY_REG_1T2RArrayLengthPciE 296 -extern u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE]; +#define RTL8192E_PHY_REG_1T2R_ARR_LEN 296 +extern u32 Rtl8192PciEPHY_REG_1T2RArray[RTL8192E_PHY_REG_1T2R_ARR_LEN ];#define RTL8192E_RADIO_A_ARR_LEN 246extern u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_LEN ];#define RTL8192E_RADIO_B_ARR_LEN 78
Signature · 1 line
2.39.2
PATCH 7/12 staging: rtl8192e: Join constants Rtl819XMACPHY_..PG with Rtl8192PciE..
In reply to Philipp HortmannJoin constants Rtl819XMACPHY_Array_PG with Rtl8192PciEMACPHY_Array_PG to RTL8192E_MACPHY_ARR_PG to improve readability.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - drivers/staging/rtl8192e/rtl8192e/table.c | 2 +- drivers/staging/rtl8192e/rtl8192e/table.h | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +1 -1
@@ -288,7 +288,7 @@ void rtl92e_config_mac(struct net_device *dev)if (priv->tx_pwr_data_read_from_eeprom) { dwArrayLen =RTL8192E_MACPHY_ARR_PG_LEN ; - pdwArray = Rtl819XMACPHY_Array_PG; + pdwArray =RTL8192E_MACPHY_ARR_PG ; }else { dwArrayLen =RTL8192E_MACPHY_ARR_LEN ;
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +0 -1
@@ -9,7 +9,6 @@#define MAX_DOZE_WAITING_TIMES_9x 64 -#define Rtl819XMACPHY_Array_PG Rtl8192PciEMACPHY_Array_PG#define Rtl819XMACPHY_Array Rtl8192PciEMACPHY_Array#define Rtl819XRadioA_Array Rtl8192PciERadioA_Array#define Rtl819XRadioB_Array Rtl8192PciERadioB_Array
drivers/staging/rtl8192e/rtl8192e/table.c +1 -1
@@ -334,7 +334,7 @@ u32 Rtl8192PciEMACPHY_Array[] = { 0x318, 0x00000fff, 0x00000100, }; -u32 Rtl8192PciEMACPHY_Array_PG[] = { +u32 RTL8192E_MACPHY_ARR_PG [] = {0x03c ,0xffff0000 ,0x00000f0f ,0xe00 ,0xffffffff ,0x06090909 ,0xe04 ,0xffffffff ,0x00030306 ,
drivers/staging/rtl8192e/rtl8192e/table.h +1 -1
@@ -20,7 +20,7 @@ extern u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_LEN];#define RTL8192E_MACPHY_ARR_LEN 18extern u32 Rtl8192PciEMACPHY_Array[RTL8192E_MACPHY_ARR_LEN ];#define RTL8192E_MACPHY_ARR_PG_LEN 30 -extern u32 Rtl8192PciEMACPHY_Array_PG[RTL8192E_MACPHY_ARR_PG_LEN ]; +extern u32 RTL8192E_MACPHY_ARR_PG [RTL8192E_MACPHY_ARR_PG_LEN ];#define RTL8192E_AGCTAB_ARR_LEN 384extern u32 Rtl8192PciEAGCTAB_Array[RTL8192E_AGCTAB_ARR_LEN ];
Signature · 1 line
2.39.2
PATCH 8/12 staging: rtl8192e: Join constants Rtl819XMACPHY_.. with Rtl8192PciE..
In reply to Philipp HortmannJoin constants Rtl819XMACPHY_Array with Rtl8192PciEMACPHY_Array to RTL8192E_MACPHY_ARR to improve readability.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - drivers/staging/rtl8192e/rtl8192e/table.c | 2 +- drivers/staging/rtl8192e/rtl8192e/table.h | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +1 -1
@@ -292,7 +292,7 @@ void rtl92e_config_mac(struct net_device *dev) }else { dwArrayLen =RTL8192E_MACPHY_ARR_LEN ; - pdwArray = Rtl819XMACPHY_Array; + pdwArray =RTL8192E_MACPHY_ARR ; }for (i =0 ; i < dwArrayLen; i +=3 ) {if (pdwArray[i] ==0x318 )
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +0 -1
@@ -9,7 +9,6 @@#define MAX_DOZE_WAITING_TIMES_9x 64 -#define Rtl819XMACPHY_Array Rtl8192PciEMACPHY_Array#define Rtl819XRadioA_Array Rtl8192PciERadioA_Array#define Rtl819XRadioB_Array Rtl8192PciERadioB_Array#define Rtl819XAGCTAB_Array Rtl8192PciEAGCTAB_Array
drivers/staging/rtl8192e/rtl8192e/table.c +1 -1
@@ -325,7 +325,7 @@ u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_LEN] = { 0x007, 0x00000700, }; -u32 Rtl8192PciEMACPHY_Array[] = { +u32 RTL8192E_MACPHY_ARR [] = {0x03c ,0xffff0000 ,0x00000f0f ,0x340 ,0xffffffff ,0x161a1a1a ,0x344 ,0xffffffff ,0x12121416 ,
drivers/staging/rtl8192e/rtl8192e/table.h +1 -1
@@ -18,7 +18,7 @@ extern u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_LEN];#define RTL8192E_RADIO_B_ARR_LEN 78extern u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_LEN ];#define RTL8192E_MACPHY_ARR_LEN 18 -extern u32 Rtl8192PciEMACPHY_Array[RTL8192E_MACPHY_ARR_LEN ]; +extern u32 RTL8192E_MACPHY_ARR [RTL8192E_MACPHY_ARR_LEN ];#define RTL8192E_MACPHY_ARR_PG_LEN 30extern u32 RTL8192E_MACPHY_ARR_PG [RTL8192E_MACPHY_ARR_PG_LEN ];#define RTL8192E_AGCTAB_ARR_LEN 384
Signature · 1 line
2.39.2
PATCH 9/12 staging: rtl8192e: Join constants Rtl819XRadioA_.. with ..RadioA_..
In reply to Philipp HortmannJoin constants Rtl819XRadioA_Array with Rtl8192PciERadioA_Array to RTL8192E_RADIO_A_ARR to improve readability. Fix spaces around '+' to improve coding style.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 6 +++--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - drivers/staging/rtl8192e/rtl8192e/table.c | 2 +- drivers/staging/rtl8192e/rtl8192e/table.h | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +3 -3
@@ -543,13 +543,13 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath)switch (eRFPath) {case RF90_PATH_A :for (i =0 ; i <RTL8192E_RADIO_A_ARR_LEN ; i +=2 ) { -if (Rtl819XRadioA_Array[i] ==0xfe ) { +if (RTL8192E_RADIO_A_ARR [i] ==0xfe ) {msleep (100 );continue ; } -rtl92e_set_rf_reg (dev, eRFPath, Rtl819XRadioA_Array[i], +rtl92e_set_rf_reg (dev, eRFPath,RTL8192E_RADIO_A_ARR [i], bMask12Bits, - Rtl819XRadioA_Array[i+1 ]); +RTL8192E_RADIO_A_ARR [i +1 ]); }break ;
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +0 -1
@@ -9,7 +9,6 @@#define MAX_DOZE_WAITING_TIMES_9x 64 -#define Rtl819XRadioA_Array Rtl8192PciERadioA_Array#define Rtl819XRadioB_Array Rtl8192PciERadioB_Array#define Rtl819XAGCTAB_Array Rtl8192PciEAGCTAB_Array#define Rtl819XPHY_REG_1T2RArray Rtl8192PciEPHY_REG_1T2RArray
drivers/staging/rtl8192e/rtl8192e/table.c +1 -1
@@ -157,7 +157,7 @@ u32 Rtl8192PciEPHY_REG_1T2RArray[RTL8192E_PHY_REG_1T2R_ARR_LEN] = { 0xe1c, 0x12121416, }; -u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_LEN ] = { +u32 RTL8192E_RADIO_A_ARR [RTL8192E_RADIO_A_ARR_LEN ] = {0x019 ,0x00000003 ,0x000 ,0x000000bf ,0x001 ,0x00000ee0 ,
drivers/staging/rtl8192e/rtl8192e/table.h +1 -1
@@ -14,7 +14,7 @@#define RTL8192E_PHY_REG_1T2R_ARR_LEN 296extern u32 Rtl8192PciEPHY_REG_1T2RArray[RTL8192E_PHY_REG_1T2R_ARR_LEN ];#define RTL8192E_RADIO_A_ARR_LEN 246 -extern u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_LEN ]; +extern u32 RTL8192E_RADIO_A_ARR [RTL8192E_RADIO_A_ARR_LEN ];#define RTL8192E_RADIO_B_ARR_LEN 78extern u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_LEN ];#define RTL8192E_MACPHY_ARR_LEN 18
Signature · 1 line
2.39.2
PATCH 10/12 staging: rtl8192e: Join constants Rtl819XRadioB_.. with ..RadioB_..
In reply to Philipp HortmannJoin constants Rtl819XRadioB_Array with Rtl8192PciERadioB_Array to RTL8192E_RADIO_B_ARR to improve readability. Fix spaces around '+' to improve coding style.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 6 +++--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - drivers/staging/rtl8192e/rtl8192e/table.c | 2 +- drivers/staging/rtl8192e/rtl8192e/table.h | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +3 -3
@@ -555,13 +555,13 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath)break ;case RF90_PATH_B :for (i =0 ; i <RTL8192E_RADIO_B_ARR_LEN ; i +=2 ) { -if (Rtl819XRadioB_Array[i] ==0xfe ) { +if (RTL8192E_RADIO_B_ARR [i] ==0xfe ) {msleep (100 );continue ; } -rtl92e_set_rf_reg (dev, eRFPath, Rtl819XRadioB_Array[i], +rtl92e_set_rf_reg (dev, eRFPath,RTL8192E_RADIO_B_ARR [i], bMask12Bits, - Rtl819XRadioB_Array[i+1 ]); +RTL8192E_RADIO_B_ARR [i +1 ]); }break ;
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +0 -1
@@ -9,7 +9,6 @@#define MAX_DOZE_WAITING_TIMES_9x 64 -#define Rtl819XRadioB_Array Rtl8192PciERadioB_Array#define Rtl819XAGCTAB_Array Rtl8192PciEAGCTAB_Array#define Rtl819XPHY_REG_1T2RArray Rtl8192PciEPHY_REG_1T2RArray
drivers/staging/rtl8192e/rtl8192e/table.c +1 -1
@@ -283,7 +283,7 @@ u32 RTL8192E_RADIO_A_ARR[RTL8192E_RADIO_A_ARR_LEN] = { 0x007, 0x00000700, }; -u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_LEN ] = { +u32 RTL8192E_RADIO_B_ARR [RTL8192E_RADIO_B_ARR_LEN ] = {0x019 ,0x00000003 ,0x000 ,0x000000bf ,0x001 ,0x000006e0 ,
drivers/staging/rtl8192e/rtl8192e/table.h +1 -1
@@ -16,7 +16,7 @@ extern u32 Rtl8192PciEPHY_REG_1T2RArray[RTL8192E_PHY_REG_1T2R_ARR_LEN];#define RTL8192E_RADIO_A_ARR_LEN 246extern u32 RTL8192E_RADIO_A_ARR [RTL8192E_RADIO_A_ARR_LEN ];#define RTL8192E_RADIO_B_ARR_LEN 78 -extern u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_LEN ]; +extern u32 RTL8192E_RADIO_B_ARR [RTL8192E_RADIO_B_ARR_LEN ];#define RTL8192E_MACPHY_ARR_LEN 18extern u32 RTL8192E_MACPHY_ARR [RTL8192E_MACPHY_ARR_LEN ];#define RTL8192E_MACPHY_ARR_PG_LEN 30
Signature · 1 line
2.39.2
PATCH 11/12 staging: rtl8192e: Join constants Rtl819XAGCTAB_.. with ..PciEAGCTAB..
In reply to Philipp HortmannJoin constants Rtl819XAGCTAB_Array with Rtl8192PciEAGCTAB_Array to RTL8192E_AGCTAB_ARR to improve readability.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - drivers/staging/rtl8192e/rtl8192e/table.c | 2 +- drivers/staging/rtl8192e/rtl8192e/table.h | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +1 -1
@@ -313,7 +313,7 @@ static void _rtl92e_phy_config_bb(struct net_device *dev, u8 ConfigType)struct r8192_priv *priv =rtllib_priv (dev); AGCTAB_ArrayLen =RTL8192E_AGCTAB_ARR_LEN ; - Rtl819XAGCTAB_Array_Table = Rtl819XAGCTAB_Array; + Rtl819XAGCTAB_Array_Table =RTL8192E_AGCTAB_ARR ;if (priv->rf_type ==RF_1T2R ) { PHY_REGArrayLen =RTL8192E_PHY_REG_1T2R_ARR_LEN ; Rtl819XPHY_REGArray_Table = Rtl819XPHY_REG_1T2RArray;
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +0 -1
@@ -9,7 +9,6 @@#define MAX_DOZE_WAITING_TIMES_9x 64 -#define Rtl819XAGCTAB_Array Rtl8192PciEAGCTAB_Array#define Rtl819XPHY_REG_1T2RArray Rtl8192PciEPHY_REG_1T2RArrayextern u32 rtl819XAGCTAB_Array[];
drivers/staging/rtl8192e/rtl8192e/table.c +1 -1
@@ -347,7 +347,7 @@ u32 RTL8192E_MACPHY_ARR_PG[] = { 0x318, 0x00000fff, 0x00000800, }; -u32 Rtl8192PciEAGCTAB_Array[RTL8192E_AGCTAB_ARR_LEN ] = { +u32 RTL8192E_AGCTAB_ARR [RTL8192E_AGCTAB_ARR_LEN ] = {0xc78 ,0x7d000001 ,0xc78 ,0x7d010001 ,0xc78 ,0x7d020001 ,
drivers/staging/rtl8192e/rtl8192e/table.h +1 -1
@@ -22,6 +22,6 @@ extern u32 RTL8192E_MACPHY_ARR[RTL8192E_MACPHY_ARR_LEN];#define RTL8192E_MACPHY_ARR_PG_LEN 30extern u32 RTL8192E_MACPHY_ARR_PG [RTL8192E_MACPHY_ARR_PG_LEN ];#define RTL8192E_AGCTAB_ARR_LEN 384 -extern u32 Rtl8192PciEAGCTAB_Array[RTL8192E_AGCTAB_ARR_LEN ]; +extern u32 RTL8192E_AGCTAB_ARR [RTL8192E_AGCTAB_ARR_LEN ];#endif
Signature · 1 line
2.39.2
PATCH 12/12 staging: rtl8192e: Join constants Rtl819XPHY_REG_.. with ..PciEPHY_REG_..
In reply to Philipp HortmannJoin constants Rtl819XPHY_REG_1T2RArray with Rtl8192PciEPHY_REG_1T2RArray to RTL8192E_PHY_REG_1T2R_ARR to improve readability.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 2 -- drivers/staging/rtl8192e/rtl8192e/table.c | 2 +- drivers/staging/rtl8192e/rtl8192e/table.h | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +1 -1
@@ -316,7 +316,7 @@ static void _rtl92e_phy_config_bb(struct net_device *dev, u8 ConfigType) Rtl819XAGCTAB_Array_Table =RTL8192E_AGCTAB_ARR ;if (priv->rf_type ==RF_1T2R ) { PHY_REGArrayLen =RTL8192E_PHY_REG_1T2R_ARR_LEN ; - Rtl819XPHY_REGArray_Table = Rtl819XPHY_REG_1T2RArray; + Rtl819XPHY_REGArray_Table =RTL8192E_PHY_REG_1T2R_ARR ; }if (ConfigType ==BB_CONFIG_PHY_REG ) {
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +0 -2
@@ -9,8 +9,6 @@#define MAX_DOZE_WAITING_TIMES_9x 64 -#define Rtl819XPHY_REG_1T2RArray Rtl8192PciEPHY_REG_1T2RArray -extern u32 rtl819XAGCTAB_Array[];enum hw90_block {
drivers/staging/rtl8192e/rtl8192e/table.c +1 -1
@@ -6,7 +6,7 @@*/ #include "table.h" -u32 Rtl8192PciEPHY_REG_1T2RArray[RTL8192E_PHY_REG_1T2R_ARR_LEN ] = { +u32 RTL8192E_PHY_REG_1T2R_ARR [RTL8192E_PHY_REG_1T2R_ARR_LEN ] = {0x800 ,0x00000000 ,0x804 ,0x00000001 ,0x808 ,0x0000fc00 ,
drivers/staging/rtl8192e/rtl8192e/table.h +1 -1
@@ -12,7 +12,7 @@#include <linux/types.h> #define RTL8192E_PHY_REG_1T2R_ARR_LEN 296 -extern u32 Rtl8192PciEPHY_REG_1T2RArray[RTL8192E_PHY_REG_1T2R_ARR_LEN ]; +extern u32 RTL8192E_PHY_REG_1T2R_ARR [RTL8192E_PHY_REG_1T2R_ARR_LEN ];#define RTL8192E_RADIO_A_ARR_LEN 246extern u32 RTL8192E_RADIO_A_ARR [RTL8192E_RADIO_A_ARR_LEN ];#define RTL8192E_RADIO_B_ARR_LEN 78
Signature · 1 line
2.39.2