diff options
author | John Baldwin <jhb@FreeBSD.org> | 2007-11-12 21:51:38 +0000 |
---|---|---|
committer | John Baldwin <jhb@FreeBSD.org> | 2007-11-12 21:51:38 +0000 |
commit | dbac8ff40032ae79e4a5dda8237f5dc1765420eb (patch) | |
tree | 59dd9aa4c8d8e187dd99419fa3cd65f9f4fa941a /sys/dev | |
parent | a4cc298ac968fd275219d04f2a6fef7b73594253 (diff) | |
download | src-dbac8ff40032ae79e4a5dda8237f5dc1765420eb.tar.gz src-dbac8ff40032ae79e4a5dda8237f5dc1765420eb.zip |
Move the agp(4) driver from sys/pci to sys/dev/agp. __FreeBSD_version was
bumped to 800004 to note the change though userland apps should not be
affected since they use <sys/agpio.h> rather than the headers in
sys/dev/agp.
Discussed with: anholt
Repocopy by: simon
Notes
Notes:
svn path=/head/; revision=173573
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/agp/agp.c | 6 | ||||
-rw-r--r-- | sys/dev/agp/agp_ali.c | 4 | ||||
-rw-r--r-- | sys/dev/agp/agp_amd.c | 4 | ||||
-rw-r--r-- | sys/dev/agp/agp_amd64.c | 4 | ||||
-rw-r--r-- | sys/dev/agp/agp_ati.c | 4 | ||||
-rw-r--r-- | sys/dev/agp/agp_i810.c | 4 | ||||
-rw-r--r-- | sys/dev/agp/agp_if.m | 4 | ||||
-rw-r--r-- | sys/dev/agp/agp_intel.c | 4 | ||||
-rw-r--r-- | sys/dev/agp/agp_nvidia.c | 4 | ||||
-rw-r--r-- | sys/dev/agp/agp_sis.c | 4 | ||||
-rw-r--r-- | sys/dev/agp/agp_via.c | 4 | ||||
-rw-r--r-- | sys/dev/agp/agppriv.h | 2 | ||||
-rw-r--r-- | sys/dev/agp/agpvar.h | 2 | ||||
-rw-r--r-- | sys/dev/drm/drmP.h | 4 | ||||
-rw-r--r-- | sys/dev/drm/drm_agpsupport.c | 4 |
15 files changed, 33 insertions, 25 deletions
diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c index ec0807a24cd3..baff9a56a076 100644 --- a/sys/dev/agp/agp.c +++ b/sys/dev/agp/agp.c @@ -42,11 +42,11 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/proc.h> +#include <dev/agp/agppriv.h> +#include <dev/agp/agpvar.h> +#include <dev/agp/agpreg.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> -#include <pci/agppriv.h> -#include <pci/agpvar.h> -#include <pci/agpreg.h> #include <vm/vm.h> #include <vm/vm_object.h> diff --git a/sys/dev/agp/agp_ali.c b/sys/dev/agp/agp_ali.c index 74bd2b1a4b17..f6ecd78f3261 100644 --- a/sys/dev/agp/agp_ali.c +++ b/sys/dev/agp/agp_ali.c @@ -39,10 +39,10 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/proc.h> +#include <dev/agp/agppriv.h> +#include <dev/agp/agpreg.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> -#include <pci/agppriv.h> -#include <pci/agpreg.h> #include <vm/vm.h> #include <vm/vm_object.h> diff --git a/sys/dev/agp/agp_amd.c b/sys/dev/agp/agp_amd.c index 7c3bd0d4b1b0..e0cb6799963d 100644 --- a/sys/dev/agp/agp_amd.c +++ b/sys/dev/agp/agp_amd.c @@ -39,10 +39,10 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/proc.h> +#include <dev/agp/agppriv.h> +#include <dev/agp/agpreg.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> -#include <pci/agppriv.h> -#include <pci/agpreg.h> #include <vm/vm.h> #include <vm/vm_object.h> diff --git a/sys/dev/agp/agp_amd64.c b/sys/dev/agp/agp_amd64.c index 7c1a25d75886..3269d5f16665 100644 --- a/sys/dev/agp/agp_amd64.c +++ b/sys/dev/agp/agp_amd64.c @@ -39,10 +39,10 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/proc.h> +#include <dev/agp/agppriv.h> +#include <dev/agp/agpreg.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> -#include <pci/agppriv.h> -#include <pci/agpreg.h> #include <vm/vm.h> #include <vm/vm_object.h> diff --git a/sys/dev/agp/agp_ati.c b/sys/dev/agp/agp_ati.c index 6bc60197aed8..05022f29361a 100644 --- a/sys/dev/agp/agp_ati.c +++ b/sys/dev/agp/agp_ati.c @@ -41,10 +41,10 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/proc.h> +#include <dev/agp/agppriv.h> +#include <dev/agp/agpreg.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> -#include <pci/agppriv.h> -#include <pci/agpreg.h> #include <vm/vm.h> #include <vm/vm_object.h> diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c index 9e081be480b2..db98d8061956 100644 --- a/sys/dev/agp/agp_i810.c +++ b/sys/dev/agp/agp_i810.c @@ -45,10 +45,10 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/proc.h> +#include <dev/agp/agppriv.h> +#include <dev/agp/agpreg.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> -#include <pci/agppriv.h> -#include <pci/agpreg.h> #include <vm/vm.h> #include <vm/vm_object.h> diff --git a/sys/dev/agp/agp_if.m b/sys/dev/agp/agp_if.m index faf7b1ab8fdf..da2e19a80ceb 100644 --- a/sys/dev/agp/agp_if.m +++ b/sys/dev/agp/agp_if.m @@ -32,7 +32,7 @@ # The AGP interface is used internally to the agp driver to isolate the # differences between various AGP chipsets into chipset mini drivers. It # should not be used outside the AGP driver. The kernel api for accessing -# AGP functionality is described in <pci/agpvar.h> +# AGP functionality is described in <dev/agp/agpvar.h> # INTERFACE agp; @@ -80,7 +80,7 @@ METHOD void flush_tlb { # # Enable the agp hardware with the relavent mode. The mode bits are -# defined in <pci/agpreg.h> +# defined in <dev/agp/agpreg.h> # METHOD int enable { device_t dev; diff --git a/sys/dev/agp/agp_intel.c b/sys/dev/agp/agp_intel.c index 60e0e6f8ad68..3e457ab17c28 100644 --- a/sys/dev/agp/agp_intel.c +++ b/sys/dev/agp/agp_intel.c @@ -39,10 +39,10 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/proc.h> +#include <dev/agp/agppriv.h> +#include <dev/agp/agpreg.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> -#include <pci/agppriv.h> -#include <pci/agpreg.h> #include <vm/vm.h> #include <vm/vm_object.h> diff --git a/sys/dev/agp/agp_nvidia.c b/sys/dev/agp/agp_nvidia.c index 8e2d243425c6..72cd4b883ea0 100644 --- a/sys/dev/agp/agp_nvidia.c +++ b/sys/dev/agp/agp_nvidia.c @@ -51,10 +51,10 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #endif +#include <dev/agp/agppriv.h> +#include <dev/agp/agpreg.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> -#include <pci/agppriv.h> -#include <pci/agpreg.h> #include <vm/vm.h> #include <vm/vm_object.h> diff --git a/sys/dev/agp/agp_sis.c b/sys/dev/agp/agp_sis.c index a51514aba561..f85fa116ab23 100644 --- a/sys/dev/agp/agp_sis.c +++ b/sys/dev/agp/agp_sis.c @@ -39,10 +39,10 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/proc.h> +#include <dev/agp/agppriv.h> +#include <dev/agp/agpreg.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> -#include <pci/agppriv.h> -#include <pci/agpreg.h> #include <vm/vm.h> #include <vm/vm_object.h> diff --git a/sys/dev/agp/agp_via.c b/sys/dev/agp/agp_via.c index d60f49aef64c..9b8bbc8b019b 100644 --- a/sys/dev/agp/agp_via.c +++ b/sys/dev/agp/agp_via.c @@ -39,10 +39,10 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/proc.h> +#include <dev/agp/agppriv.h> +#include <dev/agp/agpreg.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> -#include <pci/agppriv.h> -#include <pci/agpreg.h> #include <vm/vm.h> #include <vm/vm_object.h> diff --git a/sys/dev/agp/agppriv.h b/sys/dev/agp/agppriv.h index b4c90a053f73..32ec78aff7a8 100644 --- a/sys/dev/agp/agppriv.h +++ b/sys/dev/agp/agppriv.h @@ -34,7 +34,7 @@ */ #include <sys/agpio.h> -#include <pci/agpvar.h> +#include <dev/agp/agpvar.h> #define AGP_DEBUGxx diff --git a/sys/dev/agp/agpvar.h b/sys/dev/agp/agpvar.h index df3112b49d29..52d40ef2527a 100644 --- a/sys/dev/agp/agpvar.h +++ b/sys/dev/agp/agpvar.h @@ -87,7 +87,7 @@ int agp_release(device_t dev); /* * Enable the agp hardware with the relavent mode. The mode bits are - * defined in <pci/agpreg.h> + * defined in <dev/agp/agpreg.h> */ int agp_enable(device_t dev, u_int32_t mode); diff --git a/sys/dev/drm/drmP.h b/sys/dev/drm/drmP.h index 8e2855ad6a79..44c01301e0ca 100644 --- a/sys/dev/drm/drmP.h +++ b/sys/dev/drm/drmP.h @@ -77,7 +77,11 @@ typedef struct drm_file drm_file_t; #if defined(__FreeBSD__) #include <sys/rman.h> #include <sys/memrange.h> +#if __FreeBSD_version >= 800004 +#include <dev/agp/agpvar.h> +#else #include <pci/agpvar.h> +#endif #include <sys/agpio.h> #if __FreeBSD_version >= 500000 #include <sys/mutex.h> diff --git a/sys/dev/drm/drm_agpsupport.c b/sys/dev/drm/drm_agpsupport.c index 3d657da18ab9..104f6b699368 100644 --- a/sys/dev/drm/drm_agpsupport.c +++ b/sys/dev/drm/drm_agpsupport.c @@ -37,7 +37,11 @@ __FBSDID("$FreeBSD$"); #include "dev/drm/drmP.h" #ifdef __FreeBSD__ +#if __FreeBSD_version >= 800004 +#include <dev/agp/agpreg.h> +#else #include <pci/agpreg.h> +#endif #include <dev/pci/pcireg.h> #endif |