diff options
| author | phk <phk@FreeBSD.org> | 2004-12-22 17:36:38 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-12-22 17:36:38 +0000 |
| commit | 66e2363925306e9d5b3b904b85128aaa32f9ba46 (patch) | |
| tree | a62c46a23bfd74d39f580eee2aa23246311e04cc /sys/dev/vkbd | |
| parent | 8deec74094d9f16f06160c6ded2adc92a583dee9 (diff) | |
| download | FreeBSD-src-66e2363925306e9d5b3b904b85128aaa32f9ba46.zip FreeBSD-src-66e2363925306e9d5b3b904b85128aaa32f9ba46.tar.gz | |
Include fcntl.h
Check O_NONBLOCK instead of IO_NDELAY.
Include selinfo.h instead of relying on vnode.h to do so.
Don't include vnode.h
Diffstat (limited to 'sys/dev/vkbd')
| -rw-r--r-- | sys/dev/vkbd/vkbd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/vkbd/vkbd.c b/sys/dev/vkbd/vkbd.c index d6ceb21..b5c0c71 100644 --- a/sys/dev/vkbd/vkbd.c +++ b/sys/dev/vkbd/vkbd.c @@ -33,6 +33,7 @@ #include <sys/param.h> #include <sys/conf.h> +#include <sys/fcntl.h> #include <sys/kbio.h> #include <sys/kernel.h> #include <sys/limits.h> @@ -43,10 +44,10 @@ #include <sys/poll.h> #include <sys/proc.h> #include <sys/queue.h> +#include <sys/selinfo.h> #include <sys/systm.h> #include <sys/taskqueue.h> #include <sys/uio.h> -#include <sys/vnode.h> #include <dev/kbd/kbdreg.h> #include <dev/kbd/kbdtables.h> #include <dev/vkbd/vkbd_var.h> @@ -307,7 +308,7 @@ again: error = uiomove(&status, sizeof(status), uio); } else { - if (flag & IO_NDELAY) { + if (flag & O_NONBLOCK) { error = EWOULDBLOCK; goto done; } @@ -369,7 +370,7 @@ vkbd_dev_write(struct cdev *dev, struct uio *uio, int flag) avail = q->head - q->tail; if (avail == 0) { - if (flag & IO_NDELAY) { + if (flag & O_NONBLOCK) { error = EWOULDBLOCK; break; } |
