diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1995-01-06 15:03:41 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1995-01-06 15:03:41 +0000 |
| commit | 123bcf5fda4007c62993b97e09c911ba5da48dec (patch) | |
| tree | a140bb59f74a9d7024bd3a6d9545c1da9a1d651a /sys | |
| parent | 4c5e4b09a78c27ed1239c77ca7c0314a251492a1 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/sio/sio.c | 10 | ||||
| -rw-r--r-- | sys/i386/isa/sio.c | 10 | ||||
| -rw-r--r-- | sys/isa/sio.c | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 638ef70fd934..853c77371311 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.62 1994/12/27 13:07:07 bde Exp $ + * $Id: sio.c,v 1.63 1995/01/05 00:00:37 ache Exp $ */ #include "sio.h" @@ -1243,7 +1243,7 @@ sioioctl(dev, cmd, data, flag, p) switch (cmd) { case TIOCSETA: error = suser(p->p_ucred, &p->p_acflag); - if (error) + if (error != 0) return (error); *ct = *(struct termios *)data; return (0); @@ -1368,12 +1368,12 @@ sioioctl(dev, cmd, data, flag, p) error = suser(p->p_ucred, &p->p_acflag); if (error != 0) { splx(s); - return (EPERM); + return (error); } - com->dtr_wait = *(int *)data * 100 / hz; + com->dtr_wait = *(int *)data * hz / 100; break; case TIOCMGDTRWAIT: - *(int *)data = com->dtr_wait; + *(int *)data = com->dtr_wait * 100 / hz; break; case TIOCTIMESTAMP: com->do_timestamp = TRUE; diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c index 638ef70fd934..853c77371311 100644 --- a/sys/i386/isa/sio.c +++ b/sys/i386/isa/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.62 1994/12/27 13:07:07 bde Exp $ + * $Id: sio.c,v 1.63 1995/01/05 00:00:37 ache Exp $ */ #include "sio.h" @@ -1243,7 +1243,7 @@ sioioctl(dev, cmd, data, flag, p) switch (cmd) { case TIOCSETA: error = suser(p->p_ucred, &p->p_acflag); - if (error) + if (error != 0) return (error); *ct = *(struct termios *)data; return (0); @@ -1368,12 +1368,12 @@ sioioctl(dev, cmd, data, flag, p) error = suser(p->p_ucred, &p->p_acflag); if (error != 0) { splx(s); - return (EPERM); + return (error); } - com->dtr_wait = *(int *)data * 100 / hz; + com->dtr_wait = *(int *)data * hz / 100; break; case TIOCMGDTRWAIT: - *(int *)data = com->dtr_wait; + *(int *)data = com->dtr_wait * 100 / hz; break; case TIOCTIMESTAMP: com->do_timestamp = TRUE; diff --git a/sys/isa/sio.c b/sys/isa/sio.c index 638ef70fd934..853c77371311 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.62 1994/12/27 13:07:07 bde Exp $ + * $Id: sio.c,v 1.63 1995/01/05 00:00:37 ache Exp $ */ #include "sio.h" @@ -1243,7 +1243,7 @@ sioioctl(dev, cmd, data, flag, p) switch (cmd) { case TIOCSETA: error = suser(p->p_ucred, &p->p_acflag); - if (error) + if (error != 0) return (error); *ct = *(struct termios *)data; return (0); @@ -1368,12 +1368,12 @@ sioioctl(dev, cmd, data, flag, p) error = suser(p->p_ucred, &p->p_acflag); if (error != 0) { splx(s); - return (EPERM); + return (error); } - com->dtr_wait = *(int *)data * 100 / hz; + com->dtr_wait = *(int *)data * hz / 100; break; case TIOCMGDTRWAIT: - *(int *)data = com->dtr_wait; + *(int *)data = com->dtr_wait * 100 / hz; break; case TIOCTIMESTAMP: com->do_timestamp = TRUE; |