bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Applied 0002-use-setup_timer-for-v4.15.patch from Beckhoff.

This commit is contained in:
Florian Pose 2018-01-30 17:09:33 +01:00
parent 77dc73606d
commit 2b2c7c9613
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/mini/mini.c
View File

@ -307,7 +307,11 @@ void read_voe(void)
/*****************************************************************************/ /*****************************************************************************/
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
void cyclic_task(struct timer_list *t)
#else
void cyclic_task(unsigned long data) void cyclic_task(unsigned long data)
#endif
{ {
// receive process data // receive process data
down(&master_sem); down(&master_sem);
@ -492,8 +496,12 @@ int __init init_mini_module(void)
#endif #endif
printk(KERN_INFO PFX "Starting cyclic sample thread.\n"); printk(KERN_INFO PFX "Starting cyclic sample thread.\n");
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
timer_setup(&timer, cyclic_task, 0);
#else
init_timer(&timer); init_timer(&timer);
timer.function = cyclic_task; timer.function = cyclic_task;
#endif
timer.expires = jiffies + 10; timer.expires = jiffies + 10;
add_timer(&timer); add_timer(&timer);