summaryrefslogtreecommitdiffstats
path: root/sys/isa
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1995-01-06 15:03:41 +0000
committerbde <bde@FreeBSD.org>1995-01-06 15:03:41 +0000
commitf3185e4419e9c16dc85a4d39abaf556fcce86363 (patch)
treea140bb59f74a9d7024bd3a6d9545c1da9a1d651a /sys/isa
parent4d6f94937681365459f11d9f7bc8312d409eb974 (diff)
downloadFreeBSD-src-f3185e4419e9c16dc85a4d39abaf556fcce86363.zip
FreeBSD-src-f3185e4419e9c16dc85a4d39abaf556fcce86363.tar.gz
Fix scaling for TIOCM[SG]DTRWAIT to work when hz != 100.
Bruce
Diffstat (limited to 'sys/isa')
-rw-r--r--sys/isa/sio.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index 638ef70..853c773 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;
OpenPOWER on IntegriCloud