Skip to content

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

Staging: winbond: mto.c Coding style fixes 

I changed all things reported by checkpatch.pl except some long lines
and the use of externs in a .c file. I also removed revision comments
and "commented out" code.
Signed-off-by: default avatarLars Lindley <lindley@coyote.org>
Acked-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 75df20e0
Show whitespace changes
Inline Side-by-side
Showing with 129 additions and 170 deletions
drivers/staging/winbond/mto.c
View file @ f9a4191c
//============================================================================ /*
// MTO.C - * ============================================================================
// * MTO.C -
// Description: *
// MAC Throughput Optimization for W89C33 802.11g WLAN STA. * Description:
// * MAC Throughput Optimization for W89C33 802.11g WLAN STA.
// The following MIB attributes or internal variables will be affected *
// while the MTO is being executed: * The following MIB attributes or internal variables will be affected
// dot11FragmentationThreshold, * while the MTO is being executed:
// dot11RTSThreshold, * dot11FragmentationThreshold,
// transmission rate and PLCP preamble type, * dot11RTSThreshold,
// CCA mode, * transmission rate and PLCP preamble type,
// antenna diversity. * CCA mode,
// * antenna diversity.
// Revision history: *
// -------------------------------------------------------------------------- * Copyright (c) 2003 Winbond Electronics Corp. All rights reserved.
// 20031227 UN20 Pete Chao * ============================================================================
// First draft */
// 20031229 Turbo copy from PD43
// 20040210 Kevin revised
// Copyright (c) 2003 Winbond Electronics Corp. All rights reserved.
//============================================================================
// LA20040210_DTO kevin
#include "sysdef.h" #include "sysdef.h"
#include "sme_api.h" #include "sme_api.h"
#include "wbhal_f.h" #include "wbhal_f.h"
// Declare SQ3 to rate and fragmentation threshold table /* Declare SQ3 to rate and fragmentation threshold table */
// Declare fragmentation thresholds table /* Declare fragmentation thresholds table */
#define MTO_MAX_FRAG_TH_LEVELS 5 #define MTO_MAX_FRAG_TH_LEVELS 5
#define MTO_MAX_DATA_RATE_LEVELS 12 #define MTO_MAX_DATA_RATE_LEVELS 12
u16 MTO_Frag_Th_Tbl[MTO_MAX_FRAG_TH_LEVELS] = u16 MTO_Frag_Th_Tbl[MTO_MAX_FRAG_TH_LEVELS] = {
{
256, 384, 512, 768, 1536 256, 384, 512, 768, 1536
}; };
// Declare data rate table /*
//The following table will be changed at anytime if the opration rate supported by AP don't * Declare data rate table:
//match the table * The following table will be changed at anytime if the opration rate
* supported by AP don't match the table
*/
static u8 MTO_Data_Rate_Tbl[MTO_MAX_DATA_RATE_LEVELS] = { static u8 MTO_Data_Rate_Tbl[MTO_MAX_DATA_RATE_LEVELS] = {
2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108
}; };
static int TotalTxPkt = 0; static int TotalTxPkt;
static int TotalTxPktRetry = 0; static int TotalTxPktRetry;
static int retryrate_rec[MTO_MAX_DATA_RATE_LEVELS];//this record the retry rate at different data rate /* this record the retry rate at different data rate */
static int retryrate_rec[MTO_MAX_DATA_RATE_LEVELS];
static int PeriodTotalTxPkt = 0; static int PeriodTotalTxPkt;
static int PeriodTotalTxPktRetry = 0; static int PeriodTotalTxPktRetry;
static u8 boSparseTxTraffic = false; static u8 boSparseTxTraffic;
void MTO_Init(struct wbsoft_priv *adapter); void MTO_Init(struct wbsoft_priv *adapter);
void TxRateReductionCtrl(struct wbsoft_priv *adapter); void TxRateReductionCtrl(struct wbsoft_priv *adapter);
/** 1.1.31.1000 Turbo modify */
void MTO_SetTxCount(struct wbsoft_priv *adapter, u8 t0, u8 index); void MTO_SetTxCount(struct wbsoft_priv *adapter, u8 t0, u8 index);
void MTO_TxFailed(struct wbsoft_priv *adapter); void MTO_TxFailed(struct wbsoft_priv *adapter);
void hal_get_dto_para(struct wbsoft_priv *adapter, char *buffer); void hal_get_dto_para(struct wbsoft_priv *adapter, char *buffer);
//=========================================================================== /*
// MTO_Init -- * ===========================================================================
// * MTO_Init --
// Description: *
// Initialize MTO parameters. * Description:
// * Initialize MTO parameters.
// This function should be invoked during system initialization. *
// * This function should be invoked during system initialization.
// Arguments: *
// adapter - The pointer to the Miniport adapter Context * Arguments:
// * adapter - The pointer to the Miniport adapter Context
// Return Value: * ===========================================================================
// None */
//============================================================================
void MTO_Init(struct wbsoft_priv *adapter) void MTO_Init(struct wbsoft_priv *adapter)
{ {
int i; int i;
//[WKCHEN]MTO_CCA_MODE_SETUP()= (u8) hal_get_cca_mode(MTO_HAL()); MTO_PREAMBLE_TYPE() = MTO_PREAMBLE_SHORT; /* for test */
//[WKCHEN]MTO_CCA_MODE() = MTO_CCA_MODE_SETUP();
//MTO_PREAMBLE_TYPE() = MTO_PREAMBLE_LONG;
MTO_PREAMBLE_TYPE() = MTO_PREAMBLE_SHORT; // for test
MTO_CNT_ANT(0) = 0; MTO_CNT_ANT(0) = 0;
MTO_CNT_ANT(1) = 0; MTO_CNT_ANT(1) = 0;
...@@ -90,38 +81,22 @@ void MTO_Init(struct wbsoft_priv *adapter) ...@@ -90,38 +81,22 @@ void MTO_Init(struct wbsoft_priv *adapter)
MTO_AGING_TIMEOUT() = 0; MTO_AGING_TIMEOUT() = 0;
// The following parameters should be initialized to the values set by user /* The following parameters should be initialized to the values set by user */
//
//MTO_RATE_LEVEL() = 10;
MTO_RATE_LEVEL() = 0; MTO_RATE_LEVEL() = 0;
MTO_FRAG_TH_LEVEL() = 4; MTO_FRAG_TH_LEVEL() = 4;
/** 1.1.23.1000 Turbo modify from -1 to +1
MTO_RTS_THRESHOLD() = MTO_FRAG_TH() - 1;
MTO_RTS_THRESHOLD_SETUP() = MTO_FRAG_TH() - 1;
*/
MTO_RTS_THRESHOLD() = MTO_FRAG_TH() + 1; MTO_RTS_THRESHOLD() = MTO_FRAG_TH() + 1;
MTO_RTS_THRESHOLD_SETUP() = MTO_FRAG_TH() + 1; MTO_RTS_THRESHOLD_SETUP() = MTO_FRAG_TH() + 1;
// 1.1.23.1000 Turbo add for mto change preamble from 0 to 1
MTO_RATE_CHANGE_ENABLE() = 1; MTO_RATE_CHANGE_ENABLE() = 1;
MTO_FRAG_CHANGE_ENABLE() = 0; // 1.1.29.1000 Turbo add don't support frag MTO_FRAG_CHANGE_ENABLE() = 0;
//The default valud of ANTDIV_DEFAULT_ON will be decided by EEPROM
//#ifdef ANTDIV_DEFAULT_ON
//#else
//#endif
MTO_POWER_CHANGE_ENABLE() = 1; MTO_POWER_CHANGE_ENABLE() = 1;
MTO_PREAMBLE_CHANGE_ENABLE()= 1; MTO_PREAMBLE_CHANGE_ENABLE() = 1;
MTO_RTS_CHANGE_ENABLE() = 0; // 1.1.29.1000 Turbo add don't support frag MTO_RTS_CHANGE_ENABLE() = 0;
// 20040512 Turbo add
//old_antenna[0] = 1; for (i = 0; i < MTO_MAX_DATA_RATE_LEVELS; i++)
//old_antenna[1] = 0; retryrate_rec[i] = 5;
//old_antenna[2] = 1;
//old_antenna[3] = 0;
for (i=0;i<MTO_MAX_DATA_RATE_LEVELS;i++)
retryrate_rec[i]=5;
MTO_TXFLOWCOUNT() = 0; MTO_TXFLOWCOUNT() = 0;
//--------- DTO threshold parameters ------------- /* --------- DTO threshold parameters ------------- */
//MTOPARA_PERIODIC_CHECK_CYCLE() = 50;
MTOPARA_PERIODIC_CHECK_CYCLE() = 10; MTOPARA_PERIODIC_CHECK_CYCLE() = 10;
MTOPARA_RSSI_TH_FOR_ANTDIV() = 10; MTOPARA_RSSI_TH_FOR_ANTDIV() = 10;
MTOPARA_TXCOUNT_TH_FOR_CALC_RATE() = 50; MTOPARA_TXCOUNT_TH_FOR_CALC_RATE() = 50;
...@@ -130,13 +105,11 @@ void MTO_Init(struct wbsoft_priv *adapter) ...@@ -130,13 +105,11 @@ void MTO_Init(struct wbsoft_priv *adapter)
MTOPARA_TXRATE_EQ_TH() = 40; MTOPARA_TXRATE_EQ_TH() = 40;
MTOPARA_TXRATE_BACKOFF() = 12; MTOPARA_TXRATE_BACKOFF() = 12;
MTOPARA_TXRETRYRATE_REDUCE() = 6; MTOPARA_TXRETRYRATE_REDUCE() = 6;
if ( MTO_TXPOWER_FROM_EEPROM == 0xff) if (MTO_TXPOWER_FROM_EEPROM == 0xff) {
{ switch (MTO_HAL()->phy_type) {
switch( MTO_HAL()->phy_type)
{
case RF_AIROHA_2230: case RF_AIROHA_2230:
case RF_AIROHA_2230S: // 20060420 Add this case RF_AIROHA_2230S:
MTOPARA_TXPOWER_INDEX() = 46; // MAX-8 // @@ Only for AL 2230 MTOPARA_TXPOWER_INDEX() = 46; /* MAX-8 @@ Only for AL 2230 */
break; break;
case RF_AIROHA_7230: case RF_AIROHA_7230:
MTOPARA_TXPOWER_INDEX() = 49; MTOPARA_TXPOWER_INDEX() = 49;
...@@ -145,78 +118,64 @@ void MTO_Init(struct wbsoft_priv *adapter) ...@@ -145,78 +118,64 @@ void MTO_Init(struct wbsoft_priv *adapter)
MTOPARA_TXPOWER_INDEX() = 10; MTOPARA_TXPOWER_INDEX() = 10;
break; break;
case RF_WB_242_1: case RF_WB_242_1:
MTOPARA_TXPOWER_INDEX() = 24; // ->10 20060316.1 modify MTOPARA_TXPOWER_INDEX() = 24;
break; break;
} }
} } else { /* follow the setting from EEPROM */
else //follow the setting from EEPROM
MTOPARA_TXPOWER_INDEX() = MTO_TXPOWER_FROM_EEPROM; MTOPARA_TXPOWER_INDEX() = MTO_TXPOWER_FROM_EEPROM;
RFSynthesizer_SetPowerIndex(MTO_HAL(), (u8)MTOPARA_TXPOWER_INDEX()); }
//------------------------------------------------ RFSynthesizer_SetPowerIndex(MTO_HAL(), (u8) MTOPARA_TXPOWER_INDEX());
/* ------------------------------------------------ */
// For RSSI turning 20060808.4 Cancel load from EEPROM /* For RSSI turning -- Cancel load from EEPROM */
MTO_DATA().RSSI_high = -41; MTO_DATA().RSSI_high = -41;
MTO_DATA().RSSI_low = -60; MTO_DATA().RSSI_low = -60;
} }
//=========================================================================== /* ===========================================================================
// Description: * Description:
// If we enable DTO, we will ignore the tx count with different tx rate from * If we enable DTO, we will ignore the tx count with different tx rate
// DTO rate. This is because when we adjust DTO tx rate, there could be some * from DTO rate. This is because when we adjust DTO tx rate, there could
// packets in the tx queue with previous tx rate * be some packets in the tx queue with previous tx rate
*/
void MTO_SetTxCount(struct wbsoft_priv *adapter, u8 tx_rate, u8 index) void MTO_SetTxCount(struct wbsoft_priv *adapter, u8 tx_rate, u8 index)
{ {
MTO_TXFLOWCOUNT()++; MTO_TXFLOWCOUNT()++;
if ((MTO_ENABLE==1) && (MTO_RATE_CHANGE_ENABLE()==1)) if ((MTO_ENABLE == 1) && (MTO_RATE_CHANGE_ENABLE() == 1)) {
{ if (tx_rate == MTO_DATA_RATE()) {
if(tx_rate == MTO_DATA_RATE()) if (index == 0) {
{
if (index == 0)
{
if (boSparseTxTraffic) if (boSparseTxTraffic)
MTO_HAL()->dto_tx_frag_count += MTOPARA_PERIODIC_CHECK_CYCLE(); MTO_HAL()->dto_tx_frag_count += MTOPARA_PERIODIC_CHECK_CYCLE();
else else
MTO_HAL()->dto_tx_frag_count += 1; MTO_HAL()->dto_tx_frag_count += 1;
} } else {
else if (index < 8) {
{
if (index<8)
{
MTO_HAL()->dto_tx_retry_count += index; MTO_HAL()->dto_tx_retry_count += index;
MTO_HAL()->dto_tx_frag_count += (index+1); MTO_HAL()->dto_tx_frag_count += (index + 1);
} } else {
else
{
MTO_HAL()->dto_tx_retry_count += 7; MTO_HAL()->dto_tx_retry_count += 7;
MTO_HAL()->dto_tx_frag_count += 7; MTO_HAL()->dto_tx_frag_count += 7;
} }
} }
} } else if (MTO_DATA_RATE() > 48 && tx_rate == 48) {
else if(MTO_DATA_RATE()>48 && tx_rate ==48) /* for reducing data rate scheme, do not calculate different data rate. 3 is the reducing data rate at retry. */
{//ALFRED if (index < 3) {
if (index<3) //for reduciing data rate scheme ,
//do not calcu different data rate
//3 is the reducing data rate at retry
{
MTO_HAL()->dto_tx_retry_count += index; MTO_HAL()->dto_tx_retry_count += index;
MTO_HAL()->dto_tx_frag_count += (index+1); MTO_HAL()->dto_tx_frag_count += (index + 1);
} } else {
else
{
MTO_HAL()->dto_tx_retry_count += 3; MTO_HAL()->dto_tx_retry_count += 3;
MTO_HAL()->dto_tx_frag_count += 3; MTO_HAL()->dto_tx_frag_count += 3;
} }
} }
} } else {
else
{
MTO_HAL()->dto_tx_retry_count += index; MTO_HAL()->dto_tx_retry_count += index;
MTO_HAL()->dto_tx_frag_count += (index+1); MTO_HAL()->dto_tx_frag_count += (index + 1);
} }
TotalTxPkt ++; TotalTxPkt++;
TotalTxPktRetry += (index+1); TotalTxPktRetry += (index + 1);
PeriodTotalTxPkt ++; PeriodTotalTxPkt++;
PeriodTotalTxPktRetry += (index+1); PeriodTotalTxPktRetry += (index + 1);
} }
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