From 25fa855feaceaea46d1244fe677e867016d1cbb7 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 20 Jul 2013 23:31:27 -0500 Subject: [PATCH] rtl8188eu: Remove CONFIG_EVENT_THREAD_MODE - not defined Signed-off-by: Larry Finger --- core/rtw_cmd.c | 108 ---------------------------------------------- include/rtw_cmd.h | 22 ---------- 2 files changed, 130 deletions(-) diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index 9bbe8e9..db919ba 100644 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -95,24 +95,6 @@ _func_enter_; ATOMIC_SET(&pevtpriv->event_seq, 0); pevtpriv->evt_done_cnt = 0; -#ifdef CONFIG_EVENT_THREAD_MODE - - _rtw_init_sema(&(pevtpriv->evt_notify), 0); - _rtw_init_sema(&(pevtpriv->terminate_evtthread_sema), 0); - - pevtpriv->evt_allocated_buf = rtw_zmalloc(MAX_EVTSZ + 4); - if (pevtpriv->evt_allocated_buf == NULL){ - res= _FAIL; - goto exit; - } - pevtpriv->evt_buf = pevtpriv->evt_allocated_buf + 4 - ((unsigned int)(pevtpriv->evt_allocated_buf) & 3); - - - _rtw_init_queue(&(pevtpriv->evt_queue)); -exit: - -#endif /* end of CONFIG_EVENT_THREAD_MODE */ - #ifdef CONFIG_C2H_WK _init_workitem(&pevtpriv->c2h_wk, c2h_wk_callback, NULL); pevtpriv->c2h_wk_alive = false; @@ -130,15 +112,6 @@ _func_enter_; RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("+_rtw_free_evt_priv\n")); -#ifdef CONFIG_EVENT_THREAD_MODE - _rtw_free_sema(&(pevtpriv->evt_notify)); - _rtw_free_sema(&(pevtpriv->terminate_evtthread_sema)); - - - if (pevtpriv->evt_allocated_buf) - rtw_mfree(pevtpriv->evt_allocated_buf, MAX_EVTSZ + 4); -#endif - #ifdef CONFIG_C2H_WK _cancel_workitem_sync(&pevtpriv->c2h_wk); while (pevtpriv->c2h_wk_alive) @@ -494,87 +467,6 @@ _func_exit_; } - -#ifdef CONFIG_EVENT_THREAD_MODE -u32 rtw_enqueue_evt(struct evt_priv *pevtpriv, struct evt_obj *obj) -{ - _irqL irqL; - int res; - _queue *queue = &pevtpriv->evt_queue; - -_func_enter_; - - res = _SUCCESS; - - if (obj == NULL) { - res = _FAIL; - goto exit; - } - - _enter_critical_bh(&queue->lock, &irqL); - - rtw_list_insert_tail(&obj->list, &queue->queue); - - _exit_critical_bh(&queue->lock, &irqL); - - /* rtw_evt_notify_isr(pevtpriv); */ - -exit: - -_func_exit_; - - return res; -} - -struct evt_obj *rtw_dequeue_evt(_queue *queue) -{ - _irqL irqL; - struct evt_obj *pevtobj; - -_func_enter_; - - _enter_critical_bh(&queue->lock, &irqL); - - if (rtw_is_list_empty(&(queue->queue))) - pevtobj = NULL; - else - { - pevtobj = LIST_CONTAINOR(get_next(&(queue->queue)), struct evt_obj, list); - rtw_list_delete(&pevtobj->list); - } - - _exit_critical_bh(&queue->lock, &irqL); - -_func_exit_; - - return pevtobj; -} - -void rtw_free_evt_obj(struct evt_obj *pevtobj) -{ -_func_enter_; - - if (pevtobj->parmbuf) - rtw_mfree((unsigned char*)pevtobj->parmbuf, pevtobj->evtsz); - - rtw_mfree((unsigned char*)pevtobj, sizeof(struct evt_obj)); - -_func_exit_; -} - -void rtw_evt_notify_isr(struct evt_priv *pevtpriv) -{ -_func_enter_; - pevtpriv->evt_done_cnt++; - _rtw_up_sema(&(pevtpriv->evt_notify)); -_func_exit_; -} -#endif - - -/* -u8 rtw_setstandby_cmd(unsigned char *adapter) -*/ u8 rtw_setstandby_cmd(_adapter *padapter, uint action) { struct cmd_obj* ph2c; diff --git a/include/rtw_cmd.h b/include/rtw_cmd.h index 5d46cf9..fa0397d 100644 --- a/include/rtw_cmd.h +++ b/include/rtw_cmd.h @@ -68,23 +68,7 @@ struct cmd_priv { _adapter *padapter; }; -#ifdef CONFIG_EVENT_THREAD_MODE -struct evt_obj { - u16 evtcode; - u8 res; - u8 *parmbuf; - u32 evtsz; - _list list; -}; -#endif - struct evt_priv { -#ifdef CONFIG_EVENT_THREAD_MODE - _sema evt_notify; - _sema terminate_evtthread_sema; - _queue evt_queue; -#endif - #define CONFIG_C2H_WK #ifdef CONFIG_C2H_WK _workitem c2h_wk; @@ -121,12 +105,6 @@ extern u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *obj); extern struct cmd_obj *rtw_dequeue_cmd(struct cmd_priv *pcmdpriv); extern void rtw_free_cmd_obj(struct cmd_obj *pcmd); -#ifdef CONFIG_EVENT_THREAD_MODE -extern u32 rtw_enqueue_evt(struct evt_priv *pevtpriv, struct evt_obj *obj); -extern struct evt_obj *rtw_dequeue_evt(_queue *queue); -extern void rtw_free_evt_obj(struct evt_obj *pcmd); -#endif - thread_return rtw_cmd_thread(thread_context context); extern u32 rtw_init_cmd_priv (struct cmd_priv *pcmdpriv);