Skip to content

L
linux
Commit 1800925f authored by Larry Finger's avatar Larry Finger
Browse files
Options

staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part I 

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent 09505184
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 278 additions and 252 deletions
drivers/staging/rtl8192e/r8190P_def.h
View file @ 1800925f
...@@ -39,7 +39,7 @@ enum rtl819x_loopback { ...@@ -39,7 +39,7 @@ enum rtl819x_loopback {
#define RESET_DELAY_8185 20 #define RESET_DELAY_8185 20
#define RT_IBSS_INT_MASKS (IMR_BcnInt | IMR_BcnInt | IMR_TBDOK | IMR_TBDER) #define RT_IBSS_INT_MASKS (IMR_BcnInt | IMR_BcnInt | IMR_TBDOK | IMR_TBDER)
#define DESC90_RATE1M 0x00 #define DESC90_RATE1M 0x00
#define DESC90_RATE2M 0x01 #define DESC90_RATE2M 0x01
...@@ -85,7 +85,7 @@ enum rtl819x_loopback { ...@@ -85,7 +85,7 @@ enum rtl819x_loopback {
#define BT_QA_BOARD 1 #define BT_QA_BOARD 1
#define BT_FPGA 2 #define BT_FPGA 2
#define Rx_Smooth_Factor 20 #define RX_SMOOTH 20
#define QSLT_BK 0x1 #define QSLT_BK 0x1
#define QSLT_BE 0x0 #define QSLT_BE 0x0
...@@ -130,7 +130,7 @@ enum rtl819x_loopback { ...@@ -130,7 +130,7 @@ enum rtl819x_loopback {
enum version_8190_loopback { enum version_8190_loopback {
VERSION_8190_BD=0x3, VERSION_8190_BD = 0x3,
VERSION_8190_BE VERSION_8190_BE
}; };
...@@ -139,9 +139,9 @@ enum version_8190_loopback { ...@@ -139,9 +139,9 @@ enum version_8190_loopback {
#define IC_VersionCut_E 0x4 #define IC_VersionCut_E 0x4
enum rf_optype { enum rf_optype {
RF_OP_By_SW_3wire = 0, RF_OP_By_SW_3wire = 0,
RF_OP_By_FW, RF_OP_By_FW,
RF_OP_MAX RF_OP_MAX
}; };
...@@ -303,41 +303,41 @@ struct phy_sts_cck_819xpci { ...@@ -303,41 +303,41 @@ struct phy_sts_cck_819xpci {
#define PHY_Beacon_RSSI_SLID_WIN_MAX 10 #define PHY_Beacon_RSSI_SLID_WIN_MAX 10
struct tx_desc { struct tx_desc {
u16 PktSize; u16 PktSize;
u8 Offset; u8 Offset;
u8 Reserved1:3; u8 Reserved1:3;
u8 CmdInit:1; u8 CmdInit:1;
u8 LastSeg:1; u8 LastSeg:1;
u8 FirstSeg:1; u8 FirstSeg:1;
u8 LINIP:1; u8 LINIP:1;
u8 OWN:1; u8 OWN:1;
u8 TxFWInfoSize; u8 TxFWInfoSize;
u8 RATid:3; u8 RATid:3;
u8 DISFB:1; u8 DISFB:1;
u8 USERATE:1; u8 USERATE:1;
u8 MOREFRAG:1; u8 MOREFRAG:1;
u8 NoEnc:1; u8 NoEnc:1;
u8 PIFS:1; u8 PIFS:1;
u8 QueueSelect:5; u8 QueueSelect:5;
u8 NoACM:1; u8 NoACM:1;
u8 Resv:2; u8 Resv:2;
u8 SecCAMID:5; u8 SecCAMID:5;
u8 SecDescAssign:1; u8 SecDescAssign:1;
u8 SecType:2; u8 SecType:2;
u16 TxBufferSize; u16 TxBufferSize;
u8 PktId:7; u8 PktId:7;
u8 Resv1:1; u8 Resv1:1;
u8 Reserved2; u8 Reserved2;
u32 TxBuffAddr; u32 TxBuffAddr;
u32 NextDescAddress; u32 NextDescAddress;
u32 Reserved5; u32 Reserved5;
u32 Reserved6; u32 Reserved6;
u32 Reserved7; u32 Reserved7;
}; };
......
drivers/staging/rtl8192e/r8190P_rtl8256.c
View file @ 1800925f
This diff is collapsed.
drivers/staging/rtl8192e/r8190P_rtl8256.h
View file @ 1800925f
...@@ -21,10 +21,11 @@ ...@@ -21,10 +21,11 @@
#define RTL8225H #define RTL8225H
#define RTL819X_TOTAL_RF_PATH 2 #define RTL819X_TOTAL_RF_PATH 2
extern void PHY_SetRF8256Bandwidth(struct net_device* dev , enum ht_channel_width Bandwidth); extern void PHY_SetRF8256Bandwidth(struct net_device *dev,
extern bool PHY_RF8256_Config(struct net_device* dev); enum ht_channel_width Bandwidth);
extern bool phy_RF8256_Config_ParaFile(struct net_device* dev); extern bool PHY_RF8256_Config(struct net_device *dev);
extern void PHY_SetRF8256CCKTxPower(struct net_device* dev, u8 powerlevel); extern bool phy_RF8256_Config_ParaFile(struct net_device *dev);
extern void PHY_SetRF8256OFDMTxPower(struct net_device* dev, u8 powerlevel); extern void PHY_SetRF8256CCKTxPower(struct net_device *dev, u8 powerlevel);
extern void PHY_SetRF8256OFDMTxPower(struct net_device *dev, u8 powerlevel);
#endif #endif
drivers/staging/rtl8192e/r8192E_cmdpkt.c
View file @ 1800925f
This diff is collapsed.
drivers/staging/rtl8192e/r8192E_cmdpkt.h
View file @ 1800925f
...@@ -18,16 +18,16 @@ ...@@ -18,16 +18,16 @@
******************************************************************************/ ******************************************************************************/
#ifndef R819XUSB_CMDPKT_H #ifndef R819XUSB_CMDPKT_H
#define R819XUSB_CMDPKT_H #define R819XUSB_CMDPKT_H
#define CMPK_RX_TX_FB_SIZE sizeof(struct cmpk_txfb) #define CMPK_RX_TX_FB_SIZE sizeof(struct cmpk_txfb)
#define CMPK_TX_SET_CONFIG_SIZE sizeof(struct cmpk_set_cfg) #define CMPK_TX_SET_CONFIG_SIZE sizeof(struct cmpk_set_cfg)
#define CMPK_BOTH_QUERY_CONFIG_SIZE sizeof(struct cmpk_set_cfg) #define CMPK_BOTH_QUERY_CONFIG_SIZE sizeof(struct cmpk_set_cfg)
#define CMPK_RX_TX_STS_SIZE sizeof(struct cmpk_tx_status) #define CMPK_RX_TX_STS_SIZE sizeof(struct cmpk_tx_status)
#define CMPK_RX_DBG_MSG_SIZE sizeof(struct cmpk_rx_dbginfo) #define CMPK_RX_DBG_MSG_SIZE sizeof(struct cmpk_rx_dbginfo)
#define CMPK_TX_RAHIS_SIZE sizeof(struct cmpk_tx_rahis) #define CMPK_TX_RAHIS_SIZE sizeof(struct cmpk_tx_rahis)
#define ISR_TxBcnOk BIT27 #define ISR_TxBcnOk BIT27
#define ISR_TxBcnErr BIT26 #define ISR_TxBcnErr BIT26
#define ISR_BcnTimerIntr BIT13 #define ISR_BcnTimerIntr BIT13
struct cmpk_txfb { struct cmpk_txfb {
...@@ -110,7 +110,7 @@ struct cmpk_tx_status { ...@@ -110,7 +110,7 @@ struct cmpk_tx_status {
u16 reserve3_23; u16 reserve3_23;
u8 reserve3_1; u8 reserve3_1;
u8 rate; u8 rate;
}__packed; } __packed;
struct cmpk_rx_dbginfo { struct cmpk_rx_dbginfo {
u16 reserve1; u16 reserve1;
...@@ -138,19 +138,22 @@ struct cmpk_tx_rahis { ...@@ -138,19 +138,22 @@ struct cmpk_tx_rahis {
} __packed; } __packed;
enum cmpk_element { enum cmpk_element {
RX_TX_FEEDBACK = 0, RX_TX_FEEDBACK = 0,
RX_INTERRUPT_STATUS = 1, RX_INTERRUPT_STATUS = 1,
TX_SET_CONFIG = 2, TX_SET_CONFIG = 2,
BOTH_QUERY_CONFIG = 3, BOTH_QUERY_CONFIG = 3,
RX_TX_STATUS = 4, RX_TX_STATUS = 4,
RX_DBGINFO_FEEDBACK = 5, RX_DBGINFO_FEEDBACK = 5,
RX_TX_PER_PKT_FEEDBACK = 6, RX_TX_PER_PKT_FEEDBACK = 6,
RX_TX_RATE_HISTORY = 7, RX_TX_RATE_HISTORY = 7,
RX_CMD_ELE_MAX RX_CMD_ELE_MAX
}; };
extern u32 cmpk_message_handle_rx(struct net_device *dev, struct rtllib_rx_stats * pstats); extern u32 cmpk_message_handle_rx(struct net_device *dev,
extern bool cmpk_message_handle_tx(struct net_device *dev, u8* codevirtualaddress, u32 packettype, u32 buffer_len); struct rtllib_rx_stats *pstats);
extern bool cmpk_message_handle_tx(struct net_device *dev,
u8 *codevirtualaddress, u32 packettype,
u32 buffer_len);
#endif #endif
drivers/staging/rtl8192e/r8192E_dev.c
View file @ 1800925f
...@@ -1662,15 +1662,15 @@ void rtl8192_process_phyinfo(struct r8192_priv * priv, u8 *buffer,struct rtllib_ ...@@ -1662,15 +1662,15 @@ void rtl8192_process_phyinfo(struct r8192_priv * priv, u8 *buffer,struct rtllib_
if (pprevious_stats->RxMIMOSignalStrength[rfpath] > priv->stats.rx_rssi_percentage[rfpath]) if (pprevious_stats->RxMIMOSignalStrength[rfpath] > priv->stats.rx_rssi_percentage[rfpath])
{ {
priv->stats.rx_rssi_percentage[rfpath] = priv->stats.rx_rssi_percentage[rfpath] =
( (priv->stats.rx_rssi_percentage[rfpath]*(Rx_Smooth_Factor-1)) + ( (priv->stats.rx_rssi_percentage[rfpath]*(RX_SMOOTH-1)) +
(pprevious_stats->RxMIMOSignalStrength[rfpath])) /(Rx_Smooth_Factor); (pprevious_stats->RxMIMOSignalStrength[rfpath])) /(RX_SMOOTH);
priv->stats.rx_rssi_percentage[rfpath] = priv->stats.rx_rssi_percentage[rfpath] + 1; priv->stats.rx_rssi_percentage[rfpath] = priv->stats.rx_rssi_percentage[rfpath] + 1;
} }
else else
{ {
priv->stats.rx_rssi_percentage[rfpath] = priv->stats.rx_rssi_percentage[rfpath] =
( (priv->stats.rx_rssi_percentage[rfpath]*(Rx_Smooth_Factor-1)) + ( (priv->stats.rx_rssi_percentage[rfpath]*(RX_SMOOTH-1)) +
(pprevious_stats->RxMIMOSignalStrength[rfpath])) /(Rx_Smooth_Factor); (pprevious_stats->RxMIMOSignalStrength[rfpath])) /(RX_SMOOTH);
} }
RT_TRACE(COMP_DBG,"Jacken -> priv->RxStats.RxRSSIPercentage[rfPath] = %d \n" ,priv->stats.rx_rssi_percentage[rfpath] ); RT_TRACE(COMP_DBG,"Jacken -> priv->RxStats.RxRSSIPercentage[rfPath] = %d \n" ,priv->stats.rx_rssi_percentage[rfpath] );
} }
...@@ -1708,15 +1708,15 @@ void rtl8192_process_phyinfo(struct r8192_priv * priv, u8 *buffer,struct rtllib_ ...@@ -1708,15 +1708,15 @@ void rtl8192_process_phyinfo(struct r8192_priv * priv, u8 *buffer,struct rtllib_
if (pprevious_stats->RxPWDBAll > (u32)priv->undecorated_smoothed_pwdb) if (pprevious_stats->RxPWDBAll > (u32)priv->undecorated_smoothed_pwdb)
{ {
priv->undecorated_smoothed_pwdb = priv->undecorated_smoothed_pwdb =
( ((priv->undecorated_smoothed_pwdb)*(Rx_Smooth_Factor-1)) + ( ((priv->undecorated_smoothed_pwdb)*(RX_SMOOTH-1)) +
(pprevious_stats->RxPWDBAll)) /(Rx_Smooth_Factor); (pprevious_stats->RxPWDBAll)) /(RX_SMOOTH);
priv->undecorated_smoothed_pwdb = priv->undecorated_smoothed_pwdb + 1; priv->undecorated_smoothed_pwdb = priv->undecorated_smoothed_pwdb + 1;
} }
else else
{ {
priv->undecorated_smoothed_pwdb = priv->undecorated_smoothed_pwdb =
( ((priv->undecorated_smoothed_pwdb)*(Rx_Smooth_Factor-1)) + ( ((priv->undecorated_smoothed_pwdb)*(RX_SMOOTH-1)) +
(pprevious_stats->RxPWDBAll)) /(Rx_Smooth_Factor); (pprevious_stats->RxPWDBAll)) /(RX_SMOOTH);
} }
rtl819x_update_rxsignalstatistics8190pci(priv,pprevious_stats); rtl819x_update_rxsignalstatistics8190pci(priv,pprevious_stats);
} }
...@@ -1755,8 +1755,8 @@ void rtl8192_process_phyinfo(struct r8192_priv * priv, u8 *buffer,struct rtllib_ ...@@ -1755,8 +1755,8 @@ void rtl8192_process_phyinfo(struct r8192_priv * priv, u8 *buffer,struct rtllib_
priv->stats.rx_evm_percentage[nspatial_stream] = pprevious_stats->RxMIMOSignalQuality[nspatial_stream]; priv->stats.rx_evm_percentage[nspatial_stream] = pprevious_stats->RxMIMOSignalQuality[nspatial_stream];
} }
priv->stats.rx_evm_percentage[nspatial_stream] = priv->stats.rx_evm_percentage[nspatial_stream] =
( (priv->stats.rx_evm_percentage[nspatial_stream]* (Rx_Smooth_Factor-1)) + ( (priv->stats.rx_evm_percentage[nspatial_stream]* (RX_SMOOTH-1)) +
(pprevious_stats->RxMIMOSignalQuality[nspatial_stream]* 1)) / (Rx_Smooth_Factor); (pprevious_stats->RxMIMOSignalQuality[nspatial_stream]* 1)) / (RX_SMOOTH);
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7