diff options
Diffstat (limited to 'drivers/staging/winbond/mto.h')
| -rw-r--r-- | drivers/staging/winbond/mto.h | 116 |
1 files changed, 2 insertions, 114 deletions
diff --git a/drivers/staging/winbond/mto.h b/drivers/staging/winbond/mto.h index 56f2465723b3..4fe24b0f2791 100644 --- a/drivers/staging/winbond/mto.h +++ b/drivers/staging/winbond/mto.h @@ -15,52 +15,18 @@ struct wbsoft_priv; -#define MTO_DEFAULT_TH_CNT 5 -#define MTO_DEFAULT_TH_SQ3 112 //OLD IS 13 reference JohnXu -#define MTO_DEFAULT_TH_IDLE_SLOT 15 -#define MTO_DEFAULT_TH_PR_INTERF 30 -#define MTO_DEFAULT_TMR_AGING 25 // unit: slot time 10 reference JohnXu -#define MTO_DEFAULT_TMR_PERIODIC 5 // unit: slot time - -#define MTO_ANTENNA_DIVERSITY_OFF 0 -#define MTO_ANTENNA_DIVERSITY_ON 1 - // LA20040210_DTO kevin //#define MTO_PREAMBLE_LONG 0 //#define MTO_PREAMBLE_SHORT 1 #define MTO_PREAMBLE_LONG WLAN_PREAMBLE_TYPE_LONG #define MTO_PREAMBLE_SHORT WLAN_PREAMBLE_TYPE_SHORT -typedef enum { - TOGGLE_STATE_IDLE = 0, - TOGGLE_STATE_WAIT0 = 1, - TOGGLE_STATE_WAIT1 = 2, - TOGGLE_STATE_MAKEDESISION = 3, - TOGGLE_STATE_BKOFF = 4 -} TOGGLE_STATE; - -typedef enum { - RATE_CHGSTATE_IDLE = 0, - RATE_CHGSTATE_CALCULATE = 1, - RATE_CHGSTATE_BACKOFF = 2 -} TX_RATE_REDUCTION_STATE; - //============================================================================ // struct _MTOParameters -- // // Defines the parameters used in the MAC Throughput Optimization algorithm //============================================================================ -typedef struct _MTO_PARAMETERS -{ - u8 Th_Fixant; - u8 Th_Cnt; - u8 Th_SQ3; - u8 Th_IdleSlot; - - u16 Tmr_Aging; - u8 Th_PrInterf; - u8 Tmr_Periodic; - +struct wb35_mto_params { //--------- wkchen added ------------- u32 TxFlowCount; //to judge what kind the tx flow(sparse or busy) is //------------------------------------------------ @@ -84,9 +50,6 @@ typedef struct _MTO_PARAMETERS u8 PowerChangeEnable; u8 AntDiversityEnable; - u8 Ant_mac; - u8 Ant_div; - u8 CCA_Mode; u8 CCA_Mode_Setup; u8 Preamble_Type; @@ -113,13 +76,6 @@ typedef struct _MTO_PARAMETERS u32 SQ_Ant[2]; // 20040510 remove from globe vairable - u32 TmrCnt; - u32 BackoffTmr; - TOGGLE_STATE ToggleState; - TX_RATE_REDUCTION_STATE TxRateReductionState; - - u8 Last_Rate; - u8 Co_efficent; u8 FallbackRateLevel; u8 OfdmRateLevel; @@ -130,7 +86,7 @@ typedef struct _MTO_PARAMETERS s32 RSSI_high; s32 RSSI_low; -} MTO_PARAMETERS, *PMTO_PARAMETERS; +}; #define MTO_DATA() (adapter->sMtoPara) @@ -141,26 +97,8 @@ typedef struct _MTO_PARAMETERS #define LOCAL_ANTENNA_NO() (adapter->sLocalPara.bAntennaNo) #define LOCAL_IS_CONNECTED() (adapter->sLocalPara.wConnectedSTAindex != 0) #define MTO_INITTXRATE_MODE (adapter->sHwData.SoftwareSet&0x2) //bit 1 -// 20040510 Turbo add -#define MTO_TMR_CNT() MTO_DATA().TmrCnt -#define MTO_TOGGLE_STATE() MTO_DATA().ToggleState -#define MTO_TX_RATE_REDUCTION_STATE() MTO_DATA().TxRateReductionState -#define MTO_BACKOFF_TMR() MTO_DATA().BackoffTmr -#define MTO_LAST_RATE() MTO_DATA().Last_Rate -#define MTO_CO_EFFICENT() MTO_DATA().Co_efficent - -#define MTO_TH_CNT() MTO_DATA().Th_Cnt -#define MTO_TH_SQ3() MTO_DATA().Th_SQ3 -#define MTO_TH_IDLE_SLOT() MTO_DATA().Th_IdleSlot -#define MTO_TH_PR_INTERF() MTO_DATA().Th_PrInterf - -#define MTO_TMR_AGING() MTO_DATA().Tmr_Aging -#define MTO_TMR_PERIODIC() MTO_DATA().Tmr_Periodic #define MTO_POWER_CHANGE_ENABLE() MTO_DATA().PowerChangeEnable -#define MTO_ANT_DIVERSITY_ENABLE() adapter->sLocalPara.boAntennaDiversity -#define MTO_ANT_MAC() MTO_DATA().Ant_mac -#define MTO_ANT_DIVERSITY() MTO_DATA().Ant_div #define MTO_CCA_MODE() MTO_DATA().CCA_Mode #define MTO_CCA_MODE_SETUP() MTO_DATA().CCA_Mode_Setup #define MTO_PREAMBLE_TYPE() MTO_DATA().Preamble_Type @@ -179,7 +117,6 @@ typedef struct _MTO_PARAMETERS #define MTO_PR_INTERF() MTO_DATA().Pr_Interf #define MTO_AVG_GAP_BTWN_INTERF() MTO_DATA().AvgGapBtwnInterf -#define MTO_ANT_SEL() MTO_DATA().Ant_sel #define MTO_CNT_ANT(x) MTO_DATA().Cnt_Ant[(x)] #define MTO_SQ_ANT(x) MTO_DATA().SQ_Ant[(x)] #define MTO_AGING_TIMEOUT() MTO_DATA().aging_timeout @@ -209,55 +146,6 @@ typedef struct { u8 tx_retry_rate; } TXRETRY_REC; -typedef struct _STATISTICS_INFO { - u32 Rate54M; - u32 Rate48M; - u32 Rate36M; - u32 Rate24M; - u32 Rate18M; - u32 Rate12M; - u32 Rate9M; - u32 Rate6M; - u32 Rate11MS; - u32 Rate11ML; - u32 Rate55MS; - u32 Rate55ML; - u32 Rate2MS; - u32 Rate2ML; - u32 Rate1M; - u32 Rate54MOK; - u32 Rate48MOK; - u32 Rate36MOK; - u32 Rate24MOK; - u32 Rate18MOK; - u32 Rate12MOK; - u32 Rate9MOK; - u32 Rate6MOK; - u32 Rate11MSOK; - u32 Rate11MLOK; - u32 Rate55MSOK; - u32 Rate55MLOK; - u32 Rate2MSOK; - u32 Rate2MLOK; - u32 Rate1MOK; - u32 SQ3; - s32 RSSIAVG; - s32 RSSIMAX; - s32 TXRATE; - s32 TxRetryRate; - s32 BSS_PK_CNT; - s32 NIDLESLOT; - s32 SLOT_CNT; - s32 INTERF_CNT; - s32 GAP_CNT; - s32 DS_EVM; - s32 RcvBeaconNum; - s32 RXRATE; - s32 RxBytes; - s32 TxBytes; - s32 Antenna; -} STATISTICS_INFO, *PSTATISTICS_INFO; - extern void MTO_Init(struct wbsoft_priv *); extern void MTO_PeriodicTimerExpired(struct wbsoft_priv *); extern void MTO_SetDTORateRange(struct wbsoft_priv *, u8 *, u8); |