From 8c846f57f01614647e0a11bcded261c5a7b317f3 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 20 Feb 2015 09:59:38 -0600 Subject: [PATCH] rtl8188eu: Remove CONFIG_INTERRUPT_BASED_TXBCN and derivatives These are never selected. Signed-off-by: Larry Finger --- core/rtw_ap.c | 11 ----------- hal/usb_halinit.c | 41 ----------------------------------------- hal/usb_ops_linux.c | 19 ------------------- include/autoconf.h | 7 ------- 4 files changed, 78 deletions(-) diff --git a/core/rtw_ap.c b/core/rtw_ap.c index dacb452..12d70a7 100755 --- a/core/rtw_ap.c +++ b/core/rtw_ap.c @@ -194,9 +194,7 @@ static void update_BCNTIM(struct adapter *padapter) } -#ifndef CONFIG_INTERRUPT_BASED_TXBCN set_tx_beacon_cmd(padapter); -#endif /* CONFIG_INTERRUPT_BASED_TXBCN */ } void rtw_add_bcn_ie(struct adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len) @@ -1088,20 +1086,13 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) { update_beacon(padapter, _TIM_IE_, NULL, false); -#ifndef CONFIG_INTERRUPT_BASED_TXBCN /* other case will tx beacon when bcn interrupt coming in. */ /* issue beacon frame */ if(send_beacon(padapter)==_FAIL) DBG_871X("issue_beacon, fail!\n"); -#endif /* CONFIG_INTERRUPT_BASED_TXBCN */ - } - /* update bc/mc sta_info */ update_bmc_sta(padapter); - - /* pmlmeext->bstart_bss = true; */ - } int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) @@ -1795,10 +1786,8 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx) _exit_critical_bh(&pmlmepriv->bcn_update_lock, &irqL); -#ifndef CONFIG_INTERRUPT_BASED_TXBCN if(tx) set_tx_beacon_cmd(padapter); -#endif /* CONFIG_INTERRUPT_BASED_TXBCN */ } #ifdef CONFIG_80211N_HT diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c index 361528f..0512709 100755 --- a/hal/usb_halinit.c +++ b/hal/usb_halinit.c @@ -2408,21 +2408,9 @@ static void hw_var_set_opmode(struct adapter *Adapter, u8 variable, u8* val) if((mode == _HW_STATE_STATION_) || (mode == _HW_STATE_NOLINK_)) { - #ifdef CONFIG_INTERRUPT_BASED_TXBCN - #ifdef CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT - rtw_write8(Adapter, REG_DRVERLYINT, 0x05);/* restore early int time to 5ms */ - UpdateInterruptMask8188EU(Adapter,true, 0, IMR_BCNDMAINT0_88E); - #endif/* CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT */ - - #ifdef CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR - UpdateInterruptMask8188EU(Adapter,true ,0, (IMR_TBDER_88E|IMR_TBDOK_88E)); - #endif /* CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR */ - - #endif /* CONFIG_INTERRUPT_BASED_TXBCN */ StopTxBeacon(Adapter); rtw_write8(Adapter,REG_BCN_CTRL, 0x19);/* disable atim wnd */ - /* rtw_write8(Adapter,REG_BCN_CTRL, 0x18); */ } else if((mode == _HW_STATE_ADHOC_) /*|| (mode == _HW_STATE_AP_)*/) { @@ -2433,19 +2421,6 @@ static void hw_var_set_opmode(struct adapter *Adapter, u8 variable, u8* val) } else if(mode == _HW_STATE_AP_) { - -#ifdef CONFIG_INTERRUPT_BASED_TXBCN - #ifdef CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT - UpdateInterruptMask8188EU(Adapter,true ,IMR_BCNDMAINT0_88E, 0); - #endif/* CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT */ - - #ifdef CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR - UpdateInterruptMask8188EU(Adapter,true ,(IMR_TBDER_88E|IMR_TBDOK_88E), 0); - #endif/* CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR */ - -#endif /* CONFIG_INTERRUPT_BASED_TXBCN */ - - ResumeTxBeacon(Adapter); rtw_write8(Adapter, REG_BCN_CTRL, 0x12); @@ -2474,11 +2449,7 @@ static void hw_var_set_opmode(struct adapter *Adapter, u8 variable, u8* val) /* enable BCN0 Function for if1 */ /* don't enable update TSF0 for if1 (due to TSF update when beacon/probe rsp are received) */ - #if defined(CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR) - rtw_write8(Adapter, REG_BCN_CTRL, (DIS_TSF_UDT0_NORMAL_CHIP|EN_BCN_FUNCTION | EN_TXBCN_RPT|BIT(1))); - #else rtw_write8(Adapter, REG_BCN_CTRL, (DIS_TSF_UDT0_NORMAL_CHIP|EN_BCN_FUNCTION |BIT(1))); - #endif /* dis BCN1 ATIM WND if if2 is station */ rtw_write8(Adapter, REG_BCN_CTRL_1, rtw_read8(Adapter, REG_BCN_CTRL_1)|BIT(0)); @@ -2799,18 +2770,6 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val) break; case HW_VAR_BEACON_INTERVAL: rtw_write16(Adapter, REG_BCN_INTERVAL, *((u16 *)val)); -#ifdef CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT - { - struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - u16 bcn_interval = *((u16 *)val); - if((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE){ - DBG_8192C("%s==> bcn_interval:%d, eraly_int:%d \n",__FUNCTION__,bcn_interval,bcn_interval>>1); - rtw_write8(Adapter, REG_DRVERLYINT, bcn_interval>>1);/* 50ms for sdio */ - } - } -#endif/* CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT */ - break; case HW_VAR_SLOT_TIME: { diff --git a/hal/usb_ops_linux.c b/hal/usb_ops_linux.c index f63b146..6557597 100755 --- a/hal/usb_ops_linux.c +++ b/hal/usb_ops_linux.c @@ -344,25 +344,6 @@ static void interrupt_handler_8188eu(struct adapter *padapter,u16 pkt_len,u8 *pb } #endif/* CONFIG_LPS_LCLK */ -#ifdef CONFIG_INTERRUPT_BASED_TXBCN - - #ifdef CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT - if (pHalData->IntArray[0] & IMR_BCNDMAINT0_88E) - #endif - #ifdef CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR - if (pHalData->IntArray[0] & (IMR_TBDER_88E|IMR_TBDOK_88E)) - #endif - { - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - - if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) { - /* send_beacon(padapter); */ - if (pmlmepriv->update_bcn == true) - set_tx_beacon_cmd(padapter); - } - } -#endif /* CONFIG_INTERRUPT_BASED_TXBCN */ - #ifdef DBG_CONFIG_ERROR_DETECT_INT if ( pHalData->IntArray[1] & IMR_TXERR_88E ) DBG_871X("===> %s Tx Error Flag Interrupt Status \n",__FUNCTION__); diff --git a/include/autoconf.h b/include/autoconf.h index 085bd0e..59531e5 100755 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -93,14 +93,7 @@ #define CONFIG_AP_MODE #ifdef CONFIG_AP_MODE - //#define CONFIG_INTERRUPT_BASED_TXBCN // Tx Beacon when driver BCN_OK ,BCN_ERR interrupt occurs - #ifdef CONFIG_INTERRUPT_BASED_TXBCN - //#define CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT - #define CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR - #endif - #define CONFIG_FIND_BEST_CHANNEL - //#define CONFIG_NO_WIRELESS_HANDLERS #endif #define CONFIG_P2P