d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include fcntl.h

Browse Source 
Check O_NONBLOCK instead of IO_NDELAY.
Include selinfo.h instead of relying on vnode.h to do so.
Don't include vnode.h
This commit is contained in:
Poul-Henning Kamp 2004-12-22 17:36:38 +00:00
parent 4114357bf9
commit 559ea98d34
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/vkbd/vkbd.c
View File

@ -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 @@ vkbd_dev_read(struct cdev *dev, struct uio *uio, int flag)
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;
}