Peter M. Groen / tty0tty

Commit 7cb1cd96eb51e66e3ba925c079edc9e420a1f5e6

Authored by Jeff Buchbinder
2 parents 0fdf7a3e c5a70910

Merge pull request #3 from carpie/master 

Updated module to build on 3.2.0 kernel.
Inline Side-by-side
Showing 2 changed files with 10 additions and 10 deletions
... ... @@ -23,7 +23,7 @@ pts:
23 23  
24 24 module:
25 25  
26   - The module is tested in kernel 2.6.26-2 (debian) and kernel 2.6.30
  26 + The module is tested in kernel 3.2.0
27 27  
28 28 When loaded, create 8 ttys interconnected:
29 29 /dev/tnt0 <=> /dev/tnt1
... ...
module/tty0tty.c
  View file @7cb1cd9
... ... @@ -368,7 +368,7 @@ static void tty0tty_set_termios(struct tty_struct *tty, struct ktermios *old_ter
368 368 }
369 369  
370 370  
371   -static int tty0tty_tiocmget(struct tty_struct *tty, struct file *file)
  371 +static int tty0tty_tiocmget(struct tty_struct *tty)
372 372 {
373 373 struct tty0tty_serial *tty0tty = tty->driver_data;
374 374  
... ... @@ -390,7 +390,7 @@ static int tty0tty_tiocmget(struct tty_struct *tty, struct file *file)
390 390 return result;
391 391 }
392 392  
393   -static int tty0tty_tiocmset(struct tty_struct *tty, struct file *file,
  393 +static int tty0tty_tiocmset(struct tty_struct *tty,
394 394 unsigned int set, unsigned int clear)
395 395 {
396 396 struct tty0tty_serial *tty0tty = tty->driver_data;
... ... @@ -440,7 +440,7 @@ static int tty0tty_tiocmset(struct tty_struct *tty, struct file *file,
440 440 }
441 441  
442 442  
443   -static int tty0tty_ioctl_tiocgserial(struct tty_struct *tty, struct file *file,
  443 +static int tty0tty_ioctl_tiocgserial(struct tty_struct *tty,
444 444 unsigned int cmd, unsigned long arg)
445 445 {
446 446 struct tty0tty_serial *tty0tty = tty->driver_data;
... ... @@ -476,7 +476,7 @@ static int tty0tty_ioctl_tiocgserial(struct tty_struct *tty, struct file *file,
476 476 return -ENOIOCTLCMD;
477 477 }
478 478  
479   -static int tty0tty_ioctl_tiocmiwait(struct tty_struct *tty, struct file *file,
  479 +static int tty0tty_ioctl_tiocmiwait(struct tty_struct *tty,
480 480 unsigned int cmd, unsigned long arg)
481 481 {
482 482 struct tty0tty_serial *tty0tty = tty->driver_data;
... ... @@ -517,7 +517,7 @@ static int tty0tty_ioctl_tiocmiwait(struct tty_struct *tty, struct file *file,
517 517 return -ENOIOCTLCMD;
518 518 }
519 519  
520   -static int tty0tty_ioctl_tiocgicount(struct tty_struct *tty, struct file *file,
  520 +static int tty0tty_ioctl_tiocgicount(struct tty_struct *tty,
521 521 unsigned int cmd, unsigned long arg)
522 522 {
523 523 struct tty0tty_serial *tty0tty = tty->driver_data;
... ... @@ -548,7 +548,7 @@ static int tty0tty_ioctl_tiocgicount(struct tty_struct *tty, struct file *file,
548 548 return -ENOIOCTLCMD;
549 549 }
550 550  
551   -static int tty0tty_ioctl(struct tty_struct *tty, struct file *file,
  551 +static int tty0tty_ioctl(struct tty_struct *tty,
552 552 unsigned int cmd, unsigned long arg)
553 553 {
554 554 #ifdef SCULL_DEBUG
... ... @@ -556,11 +556,11 @@ static int tty0tty_ioctl(struct tty_struct *tty, struct file *file,
556 556 #endif
557 557 switch (cmd) {
558 558 case TIOCGSERIAL:
559   - return tty0tty_ioctl_tiocgserial(tty, file, cmd, arg);
  559 + return tty0tty_ioctl_tiocgserial(tty, cmd, arg);
560 560 case TIOCMIWAIT:
561   - return tty0tty_ioctl_tiocmiwait(tty, file, cmd, arg);
  561 + return tty0tty_ioctl_tiocmiwait(tty, cmd, arg);
562 562 case TIOCGICOUNT:
563   - return tty0tty_ioctl_tiocgicount(tty, file, cmd, arg);
  563 + return tty0tty_ioctl_tiocgicount(tty, cmd, arg);
564 564 }
565 565  
566 566 return -ENOIOCTLCMD;
... ...