1
0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-31 16:57:10 +00:00

Fix scaling for TIOCM[SG]DTRWAIT to work when hz != 100.

Bruce
This commit is contained in:
Bruce Evans 1995-01-06 15:03:41 +00:00
parent 4c5e4b09a7
commit 123bcf5fda
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=5416
3 changed files with 15 additions and 15 deletions

View File

@ -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;

View File

@ -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;

View File

@ -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;