fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2025-12-25 03:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move some header includes to drm_os_freebsd.h. This is in preparation for

Browse source 
some NetBSD work to be done soon. There shouldn't be too much extra
    header inclusion, and it'll clean up a lot of #ifdefs.
This commit is contained in:
Eric Anholt 2002-06-17 08:56:00 +00:00
parent 117d3d9a7e
commit 9c7a48f2ce
43 changed files with 42 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bsd-core/ati_pcigart.c
View file

@ -27,7 +27,6 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include "drmP.h"
#if PAGE_SIZE == 8192

6
bsd-core/drm_agpsupport.c
View file

@ -31,12 +31,6 @@
#include "drmP.h"
#include <vm/vm.h>
#include <vm/pmap.h>
#if __REALLY_HAVE_AGP
#include <sys/agpio.h>
#endif
int DRM(agp_info)(DRM_OS_IOCTL)
{
drm_device_t *dev = kdev->si_drv1;

1
bsd-core/drm_auth.c
View file

@ -29,7 +29,6 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include "drmP.h"
static int DRM(hash_magic)(drm_magic_t magic)

8
bsd-core/drm_bufs.c
View file

@ -29,14 +29,6 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include <machine/param.h>
#include <sys/mman.h>
#include <vm/vm.h>
#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <vm/vm_map.h>
#include <vm/vm_param.h>
#include "drmP.h"
#ifndef __HAVE_PCI_DMA

1
bsd-core/drm_context.c
View file

@ -29,7 +29,6 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include "drmP.h"
#if __HAVE_CTX_BITMAP

4
bsd-core/drm_dma.c
View file

@ -29,10 +29,6 @@
* Gareth Hughes <gareth@valinux.com>
*/
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
#include "drmP.h"
#ifndef __HAVE_DMA_WAITQUEUE

1
bsd-core/drm_drawable.c
View file

@ -29,7 +29,6 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include "drmP.h"
int DRM(adddraw)( DRM_OS_IOCTL )

8
bsd-core/drm_drv.c
View file

@ -116,15 +116,7 @@
#define DRIVER_IOCTLS
#endif
#ifndef DRIVER_FOPS
#if DRM_LINUX
#include <sys/file.h>
#include <sys/proc.h>
#include <machine/../linux/linux.h>
#include <machine/../linux/linux_proto.h>
#include "drm_linux.h"
#endif
#endif
/*
* The default number of instances (minor numbers) to initialize.

5
bsd-core/drm_fops.c
View file

@ -30,13 +30,8 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include "drmP.h"
#include <sys/signalvar.h>
#include <sys/poll.h>
drm_file_t *DRM(find_file_by_proc)(drm_device_t *dev, DRM_OS_STRUCTPROC *p)
{
#if __FreeBSD_version >= 500021

3
bsd-core/drm_ioctl.c
View file

@ -29,10 +29,7 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include "drmP.h"
#include <sys/bus.h>
#include <pci/pcivar.h>
int DRM(irq_busid)( DRM_OS_IOCTL )
{

1
bsd-core/drm_lock.c
View file

@ -29,7 +29,6 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include "drmP.h"
int DRM(block)( DRM_OS_IOCTL )

6
bsd-core/drm_memory.c
View file

@ -29,13 +29,7 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include "drmP.h"
#include <vm/vm.h>
#include <vm/pmap.h>
#if __REALLY_HAVE_AGP
#include <sys/agpio.h>
#endif
#define malloctype DRM(M_DRM)
/* The macros confliced in the MALLOC_DEFINE */

22
bsd-core/drm_os_freebsd.h
View file

@ -12,10 +12,21 @@
#include <sys/uio.h>
#include <sys/filio.h>
#include <sys/sysctl.h>
#include <sys/select.h>
#include <sys/bus.h>
#include <sys/signalvar.h>
#include <sys/poll.h>
#include <vm/vm.h>
#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <vm/vm_map.h>
#include <vm/vm_param.h>
#include <machine/param.h>
#include <machine/pmap.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/mman.h>
#include <sys/rman.h>
#include <pci/pcivar.h>
#if __FreeBSD_version >= 500000
#include <sys/selinfo.h>
#endif
@ -36,6 +47,7 @@
#if __REALLY_HAVE_AGP
#include <pci/agpvar.h>
#include <sys/agpio.h>
#endif
#include <opt_drm.h>
@ -45,6 +57,14 @@
#endif
#undef DRM_DEBUG
#if DRM_LINUX
#include <sys/file.h>
#include <sys/proc.h>
#include <machine/../linux/linux.h>
#include <machine/../linux/linux_proto.h>
#include "drm_linux.h"
#endif
#define DRM_TIME_SLICE (hz/20) /* Time slice for GLXContexts */
#define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)

2
bsd-core/drm_vm.c
View file

@ -1,5 +1,3 @@
#include <vm/vm.h>
#include <vm/pmap.h>
static int DRM(dma_mmap)(dev_t kdev, vm_offset_t offset, int prot)
{

2
bsd-core/mga_drv.c
View file

@ -31,8 +31,6 @@
#include <sys/types.h>
#include <sys/bus.h>
#include <pci/pcivar.h>
#include "mga.h"
#include "drmP.h"

2
bsd-core/r128_drv.c
View file

@ -31,8 +31,6 @@
#include <sys/types.h>
#include <sys/bus.h>
#include <pci/pcivar.h>
#include "r128.h"
#include "drmP.h"

2
bsd-core/radeon_drv.c
View file

@ -30,8 +30,6 @@
#include <sys/types.h>
#include <sys/bus.h>
#include <pci/pcivar.h>
#include "radeon.h"
#include "drmP.h"

2
bsd-core/tdfx_drv.c
View file

@ -32,8 +32,6 @@
#include <sys/types.h>
#include <sys/bus.h>
#include <pci/pcivar.h>
#include "tdfx.h"
#include "drmP.h"

1
bsd/ati_pcigart.h
View file

@ -27,7 +27,6 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include "drmP.h"
#if PAGE_SIZE == 8192

6
bsd/drm_agpsupport.h
View file

@ -31,12 +31,6 @@
#include "drmP.h"
#include <vm/vm.h>
#include <vm/pmap.h>
#if __REALLY_HAVE_AGP
#include <sys/agpio.h>
#endif
int DRM(agp_info)(DRM_OS_IOCTL)
{
drm_device_t *dev = kdev->si_drv1;

1
bsd/drm_auth.h
View file

@ -29,7 +29,6 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include "drmP.h"
static int DRM(hash_magic)(drm_magic_t magic)

8
bsd/drm_bufs.h
View file

@ -29,14 +29,6 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include <machine/param.h>
#include <sys/mman.h>
#include <vm/vm.h>
#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <vm/vm_map.h>
#include <vm/vm_param.h>
#include "drmP.h"
#ifndef __HAVE_PCI_DMA

1
bsd/drm_context.h
View file

@ -29,7 +29,6 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include "drmP.h"
#if __HAVE_CTX_BITMAP

4
bsd/drm_dma.h
View file

@ -29,10 +29,6 @@
* Gareth Hughes <gareth@valinux.com>
*/
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
#include "drmP.h"
#ifndef __HAVE_DMA_WAITQUEUE

1
bsd/drm_drawable.h
View file

@ -29,7 +29,6 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include "drmP.h"
int DRM(adddraw)( DRM_OS_IOCTL )

8
bsd/drm_drv.h
View file

@ -116,15 +116,7 @@
#define DRIVER_IOCTLS
#endif
#ifndef DRIVER_FOPS
#if DRM_LINUX
#include <sys/file.h>
#include <sys/proc.h>
#include <machine/../linux/linux.h>
#include <machine/../linux/linux_proto.h>
#include "drm_linux.h"
#endif
#endif
/*
* The default number of instances (minor numbers) to initialize.

5
bsd/drm_fops.h
View file

@ -30,13 +30,8 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include "drmP.h"
#include <sys/signalvar.h>
#include <sys/poll.h>
drm_file_t *DRM(find_file_by_proc)(drm_device_t *dev, DRM_OS_STRUCTPROC *p)
{
#if __FreeBSD_version >= 500021

1
bsd/drm_init.h
View file

@ -29,7 +29,6 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include "drmP.h"
#if 0 && DRM_DEBUG_CODE

3
bsd/drm_ioctl.h
View file

@ -29,10 +29,7 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include "drmP.h"
#include <sys/bus.h>
#include <pci/pcivar.h>
int DRM(irq_busid)( DRM_OS_IOCTL )
{

1
bsd/drm_lists.h
View file

@ -29,7 +29,6 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include "drmP.h"
#if __HAVE_DMA_WAITLIST

1
bsd/drm_lock.h
View file

@ -29,7 +29,6 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include "drmP.h"
int DRM(block)( DRM_OS_IOCTL )

6
bsd/drm_memory.h
View file

@ -29,13 +29,7 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include "drmP.h"
#include <vm/vm.h>
#include <vm/pmap.h>
#if __REALLY_HAVE_AGP
#include <sys/agpio.h>
#endif
#define malloctype DRM(M_DRM)
/* The macros confliced in the MALLOC_DEFINE */

22
bsd/drm_os_freebsd.h
View file

@ -12,10 +12,21 @@
#include <sys/uio.h>
#include <sys/filio.h>
#include <sys/sysctl.h>
#include <sys/select.h>
#include <sys/bus.h>
#include <sys/signalvar.h>
#include <sys/poll.h>
#include <vm/vm.h>
#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <vm/vm_map.h>
#include <vm/vm_param.h>
#include <machine/param.h>
#include <machine/pmap.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/mman.h>
#include <sys/rman.h>
#include <pci/pcivar.h>
#if __FreeBSD_version >= 500000
#include <sys/selinfo.h>
#endif
@ -36,6 +47,7 @@
#if __REALLY_HAVE_AGP
#include <pci/agpvar.h>
#include <sys/agpio.h>
#endif
#include <opt_drm.h>
@ -45,6 +57,14 @@
#endif
#undef DRM_DEBUG
#if DRM_LINUX
#include <sys/file.h>
#include <sys/proc.h>
#include <machine/../linux/linux.h>
#include <machine/../linux/linux_proto.h>
#include "drm_linux.h"
#endif
#define DRM_TIME_SLICE (hz/20) /* Time slice for GLXContexts */
#define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)

2
bsd/drm_vm.h
View file

@ -1,5 +1,3 @@
#include <vm/vm.h>
#include <vm/pmap.h>
static int DRM(dma_mmap)(dev_t kdev, vm_offset_t offset, int prot)
{

2
bsd/gamma_drv.c
View file

@ -30,8 +30,6 @@
*/
#include <sys/types.h>
#include <sys/bus.h>
#include <pci/pcivar.h>
#include "gamma.h"
#include "drmP.h"
#include "drm.h"

1
bsd/mga_dma.c
View file

@ -33,7 +33,6 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include "mga.h"
#include "drmP.h"
#include "drm.h"

2
bsd/mga_drv.c
View file

@ -31,8 +31,6 @@
#include <sys/types.h>
#include <sys/bus.h>
#include <pci/pcivar.h>
#include "mga.h"
#include "drmP.h"

1
bsd/mga_state.c
View file

@ -32,7 +32,6 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include "mga.h"
#include "drmP.h"
#include "drm.h"

1
bsd/r128_cce.c
View file

@ -28,7 +28,6 @@
* Gareth Hughes <gareth@valinux.com>
*/
#define __NO_VERSION__
#include "r128.h"
#include "drmP.h"
#include "drm.h"

2
bsd/r128_drv.c
View file

@ -31,8 +31,6 @@
#include <sys/types.h>
#include <sys/bus.h>
#include <pci/pcivar.h>
#include "r128.h"
#include "drmP.h"

3
bsd/radeon_cp.c
View file

@ -34,9 +34,6 @@
#include "radeon_drm.h"
#include "radeon_drv.h"
#include <vm/vm.h>
#include <vm/pmap.h>
#define RADEON_FIFO_DEBUG 0
#if defined(__alpha__)

2
bsd/radeon_drv.c
View file

@ -30,8 +30,6 @@
#include <sys/types.h>
#include <sys/bus.h>
#include <pci/pcivar.h>
#include "radeon.h"
#include "drmP.h"

2
bsd/tdfx_drv.c
View file

@ -32,8 +32,6 @@
#include <sys/types.h>
#include <sys/bus.h>
#include <pci/pcivar.h>
#include "tdfx.h"
#include "drmP.h"