diff options
author | phk <phk@FreeBSD.org> | 2004-06-01 13:49:28 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2004-06-01 13:49:28 +0000 |
commit | 83ae77becd632897687db152538a6e5bb5e92eb1 (patch) | |
tree | 219773bb1bc353479f3267950d51f81b41bdfdb2 /sys/dev/syscons | |
parent | 3521579704b6a092199dccaeecd4b1561e5ca508 (diff) | |
download | FreeBSD-src-83ae77becd632897687db152538a6e5bb5e92eb1.zip FreeBSD-src-83ae77becd632897687db152538a6e5bb5e92eb1.tar.gz |
Gainfully employ the new ttyioctl in the trivial cases.
Diffstat (limited to 'sys/dev/syscons')
-rw-r--r-- | sys/dev/syscons/syscons.c | 8 | ||||
-rw-r--r-- | sys/dev/syscons/sysmouse.c | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 7a81f3f..eb685cf 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -1344,13 +1344,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td) break; } - error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td); - if (error != ENOIOCTL) - return(error); - error = ttioctl(tp, cmd, data, flag); - if (error != ENOIOCTL) - return(error); - return(ENOTTY); + return (ttyioctl(dev, cmd, data, flag, td)); } static void diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c index 7aa72cf..af36098 100644 --- a/sys/dev/syscons/sysmouse.c +++ b/sys/dev/syscons/sysmouse.c @@ -233,13 +233,7 @@ smioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td) return ENODEV; } - error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td); - if (error != ENOIOCTL) - return error; - error = ttioctl(tp, cmd, data, flag); - if (error != ENOIOCTL) - return error; - return ENOTTY; + return(ttyioctl(dev, cmd, data, flag, td)); } static void |