Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-03-23 21:22:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'stable-1.6-kernel615' into 'stable-1.6'

Browse Source 
tty: Implemented new timer interface since kernel 6.15.

See merge request etherlab.org/ethercat!187
This commit is contained in:
Florian Pose
2026-03-16 14:47:06 +01:00
parent 7a7d7f051b e32e99f8b8
commit 6869c2bab8
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/tty/tty.c
View File

@@ -233,7 +233,11 @@ static void __exit cleanup_mini_module(void)
{
printk(KERN_INFO PFX "Stopping...\n");
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)
timer_delete_sync(&timer);
#else
del_timer_sync(&timer);
#endif
free_serial_devices();

8
tty/module.c
View File

@@ -292,7 +292,11 @@ static int ec_tty_init(ec_tty_t *t, int minor,
static void ec_tty_clear(ec_tty_t *tty)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)
timer_delete_sync(&tty->timer);
#else
del_timer_sync(&tty->timer);
#endif
tty_unregister_device(tty_driver, tty->minor);
}
@@ -367,10 +371,14 @@ static void ec_tty_wakeup(struct timer_list *t)
static void ec_tty_wakeup(unsigned long data)
#endif
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)
ec_tty_t *tty = timer_container_of(tty, t, timer);
#else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
ec_tty_t *tty = from_timer(tty, t, timer);
#else
ec_tty_t *tty = (ec_tty_t *) data;
#endif
#endif
size_t to_recv;