diff options
author | phk <phk@FreeBSD.org> | 2004-06-04 08:02:37 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2004-06-04 08:02:37 +0000 |
commit | 9bb2c2f2d29e403661d3a82df654de61b0356def (patch) | |
tree | 96f709f4adacd5078943626c84918a97005223bc /sys/pc98 | |
parent | 41a29cfd2f86e0a0e54ffc45a69c5bfd031f1e2d (diff) | |
download | FreeBSD-src-9bb2c2f2d29e403661d3a82df654de61b0356def.zip FreeBSD-src-9bb2c2f2d29e403661d3a82df654de61b0356def.tar.gz |
Make the remaining serial drivers call ttyioctl() rather than calling
the linedisc directly.
Diffstat (limited to 'sys/pc98')
-rw-r--r-- | sys/pc98/cbus/sio.c | 11 | ||||
-rw-r--r-- | sys/pc98/pc98/sio.c | 11 |
2 files changed, 6 insertions, 16 deletions
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index 68045ab..ba1a15f 100644 --- a/sys/pc98/cbus/sio.c +++ b/sys/pc98/cbus/sio.c @@ -3021,16 +3021,11 @@ sioioctl(dev, cmd, data, flag, td) if (lt->c_ospeed != 0) dt->c_ospeed = tp->t_ospeed; } - error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td); - if (error != ENOIOCTL) - return (error); - s = spltty(); - error = ttioctl(tp, cmd, data, flag); + error = ttyioctl(dev, cmd, data, flag, td); disc_optim(tp, &tp->t_termios, com); - if (error != ENOIOCTL) { - splx(s); + if (error != ENOTTY) return (error); - } + s = spltty(); #ifdef PC98 if (IS_8251(com->pc98_if_type)) { switch (cmd) { diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c index 68045ab..ba1a15f 100644 --- a/sys/pc98/pc98/sio.c +++ b/sys/pc98/pc98/sio.c @@ -3021,16 +3021,11 @@ sioioctl(dev, cmd, data, flag, td) if (lt->c_ospeed != 0) dt->c_ospeed = tp->t_ospeed; } - error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td); - if (error != ENOIOCTL) - return (error); - s = spltty(); - error = ttioctl(tp, cmd, data, flag); + error = ttyioctl(dev, cmd, data, flag, td); disc_optim(tp, &tp->t_termios, com); - if (error != ENOIOCTL) { - splx(s); + if (error != ENOTTY) return (error); - } + s = spltty(); #ifdef PC98 if (IS_8251(com->pc98_if_type)) { switch (cmd) { |