skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-22 04:23:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Convert typedef for _workitem to struct work_struct

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-25 11:02:03 -05:00
parent ee237545ff
commit d8af6fff83
5 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/rtw_cmd.c
View file

@ -81,7 +81,7 @@ _func_exit_;
} }
static void c2h_wk_callback(_workitem *work); static void c2h_wk_callback(struct work_struct *work);
sint _rtw_init_evt_priv(struct evt_priv *pevtpriv) sint _rtw_init_evt_priv(struct evt_priv *pevtpriv)
{ {
@ -2258,7 +2258,7 @@ exit:
return ret; return ret;
} }
static void c2h_wk_callback(_workitem *work) static void c2h_wk_callback(struct work_struct *work)
{ {
struct evt_priv *evtpriv = container_of(work, struct evt_priv, c2h_wk); struct evt_priv *evtpriv = container_of(work, struct evt_priv, c2h_wk);
_adapter *adapter = container_of(evtpriv, _adapter, evtpriv); _adapter *adapter = container_of(evtpriv, _adapter, evtpriv);

10
include/osdep_service.h
View file

@ -76,10 +76,6 @@
#define thread_exit() complete_and_exit(NULL, 0) #define thread_exit() complete_and_exit(NULL, 0)
typedef void timer_hdl_return;
typedef void* timer_hdl_context;
typedef struct work_struct _workitem;
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
#endif #endif
@ -200,7 +196,7 @@ __inline static void _cancel_timer(struct timer_list *ptimer,u8 *bcancelled)
#define RTW_TIMER_HDL_NAME(name) rtw_##name##_timer_hdl #define RTW_TIMER_HDL_NAME(name) rtw_##name##_timer_hdl
#define RTW_DECLARE_TIMER_HDL(name) void RTW_TIMER_HDL_NAME(name)(RTW_TIMER_HDL_ARGS) #define RTW_DECLARE_TIMER_HDL(name) void RTW_TIMER_HDL_NAME(name)(RTW_TIMER_HDL_ARGS)
__inline static void _init_workitem(_workitem *pwork, void *pfunc, void * cntx) __inline static void _init_workitem(struct work_struct *pwork, void *pfunc, void * cntx)
{ {
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
INIT_WORK(pwork, pfunc); INIT_WORK(pwork, pfunc);
@ -209,12 +205,12 @@ __inline static void _init_workitem(_workitem *pwork, void *pfunc, void * cntx)
#endif #endif
} }
__inline static void _set_workitem(_workitem *pwork) __inline static void _set_workitem(struct work_struct *pwork)
{ {
schedule_work(pwork); schedule_work(pwork);
} }
__inline static void _cancel_workitem_sync(_workitem *pwork) __inline static void _cancel_workitem_sync(struct work_struct *pwork)
{ {
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,22)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,22))
cancel_work_sync(pwork); cancel_work_sync(pwork);

2
include/rtw_cmd.h
View file

@ -66,7 +66,7 @@ struct cmd_priv {
}; };
struct evt_priv { struct evt_priv {
_workitem c2h_wk; struct work_struct c2h_wk;
bool c2h_wk_alive; bool c2h_wk_alive;
struct rtw_cbuf *c2h_queue; struct rtw_cbuf *c2h_queue;
#define C2H_QUEUE_MAX_LEN 10 #define C2H_QUEUE_MAX_LEN 10

5
include/rtw_led.h
View file

@ -125,10 +125,7 @@ struct LED_871x {
u8 bLedLinkBlinkInProgress; u8 bLedLinkBlinkInProgress;
u8 bLedStartToLinkBlinkInProgress; u8 bLedStartToLinkBlinkInProgress;
u8 bLedScanBlinkInProgress; u8 bLedScanBlinkInProgress;
struct work_struct BlinkWorkItem; // Workitem used by BlinkTimer to manipulate H/W to blink LED.
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
_workitem BlinkWorkItem; // Workitem used by BlinkTimer to manipulate H/W to blink LED.
#endif
}; };
#define IS_LED_WPS_BLINKING(_LED_871x) (((struct LED_871x *)_LED_871x)->CurrLedState==LED_BLINK_WPS \ #define IS_LED_WPS_BLINKING(_LED_871x) (((struct LED_871x *)_LED_871x)->CurrLedState==LED_BLINK_WPS \

2
include/rtw_pwrctrl.h
View file

@ -185,7 +185,7 @@ struct pwrctrl_priv
u8 bcn_ant_mode; u8 bcn_ant_mode;
u32 alives; u32 alives;
_workitem cpwm_event; struct work_struct cpwm_event;
u8 bpower_saving; u8 bpower_saving;
u8 b_hw_radio_off; u8 b_hw_radio_off;