From 96ffa091d27c14bc838c55796e21209d13d92cf2 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Wed, 31 Dec 2003 18:16:34 +0000 Subject: [PATCH] Clean up includes including a style(9) fix and replace proc pointers with thread pointers to catch up to 5.x. PR: docs/60107 Submitted by: Lukas Ertl --- .../books/arch-handbook/pci/chapter.sgml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml index 45ed987384..3952c24c6b 100644 --- a/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml +++ b/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml @@ -25,18 +25,22 @@ #define MIN(a,b) (((a) < (b)) ? (a) : (b)) -#include <sys/types.h> +#include <sys/param.h> /* defines used in kernel.h */ #include <sys/module.h> #include <sys/systm.h> #include <sys/errno.h> -#include <sys/param.h> /* defines used in kernel.h */ #include <sys/kernel.h> /* types used in module initialization */ #include <sys/conf.h> /* cdevsw struct */ #include <sys/uio.h> /* uio struct */ #include <sys/malloc.h> #include <sys/bus.h> /* structs, prototypes for pci bus stuff */ -#include <pci/pcivar.h> /* For get_pci macros! */ +#include <machine/bus.h> +#include <sys/rman.h> +#include <machine/resource.h> + +#include <dev/pci/pcivar.h> /* For get_pci macros! */ +#include <dev/pci/pcireg.h> /* Function prototypes */ d_open_t mypci_open; @@ -61,7 +65,7 @@ static dev_t sdev; open/close/read/write at this point */ int -mypci_open(dev_t dev, int oflags, int devtype, struct proc *p) +mypci_open(dev_t dev, int oflags, int devtype, struct thread *td) { int err = 0; @@ -70,7 +74,7 @@ mypci_open(dev_t dev, int oflags, int devtype, struct proc *p) } int -mypci_close(dev_t dev, int fflag, int devtype, struct proc *p) +mypci_close(dev_t dev, int fflag, int devtype, struct thread *td) { int err=0;