Skip to content

L
linux
Commit 75df20e0 authored by Lars Lindley's avatar Lars Lindley Committed by Greg Kroah-Hartman
Browse files
Options

Staging: winbond: mto.h Coding style fixes 

I fixed all problems reported by checkpatch.pl except for a couple of
long lines. I also removed version comments and removed "commented away"
code.
Signed-off-by: default avatarLars Lindley <lindley@coyote.org>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 20dbe695
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 97 deletions
drivers/staging/winbond/mto.h
View file @ 75df20e0
//================================================================== /*
// MTO.H * ==================================================================
// * MTO.H
// Revision history *
//================================= * Copyright (c) 2003 Winbond Electronics Corp. All rights reserved.
// 20030110 UN20 Pete Chao * ==================================================================
// Initial Release */
//
// Copyright (c) 2003 Winbond Electronics Corp. All rights reserved.
//==================================================================
#ifndef __MTO_H__ #ifndef __MTO_H__
#define __MTO_H__ #define __MTO_H__
...@@ -15,115 +12,104 @@ ...@@ -15,115 +12,104 @@
struct wbsoft_priv; struct wbsoft_priv;
// LA20040210_DTO kevin
//#define MTO_PREAMBLE_LONG 0
//#define MTO_PREAMBLE_SHORT 1
#define MTO_PREAMBLE_LONG WLAN_PREAMBLE_TYPE_LONG #define MTO_PREAMBLE_LONG WLAN_PREAMBLE_TYPE_LONG
#define MTO_PREAMBLE_SHORT WLAN_PREAMBLE_TYPE_SHORT #define MTO_PREAMBLE_SHORT WLAN_PREAMBLE_TYPE_SHORT
//============================================================================ /* Defines the parameters used in the MAC Throughput Optimization algorithm */
// struct _MTOParameters --
//
// Defines the parameters used in the MAC Throughput Optimization algorithm
//============================================================================
struct wb35_mto_params { struct wb35_mto_params {
//--------- wkchen added ------------- u32 TxFlowCount; /* to judge what kind the tx flow(sparse or busy) is */
u32 TxFlowCount; //to judge what kind the tx flow(sparse or busy) is
//------------------------------------------------
//--------- DTO threshold parameters ------------- /* --------- DTO threshold parameters ------------- */
u16 DTO_PeriodicCheckCycle; u16 DTO_PeriodicCheckCycle;
u16 DTO_RssiThForAntDiv; u16 DTO_RssiThForAntDiv;
u16 DTO_TxCountThForCalcNewRate; u16 DTO_TxCountThForCalcNewRate;
u16 DTO_TxRateIncTh; u16 DTO_TxRateIncTh;
u16 DTO_TxRateDecTh; u16 DTO_TxRateDecTh;
u16 DTO_TxRateEqTh; u16 DTO_TxRateEqTh;
u16 DTO_TxRateBackOff; u16 DTO_TxRateBackOff;
u16 DTO_TxRetryRateReduce; u16 DTO_TxRetryRateReduce;
u16 DTO_TxPowerIndex; //0 ~ 31 u16 DTO_TxPowerIndex; /* 0 ~ 31 */
u16 reserved_1; u16 reserved_1;
//------------------------------------------------ /* ------------------------------------------------ */
u8 PowerChangeEnable; u8 PowerChangeEnable;
u8 AntDiversityEnable; u8 AntDiversityEnable;
u8 CCA_Mode; u8 CCA_Mode;
u8 CCA_Mode_Setup; u8 CCA_Mode_Setup;
u8 Preamble_Type; u8 Preamble_Type;
u8 PreambleChangeEnable; u8 PreambleChangeEnable;
u8 DataRateLevel; u8 DataRateLevel;
u8 DataRateChangeEnable; u8 DataRateChangeEnable;
u8 FragThresholdLevel; u8 FragThresholdLevel;
u8 FragThresholdChangeEnable; u8 FragThresholdChangeEnable;
u16 RTSThreshold; u16 RTSThreshold;
u16 RTSThreshold_Setup; u16 RTSThreshold_Setup;
u32 AvgIdleSlot; u32 AvgIdleSlot;
u32 Pr_Interf; u32 Pr_Interf;
u32 AvgGapBtwnInterf; u32 AvgGapBtwnInterf;
u8 RTSChangeEnable; u8 RTSChangeEnable;
u8 Ant_sel; u8 Ant_sel;
u8 aging_timeout; u8 aging_timeout;
u8 reserved_2; u8 reserved_2;
u32 Cnt_Ant[2]; u32 Cnt_Ant[2];
u32 SQ_Ant[2]; u32 SQ_Ant[2];
// 20040510 remove from globe vairable u8 FallbackRateLevel;
u8 FallbackRateLevel; u8 OfdmRateLevel;
u8 OfdmRateLevel;
u8 RatePolicy; u8 RatePolicy;
u8 reserved_3[3]; u8 reserved_3[3];
// For RSSI turning
s32 RSSI_high;
s32 RSSI_low;
/* For RSSI turning */
s32 RSSI_high;
s32 RSSI_low;
}; };
#define MTO_DATA() (adapter->sMtoPara) #define MTO_DATA() (adapter->sMtoPara)
#define MTO_HAL() (&adapter->sHwData) #define MTO_HAL() (&adapter->sHwData)
#define MTO_SET_PREAMBLE_TYPE(x) // 20040511 Turbo mark LM_PREAMBLE_TYPE(&pcore_data->lm_data) = (x) #define MTO_SET_PREAMBLE_TYPE(x) /* Turbo mark LM_PREAMBLE_TYPE(&pcore_data->lm_data) = (x) */
#define MTO_ENABLE (adapter->sLocalPara.TxRateMode == RATE_AUTO) #define MTO_ENABLE (adapter->sLocalPara.TxRateMode == RATE_AUTO)
#define MTO_TXPOWER_FROM_EEPROM (adapter->sHwData.PowerIndexFromEEPROM) #define MTO_TXPOWER_FROM_EEPROM (adapter->sHwData.PowerIndexFromEEPROM)
#define LOCAL_ANTENNA_NO() (adapter->sLocalPara.bAntennaNo) #define LOCAL_ANTENNA_NO() (adapter->sLocalPara.bAntennaNo)
#define LOCAL_IS_CONNECTED() (adapter->sLocalPara.wConnectedSTAindex != 0) #define LOCAL_IS_CONNECTED() (adapter->sLocalPara.wConnectedSTAindex != 0)
#define MTO_INITTXRATE_MODE (adapter->sHwData.SoftwareSet&0x2) //bit 1 #define MTO_INITTXRATE_MODE (adapter->sHwData.SoftwareSet&0x2) /* bit 1 */
#define MTO_POWER_CHANGE_ENABLE() MTO_DATA().PowerChangeEnable #define MTO_POWER_CHANGE_ENABLE() MTO_DATA().PowerChangeEnable
#define MTO_CCA_MODE() MTO_DATA().CCA_Mode #define MTO_CCA_MODE() MTO_DATA().CCA_Mode
#define MTO_CCA_MODE_SETUP() MTO_DATA().CCA_Mode_Setup #define MTO_CCA_MODE_SETUP() MTO_DATA().CCA_Mode_Setup
#define MTO_PREAMBLE_TYPE() MTO_DATA().Preamble_Type #define MTO_PREAMBLE_TYPE() MTO_DATA().Preamble_Type
#define MTO_PREAMBLE_CHANGE_ENABLE() MTO_DATA().PreambleChangeEnable #define MTO_PREAMBLE_CHANGE_ENABLE() MTO_DATA().PreambleChangeEnable
#define MTO_RATE_LEVEL() MTO_DATA().DataRateLevel #define MTO_RATE_LEVEL() MTO_DATA().DataRateLevel
#define MTO_OFDM_RATE_LEVEL() MTO_DATA().OfdmRateLevel #define MTO_OFDM_RATE_LEVEL() MTO_DATA().OfdmRateLevel
#define MTO_RATE_CHANGE_ENABLE() MTO_DATA().DataRateChangeEnable #define MTO_RATE_CHANGE_ENABLE() MTO_DATA().DataRateChangeEnable
#define MTO_FRAG_TH_LEVEL() MTO_DATA().FragThresholdLevel #define MTO_FRAG_TH_LEVEL() MTO_DATA().FragThresholdLevel
#define MTO_FRAG_CHANGE_ENABLE() MTO_DATA().FragThresholdChangeEnable #define MTO_FRAG_CHANGE_ENABLE() MTO_DATA().FragThresholdChangeEnable
#define MTO_RTS_THRESHOLD() MTO_DATA().RTSThreshold #define MTO_RTS_THRESHOLD() MTO_DATA().RTSThreshold
#define MTO_RTS_CHANGE_ENABLE() MTO_DATA().RTSChangeEnable #define MTO_RTS_CHANGE_ENABLE() MTO_DATA().RTSChangeEnable
#define MTO_RTS_THRESHOLD_SETUP() MTO_DATA().RTSThreshold_Setup #define MTO_RTS_THRESHOLD_SETUP() MTO_DATA().RTSThreshold_Setup
#define MTO_AVG_IDLE_SLOT() MTO_DATA().AvgIdleSlot #define MTO_AVG_IDLE_SLOT() MTO_DATA().AvgIdleSlot
#define MTO_PR_INTERF() MTO_DATA().Pr_Interf #define MTO_PR_INTERF() MTO_DATA().Pr_Interf
#define MTO_AVG_GAP_BTWN_INTERF() MTO_DATA().AvgGapBtwnInterf #define MTO_AVG_GAP_BTWN_INTERF() MTO_DATA().AvgGapBtwnInterf
#define MTO_CNT_ANT(x) MTO_DATA().Cnt_Ant[(x)] #define MTO_CNT_ANT(x) MTO_DATA().Cnt_Ant[(x)]
#define MTO_SQ_ANT(x) MTO_DATA().SQ_Ant[(x)] #define MTO_SQ_ANT(x) MTO_DATA().SQ_Ant[(x)]
#define MTO_AGING_TIMEOUT() MTO_DATA().aging_timeout #define MTO_AGING_TIMEOUT() MTO_DATA().aging_timeout
#define MTO_TXFLOWCOUNT() MTO_DATA().TxFlowCount
#define MTO_TXFLOWCOUNT() MTO_DATA().TxFlowCount /* --------- DTO threshold parameters ------------- */
//--------- DTO threshold parameters -------------
#define MTOPARA_PERIODIC_CHECK_CYCLE() MTO_DATA().DTO_PeriodicCheckCycle #define MTOPARA_PERIODIC_CHECK_CYCLE() MTO_DATA().DTO_PeriodicCheckCycle
#define MTOPARA_RSSI_TH_FOR_ANTDIV() MTO_DATA().DTO_RssiThForAntDiv #define MTOPARA_RSSI_TH_FOR_ANTDIV() MTO_DATA().DTO_RssiThForAntDiv
#define MTOPARA_TXCOUNT_TH_FOR_CALC_RATE() MTO_DATA().DTO_TxCountThForCalcNewRate #define MTOPARA_TXCOUNT_TH_FOR_CALC_RATE() MTO_DATA().DTO_TxCountThForCalcNewRate
...@@ -133,13 +119,13 @@ struct wb35_mto_params { ...@@ -133,13 +119,13 @@ struct wb35_mto_params {
#define MTOPARA_TXRATE_BACKOFF() MTO_DATA().DTO_TxRateBackOff #define MTOPARA_TXRATE_BACKOFF() MTO_DATA().DTO_TxRateBackOff
#define MTOPARA_TXRETRYRATE_REDUCE() MTO_DATA().DTO_TxRetryRateReduce #define MTOPARA_TXRETRYRATE_REDUCE() MTO_DATA().DTO_TxRetryRateReduce
#define MTOPARA_TXPOWER_INDEX() MTO_DATA().DTO_TxPowerIndex #define MTOPARA_TXPOWER_INDEX() MTO_DATA().DTO_TxPowerIndex
//------------------------------------------------ /* ------------------------------------------------ */
extern u16 MTO_Frag_Th_Tbl[]; extern u16 MTO_Frag_Th_Tbl[];
#define MTO_DATA_RATE() MTO_Data_Rate_Tbl[MTO_RATE_LEVEL()] #define MTO_DATA_RATE() MTO_Data_Rate_Tbl[MTO_RATE_LEVEL()]
#define MTO_FRAG_TH() MTO_Frag_Th_Tbl[MTO_FRAG_TH_LEVEL()] #define MTO_FRAG_TH() MTO_Frag_Th_Tbl[MTO_FRAG_TH_LEVEL()]
extern void MTO_Init(struct wbsoft_priv *); extern void MTO_Init(struct wbsoft_priv *);
extern void MTO_PeriodicTimerExpired(struct wbsoft_priv *); extern void MTO_PeriodicTimerExpired(struct wbsoft_priv *);
...@@ -148,6 +134,5 @@ extern u8 MTO_GetTxRate(struct wbsoft_priv *adapter, u32 fpdu_len); ...@@ -148,6 +134,5 @@ extern u8 MTO_GetTxRate(struct wbsoft_priv *adapter, u32 fpdu_len);
extern u8 MTO_GetTxFallbackRate(struct wbsoft_priv *adapter); extern u8 MTO_GetTxFallbackRate(struct wbsoft_priv *adapter);
extern void MTO_SetTxCount(struct wbsoft_priv *adapter, u8 t0, u8 index); extern void MTO_SetTxCount(struct wbsoft_priv *adapter, u8 t0, u8 index);
#endif //__MTO_H__ #endif /* __MTO_H__ */
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