diff options
| author | imp <imp@FreeBSD.org> | 2005-01-08 22:43:33 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2005-01-08 22:43:33 +0000 |
| commit | 314a0d938672ff094966c2d5f93a2f8bffc8df94 (patch) | |
| tree | c090f5a0028541a27a64686192f083f263ad1252 /sys/dev/bktr | |
| parent | c967543ab74c4355d62eea1cc81ee7b35a25e8d6 (diff) | |
| download | FreeBSD-src-314a0d938672ff094966c2d5f93a2f8bffc8df94.zip FreeBSD-src-314a0d938672ff094966c2d5f93a2f8bffc8df94.tar.gz | |
Remove vnode.h and adjust includes to compensate for pollution.
Diffstat (limited to 'sys/dev/bktr')
| -rw-r--r-- | sys/dev/bktr/bktr_audio.c | 4 | ||||
| -rw-r--r-- | sys/dev/bktr/bktr_card.c | 4 | ||||
| -rw-r--r-- | sys/dev/bktr/bktr_core.c | 6 | ||||
| -rw-r--r-- | sys/dev/bktr/bktr_os.c | 1 | ||||
| -rw-r--r-- | sys/dev/bktr/bktr_tuner.c | 4 |
5 files changed, 13 insertions, 6 deletions
diff --git a/sys/dev/bktr/bktr_audio.c b/sys/dev/bktr/bktr_audio.c index 68bf40b..234b37a 100644 --- a/sys/dev/bktr/bktr_audio.c +++ b/sys/dev/bktr/bktr_audio.c @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/vnode.h> #ifdef __FreeBSD__ @@ -61,6 +60,9 @@ __FBSDID("$FreeBSD$"); #include <machine/clock.h> /* for DELAY */ #include <pci/pcivar.h> #else +#include <sys/lock.h> +#include <sys/mutex.h> +#include <sys/selinfo.h> #include <dev/pci/pcivar.h> #endif diff --git a/sys/dev/bktr/bktr_card.c b/sys/dev/bktr/bktr_card.c index c923aea..f991e3a 100644 --- a/sys/dev/bktr/bktr_card.c +++ b/sys/dev/bktr/bktr_card.c @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/vnode.h> #ifdef __FreeBSD__ @@ -59,6 +58,9 @@ __FBSDID("$FreeBSD$"); #include <machine/clock.h> /* for DELAY */ #include <pci/pcivar.h> #else +#include <sys/lock.h> +#include <sys/mutex.h> +#include <sys/selinfo.h> #include <dev/pci/pcivar.h> #endif diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c index d8b381f..276d225 100644 --- a/sys/dev/bktr/bktr_core.c +++ b/sys/dev/bktr/bktr_core.c @@ -107,11 +107,13 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> +#include <sys/fcntl.h> #include <sys/lock.h> #include <sys/mutex.h> #include <sys/proc.h> #include <sys/signalvar.h> -#include <sys/vnode.h> +#include <sys/selinfo.h> +#include <sys/uio.h> #include <vm/vm.h> #include <vm/vm_kern.h> @@ -1258,7 +1260,7 @@ vbi_read(bktr_ptr_t bktr, struct uio *uio, int ioflag) LOCK_VBI(bktr); while(bktr->vbisize == 0) { - if (ioflag & IO_NDELAY) { + if (ioflag & FNDELAY) { status = EWOULDBLOCK; goto out; } diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c index 87d4ed9..5dfcd01 100644 --- a/sys/dev/bktr/bktr_os.c +++ b/sys/dev/bktr/bktr_os.c @@ -72,7 +72,6 @@ __FBSDID("$FreeBSD$"); #else #include <sys/select.h> #endif -#include <sys/vnode.h> #include <vm/vm.h> #include <vm/vm_kern.h> diff --git a/sys/dev/bktr/bktr_tuner.c b/sys/dev/bktr/bktr_tuner.c index 424643f..8b92828 100644 --- a/sys/dev/bktr/bktr_tuner.c +++ b/sys/dev/bktr/bktr_tuner.c @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/vnode.h> #ifdef __NetBSD__ #include <sys/proc.h> #endif @@ -56,6 +55,9 @@ __FBSDID("$FreeBSD$"); #include <machine/clock.h> /* for DELAY */ #include <pci/pcivar.h> #else +#include <sys/lock.h> +#include <sys/mutex.h> +#include <sys/selinfo.h> #include <dev/pci/pcivar.h> #endif |
