skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-03-15 06:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove CONFIG_XMIT_THREAD_MODE

Browse source 
This variable is not defined.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-19 17:50:08 -05:00
parent d2528caa5f
commit 2f86fc26dd
8 changed files with 0 additions and 247 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

135
core/rtw_xmit.c
View file

@ -2853,141 +2853,6 @@ void xmit_delivery_enabled_frames(_adapter *padapter, struct sta_info *psta)
#endif #endif
#ifdef CONFIG_XMIT_THREAD_MODE
void enqueue_pending_xmitbuf(
struct xmit_priv *pxmitpriv,
struct xmit_buf *pxmitbuf)
{
_irqL irql;
_queue *pqueue;
_adapter *pri_adapter = pxmitpriv->adapter;
pqueue = &pxmitpriv->pending_xmitbuf_queue;
_enter_critical_bh(&pqueue->lock, &irql);
rtw_list_delete(&pxmitbuf->list);
rtw_list_insert_tail(&pxmitbuf->list, get_list_head(pqueue));
_exit_critical_bh(&pqueue->lock, &irql);
_rtw_up_sema(&(pri_adapter->xmitpriv.xmit_sema));
}
struct xmit_buf* dequeue_pending_xmitbuf(
struct xmit_priv *pxmitpriv)
{
_irqL irql;
struct xmit_buf *pxmitbuf;
_queue *pqueue;
pxmitbuf = NULL;
pqueue = &pxmitpriv->pending_xmitbuf_queue;
_enter_critical_bh(&pqueue->lock, &irql);
if (_rtw_queue_empty(pqueue) == false)
{
_list *plist, *phead;
phead = get_list_head(pqueue);
plist = get_next(phead);
pxmitbuf = LIST_CONTAINOR(plist, struct xmit_buf, list);
rtw_list_delete(&pxmitbuf->list);
}
_exit_critical_bh(&pqueue->lock, &irql);
return pxmitbuf;
}
struct xmit_buf* dequeue_pending_xmitbuf_under_survey(
struct xmit_priv *pxmitpriv)
{
_irqL irql;
struct xmit_buf *pxmitbuf;
struct xmit_frame *pxmitframe;
_queue *pqueue;
pxmitbuf = NULL;
pqueue = &pxmitpriv->pending_xmitbuf_queue;
_enter_critical_bh(&pqueue->lock, &irql);
if (_rtw_queue_empty(pqueue) == false)
{
_list *plist, *phead;
u8 type;
phead = get_list_head(pqueue);
plist = phead;
do {
plist = get_next(plist);
if (plist == phead) break;
pxmitbuf = LIST_CONTAINOR(plist, struct xmit_buf, list);
pxmitframe = (struct xmit_frame*)pxmitbuf->priv_data;
if (pxmitframe)
{
type = GetFrameSubType(pxmitbuf->pbuf + TXDESC_SIZE + pxmitframe->pkt_offset * PACKET_OFFSET_SZ);
}
else
{
DBG_88E("%s, !!!ERROR!!! For USB, TODO ITEM\n", __func__);
}
if ((type == WIFI_PROBEREQ) ||
(type == WIFI_DATA_NULL) ||
(type == WIFI_QOS_DATA_NULL))
{
rtw_list_delete(&pxmitbuf->list);
break;
}
pxmitbuf = NULL;
} while (1);
}
_exit_critical_bh(&pqueue->lock, &irql);
return pxmitbuf;
}
sint check_pending_xmitbuf(
struct xmit_priv *pxmitpriv)
{
_queue *pqueue;
pqueue = &pxmitpriv->pending_xmitbuf_queue;
if (_rtw_queue_empty(pqueue) == false)
return true;
else
return false;
}
thread_return rtw_xmit_thread(thread_context context)
{
s32 err;
PADAPTER padapter;
err = _SUCCESS;
padapter = (PADAPTER)context;
thread_enter("RTW_XMIT_THREAD");
do {
err = rtw_hal_xmit_thread_handler(padapter);
flush_signals_thread();
} while (_SUCCESS == err);
_rtw_up_sema(&padapter->xmitpriv.terminate_xmitthread_sema);
thread_exit();
}
#endif
void rtw_sctx_init(struct submit_ctx *sctx, int timeout_ms) void rtw_sctx_init(struct submit_ctx *sctx, int timeout_ms)
{ {
sctx->timeout_ms = timeout_ms; sctx->timeout_ms = timeout_ms;

9
hal/hal_intf.c
View file

@ -406,15 +406,6 @@ int rtw_hal_iol_cmd(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wat
return _FAIL; return _FAIL;
} }
#ifdef CONFIG_XMIT_THREAD_MODE
s32 rtw_hal_xmit_thread_handler(_adapter *padapter)
{
if (padapter->HalFunc.xmit_thread_handler)
return padapter->HalFunc.xmit_thread_handler(padapter);
return _FAIL;
}
#endif
void rtw_hal_notch_filter(_adapter *adapter, bool enable) void rtw_hal_notch_filter(_adapter *adapter, bool enable)
{ {
if (adapter->HalFunc.hal_notch_filter) if (adapter->HalFunc.hal_notch_filter)

5
hal/rtl8188e_hal_init.c
View file

@ -2579,14 +2579,9 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
pHalFunc->GetHalODMVarHandler = &rtl8188e_GetHalODMVar; pHalFunc->GetHalODMVarHandler = &rtl8188e_GetHalODMVar;
pHalFunc->SetHalODMVarHandler = &rtl8188e_SetHalODMVar; pHalFunc->SetHalODMVarHandler = &rtl8188e_SetHalODMVar;
#ifdef CONFIG_XMIT_THREAD_MODE
pHalFunc->xmit_thread_handler = &hal_xmit_handler;
#endif
pHalFunc->IOL_exec_cmds_sync = &rtl8188e_IOL_exec_cmds_sync; pHalFunc->IOL_exec_cmds_sync = &rtl8188e_IOL_exec_cmds_sync;
pHalFunc->hal_notch_filter = &hal_notch_filter_8188e; pHalFunc->hal_notch_filter = &hal_notch_filter_8188e;
} }
u8 GetEEPROMSize8188E(PADAPTER padapter) u8 GetEEPROMSize8188E(PADAPTER padapter)

67
hal/rtl8188eu_xmit.c
View file

@ -429,67 +429,6 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
return pull; return pull;
} }
#ifdef CONFIG_XMIT_THREAD_MODE
/*
* Description
* Transmit xmitbuf to hardware tx fifo
*
* Return
* _SUCCESS ok
* _FAIL something error
*/
s32 rtl8188eu_xmit_buf_handler(PADAPTER padapter)
{
struct xmit_priv *pxmitpriv;
struct xmit_buf *pxmitbuf;
s32 ret;
pxmitpriv = &padapter->xmitpriv;
ret = _rtw_down_sema(&pxmitpriv->xmit_sema);
if (_FAIL == ret) {
RT_TRACE(_module_hal_xmit_c_, _drv_emerg_,
("%s: down SdioXmitBufSema fail!\n", __func__));
return _FAIL;
}
ret = (padapter->bDriverStopped == true) || (padapter->bSurpriseRemoved == true);
if (ret) {
RT_TRACE(_module_hal_xmit_c_, _drv_notice_,
("%s: bDriverStopped(%d) bSurpriseRemoved(%d)!\n",
__func__, padapter->bDriverStopped, padapter->bSurpriseRemoved));
return _FAIL;
}
if (check_pending_xmitbuf(pxmitpriv) == false)
return _SUCCESS;
#ifdef CONFIG_LPS_LCLK
ret = rtw_register_tx_alive(padapter);
if (ret != _SUCCESS) {
RT_TRACE(_module_hal_xmit_c_, _drv_notice_,
("%s: wait to leave LPS_LCLK\n", __func__));
return _SUCCESS;
}
#endif
do {
pxmitbuf = dequeue_pending_xmitbuf(pxmitpriv);
if (pxmitbuf == NULL) break;
rtw_write_port(padapter, pxmitbuf->ff_hwaddr, pxmitbuf->len, (unsigned char*)pxmitbuf);
} while (1);
#ifdef CONFIG_LPS_LCLK
rtw_unregister_tx_alive(padapter);
#endif
return _SUCCESS;
}
#endif
/* for non-agg data frame or management frame */ /* for non-agg data frame or management frame */
static s32 rtw_dump_xframe(_adapter *padapter, struct xmit_frame *pxmitframe) static s32 rtw_dump_xframe(_adapter *padapter, struct xmit_frame *pxmitframe)
{ {
@ -549,13 +488,7 @@ static s32 rtw_dump_xframe(_adapter *padapter, struct xmit_frame *pxmitframe)
} }
ff_hwaddr = rtw_get_ff_hwaddr(pxmitframe); ff_hwaddr = rtw_get_ff_hwaddr(pxmitframe);
#ifdef CONFIG_XMIT_THREAD_MODE
pxmitbuf->len = w_sz;
pxmitbuf->ff_hwaddr = ff_hwaddr;
enqueue_pending_xmitbuf(pxmitpriv, pxmitbuf);
#else
inner_ret = rtw_write_port(padapter, ff_hwaddr, w_sz, (unsigned char*)pxmitbuf); inner_ret = rtw_write_port(padapter, ff_hwaddr, w_sz, (unsigned char*)pxmitbuf);
#endif
rtw_count_tx_stats(padapter, pxmitframe, sz); rtw_count_tx_stats(padapter, pxmitframe, sz);

