From d42f678a38d3df4cc8453547b16a0e6158a46433 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 20 Jul 2013 21:51:30 -0500 Subject: [PATCH] rtl8188eu: Remove CONFIG_TSF_RESET_OFFLOAD - not defined Signed-off-by: Larry Finger --- hal/rtl8188e_cmd.c | 48 ------------------------------------------ hal/usb_halinit.c | 9 -------- include/rtl8188e_cmd.h | 5 ----- 3 files changed, 62 deletions(-) diff --git a/hal/rtl8188e_cmd.c b/hal/rtl8188e_cmd.c index 2500358..cd1dabd 100644 --- a/hal/rtl8188e_cmd.c +++ b/hal/rtl8188e_cmd.c @@ -881,54 +881,6 @@ _func_exit_; } -#ifdef CONFIG_TSF_RESET_OFFLOAD -/* - ask FW to Reset sync register at Beacon early interrupt -*/ -u8 rtl8188e_reset_tsf(_adapter *padapter, u8 reset_port ) -{ - u8 buf[2]; - u8 res=_SUCCESS; - - s32 ret; -_func_enter_; - if (IFACE_PORT0==reset_port) { - buf[0] = 0x1; buf[1] = 0; - } else{ - buf[0] = 0x0; buf[1] = 0x1; - } - - ret = FillH2CCmd_88E(padapter, H2C_RESET_TSF, 2, buf); - -_func_exit_; - - return res; -} - -int reset_tsf(PADAPTER Adapter, u8 reset_port ) -{ - u8 reset_cnt_before = 0, reset_cnt_after = 0, loop_cnt = 0; - u32 reg_reset_tsf_cnt = (IFACE_PORT0==reset_port) ? - REG_FW_RESET_TSF_CNT_0:REG_FW_RESET_TSF_CNT_1; - u32 reg_bcncrtl = (IFACE_PORT0==reset_port) ? - REG_BCN_CTRL_1:REG_BCN_CTRL; - - rtw_scan_abort(Adapter->pbuddy_adapter); /* site survey will cause reset_tsf fail */ - reset_cnt_after = reset_cnt_before = rtw_read8(Adapter,reg_reset_tsf_cnt); - rtl8188e_reset_tsf(Adapter, reset_port); - - while ((reset_cnt_after == reset_cnt_before ) && (loop_cnt < 10)) { - rtw_msleep_os(100); - loop_cnt++; - reset_cnt_after = rtw_read8(Adapter, reg_reset_tsf_cnt); - } - - return(loop_cnt >= 10) ? _FAIL : true; -} - - -#endif /* CONFIG_TSF_RESET_OFFLOAD */ - #ifdef CONFIG_WOWLAN void rtl8188es_set_wowlan_cmd(_adapter* padapter, u8 enable) { diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c index 23361e9..ba4feb5 100644 --- a/hal/usb_halinit.c +++ b/hal/usb_halinit.c @@ -2224,17 +2224,8 @@ static void hw_var_set_opmode(PADAPTER Adapter, u8 variable, u8* val) /* dis BCN1 ATIM WND if if2 is station */ rtw_write8(Adapter, REG_BCN_CTRL_1, rtw_read8(Adapter, REG_BCN_CTRL_1)|BIT(0)); -#ifdef CONFIG_TSF_RESET_OFFLOAD - /* Reset TSF for STA+AP concurrent mode */ - if ( check_buddy_fwstate(Adapter, (WIFI_STATION_STATE|WIFI_ASOC_STATE)) ) { - if (reset_tsf(Adapter, IFACE_PORT0) == false) - DBG_88E("ERROR! %s()-%d: Reset port0 TSF fail\n", - __func__, __LINE__); - } -#endif /* CONFIG_TSF_RESET_OFFLOAD */ } } - } static void hw_var_set_macaddr(PADAPTER Adapter, u8 variable, u8* val) diff --git a/include/rtl8188e_cmd.h b/include/rtl8188e_cmd.h index 1802eb7..f4b9503 100644 --- a/include/rtl8188e_cmd.h +++ b/include/rtl8188e_cmd.h @@ -136,11 +136,6 @@ void rtl8188e_set_p2p_ps_offload_cmd(PADAPTER padapter, u8 p2p_ps_state); void CheckFwRsvdPageContent(PADAPTER padapter); void rtl8188e_set_FwMediaStatus_cmd(PADAPTER padapter, __le16 mstatus_rpt); -#ifdef CONFIG_TSF_RESET_OFFLOAD -//u8 rtl8188e_reset_tsf(_adapter *padapter, u8 reset_port); -int reset_tsf(PADAPTER Adapter, u8 reset_port ); -#endif // CONFIG_TSF_RESET_OFFLOAD - #ifdef CONFIG_WOWLAN typedef struct _SETWOWLAN_PARM{ u8 mode;