From c5a70910d0d154616d4676cb6f201868a9fed05c Mon Sep 17 00:00:00 2001 From: carpie Date: Wed, 14 Aug 2013 16:19:34 -0400 Subject: [PATCH] Updated module to build on 3.2.0 kernel. --- README | 2 +- module/tty0tty.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README b/README index 8c1a817..c6a3877 100644 --- a/README +++ b/README @@ -23,7 +23,7 @@ pts: module: - The module is tested in kernel 2.6.26-2 (debian) and kernel 2.6.30 + The module is tested in kernel 3.2.0 When loaded, create 8 ttys interconnected: /dev/tnt0 <=> /dev/tnt1 diff --git a/module/tty0tty.c b/module/tty0tty.c index f9814ce..0b2bccd 100644 --- a/module/tty0tty.c +++ b/module/tty0tty.c @@ -368,7 +368,7 @@ static void tty0tty_set_termios(struct tty_struct *tty, struct ktermios *old_ter } -static int tty0tty_tiocmget(struct tty_struct *tty, struct file *file) +static int tty0tty_tiocmget(struct tty_struct *tty) { struct tty0tty_serial *tty0tty = tty->driver_data; @@ -390,7 +390,7 @@ static int tty0tty_tiocmget(struct tty_struct *tty, struct file *file) return result; } -static int tty0tty_tiocmset(struct tty_struct *tty, struct file *file, +static int tty0tty_tiocmset(struct tty_struct *tty, unsigned int set, unsigned int clear) { struct tty0tty_serial *tty0tty = tty->driver_data; @@ -440,7 +440,7 @@ static int tty0tty_tiocmset(struct tty_struct *tty, struct file *file, } -static int tty0tty_ioctl_tiocgserial(struct tty_struct *tty, struct file *file, +static int tty0tty_ioctl_tiocgserial(struct tty_struct *tty, unsigned int cmd, unsigned long arg) { struct tty0tty_serial *tty0tty = tty->driver_data; @@ -476,7 +476,7 @@ static int tty0tty_ioctl_tiocgserial(struct tty_struct *tty, struct file *file, return -ENOIOCTLCMD; } -static int tty0tty_ioctl_tiocmiwait(struct tty_struct *tty, struct file *file, +static int tty0tty_ioctl_tiocmiwait(struct tty_struct *tty, unsigned int cmd, unsigned long arg) { struct tty0tty_serial *tty0tty = tty->driver_data; @@ -517,7 +517,7 @@ static int tty0tty_ioctl_tiocmiwait(struct tty_struct *tty, struct file *file, return -ENOIOCTLCMD; } -static int tty0tty_ioctl_tiocgicount(struct tty_struct *tty, struct file *file, +static int tty0tty_ioctl_tiocgicount(struct tty_struct *tty, unsigned int cmd, unsigned long arg) { struct tty0tty_serial *tty0tty = tty->driver_data; @@ -548,7 +548,7 @@ static int tty0tty_ioctl_tiocgicount(struct tty_struct *tty, struct file *file, return -ENOIOCTLCMD; } -static int tty0tty_ioctl(struct tty_struct *tty, struct file *file, +static int tty0tty_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) { #ifdef SCULL_DEBUG @@ -556,11 +556,11 @@ static int tty0tty_ioctl(struct tty_struct *tty, struct file *file, #endif switch (cmd) { case TIOCGSERIAL: - return tty0tty_ioctl_tiocgserial(tty, file, cmd, arg); + return tty0tty_ioctl_tiocgserial(tty, cmd, arg); case TIOCMIWAIT: - return tty0tty_ioctl_tiocmiwait(tty, file, cmd, arg); + return tty0tty_ioctl_tiocmiwait(tty, cmd, arg); case TIOCGICOUNT: - return tty0tty_ioctl_tiocgicount(tty, file, cmd, arg); + return tty0tty_ioctl_tiocgicount(tty, cmd, arg); } return -ENOIOCTLCMD; -- libgit2 0.21.4