rtl8188eu: Remove CONFIG_INTERRUPT_BASED_TXBCN

This one is not devined.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-20 11:13:08 -05:00
parent 6bec54efb7
commit f004d23436
4 changed files with 2 additions and 61 deletions

View file

@ -163,9 +163,7 @@ static void update_BCNTIM(_adapter *padapter)
pnetwork_mlmeext->IELength = offset + remainder_ielen; pnetwork_mlmeext->IELength = offset + remainder_ielen;
} }
#ifndef CONFIG_INTERRUPT_BASED_TXBCN
set_tx_beacon_cmd(padapter); set_tx_beacon_cmd(padapter);
#endif /* CONFIG_INTERRUPT_BASED_TXBCN */
} }
void rtw_add_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len) void rtw_add_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len)
@ -887,16 +885,10 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf)
{ {
update_beacon(padapter, _TIM_IE_, NULL, false); 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 */ /* issue beacon frame */
if (send_beacon(padapter)==_FAIL) if (send_beacon(padapter)==_FAIL)
{
DBG_88E("issue_beacon, fail!\n"); DBG_88E("issue_beacon, fail!\n");
} }
#endif /* CONFIG_INTERRUPT_BASED_TXBCN */
}
/* update bc/mc sta_info */ /* update bc/mc sta_info */
update_bmc_sta(padapter); update_bmc_sta(padapter);
@ -1578,10 +1570,8 @@ void update_beacon(_adapter *padapter, u8 ie_id, u8 *oui, u8 tx)
_exit_critical_bh(&pmlmepriv->bcn_update_lock, &irqL); _exit_critical_bh(&pmlmepriv->bcn_update_lock, &irqL);
#ifndef CONFIG_INTERRUPT_BASED_TXBCN
if (tx) if (tx)
set_tx_beacon_cmd(padapter); set_tx_beacon_cmd(padapter);
#endif /* CONFIG_INTERRUPT_BASED_TXBCN */
} }
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT

View file

@ -2243,15 +2243,7 @@ static void hw_var_set_opmode(PADAPTER Adapter, u8 variable, u8* val)
if ((mode == _HW_STATE_STATION_) || (mode == _HW_STATE_NOLINK_)) 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 */
#endif /* CONFIG_INTERRUPT_BASED_TXBCN */
StopTxBeacon(Adapter); StopTxBeacon(Adapter);
}
rtw_write8(Adapter,REG_BCN_CTRL, 0x19);/* disable atim wnd */ rtw_write8(Adapter,REG_BCN_CTRL, 0x19);/* disable atim wnd */
} }
@ -2263,13 +2255,6 @@ static void hw_var_set_opmode(PADAPTER Adapter, u8 variable, u8* val)
else if (mode == _HW_STATE_AP_) 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 */
#endif /* CONFIG_INTERRUPT_BASED_TXBCN */
ResumeTxBeacon(Adapter); ResumeTxBeacon(Adapter);
rtw_write8(Adapter, REG_BCN_CTRL, 0x12); rtw_write8(Adapter, REG_BCN_CTRL, 0x12);
@ -2602,18 +2587,6 @@ _func_enter_;
break; break;
case HW_VAR_BEACON_INTERVAL: case HW_VAR_BEACON_INTERVAL:
rtw_write16(Adapter, REG_BCN_INTERVAL, *((u16 *)val)); 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_88E("%s==> bcn_interval:%d, eraly_int:%d\n",__func__,bcn_interval,bcn_interval>>1);
rtw_write8(Adapter, REG_DRVERLYINT, bcn_interval>>1);/* 50ms for sdio */
}
}
#endif/* CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT */
break; break;
case HW_VAR_SLOT_TIME: case HW_VAR_SLOT_TIME:
{ {

View file

@ -365,27 +365,9 @@ static void interrupt_handler_8188eu(_adapter *padapter,u16 pkt_len,u8 *pbuf)
_rtw_memcpy(&(pHalData->IntArray[0]), &(pbuf[USB_INTR_CONTENT_HISR_OFFSET]), 4); _rtw_memcpy(&(pHalData->IntArray[0]), &(pbuf[USB_INTR_CONTENT_HISR_OFFSET]), 4);
_rtw_memcpy(&(pHalData->IntArray[1]), &(pbuf[USB_INTR_CONTENT_HISRE_OFFSET]), 4); _rtw_memcpy(&(pHalData->IntArray[1]), &(pbuf[USB_INTR_CONTENT_HISRE_OFFSET]), 4);
#ifdef CONFIG_INTERRUPT_BASED_TXBCN
#ifdef CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT
if (pHalData->IntArray[0] & IMR_BCNDMAINT0_88E)
#endif
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
if (pmlmepriv->update_bcn == true)
set_tx_beacon_cmd(padapter);
}
}
#endif /* CONFIG_INTERRUPT_BASED_TXBCN */
/* C2H Event */ /* C2H Event */
if (pbuf[0]!= 0){ if (pbuf[0]!= 0)
_rtw_memcpy(&(pHalData->C2hArray[0]), &(pbuf[USB_INTR_CONTENT_C2H_OFFSET]), 16); _rtw_memcpy(&(pHalData->C2hArray[0]), &(pbuf[USB_INTR_CONTENT_C2H_OFFSET]), 16);
/* rtw_c2h_wk_cmd(padapter); to do.. */
}
} }
#endif #endif

View file

@ -51,10 +51,6 @@
#define SUPPORT_HW_RFOFF_DETECTED #define SUPPORT_HW_RFOFF_DETECTED
#define CONFIG_AP_MODE #define CONFIG_AP_MODE
#ifdef CONFIG_AP_MODE
#ifdef CONFIG_INTERRUPT_BASED_TXBCN
#endif
#endif
#define CONFIG_P2P #define CONFIG_P2P
#ifdef CONFIG_P2P #ifdef CONFIG_P2P