mirror of
https://github.com/Mange/rtl8192eu-linux-driver
synced 2025-12-08 07:14:03 +00:00
Update for kernel 4.15
This commit adds support for kernel 4.15, which changed the timer interface.
Fetch from 8c3acf9275
This commit is contained in:
@@ -318,15 +318,17 @@ extern void rtw_udelay_os(int us);
|
||||
|
||||
extern void rtw_yield_os(void);
|
||||
|
||||
|
||||
extern void rtw_init_timer(_timer *ptimer, void *padapter, void *pfunc);
|
||||
|
||||
|
||||
__inline static unsigned char _cancel_timer_ex(_timer *ptimer)
|
||||
{
|
||||
#ifdef PLATFORM_LINUX
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
|
||||
return del_timer_sync(&ptimer->t);
|
||||
#else
|
||||
return del_timer_sync(ptimer);
|
||||
#endif
|
||||
#endif
|
||||
#ifdef PLATFORM_FREEBSD
|
||||
_cancel_timer(ptimer,0);
|
||||
return 0;
|
||||
|
||||
@@ -133,7 +133,15 @@
|
||||
#else
|
||||
typedef struct semaphore _mutex;
|
||||
#endif
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
|
||||
typedef struct legacy_timer_emu {
|
||||
struct timer_list t;
|
||||
void (*function)(unsigned long);
|
||||
unsigned long data;
|
||||
} _timer;
|
||||
#else
|
||||
typedef struct timer_list _timer;
|
||||
#endif
|
||||
|
||||
struct __queue {
|
||||
struct list_head queue;
|
||||
@@ -266,26 +274,45 @@ __inline static void rtw_list_delete(_list *plist)
|
||||
|
||||
#define RTW_TIMER_HDL_ARGS void *FunctionContext
|
||||
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
|
||||
static void legacy_timer_emu_func(struct timer_list *t)
|
||||
{
|
||||
struct legacy_timer_emu *lt = from_timer(lt, t, t);
|
||||
lt->function(lt->data);
|
||||
}
|
||||
#endif
|
||||
|
||||
__inline static void _init_timer(_timer *ptimer,_nic_hdl nic_hdl,void *pfunc,void* cntx)
|
||||
{
|
||||
//setup_timer(ptimer, pfunc,(u32)cntx);
|
||||
ptimer->function = pfunc;
|
||||
ptimer->data = (unsigned long)cntx;
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
|
||||
timer_setup(&ptimer->t, legacy_timer_emu_func, 0);
|
||||
#else
|
||||
init_timer(ptimer);
|
||||
#endif
|
||||
}
|
||||
|
||||
__inline static void _set_timer(_timer *ptimer,u32 delay_time)
|
||||
{
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
|
||||
mod_timer(&ptimer->t, (jiffies+(delay_time*HZ/1000)));
|
||||
#else
|
||||
mod_timer(ptimer , (jiffies+(delay_time*HZ/1000)));
|
||||
#endif
|
||||
}
|
||||
|
||||
__inline static void _cancel_timer(_timer *ptimer,u8 *bcancelled)
|
||||
{
|
||||
del_timer_sync(ptimer);
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
|
||||
del_timer_sync(&ptimer->t);
|
||||
#else
|
||||
del_timer_sync(ptimer);
|
||||
#endif
|
||||
*bcancelled = 1;
|
||||
}
|
||||
|
||||
|
||||
static inline void _init_workitem(_workitem *pwork, void *pfunc, void *cntx)
|
||||
{
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
|
||||
|
||||
Reference in New Issue
Block a user