4
include/autoconf.h
View file

@ -53,10 +53,6 @@
#define CONFIG_LPS #define CONFIG_LPS
#ifdef CONFIG_LPS_LCLK
#define CONFIG_XMIT_THREAD_MODE
#endif
#define CONFIG_AP_MODE #define CONFIG_AP_MODE
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
#ifdef CONFIG_INTERRUPT_BASED_TXBCN #ifdef CONFIG_INTERRUPT_BASED_TXBCN

7
include/hal_intf.h
View file

@ -234,9 +234,6 @@ struct hal_ops {
int (*IOL_exec_cmds_sync)(_adapter *padapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt); int (*IOL_exec_cmds_sync)(_adapter *padapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt);
#ifdef CONFIG_XMIT_THREAD_MODE
s32 (*xmit_thread_handler)(_adapter *padapter);
#endif
void (*hal_notch_filter)(_adapter * adapter, bool enable); void (*hal_notch_filter)(_adapter * adapter, bool enable);
void (*hal_reset_security_engine)(_adapter * adapter); void (*hal_reset_security_engine)(_adapter * adapter);
s32 (*c2h_handler)(_adapter *padapter, struct c2h_evt_hdr *c2h_evt); s32 (*c2h_handler)(_adapter *padapter, struct c2h_evt_hdr *c2h_evt);
@ -432,10 +429,6 @@ u8 rtw_hal_sreset_get_wifi_status(_adapter *padapter);
int rtw_hal_iol_cmd(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt); int rtw_hal_iol_cmd(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt);
#ifdef CONFIG_XMIT_THREAD_MODE
s32 rtw_hal_xmit_thread_handler(_adapter *padapter);
#endif
void rtw_hal_notch_filter(_adapter * adapter, bool enable); void rtw_hal_notch_filter(_adapter * adapter, bool enable);
void rtw_hal_reset_security_engine(_adapter * adapter); void rtw_hal_reset_security_engine(_adapter * adapter);

8
include/rtw_xmit.h
View file

@ -445,14 +445,6 @@ void xmit_delivery_enabled_frames(_adapter *padapter, struct sta_info *psta);
u8 qos_acm(u8 acm_mask, u8 priority); u8 qos_acm(u8 acm_mask, u8 priority);
#ifdef CONFIG_XMIT_THREAD_MODE
void enqueue_pending_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf);
struct xmit_buf* dequeue_pending_xmitbuf(struct xmit_priv *pxmitpriv);
struct xmit_buf* dequeue_pending_xmitbuf_under_survey(struct xmit_priv *pxmitpriv);
sint check_pending_xmitbuf(struct xmit_priv *pxmitpriv);
thread_return rtw_xmit_thread(thread_context context);
#endif
u32 rtw_get_ff_hwaddr(struct xmit_frame *pxmitframe); u32 rtw_get_ff_hwaddr(struct xmit_frame *pxmitframe);
int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms); int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms);

