staging:rtl8192u: r8192U_hw.h - Style
cover staging:rtl8192u: r8192U_hw.h - Style
This series of patches contain simple coding style changes to the file r8192U_hw.h, most of the changes are to clear the CamelCase issue in checkpatch. To minimise the number of CamelCase names which have to be renamed the unused definitions have been removed from the header file.
John Whitmore (21):
staging:rtl8192u: Refactor enum VERSION_819xU - Style staging:rtl8192u: Refactor RT_RF_TYPE_DEF - Style staging:rtl8192u: Make function rtl8192_phyConfigBB static staging:rtl8192u: Refactor BaseBand_Config_Type - Style staging:rtl8192u: Remove unused definitions - Style staging:rtl8192u: Reorder enum _RTL8192Usb_HW members - Style staging:rtl8192u: Rename EEPROM_TxPowerDiff - Style staging:rtl8192u: Rename EEPROM_ThermalMeter - Style staging:rtl8192u: Rename EEPROM_PwDiff - Style staging:rtl8192u: Rename EEPROM_CrystalCap - Style staging:rtl8192u: Rename EEPROM_TxPwIndex_CCK - Style staging:rtl8192u: Rename EEPROM_TxPwIndex_OFDM_24G_V1 - STYLE staging:rtl8192u: Rename EEPROM_TxPwIndex_OFDM_24G - Style staging:rtl8192u: Rename EEPROM_TxPwIndex_CCK_V1 - Style staging:rtl8192u: rename EEPROM_TxPwIndex_Ver - Style staging:rtl8192u: Rename EEPROM_Default_ThermalMeter - Style staging:rtl8192u: Rename EEPROM_Default_PwDiff - Style staging:rtl8192u: Rename EEPROM_Default_CrystalCap - Style staging:rtl8192u: Rename EEPROM_Default_TxPower - Style staging:rtl8192u: Rename EEPROM_Customer_ID - Style staging:rtl8192u: Rename EEPROM_ChannelPlan - Style
drivers/staging/rtl8192u/r8190_rtl8256.c | 6 +- drivers/staging/rtl8192u/r8192U.h | 16 +- drivers/staging/rtl8192u/r8192U_core.c | 44 ++--- drivers/staging/rtl8192u/r8192U_hw.h | 204 +++-------------------- drivers/staging/rtl8192u/r819xU_phy.c | 15 +- drivers/staging/rtl8192u/r819xU_phy.h | 6 +- 6 files changed, 71 insertions(+), 220 deletions(-)
Signature · 1 line
2.18.0
PATCH 1/21 staging:rtl8192u: Refactor enum VERSION_819xU - Style
Rename enumerated type VERSION_819xU to version_819xu to clear checkpatch issue with CamelCase naming. Additionally the constants defined by the type are renamed for the same reason.
Remove the 'typedef' directive to clear the checkpatch issue with defining new types.
The enumerated type has been moved to the file where the type is actually used, r8192U.h
Additionally the memeber variable, which uses the type (card_8192_version), has been changed to use the type to enable compiler typechecking.
These are coding style changes which should not impact runtime code execution.
--- drivers/staging/rtl8192u/r8190_rtl8256.c | 6 +++--- drivers/staging/rtl8192u/r8192U.h | 8 +++++++- drivers/staging/rtl8192u/r8192U_core.c | 8 ++++---- drivers/staging/rtl8192u/r8192U_hw.h | 5 ----- drivers/staging/rtl8192u/r819xU_phy.c | 4 ++-- 5 files changed, 16 insertions(+), 15 deletions(-)
drivers/staging/rtl8192u/r8190_rtl8256.c +3 -3
@@ -37,9 +37,9 @@ void PHY_SetRF8256Bandwidth(struct net_device *dev, enum ht_channel_width Bandwiswitch (Bandwidth) {case HT_CHANNEL_WIDTH_20 : -if (priv->card_8192_version == VERSION_819xU_A +if (priv->card_8192_version ==VERSION_819XU_A || priv->card_8192_version - == VERSION_819xU_B) {/* 8256 D-cut, E-cut, xiong: consider it later! */ + ==VERSION_819XU_B ) {/* 8256 D-cut, E-cut, xiong: consider it later! */ rtl8192_phy_SetRFReg (dev, (enum rf90_radio_path_e )eRFPath,0x0b , bMask12Bits,0x100 );/* phy para:1ba */
@@ -57,7 +57,7 @@ void PHY_SetRF8256Bandwidth(struct net_device *dev, enum ht_channel_width Bandwi }break ;case HT_CHANNEL_WIDTH_20_40 : -if (priv->card_8192_version == VERSION_819xU_A || priv->card_8192_version == VERSION_819xU_B) {/* 8256 D-cut, E-cut, xiong: consider it later! */ +if (priv->card_8192_version ==VERSION_819XU_A || priv->card_8192_version ==VERSION_819XU_B ) {/* 8256 D-cut, E-cut, xiong: consider it later! */ rtl8192_phy_SetRFReg (dev, (enum rf90_radio_path_e )eRFPath,0x0b , bMask12Bits,0x300 );/* phy para:3ba */ rtl8192_phy_SetRFReg (dev, (enum rf90_radio_path_e )eRFPath,0x2c , bMask12Bits,0x3df );rtl8192_phy_SetRFReg (dev, (enum rf90_radio_path_e )eRFPath,0x0e , bMask12Bits,0x0a1 );
drivers/staging/rtl8192u/r8192U.h +7 -1
@@ -798,6 +798,12 @@ typedef enum _tag_TxCmd_Config_Index {TXCMD_XXXX_CTRL , } DCMD_TXCMD_OP; +enum version_819xu { +VERSION_819XU_A ,// A-cut +VERSION_819XU_B ,// B-cut +VERSION_819XU_C ,// C-cut +}; + typedef struct r8192_priv { struct usb_device *udev; /* For maintain info from eeprom */
@@ -815,7 +821,7 @@ typedef struct r8192_priv {/* O: rtl8192, 1: rtl8185 V B/C, 2: rtl8185 V D */ short card_8192;/* If TCR reports card V B/C, this discriminates */ -u8 card_8192_version; +enum version_819xu card_8192_version;short enable_gpio0;enum card_type {PCI ,MINIPCI ,CARDBUS ,USB
drivers/staging/rtl8192u/r8192U_core.c +4 -4
@@ -2395,7 +2395,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev) }else { priv->eeprom_vid =0 ; priv->eeprom_pid =0 ; - priv->card_8192_version = VERSION_819xU_B; + priv->card_8192_version =VERSION_819XU_B ; priv->eeprom_ChannelPlan =0 ; priv->eeprom_CustomerID =0 ; }
@@ -2422,7 +2422,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev) priv->rf_type =RTL819X_DEFAULT_RF_TYPE ;/* default 1T2R */ priv->rf_chip =RF_8256 ; -if (priv->card_8192_version == (u8 )VERSION_819xU_A) { +if (priv->card_8192_version ==VERSION_819XU_A ) {/* read Tx power gain offset of legacy OFDM to HT rate */ if (bLoad_From_EEPOM) { ret =eprom_read (dev, (EEPROM_TxPowerDiff >>1 ));
@@ -2567,7 +2567,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev)* 92U does not enable TX power tracking. */ priv->ThermalMeter[0 ] = priv->EEPROMThermalMeter; - }/* end if VersionID == VERSION_819xU_A */ + }/* end if VersionID == VERSION_819XU_A */ /* for dlink led */ switch (priv->eeprom_CustomerID) {
@@ -2872,7 +2872,7 @@ static bool rtl8192_adapter_start(struct net_device *dev)rtl8192_phy_configmac (dev); -if (priv->card_8192_version == (u8 )VERSION_819xU_A) { +if (priv->card_8192_version ==VERSION_819XU_A ) {rtl8192_phy_getTxPower (dev);rtl8192_phy_setTxPower (dev, priv->chan); }
drivers/staging/rtl8192u/r8192U_hw.h +0 -5
@@ -20,11 +20,6 @@ #ifndef R8192_HW #define R8192_HW -typedef enum _VERSION_819xU { - VERSION_819xU_A, // A-cut - VERSION_819xU_B, // B-cut - VERSION_819xU_C,// C-cut -} VERSION_819xU, *PVERSION_819xU; //added for different RF type typedef enum _RT_RF_TYPE_DEF { RF_1T2R = 0,
drivers/staging/rtl8192u/r819xU_phy.c +2 -2
@@ -814,7 +814,7 @@ static void rtl8192_BB_Config_ParaFile(struct net_device *dev)/* ----Enable XSTAL ---- */ write_nic_byte_E (dev,0x5e ,0x00 ); -if (priv->card_8192_version == (u8 )VERSION_819xU_A) { +if (priv->card_8192_version ==VERSION_819XU_A ) {/* Antenna gain offset from B/C/D to A */ reg_u32 = priv->AntennaTxPwDiff[1 ]<<4 | priv->AntennaTxPwDiff[0 ];
@@ -1367,7 +1367,7 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel,switch (CurrentCmd->cmd_id) {case CMD_ID_SET_TX_PWR_LEVEL : -if (priv->card_8192_version == (u8 )VERSION_819xU_A) +if (priv->card_8192_version ==VERSION_819XU_A )/* consider it later! */ rtl8192_SetTxPowerLevel (dev, channel);break ;
Signature · 1 line
2.18.0
PATCH 2/21 staging:rtl8192u: Refactor RT_RF_TYPE_DEF - Style
In reply to John WhitmoreRename the enumerated type RT_RF_TYPE_DEF to rt_rf_type to comply with the coding standard, lower case type names. Removed the 'def' postscript which provides no additional information.
The 'typedef' directive has been removed to clear the checkpatch issue with defining new types.
The type has been moved to the file r8192U.h, where it is actually used by the member variable 'rf_type'. Previously the member variable used a 'u8' type so no compiler type checking is being performed. The type has been changed to the correct type.
--- drivers/staging/rtl8192u/r8192U.h | 8 +++++++- drivers/staging/rtl8192u/r8192U_hw.h | 9 --------- 2 files changed, 7 insertions(+), 10 deletions(-)
drivers/staging/rtl8192u/r8192U.h +7 -1
@@ -804,6 +804,12 @@ enum version_819xu { VERSION_819XU_C,// C-cut }; +//added for different RF type +enum rt_rf_type { +RF_1T2R =0 , +RF_2T4R , +}; + typedef struct r8192_priv { struct usb_device *udev; /* For maintain info from eeprom */
@@ -844,7 +850,7 @@ typedef struct r8192_priv {struct mutex wx_mutex; -u8 rf_type;/* 0: 1T2R, 1: 2T4R */ +enum rt_rf_type rf_type;/* 0: 1T2R, 1: 2T4R */ RT_RF_TYPE_819xU rf_chip;short (*rf_set_sens)(struct net_device *dev,short sens);
drivers/staging/rtl8192u/r8192U_hw.h +0 -9
@@ -20,15 +20,6 @@ #ifndef R8192_HW #define R8192_HW -//added for different RF type -typedef enum _RT_RF_TYPE_DEF { - RF_1T2R = 0, - RF_2T4R, - - RF_819X_MAX_TYPE -} RT_RF_TYPE_DEF; - - typedef enum _BaseBand_Config_Type { BaseBand_Config_PHY_REG = 0, //Radio Path A BaseBand_Config_AGC_TAB = 1, //Radio Path B
Signature · 1 line
2.18.0
PATCH 3/21 staging:rtl8192u: Make function rtl8192_phyConfigBB static
In reply to John WhitmoreThe function rtl8192_phyConfigBB is only used in the file in which it is defined so can be declared static. Additionally the prototype has been removed from the header file, as it is not used.
--- drivers/staging/rtl8192u/r819xU_phy.c | 2 +- drivers/staging/rtl8192u/r819xU_phy.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/staging/rtl8192u/r819xU_phy.c +1 -1
@@ -511,7 +511,7 @@ void rtl8192_phy_configmac(struct net_device *dev)* notice: BB parameters may change all the time, so please make * sure it has been synced with the newest. *****************************************************************************/ -void rtl8192_phyConfigBB (struct net_device *dev,u8 ConfigType) +static void rtl8192_phyConfigBB (struct net_device *dev,u8 ConfigType) {u32 i;
drivers/staging/rtl8192u/r819xU_phy.h +0 -1
@@ -52,7 +52,6 @@ u32 rtl8192_phy_QueryRFReg(struct net_device *dev,enum rf90_radio_path_e e_rfpath, u32 reg_addr, u32 bitmask);void rtl8192_phy_configmac (struct net_device *dev); -void rtl8192_phyConfigBB (struct net_device *dev,u8 ConfigType);u8 rtl8192_phy_checkBBAndRF (struct net_device *dev,enum hw90_block_e CheckBlock,enum rf90_radio_path_e e_rfpath);
Signature · 1 line
2.18.0
PATCH 4/21 staging:rtl8192u: Refactor BaseBand_Config_Type - Style
In reply to John WhitmoreRename the type to baseband_config_type to clear the checkpatch issue with CamelCase naming. Remove the 'typedef' directive to clear the issue with defining new types.
As it is only used in the file r819xU_phy.c the type has been moved to the r819xU_phy.h file.
The enumerated type is only used as a parameter to the function rtl8192_phyConfigBB. Previously that parameter used type 'u8' so no compiler typechecking was being performed. The parameter type has been corrected.
These changes are coding style changes and as such should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/r8192U_hw.h | 4 ---- drivers/staging/rtl8192u/r819xU_phy.c | 11 ++++++----- drivers/staging/rtl8192u/r819xU_phy.h | 5 +++++ 3 files changed, 11 insertions(+), 9 deletions(-)
drivers/staging/rtl8192u/r8192U_hw.h +0 -4
@@ -20,10 +20,6 @@#ifndef R8192_HW #define R8192_HW -typedef enum _BaseBand_Config_Type { - BaseBand_Config_PHY_REG =0 ,//Radio Path A - BaseBand_Config_AGC_TAB =1 ,//Radio Path B -}BaseBand_Config_Type , *PBaseBand_Config_Type ;#define RTL8187_REQT_READ 0xc0#define RTL8187_REQT_WRITE 0x40#define RTL8187_REQ_GET_REGS 0x05
drivers/staging/rtl8192u/r819xU_phy.c +6 -5
@@ -511,7 +511,8 @@ void rtl8192_phy_configmac(struct net_device *dev)* notice: BB parameters may change all the time, so please make * sure it has been synced with the newest. *****************************************************************************/ -static void rtl8192_phyConfigBB (struct net_device *dev,u8 ConfigType) +static void rtl8192_phyConfigBB (struct net_device *dev, +enum baseband_config_type ConfigType) {u32 i;
@@ -525,7 +526,7 @@ static void rtl8192_phyConfigBB(struct net_device *dev, u8 ConfigType) Rtl8190AGCTAB_Array_Table = Rtl819XAGCTAB_ArrayDTM; }#endif -if (ConfigType == BaseBand_Config_PHY_REG) { +if (ConfigType ==BASEBAND_CONFIG_PHY_REG ) {for (i =0 ; i < PHY_REG_1T2RArrayLength; i +=2 ) { rtl8192_setBBreg(dev, Rtl8192UsbPHY_REG_1T2RArray[i], bMaskDWord,
@@ -535,7 +536,7 @@ static void rtl8192_phyConfigBB(struct net_device *dev, u8 ConfigType) i, Rtl8192UsbPHY_REG_1T2RArray[i], Rtl8192UsbPHY_REG_1T2RArray[i+1]); } - }else if (ConfigType == BaseBand_Config_AGC_TAB) { + }else if (ConfigType ==BASEBAND_CONFIG_AGC_TAB ) {for (i =0 ; i < AGCTAB_ArrayLength; i +=2 ) {rtl8192_setBBreg (dev, Rtl8192UsbAGCTAB_Array[i], bMaskDWord, Rtl8192UsbAGCTAB_Array[i+1 ]);
@@ -802,7 +803,7 @@ static void rtl8192_BB_Config_ParaFile(struct net_device *dev)rtl8192_setBBreg (dev, rFPGA0_RFMOD, bCCKEn|bOFDMEn,0x0 );/* ----BB Register Initilazation---- */ /* ==m==>Set PHY REG From Header<==m== */ -rtl8192_phyConfigBB (dev, BaseBand_Config_PHY_REG); +rtl8192_phyConfigBB (dev,BASEBAND_CONFIG_PHY_REG );/* ----Set BB reset de-Active---- */ read_nic_dword (dev,CPU_GEN , ®_u32);
@@ -810,7 +811,7 @@ static void rtl8192_BB_Config_ParaFile(struct net_device *dev)/* ----BB AGC table Initialization---- */ /* ==m==>Set PHY REG From Header<==m== */ -rtl8192_phyConfigBB (dev, BaseBand_Config_AGC_TAB); +rtl8192_phyConfigBB (dev,BASEBAND_CONFIG_AGC_TAB );/* ----Enable XSTAL ---- */ write_nic_byte_E (dev,0x5e ,0x00 );
drivers/staging/rtl8192u/r819xU_phy.h +5 -0
@@ -7,6 +7,11 @@#define MAX_RFDEPENDCMD_CNT 16#define MAX_POSTCMD_CNT 16 +enum baseband_config_type { +BASEBAND_CONFIG_PHY_REG =0 ,//Radio Path A +BASEBAND_CONFIG_AGC_TAB =1 ,//Radio Path B +}; +enum switch_chan_cmd_id {CMD_ID_END ,CMD_ID_SET_TX_PWR_LEVEL ,
Signature · 1 line
2.18.0
PATCH 5/21 staging:rtl8192u: Remove unused definitions - Style
In reply to John WhitmoreRemove unused definitions from the r8192U_hw.h header file.
These are coding style changes which should not impact on runtime code execution.
--- drivers/staging/rtl8192u/r8192U_hw.h | 149 +-------------------------- 1 file changed, 1 insertion(+), 148 deletions(-)
drivers/staging/rtl8192u/r8192U_hw.h +1 -148
@@ -29,24 +29,9 @@#define MAX_RX_URB 16#define R8180_MAX_RETRY 255 -//#define MAX_RX_NORMAL_URB 3 -//#define MAX_RX_COMMAND_URB 2 -#define RX_URB_SIZE 9100 - -#define BB_ANTATTEN_CHAN14 0x0c -#define BB_ANTENNA_B 0x40 -#define BB_HOST_BANG BIT(30) -#define BB_HOST_BANG_EN BIT(2) -#define BB_HOST_BANG_CLK BIT(1) -#define BB_HOST_BANG_RW BIT(3) -#define BB_HOST_BANG_DATA 1 +#define RX_URB_SIZE 9100 -//#if (RTL819X_FPGA_VER & RTL819X_FPGA_VIVI_070920) -#define AFR 0x010 -#define AFR_CardBEn BIT(0) -#define AFR_CLKRUN_SEL BIT(1) -#define AFR_FuncRegEn BIT(2)#define RTL8190_EEPROM_ID 0x8129#define EEPROM_VID 0x02#define EEPROM_PID 0x04
@@ -63,24 +48,14 @@#define EEPROM_TxPwIndex_OFDM_24G_V1 0x2C //0x2C~0x2E#define EEPROM_TxPwIndex_Ver 0x27 //0x27 -#define EEPROM_Default_TxPowerDiff 0x0#define EEPROM_Default_ThermalMeter 0x7#define EEPROM_Default_PwDiff 0x4#define EEPROM_Default_CrystalCap 0x5#define EEPROM_Default_TxPower 0x1010#define EEPROM_Customer_ID 0x7B //0x7B:CustomerID#define EEPROM_ChannelPlan 0x16 //0x7C -#define EEPROM_IC_VER 0x7d //0x7D -#define EEPROM_CRC 0x7e //0x7E~0x7F -#define EEPROM_CID_DEFAULT 0x0 -#define EEPROM_CID_CAMEO 0x1#define EEPROM_CID_RUNTOP 0x2 -#define EEPROM_CID_Senao 0x3 -#define EEPROM_CID_TOSHIBA 0x4 // Toshiba setting, Merge by Jacken, 2008/01/31 -#define EEPROM_CID_NetCore 0x5 -#define EEPROM_CID_Nettronix 0x6 -#define EEPROM_CID_Pronet 0x7#define EEPROM_CID_DLINK 0x8#define AC_PARAM_TXOP_LIMIT_OFFSET 16
@@ -91,17 +66,13 @@//#endif enum _RTL8192Usb_HW { -PCIF =0x009 ,// PCI Function Register 0x0009h~0x000bh #define BB_GLOBAL_RESET_BIT 0x1 BB_GLOBAL_RESET = 0x020, // BasebandGlobal Reset RegisterBSSIDR =0x02E ,// BSSID Register CMDR =0x037 ,// Command register -#define CR_RST 0x10 #define CR_RE 0x08 #define CR_TE 0x04 -#define CR_MulRW 0x01SIFS =0x03E ,// SIFS register -TCR =0x040 ,// Transmit Configuration Register #define TCR_MXDMA_2048 7 #define TCR_LRL_OFFSET 0
@@ -114,26 +85,16 @@ enum _RTL8192Usb_HW { BIT(22) | BIT(23))#define RX_FIFO_THRESHOLD_MASK (BIT(13) | BIT(14) | BIT(15))#define RX_FIFO_THRESHOLD_SHIFT 13 -#define RX_FIFO_THRESHOLD_128 3 -#define RX_FIFO_THRESHOLD_256 4 -#define RX_FIFO_THRESHOLD_512 5 -#define RX_FIFO_THRESHOLD_1024 6#define RX_FIFO_THRESHOLD_NONE 7#define MAX_RX_DMA_MASK (BIT(8) | BIT(9) | BIT(10))#define RCR_MXDMA_OFFSET 8#define RCR_FIFO_OFFSET 13#define RCR_ONLYERLPKT BIT(31) // Early Receiving based on Packet Size. -#define RCR_ENCS2 BIT(30) // Enable Carrier Sense Detection Method 2 -#define RCR_ENCS1 BIT(29) // Enable Carrier Sense Detection Method 1 -#define RCR_ENMBID BIT(27) // Enable Multiple BssId. -#define RCR_ACKTXBW (BIT(24) | BIT(25)) // TXBW Setting of ACK frames#define RCR_CBSSID BIT(23) // Accept BSSID match packet#define RCR_APWRMGT BIT(22) // Accept power management packet -#define RCR_ADD3 BIT(21) // Accept address 3 match packet#define RCR_AMF BIT(20) // Accept management type frame#define RCR_ACF BIT(19) // Accept control type frame#define RCR_ADF BIT(18) // Accept data type frame -#define RCR_RXFTH BIT(13) // Rx FIFO Threshold#define RCR_AICV BIT(12) // Accept ICV error packet#define RCR_ACRC32 BIT(5) // Accept CRC32 error packet#define RCR_AB BIT(3) // Accept broadcast packet
@@ -142,14 +103,10 @@ enum _RTL8192Usb_HW {#define RCR_AAP BIT(0) // Accept all unicast packetSLOT_TIME =0x049 ,// Slot Time Register ACK_TIMEOUT =0x04c ,// Ack Timeout Register -PIFS_TIME =0x04d ,// PIFS time -USTIME =0x04e ,// Microsecond Tuning Register, Sets the microsecond time unit used by MAC clock. EDCAPARA_BE =0x050 ,// EDCA Parameter of AC BE EDCAPARA_BK =0x054 ,// EDCA Parameter of AC BK EDCAPARA_VO =0x058 ,// EDCA Parameter of AC VO EDCAPARA_VI =0x05C ,// EDCA Parameter of AC VI -RFPC =0x05F ,// Rx FIFO Packet Count -CWRR =0x060 ,// Contention Window Report Register BCN_TCFG =0x062 ,// Beacon Time Configuration #define BCN_TCFG_CW_SHIFT 8 #define BCN_TCFG_IFS 0
@@ -160,7 +117,6 @@ enum _RTL8192Usb_HW {BCN_ERR_THRESH =0x078 ,// Beacon Error Threshold RWCAM =0x0A0 ,//IN 8190 Data Sheet is called CAMcmd WCAMI =0x0A4 ,// Software write CAM input content -RCAMO =0x0A8 ,// Software read/write CAM config SECR =0x0B0 ,//Security Configuration Register #define SCR_TxUseDK BIT(0) //Force Tx Use Default Key#define SCR_RxUseDK BIT(1) //Force Rx Use Default Key
@@ -168,21 +124,6 @@ enum _RTL8192Usb_HW {#define SCR_RxDecEnable BIT(3) //Enable Rx Decryption#define SCR_SKByA2 BIT(4) //Search kEY BY A2#define SCR_NoSKMC BIT(5) //No Key Search for Multicast -#define SCR_UseDK 0x01 -#define SCR_TxSecEnable 0x02 -#define SCR_RxSecEnable 0x04 - TPPoll = 0x0fd, // Transmit priority polling register - PSR = 0x0ff, // Page Select Register -#define CPU_CCK_LOOPBACK 0x00030000 -#define CPU_GEN_SYSTEM_RESET 0x00000001 -#define CPU_GEN_FIRMWARE_RESET 0x00000008 -#define CPU_GEN_BOOT_RDY 0x00000010 -#define CPU_GEN_FIRM_RDY 0x00000020 -#define CPU_GEN_PUT_CODE_OK 0x00000080 -#define CPU_GEN_BB_RST 0x00000100 -#define CPU_GEN_PWR_STB_CPU 0x00000004 -#define CPU_GEN_NO_LOOPBACK_MSK 0xFFF8FFFF // Set bit18,17,16 to 0. Set bit19 -#define CPU_GEN_NO_LOOPBACK_SET 0x00080000 // Set BIT19 to 1//---------------------------------------------------------------------------- // 8190 CPU General Register (offset 0x100, 4 byte)
@@ -198,72 +139,20 @@ enum _RTL8192Usb_HW {#define CPU_GEN_NO_LOOPBACK_MSK 0xFFF8FFFF // Set bit18,17,16 to 0. Set bit19#define CPU_GEN_NO_LOOPBACK_SET 0x00080000 // Set BIT19 to 1 CPU_GEN = 0x100, // CPU Reset Register - LED1Cfg =0x154 ,// LED1 Configuration Register - LED0Cfg =0x155 ,// LED0 Configuration Register - AcmAvg =0x170 ,// ACM Average Period Register AcmHwCtrl = 0x171, // ACM Hardware Control Register//---------------------------------------------------------------------------- //// //// 8190 AcmHwCtrl bits (offset 0x171, 1 byte) ////---------------------------------------------------------------------------- // -#define AcmHw_HwEn BIT(0)#define AcmHw_BeqEn BIT(1) -#define AcmHw_ViqEn BIT(2) -#define AcmHw_VoqEn BIT(3) -#define AcmHw_BeqStatus BIT(4) -#define AcmHw_ViqStatus BIT(5) -#define AcmHw_VoqStatus BIT(6) - AcmFwCtrl =0x172 ,// ACM Firmware Control Register -AES_11N_FIX =0x173 , - VOAdmTime =0x174 ,// VO Queue Admitted Time Register - VIAdmTime =0x178 ,// VI Queue Admitted Time Register - BEAdmTime =0x17C ,// BE Queue Admitted Time Register RQPN1 =0x180 ,// Reserved Queue Page Number , Vo Vi, Be, Bk RQPN2 =0x184 ,// Reserved Queue Page Number, HCCA, Cmd, Mgnt, High RQPN3 =0x188 ,// Reserved Queue Page Number, Bcn, Public, -// QPRR = 0x1E0, // Queue Page Report per TID QPNR =0x1D0 ,//0x1F0, // Queue Packet Number report per TID -BQDA =0x200 ,// Beacon Queue Descriptor Address -HQDA =0x204 ,// High Priority Queue Descriptor Address -CQDA =0x208 ,// Command Queue Descriptor Address -MQDA =0x20C ,// Management Queue Descriptor Address -HCCAQDA =0x210 ,// HCCA Queue Descriptor Address -VOQDA =0x214 ,// VO Queue Descriptor Address -VIQDA =0x218 ,// VI Queue Descriptor Address -BEQDA =0x21C ,// BE Queue Descriptor Address -BKQDA =0x220 ,// BK Queue Descriptor Address -RCQDA =0x224 ,// Receive command Queue Descriptor Address -RDQDA =0x228 ,// Receive Queue Descriptor Start Address - -MAR0 =0x240 ,// Multicast filter. -MAR4 =0x244 , - -CCX_PERIOD =0x250 ,// CCX Measurement Period Register, in unit of TU. -CLM_RESULT =0x251 ,// CCA Busy fraction register. -NHM_PERIOD =0x252 ,// NHM Measurement Period register, in unit of TU. -NHM_THRESHOLD0 =0x253 ,// Noise Histogram Meashorement0. -NHM_THRESHOLD1 =0x254 ,// Noise Histogram Meashorement1. -NHM_THRESHOLD2 =0x255 ,// Noise Histogram Meashorement2. -NHM_THRESHOLD3 =0x256 ,// Noise Histogram Meashorement3. -NHM_THRESHOLD4 =0x257 ,// Noise Histogram Meashorement4. -NHM_THRESHOLD5 =0x258 ,// Noise Histogram Meashorement5. -NHM_THRESHOLD6 =0x259 ,// Noise Histogram Meashorement6 - -MCTRL =0x25A ,// Measurement Control - -NHM_RPI_COUNTER0 =0x264 ,// Noise Histogram RPI counter0, the fraction of signal strength < NHM_THRESHOLD0. -NHM_RPI_COUNTER1 =0x265 ,// Noise Histogram RPI counter1, the fraction of signal strength in (NHM_THRESHOLD0, NHM_THRESHOLD1]. -NHM_RPI_COUNTER2 =0x266 ,// Noise Histogram RPI counter2, the fraction of signal strength in (NHM_THRESHOLD1, NHM_THRESHOLD2]. -NHM_RPI_COUNTER3 =0x267 ,// Noise Histogram RPI counter3, the fraction of signal strength in (NHM_THRESHOLD2, NHM_THRESHOLD3]. -NHM_RPI_COUNTER4 =0x268 ,// Noise Histogram RPI counter4, the fraction of signal strength in (NHM_THRESHOLD3, NHM_THRESHOLD4]. -NHM_RPI_COUNTER5 =0x269 ,// Noise Histogram RPI counter5, the fraction of signal strength in (NHM_THRESHOLD4, NHM_THRESHOLD5]. -NHM_RPI_COUNTER6 =0x26A ,// Noise Histogram RPI counter6, the fraction of signal strength in (NHM_THRESHOLD5, NHM_THRESHOLD6]. -NHM_RPI_COUNTER7 =0x26B ,// Noise Histogram RPI counter7, the fraction of signal strength in (NHM_THRESHOLD6, NHM_THRESHOLD7]. -#define BW_OPMODE_11J BIT(0) #define BW_OPMODE_5G BIT(1)#define BW_OPMODE_20MHZ BIT(2) BW_OPMODE = 0x300, // Bandwidth operation mode
@@ -274,18 +163,10 @@ enum _RTL8192Usb_HW {#define MSR_LINK_SHIFT 0#define MSR_LINK_ADHOC 1#define MSR_LINK_MASTER 3 -#define MSR_LINK_ENEDCA BIT(4) RETRY_LIMIT = 0x304, // Retry Limit [15:8]-short, [7:0]-long#define RETRY_LIMIT_SHORT_SHIFT 8#define RETRY_LIMIT_LONG_SHIFT 0 - TSFR = 0x308, RRSR = 0x310, // Response Rate Set -#define RRSR_RSC_OFFSET 21 -#define RRSR_SHORT_OFFSET 23 -#define RRSR_RSC_DUPLICATE 0x600000 -#define RRSR_RSC_LOWSUBCHNL 0x400000 -#define RRSR_RSC_UPSUBCHANL 0x200000 -#define RRSR_SHORT 0x800000#define RRSR_1M BIT(0)#define RRSR_2M BIT(1)#define RRSR_5_5M BIT(2)
@@ -298,14 +179,6 @@ enum _RTL8192Usb_HW {#define RRSR_36M BIT(9)#define RRSR_48M BIT(10)#define RRSR_54M BIT(11) -#define RRSR_MCS0 BIT(12) -#define RRSR_MCS1 BIT(13) -#define RRSR_MCS2 BIT(14) -#define RRSR_MCS3 BIT(15) -#define RRSR_MCS4 BIT(16) -#define RRSR_MCS5 BIT(17) -#define RRSR_MCS6 BIT(18) -#define RRSR_MCS7 BIT(19)#define BRSR_AckShortPmb BIT(23) // CCK ACK: use Short Preamble or not.RATR0 =0x320 ,// Rate Adaptive Table register1 UFWP = 0x318,
@@ -354,21 +227,10 @@ enum _RTL8192Usb_HW {#define RATE_ALL_OFDM_2SS RATR_MCS8|RATR_MCS9 |RATR_MCS10|RATR_MCS11| \ RATR_MCS12|RATR_MCS13|RATR_MCS14|RATR_MCS15 -MCS_TXAGC =0x340 ,// MCS AGC -CCK_TXAGC =0x348 ,// CCK AGC -// ISR = 0x350, // Interrupt Status Register -// IMR = 0x354, // Interrupt Mask Register -// IMR_POLL = 0x360, - MacBlkCtrl =0x403 ,// Mac block on/off control register - EPROM_CMD = 0xfe58,#define Cmd9346CR_9356SEL BIT(4) -#define EPROM_CMD_RESERVED_MASK BIT(5)#define EPROM_CMD_OPERATING_MODE_SHIFT 6 -#define EPROM_CMD_OPERATING_MODE_MASK (BIT(7) | BIT(6)) -#define EPROM_CMD_CONFIG 0x3#define EPROM_CMD_NORMAL 0 -#define EPROM_CMD_LOAD 1#define EPROM_CMD_PROGRAM 2#define EPROM_CS_BIT BIT(3)#define EPROM_CK_BIT BIT(2)
@@ -376,19 +238,10 @@ enum _RTL8192Usb_HW {#define EPROM_R_BIT BIT(0)MAC0 =0x000 , -MAC1 =0x001 , -MAC2 =0x002 , -MAC3 =0x003 , MAC4 = 0x004, - MAC5 = 0x005, - };//---------------------------------------------------------------------------- // 818xB AnaParm & AnaParm2 Register //---------------------------------------------------------------------------- -//#define ANAPARM_ASIC_ON 0x45090658 -//#define ANAPARM2_ASIC_ON 0x727f3f52 #define GPI 0x108 -#define GPO 0x109 -#define GPE 0x10a#endif
Signature · 1 line
2.18.0
PATCH 6/21 staging:rtl8192u: Reorder enum _RTL8192Usb_HW members - Style
In reply to John WhitmoreReorder the members of enum _RTL8192Usb_HW so that they are in order.
This is a coding style change which should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/r8192U_hw.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/staging/rtl8192u/r8192U_hw.h +3 -4
@@ -65,6 +65,8 @@//#endif enum _RTL8192Usb_HW { +MAC0 =0x000 , +MAC4 =0x004 ,#define BB_GLOBAL_RESET_BIT 0x1 BB_GLOBAL_RESET = 0x020, // BasebandGlobal Reset Register
@@ -180,8 +182,8 @@ enum _RTL8192Usb_HW {#define RRSR_48M BIT(10)#define RRSR_54M BIT(11)#define BRSR_AckShortPmb BIT(23) // CCK ACK: use Short Preamble or not. -RATR0 =0x320 ,// Rate Adaptive Table register1 UFWP =0x318 , +RATR0 =0x320 ,// Rate Adaptive Table register1 DRIVER_RSSI = 0x32c, // Driver tell Firmware current RSSI//---------------------------------------------------------------------------- // 8190 Rate Adaptive Table Register (offset 0x320, 4 byte)
@@ -236,9 +238,6 @@ enum _RTL8192Usb_HW {#define EPROM_CK_BIT BIT(2)#define EPROM_W_BIT BIT(1)#define EPROM_R_BIT BIT(0) - -MAC0 =0x000 , - MAC4 = 0x004, };//---------------------------------------------------------------------------- // 818xB AnaParm & AnaParm2 Register
Signature · 1 line
2.18.0
PATCH 7/21 staging:rtl8192u: Rename EEPROM_TxPowerDiff - Style
In reply to John WhitmoreRename EEPROM_TxPowerDiff to EEPROM_TX_POWER_DIFF. This change clears the checkpatch issue with CamelCase naming.
This change is purely a coding style change which should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/r8192U_core.c | 2 +- drivers/staging/rtl8192u/r8192U_hw.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +1 -1
@@ -2425,7 +2425,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev)if (priv->card_8192_version ==VERSION_819XU_A ) {/* read Tx power gain offset of legacy OFDM to HT rate */ if (bLoad_From_EEPOM) { - ret =eprom_read (dev, (EEPROM_TxPowerDiff >>1 )); + ret =eprom_read (dev, (EEPROM_TX_POWER_DIFF >>1 ));if (ret <0 )return ret; priv->EEPROMTxPowerDiff = ((u16 )ret &0xff00 ) >>8 ;
drivers/staging/rtl8192u/r8192U_hw.h +1 -1
@@ -37,7 +37,7 @@#define EEPROM_PID 0x04#define EEPROM_NODE_ADDRESS_BYTE_0 0x0C -#define EEPROM_TxPowerDiff 0x1F +#define EEPROM_TX_POWER_DIFF 0x1F#define EEPROM_ThermalMeter 0x20#define EEPROM_PwDiff 0x21 //0x21#define EEPROM_CrystalCap 0x22 //0x22
Signature · 1 line
2.18.0
PATCH 8/21 staging:rtl8192u: Rename EEPROM_ThermalMeter - Style
In reply to John WhitmoreRename EEPROM_ThermalMeter to EEPROM_THERMAL_METER. This change clears the checkpatch issue with CamelCase naming.
This change is a coding style change which should not impact on runtime code execution.
--- drivers/staging/rtl8192u/r8192U_core.c | 2 +- drivers/staging/rtl8192u/r8192U_hw.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +1 -1
@@ -2434,7 +2434,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev)RT_TRACE (COMP_EPROM ,"TxPowerDiff:%d\n" , priv->EEPROMTxPowerDiff);/* read ThermalMeter from EEPROM */ if (bLoad_From_EEPOM) { - ret =eprom_read (dev, (EEPROM_ThermalMeter >>1 )); + ret =eprom_read (dev, (EEPROM_THERMAL_METER >>1 ));if (ret <0 )return ret; priv->EEPROMThermalMeter = (u8)((u16 )ret &0x00ff );
drivers/staging/rtl8192u/r8192U_hw.h +1 -1
@@ -38,7 +38,7 @@#define EEPROM_NODE_ADDRESS_BYTE_0 0x0C#define EEPROM_TX_POWER_DIFF 0x1F -#define EEPROM_ThermalMeter 0x20 +#define EEPROM_THERMAL_METER 0x20#define EEPROM_PwDiff 0x21 //0x21#define EEPROM_CrystalCap 0x22 //0x22
Signature · 1 line
2.18.0
PATCH 9/21 staging:rtl8192u: Rename EEPROM_PwDiff - Style
In reply to John WhitmoreRename the constant EEPROM_PwDiff to EEPROM_PW_DIFF. This change clears the checkpatch issue with CamelCase naming.
This is a coding style change which should not impact on runtime code execution.
--- drivers/staging/rtl8192u/r8192U_core.c | 2 +- drivers/staging/rtl8192u/r8192U_hw.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +1 -1
@@ -2445,7 +2445,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev) priv->TSSI_13dBm = priv->EEPROMThermalMeter *100 ;/* read antenna tx power offset of B/C/D to A from EEPROM */ if (bLoad_From_EEPOM) { - ret =eprom_read (dev, (EEPROM_PwDiff >>1 )); + ret =eprom_read (dev, (EEPROM_PW_DIFF >>1 ));if (ret <0 )return ret; priv->EEPROMPwDiff = ((u16 )ret &0x0f00 ) >>8 ;
drivers/staging/rtl8192u/r8192U_hw.h +1 -1
@@ -39,7 +39,7 @@#define EEPROM_TX_POWER_DIFF 0x1F#define EEPROM_THERMAL_METER 0x20 -#define EEPROM_PwDiff 0x21 //0x21 +#define EEPROM_PW_DIFF 0x21 //0x21#define EEPROM_CrystalCap 0x22 //0x22#define EEPROM_TxPwIndex_CCK 0x23 //0x23
Signature · 1 line
2.18.0
PATCH 10/21 staging:rtl8192u: Rename EEPROM_CrystalCap - Style
In reply to John WhitmoreRename the constant EEPROM_CrystalCap to EEPROM_CRYSTAL_CAP. This clears the checkpatch issue with CamelCase naming.
This is a coding style change which should not impact on runtime code execution.
--- drivers/staging/rtl8192u/r8192U_core.c | 2 +- drivers/staging/rtl8192u/r8192U_hw.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +1 -1
@@ -2454,7 +2454,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev)RT_TRACE (COMP_EPROM ,"TxPwDiff:%d\n" , priv->EEPROMPwDiff);/* Read CrystalCap from EEPROM */ if (bLoad_From_EEPOM) { - ret =eprom_read (dev, (EEPROM_CrystalCap >>1 )); + ret =eprom_read (dev, (EEPROM_CRYSTAL_CAP >>1 ));if (ret <0 )return ret; priv->EEPROMCrystalCap = (u16 )ret &0x0f ;
drivers/staging/rtl8192u/r8192U_hw.h +1 -1
@@ -40,7 +40,7 @@#define EEPROM_TX_POWER_DIFF 0x1F#define EEPROM_THERMAL_METER 0x20#define EEPROM_PW_DIFF 0x21 //0x21 -#define EEPROM_CrystalCap 0x22 //0x22 +#define EEPROM_CRYSTAL_CAP 0x22 //0x22#define EEPROM_TxPwIndex_CCK 0x23 //0x23#define EEPROM_TxPwIndex_OFDM_24G 0x24 //0x24~0x26
Signature · 1 line
2.18.0
PATCH 11/21 staging:rtl8192u: Rename EEPROM_TxPwIndex_CCK - Style
In reply to John WhitmoreRename the constant EEPROM_TxPwIndex_CCK to EEPROM_TX_PW_INDEX_CCK. This change clears the checkpatch issue with CamelCase naming.
The change is coding style in nature so should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/r8192U_core.c | 2 +- drivers/staging/rtl8192u/r8192U_hw.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +1 -1
@@ -2474,7 +2474,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev)int i;if (bLoad_From_EEPOM) { - ret =eprom_read (dev, (EEPROM_TxPwIndex_CCK >>1 )); + ret =eprom_read (dev, (EEPROM_TX_PW_INDEX_CCK >>1 ));if (ret <0 )return ret; priv->EEPROMTxPowerLevelCCK = ((u16 )ret &0xff ) >>8 ;
drivers/staging/rtl8192u/r8192U_hw.h +1 -1
@@ -42,7 +42,7 @@#define EEPROM_PW_DIFF 0x21 //0x21#define EEPROM_CRYSTAL_CAP 0x22 //0x22 -#define EEPROM_TxPwIndex_CCK 0x23 //0x23 +#define EEPROM_TX_PW_INDEX_CCK 0x23 //0x23#define EEPROM_TxPwIndex_OFDM_24G 0x24 //0x24~0x26#define EEPROM_TxPwIndex_CCK_V1 0x29 //0x29~0x2B#define EEPROM_TxPwIndex_OFDM_24G_V1 0x2C //0x2C~0x2E
Signature · 1 line
2.18.0
PATCH 12/21 staging:rtl8192u: Rename EEPROM_TxPwIndex_OFDM_24G_V1 - STYLE
In reply to John WhitmoreRename the constant EEPROM_TxPwIndex_OFDM_24G_V1 to EEPROM_TX_PW_INDEX_OFDM_24G_V1, this change clears the checkpatch issue with CamelCase naming.
This is a coding style change which should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/r8192U_core.c | 4 ++-- drivers/staging/rtl8192u/r8192U_hw.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +2 -2
@@ -2517,12 +2517,12 @@ static int rtl8192_read_eeprom_info(struct net_device *dev) *((u16 *)(&priv->EEPROMTxPowerLevelCCK_V1[1 ])) = tmpValue;if (bLoad_From_EEPOM) tmpValue =eprom_read (dev, - EEPROM_TxPwIndex_OFDM_24G_V1 >>1 ); +EEPROM_TX_PW_INDEX_OFDM_24G_V1 >>1 );else tmpValue =0x1010 ; *((u16 *)(&priv->EEPROMTxPowerLevelOFDM24G[0 ])) = tmpValue;if (bLoad_From_EEPOM) - tmpValue =eprom_read (dev, (EEPROM_TxPwIndex_OFDM_24G_V1 +2 ) >>1 ); + tmpValue =eprom_read (dev, (EEPROM_TX_PW_INDEX_OFDM_24G_V1 +2 ) >>1 );else tmpValue =0x10 ; priv->EEPROMTxPowerLevelOFDM24G[2 ] = (u8 )tmpValue;
drivers/staging/rtl8192u/r8192U_hw.h +1 -1
@@ -45,7 +45,7 @@#define EEPROM_TX_PW_INDEX_CCK 0x23 //0x23#define EEPROM_TxPwIndex_OFDM_24G 0x24 //0x24~0x26#define EEPROM_TxPwIndex_CCK_V1 0x29 //0x29~0x2B -#define EEPROM_TxPwIndex_OFDM_24G_V1 0x2C //0x2C~0x2E +#define EEPROM_TX_PW_INDEX_OFDM_24G_V1 0x2C //0x2C~0x2E#define EEPROM_TxPwIndex_Ver 0x27 //0x27#define EEPROM_Default_ThermalMeter 0x7
Signature · 1 line
2.18.0
PATCH 13/21 staging:rtl8192u: Rename EEPROM_TxPwIndex_OFDM_24G - Style
In reply to John WhitmoreRename the constant EEPROM_TxPwIndex_OFDM_24G to EEPROM_TX_PW_INDEX_OFDM_24G, this change clears the checkpatch issue with CamelCase naming.
This change is a coding style change which should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/r8192U_core.c | 4 ++-- drivers/staging/rtl8192u/r8192U_hw.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +2 -2
@@ -2483,10 +2483,10 @@ static int rtl8192_read_eeprom_info(struct net_device *dev)RT_TRACE (COMP_EPROM ,"CCK Tx Power Levl: 0x%02x\n" , priv->EEPROMTxPowerLevelCCK);for (i =0 ; i <3 ; i++) {if (bLoad_From_EEPOM) { - ret =eprom_read (dev, (EEPROM_TxPwIndex_OFDM_24G + i) >>1 ); + ret =eprom_read (dev, (EEPROM_TX_PW_INDEX_OFDM_24G + i) >>1 );if (ret <0 )return ret; -if (((EEPROM_TxPwIndex_OFDM_24G + i) %2 ) ==0 ) +if (((EEPROM_TX_PW_INDEX_OFDM_24G + i) %2 ) ==0 ) tmpValue = (u16 )ret &0x00ff ;else tmpValue = ((u16 )ret &0xff00 ) >>8 ;
drivers/staging/rtl8192u/r8192U_hw.h +1 -1
@@ -43,7 +43,7 @@#define EEPROM_CRYSTAL_CAP 0x22 //0x22#define EEPROM_TX_PW_INDEX_CCK 0x23 //0x23 -#define EEPROM_TxPwIndex_OFDM_24G 0x24 //0x24~0x26 +#define EEPROM_TX_PW_INDEX_OFDM_24G 0x24 //0x24~0x26#define EEPROM_TxPwIndex_CCK_V1 0x29 //0x29~0x2B#define EEPROM_TX_PW_INDEX_OFDM_24G_V1 0x2C //0x2C~0x2E#define EEPROM_TxPwIndex_Ver 0x27 //0x27
Signature · 1 line
2.18.0
PATCH 14/21 staging:rtl8192u: Rename EEPROM_TxPwIndex_CCK_V1 - Style
In reply to John WhitmoreRename the constant EEPROM_TxPwIndex_CCK_V1 to EEPROM_TX_PW_INDEX_CCK_V1, this clears the checkpatch issue with CamelCase naming.
This is purely a coding style change which should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/r8192U_core.c | 4 ++-- drivers/staging/rtl8192u/r8192U_hw.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +2 -2
@@ -2498,7 +2498,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev) } }else if (priv->EEPROM_Def_Ver ==1 ) {if (bLoad_From_EEPOM) { - ret =eprom_read (dev, EEPROM_TxPwIndex_CCK_V1 >>1 ); + ret =eprom_read (dev,EEPROM_TX_PW_INDEX_CCK_V1 >>1 );if (ret <0 )return ret; tmpValue = ((u16 )ret &0xff00 ) >>8 ;
@@ -2508,7 +2508,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev) priv->EEPROMTxPowerLevelCCK_V1[0 ] = (u8 )tmpValue;if (bLoad_From_EEPOM) { - ret =eprom_read (dev, (EEPROM_TxPwIndex_CCK_V1 +2 ) >>1 ); + ret =eprom_read (dev, (EEPROM_TX_PW_INDEX_CCK_V1 +2 ) >>1 );if (ret <0 )return ret; tmpValue = (u16 )ret;
drivers/staging/rtl8192u/r8192U_hw.h +1 -1
@@ -44,7 +44,7 @@#define EEPROM_TX_PW_INDEX_CCK 0x23 //0x23#define EEPROM_TX_PW_INDEX_OFDM_24G 0x24 //0x24~0x26 -#define EEPROM_TxPwIndex_CCK_V1 0x29 //0x29~0x2B +#define EEPROM_TX_PW_INDEX_CCK_V1 0x29 //0x29~0x2B#define EEPROM_TX_PW_INDEX_OFDM_24G_V1 0x2C //0x2C~0x2E#define EEPROM_TxPwIndex_Ver 0x27 //0x27
Signature · 1 line
2.18.0
PATCH 15/21 staging:rtl8192u: rename EEPROM_TxPwIndex_Ver - Style
In reply to John WhitmoreRename the constant EEPROM_TxPwIndex_Ver to EEPROM_TX_PW_INDEX_VER, this clears the checkpatch issue with CamelCase naming.
This is purely a coding style change which should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/r8192U_core.c | 2 +- drivers/staging/rtl8192u/r8192U_hw.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +1 -1
@@ -2463,7 +2463,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev)RT_TRACE (COMP_EPROM ,"CrystalCap = %d\n" , priv->EEPROMCrystalCap);/* get per-channel Tx power level */ if (bLoad_From_EEPOM) { - ret =eprom_read (dev, (EEPROM_TxPwIndex_Ver >>1 )); + ret =eprom_read (dev, (EEPROM_TX_PW_INDEX_VER >>1 ));if (ret <0 )return ret; priv->EEPROM_Def_Ver = ((u16 )ret &0xff00 ) >>8 ;
drivers/staging/rtl8192u/r8192U_hw.h +1 -1
@@ -46,7 +46,7 @@#define EEPROM_TX_PW_INDEX_OFDM_24G 0x24 //0x24~0x26#define EEPROM_TX_PW_INDEX_CCK_V1 0x29 //0x29~0x2B#define EEPROM_TX_PW_INDEX_OFDM_24G_V1 0x2C //0x2C~0x2E -#define EEPROM_TxPwIndex_Ver 0x27 //0x27 +#define EEPROM_TX_PW_INDEX_VER 0x27 //0x27#define EEPROM_Default_ThermalMeter 0x7#define EEPROM_Default_PwDiff 0x4
Signature · 1 line
2.18.0
PATCH 16/21 staging:rtl8192u: Rename EEPROM_Default_ThermalMeter - Style
In reply to John WhitmoreRename the constant EEPROM_Default_ThermalMeter to EEPROM_DEFAULT_THERNAL_METER, this change clears the checkpatch issue with CamelCase naming.
This is purely a coding style change which should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/r8192U_core.c | 2 +- drivers/staging/rtl8192u/r8192U_hw.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +1 -1
@@ -2439,7 +2439,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev)return ret; priv->EEPROMThermalMeter = (u8)((u16 )ret &0x00ff ); }else - priv->EEPROMThermalMeter = EEPROM_Default_ThermalMeter; + priv->EEPROMThermalMeter =EEPROM_DEFAULT_THERNAL_METER ;RT_TRACE (COMP_EPROM ,"ThermalMeter:%d\n" , priv->EEPROMThermalMeter);/* for tx power track */ priv->TSSI_13dBm = priv->EEPROMThermalMeter *100 ;
drivers/staging/rtl8192u/r8192U_hw.h +1 -1
@@ -48,7 +48,7 @@#define EEPROM_TX_PW_INDEX_OFDM_24G_V1 0x2C //0x2C~0x2E#define EEPROM_TX_PW_INDEX_VER 0x27 //0x27 -#define EEPROM_Default_ThermalMeter 0x7 +#define EEPROM_DEFAULT_THERNAL_METER 0x7#define EEPROM_Default_PwDiff 0x4#define EEPROM_Default_CrystalCap 0x5#define EEPROM_Default_TxPower 0x1010
Signature · 1 line
2.18.0
PATCH 17/21 staging:rtl8192u: Rename EEPROM_Default_PwDiff - Style
In reply to John WhitmoreRename the constant EEPROM_Default_PwDiff to EEPROM_DEFAULT_PW_DIFF, this clears the checkpatch issue with CamelCase naming.
This change is purely a coding style change which should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/r8192U_core.c | 2 +- drivers/staging/rtl8192u/r8192U_hw.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +1 -1
@@ -2450,7 +2450,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev)return ret; priv->EEPROMPwDiff = ((u16 )ret &0x0f00 ) >>8 ; }else - priv->EEPROMPwDiff = EEPROM_Default_PwDiff; + priv->EEPROMPwDiff =EEPROM_DEFAULT_PW_DIFF ;RT_TRACE (COMP_EPROM ,"TxPwDiff:%d\n" , priv->EEPROMPwDiff);/* Read CrystalCap from EEPROM */ if (bLoad_From_EEPOM) {
drivers/staging/rtl8192u/r8192U_hw.h +1 -1
@@ -49,7 +49,7 @@#define EEPROM_TX_PW_INDEX_VER 0x27 //0x27#define EEPROM_DEFAULT_THERNAL_METER 0x7 -#define EEPROM_Default_PwDiff 0x4 +#define EEPROM_DEFAULT_PW_DIFF 0x4#define EEPROM_Default_CrystalCap 0x5#define EEPROM_Default_TxPower 0x1010#define EEPROM_Customer_ID 0x7B //0x7B:CustomerID
Signature · 1 line
2.18.0
PATCH 18/21 staging:rtl8192u: Rename EEPROM_Default_CrystalCap - Style
In reply to John WhitmoreRename the constant EEPROM_Default_CrystalCap to EEPROM_DEFAULT_CRYSTAL_CAP, this clears the checkpatch issue with CamelCase naming.
This is purely a coding style change which should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/r8192U_core.c | 2 +- drivers/staging/rtl8192u/r8192U_hw.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +1 -1
@@ -2459,7 +2459,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev)return ret; priv->EEPROMCrystalCap = (u16 )ret &0x0f ; }else - priv->EEPROMCrystalCap = EEPROM_Default_CrystalCap; + priv->EEPROMCrystalCap =EEPROM_DEFAULT_CRYSTAL_CAP ;RT_TRACE (COMP_EPROM ,"CrystalCap = %d\n" , priv->EEPROMCrystalCap);/* get per-channel Tx power level */ if (bLoad_From_EEPOM) {
drivers/staging/rtl8192u/r8192U_hw.h +1 -1
@@ -50,7 +50,7 @@#define EEPROM_DEFAULT_THERNAL_METER 0x7#define EEPROM_DEFAULT_PW_DIFF 0x4 -#define EEPROM_Default_CrystalCap 0x5 +#define EEPROM_DEFAULT_CRYSTAL_CAP 0x5#define EEPROM_Default_TxPower 0x1010#define EEPROM_Customer_ID 0x7B //0x7B:CustomerID#define EEPROM_ChannelPlan 0x16 //0x7C
Signature · 1 line
2.18.0
PATCH 19/21 staging:rtl8192u: Rename EEPROM_Default_TxPower - Style
In reply to John Whitmorerename the constant EEPROM_Default_TxPower to EEPROM_DEFAULT_TX_POWER, this clears the checkpatch issue with CamelCase issue.
This is purely a coding style change which should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/r8192U_core.c | 2 +- drivers/staging/rtl8192u/r8192U_hw.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +1 -1
@@ -2430,7 +2430,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev)return ret; priv->EEPROMTxPowerDiff = ((u16 )ret &0xff00 ) >>8 ; }else - priv->EEPROMTxPowerDiff = EEPROM_Default_TxPower; + priv->EEPROMTxPowerDiff =EEPROM_DEFAULT_TX_POWER ;RT_TRACE (COMP_EPROM ,"TxPowerDiff:%d\n" , priv->EEPROMTxPowerDiff);/* read ThermalMeter from EEPROM */ if (bLoad_From_EEPOM) {
drivers/staging/rtl8192u/r8192U_hw.h +1 -1
@@ -51,7 +51,7 @@#define EEPROM_DEFAULT_THERNAL_METER 0x7#define EEPROM_DEFAULT_PW_DIFF 0x4#define EEPROM_DEFAULT_CRYSTAL_CAP 0x5 -#define EEPROM_Default_TxPower 0x1010 +#define EEPROM_DEFAULT_TX_POWER 0x1010#define EEPROM_Customer_ID 0x7B //0x7B:CustomerID#define EEPROM_ChannelPlan 0x16 //0x7C
Signature · 1 line
2.18.0
PATCH 20/21 staging:rtl8192u: Rename EEPROM_Customer_ID - Style
In reply to John WhitmoreRename the constant EEPROM_Customer_ID to EEPROM_CUSTOMER_ID, this change clears the checkpatch issue with CamelCase naming.
This is purely a coding style change which should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/r8192U_core.c | 2 +- drivers/staging/rtl8192u/r8192U_hw.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +1 -1
@@ -2388,7 +2388,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev) tmpValue = (u16 )ret; priv->eeprom_ChannelPlan = (tmpValue &0xff00 ) >>8 ; priv->btxpowerdata_readfromEEPORM = true; - ret =eprom_read (dev, (EEPROM_Customer_ID >>1 )) >>8 ; + ret =eprom_read (dev, (EEPROM_CUSTOMER_ID >>1 )) >>8 ;if (ret <0 )return ret; priv->eeprom_CustomerID = (u16 )ret;
drivers/staging/rtl8192u/r8192U_hw.h +1 -1
@@ -52,7 +52,7 @@#define EEPROM_DEFAULT_PW_DIFF 0x4#define EEPROM_DEFAULT_CRYSTAL_CAP 0x5#define EEPROM_DEFAULT_TX_POWER 0x1010 -#define EEPROM_Customer_ID 0x7B //0x7B:CustomerID +#define EEPROM_CUSTOMER_ID 0x7B //0x7B:CustomerID#define EEPROM_ChannelPlan 0x16 //0x7C#define EEPROM_CID_RUNTOP 0x2
Signature · 1 line
2.18.0
PATCH 21/21 staging:rtl8192u: Rename EEPROM_ChannelPlan - Style
In reply to John WhitmoreRename the constant EEPROM_ChannelPlan to EEPROM_CHANNEL_PLAN, this clears the checkpatch issue with CamelCase naming.
This is purely a coding style change which should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/r8192U_core.c | 2 +- drivers/staging/rtl8192u/r8192U_hw.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +1 -1
@@ -2382,7 +2382,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev)if (ret <0 )return ret; priv->eeprom_pid = (u16 )ret; - ret =eprom_read (dev, EEPROM_ChannelPlan >>1 ); + ret =eprom_read (dev,EEPROM_CHANNEL_PLAN >>1 );if (ret <0 )return ret; tmpValue = (u16 )ret;
drivers/staging/rtl8192u/r8192U_hw.h +1 -1
@@ -53,7 +53,7 @@#define EEPROM_DEFAULT_CRYSTAL_CAP 0x5#define EEPROM_DEFAULT_TX_POWER 0x1010#define EEPROM_CUSTOMER_ID 0x7B //0x7B:CustomerID -#define EEPROM_ChannelPlan 0x16 //0x7C +#define EEPROM_CHANNEL_PLAN 0x16 //0x7C#define EEPROM_CID_RUNTOP 0x2#define EEPROM_CID_DLINK 0x8
Signature · 1 line
2.18.0