diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/winbond/mto.c | |
parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/winbond/mto.c')
-rw-r--r-- | drivers/staging/winbond/mto.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/drivers/staging/winbond/mto.c b/drivers/staging/winbond/mto.c index 7deb5c7..5e7fa1c 100644 --- a/drivers/staging/winbond/mto.c +++ b/drivers/staging/winbond/mto.c @@ -76,23 +76,6 @@ void hal_get_dto_para(struct wbsoft_priv *adapter, char *buffer); void MTO_Init(struct wbsoft_priv *adapter) { int i; - //[WKCHEN]pMTOcore_data = pcore_data; -// 20040510 Turbo add for global variable - MTO_TMR_CNT() = 0; - MTO_TOGGLE_STATE() = TOGGLE_STATE_IDLE; - MTO_TX_RATE_REDUCTION_STATE() = RATE_CHGSTATE_IDLE; - MTO_BACKOFF_TMR() = 0; - MTO_LAST_RATE() = 11; - MTO_CO_EFFICENT() = 0; - - //MTO_TH_FIXANT() = MTO_DEFAULT_TH_FIXANT; - MTO_TH_CNT() = MTO_DEFAULT_TH_CNT; - MTO_TH_SQ3() = MTO_DEFAULT_TH_SQ3; - MTO_TH_IDLE_SLOT() = MTO_DEFAULT_TH_IDLE_SLOT; - MTO_TH_PR_INTERF() = MTO_DEFAULT_TH_PR_INTERF; - - MTO_TMR_AGING() = MTO_DEFAULT_TMR_AGING; - MTO_TMR_PERIODIC() = MTO_DEFAULT_TMR_PERIODIC; //[WKCHEN]MTO_CCA_MODE_SETUP()= (u8) hal_get_cca_mode(MTO_HAL()); //[WKCHEN]MTO_CCA_MODE() = MTO_CCA_MODE_SETUP(); @@ -100,17 +83,12 @@ void MTO_Init(struct wbsoft_priv *adapter) //MTO_PREAMBLE_TYPE() = MTO_PREAMBLE_LONG; MTO_PREAMBLE_TYPE() = MTO_PREAMBLE_SHORT; // for test - MTO_ANT_SEL() = hal_get_antenna_number(MTO_HAL()); - MTO_ANT_MAC() = MTO_ANT_SEL(); MTO_CNT_ANT(0) = 0; MTO_CNT_ANT(1) = 0; MTO_SQ_ANT(0) = 0; MTO_SQ_ANT(1) = 0; - MTO_ANT_DIVERSITY() = MTO_ANTENNA_DIVERSITY_ON; - //CardSet_AntennaDiversity(adapter, MTO_ANT_DIVERSITY()); - //PLMESetAntennaDiversity( adapter, MTO_ANT_DIVERSITY()); - MTO_AGING_TIMEOUT() = 0;//MTO_TMR_AGING() / MTO_TMR_PERIODIC(); + MTO_AGING_TIMEOUT() = 0; // The following parameters should be initialized to the values set by user // @@ -128,9 +106,7 @@ void MTO_Init(struct wbsoft_priv *adapter) MTO_FRAG_CHANGE_ENABLE() = 0; // 1.1.29.1000 Turbo add don't support frag //The default valud of ANTDIV_DEFAULT_ON will be decided by EEPROM //#ifdef ANTDIV_DEFAULT_ON - //MTO_ANT_DIVERSITY_ENABLE() = 1; //#else - //MTO_ANT_DIVERSITY_ENABLE() = 0; //#endif MTO_POWER_CHANGE_ENABLE() = 1; MTO_PREAMBLE_CHANGE_ENABLE()= 1; |