12
os_dep/os_intfs.c
View file

@ -954,11 +954,6 @@ u32 rtw_start_drv_threads(_adapter *padapter)
u32 _status = _SUCCESS; u32 _status = _SUCCESS;
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_start_drv_threads\n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_start_drv_threads\n"));
#ifdef CONFIG_XMIT_THREAD_MODE
padapter->xmitThread = kthread_run(rtw_xmit_thread, padapter, "RTW_XMIT_THREAD");
if (IS_ERR(padapter->xmitThread))
_status = _FAIL;
#endif
#ifdef CONFIG_RECV_THREAD_MODE #ifdef CONFIG_RECV_THREAD_MODE
padapter->recvThread = kthread_run(rtw_recv_thread, padapter, "RTW_RECV_THREAD"); padapter->recvThread = kthread_run(rtw_recv_thread, padapter, "RTW_RECV_THREAD");
@ -998,13 +993,6 @@ void rtw_stop_drv_threads (_adapter *padapter)
} }
#endif #endif
#ifdef CONFIG_XMIT_THREAD_MODE
// Below is to termindate tx_thread...
_rtw_up_sema(&padapter->xmitpriv.xmit_sema);
_rtw_down_sema(&padapter->xmitpriv.terminate_xmitthread_sema);
RT_TRACE(_module_os_intfs_c_,_drv_info_,("\n drv_halt: rtw_xmit_thread can be terminated !\n"));
#endif
#ifdef CONFIG_RECV_THREAD_MODE #ifdef CONFIG_RECV_THREAD_MODE
// Below is to termindate rx_thread... // Below is to termindate rx_thread...
_rtw_up_sema(&padapter->recvpriv.recv_sema); _rtw_up_sema(&padapter->recvpriv.recv_sema);