more compile fixes

This commit is contained in:
Alan Hourihane 2001-04-26 10:15:26 +00:00
parent 144f517d31
commit 2020bf40f2
2 changed files with 108 additions and 90 deletions

View file

@ -172,7 +172,7 @@
} while(0)
#ifdef __linux__
typedef int drm_ioctl_t( DRM_OS_IOCTL )
typedef int drm_ioctl_t( DRM_OS_IOCTL );
#endif
typedef struct drm_ioctl_desc {
@ -554,16 +554,25 @@ extern void DRM(parse_options)( char *s );
extern int DRM(cpu_valid)( void );
/* Driver support (drm_drv.h) */
extern int DRM(version)( DRM_OS_IOCTL )
extern int DRM(version)( DRM_OS_IOCTL );
#ifdef __linux__
extern int DRM(open)(struct inode *inode, struct file *filp);
extern int DRM(release)(struct inode *inode, struct file *filp);
extern int DRM(ioctl)( DRM_OS_IOCTL )
extern int DRM(lock)( DRM_OS_IOCTL )
extern int DRM(unlock)( DRM_OS_IOCTL )
#endif
extern int DRM(ioctl)( DRM_OS_IOCTL );
extern int DRM(lock)( DRM_OS_IOCTL );
extern int DRM(unlock)( DRM_OS_IOCTL );
/* Device support (drm_fops.h) */
#ifdef __linux__
extern int DRM(open_helper)(struct inode *inode, struct file *filp,
drm_device_t *dev);
#endif
#ifdef __FreeBSD__
extern drm_file_t *DRM(find_file_by_proc)(drm_device_t *dev, struct proc *p);
extern int DRM(open_helper)(dev_t kdev, int flags, int fmt, struct proc *p,
#endif
extern int DRM(flush)(struct file *filp);
extern int DRM(release_fuck)(struct inode *inode, struct file *filp);
extern int DRM(fasync)(int fd, struct file *filp, int on);
@ -633,21 +642,21 @@ extern int DRM(unbind_agp)(agp_memory *handle);
#endif
/* Misc. IOCTL support (drm_ioctl.h) */
extern int DRM(irq_busid)( DRM_OS_IOCTL )
extern int DRM(getunique)( DRM_OS_IOCTL )
extern int DRM(setunique)( DRM_OS_IOCTL )
extern int DRM(getmap)( DRM_OS_IOCTL )
extern int DRM(getclient)( DRM_OS_IOCTL )
extern int DRM(getstats)( DRM_OS_IOCTL )
extern int DRM(irq_busid)( DRM_OS_IOCTL );
extern int DRM(getunique)( DRM_OS_IOCTL );
extern int DRM(setunique)( DRM_OS_IOCTL );
extern int DRM(getmap)( DRM_OS_IOCTL );
extern int DRM(getclient)( DRM_OS_IOCTL );
extern int DRM(getstats)( DRM_OS_IOCTL );
/* Context IOCTL support (drm_context.h) */
extern int DRM(resctx)( DRM_OS_IOCTL )
extern int DRM(addctx)( DRM_OS_IOCTL )
extern int DRM(modctx)( DRM_OS_IOCTL )
extern int DRM(getctx)( DRM_OS_IOCTL )
extern int DRM(switchctx)( DRM_OS_IOCTL )
extern int DRM(newctx)( DRM_OS_IOCTL )
extern int DRM(rmctx)( DRM_OS_IOCTL )
extern int DRM(resctx)( DRM_OS_IOCTL );
extern int DRM(addctx)( DRM_OS_IOCTL );
extern int DRM(modctx)( DRM_OS_IOCTL );
extern int DRM(getctx)( DRM_OS_IOCTL );
extern int DRM(switchctx)( DRM_OS_IOCTL );
extern int DRM(newctx)( DRM_OS_IOCTL );
extern int DRM(rmctx)( DRM_OS_IOCTL );
extern int DRM(context_switch)(drm_device_t *dev, int old, int new);
extern int DRM(context_switch_complete)(drm_device_t *dev, int new);
@ -657,23 +666,23 @@ extern int DRM(ctxbitmap_init)( drm_device_t *dev );
extern void DRM(ctxbitmap_cleanup)( drm_device_t *dev );
#endif
extern int DRM(setsareactx)( DRM_OS_IOCTL )
extern int DRM(getsareactx)( DRM_OS_IOCTL )
extern int DRM(setsareactx)( DRM_OS_IOCTL );
extern int DRM(getsareactx)( DRM_OS_IOCTL );
/* Drawable IOCTL support (drm_drawable.h) */
extern int DRM(adddraw)( DRM_OS_IOCTL )
extern int DRM(rmdraw)( DRM_OS_IOCTL )
extern int DRM(adddraw)( DRM_OS_IOCTL );
extern int DRM(rmdraw)( DRM_OS_IOCTL );
/* Authentication IOCTL support (drm_auth.h) */
extern int DRM(add_magic)(drm_device_t *dev, drm_file_t *priv,
drm_magic_t magic);
extern int DRM(remove_magic)(drm_device_t *dev, drm_magic_t magic);
extern int DRM(getmagic)( DRM_OS_IOCTL )
extern int DRM(authmagic)( DRM_OS_IOCTL )
extern int DRM(getmagic)( DRM_OS_IOCTL );
extern int DRM(authmagic)( DRM_OS_IOCTL );
/* Locking IOCTL support (drm_lock.h) */
extern int DRM(block)( DRM_OS_IOCTL )
extern int DRM(unblock)( DRM_OS_IOCTL )
extern int DRM(block)( DRM_OS_IOCTL );
extern int DRM(unblock)( DRM_OS_IOCTL );
extern int DRM(lock_take)(__volatile__ unsigned int *lock,
unsigned int context);
extern int DRM(lock_transfer)(drm_device_t *dev,
@ -682,7 +691,7 @@ extern int DRM(lock_transfer)(drm_device_t *dev,
extern int DRM(lock_free)(drm_device_t *dev,
__volatile__ unsigned int *lock,
unsigned int context);
extern int DRM(finish)( DRM_OS_IOCTL )
extern int DRM(finish)( DRM_OS_IOCTL );
extern int DRM(flush_unblock)(drm_device_t *dev, int context,
drm_lock_flags_t flags);
extern int DRM(flush_block_and_flush)(drm_device_t *dev, int context,
@ -691,14 +700,14 @@ extern int DRM(notifier)(void *priv);
/* Buffer management support (drm_bufs.h) */
extern int DRM(order)( unsigned long size );
extern int DRM(addmap)( DRM_OS_IOCTL )
extern int DRM(rmmap)( DRM_OS_IOCTL )
extern int DRM(addmap)( DRM_OS_IOCTL );
extern int DRM(rmmap)( DRM_OS_IOCTL );
#if __HAVE_DMA
extern int DRM(addbufs)( DRM_OS_IOCTL )
extern int DRM(infobufs)( DRM_OS_IOCTL )
extern int DRM(markbufs)( DRM_OS_IOCTL )
extern int DRM(freebufs)( DRM_OS_IOCTL )
extern int DRM(mapbufs)( DRM_OS_IOCTL )
extern int DRM(addbufs)( DRM_OS_IOCTL );
extern int DRM(infobufs)( DRM_OS_IOCTL );
extern int DRM(markbufs)( DRM_OS_IOCTL );
extern int DRM(freebufs)( DRM_OS_IOCTL );
extern int DRM(mapbufs)( DRM_OS_IOCTL );
/* DMA support (drm_dma.h) */
extern int DRM(dma_setup)(drm_device_t *dev);
@ -715,7 +724,7 @@ extern int DRM(dma_enqueue)(drm_device_t *dev, drm_dma_t *dma);
extern int DRM(dma_get_buffers)(drm_device_t *dev, drm_dma_t *dma);
#endif
#if __HAVE_DMA_IRQ
extern int DRM(control)( DRM_OS_IOCTL )
extern int DRM(control)( DRM_OS_IOCTL );
extern int DRM(irq_install)( drm_device_t *dev, int irq );
extern int DRM(irq_uninstall)( drm_device_t *dev );
extern void DRM(dma_service)( int irq, void *device,
@ -749,15 +758,15 @@ extern drm_buf_t *DRM(freelist_get)(drm_freelist_t *bl, int block);
/* AGP/GART support (drm_agpsupport.h) */
extern drm_agp_head_t *DRM(agp_init)(void);
extern void DRM(agp_uninit)(void);
extern int DRM(agp_acquire)( DRM_OS_IOCTL )
extern int DRM(agp_acquire)( DRM_OS_IOCTL );
extern void DRM(agp_do_release)(void);
extern int DRM(agp_release)( DRM_OS_IOCTL )
extern int DRM(agp_enable)( DRM_OS_IOCTL )
extern int DRM(agp_info)( DRM_OS_IOCTL )
extern int DRM(agp_alloc)( DRM_OS_IOCTL )
extern int DRM(agp_free)( DRM_OS_IOCTL )
extern int DRM(agp_unbind)( DRM_OS_IOCTL )
extern int DRM(agp_bind)( DRM_OS_IOCTL )
extern int DRM(agp_release)( DRM_OS_IOCTL );
extern int DRM(agp_enable)( DRM_OS_IOCTL );
extern int DRM(agp_info)( DRM_OS_IOCTL );
extern int DRM(agp_alloc)( DRM_OS_IOCTL );
extern int DRM(agp_free)( DRM_OS_IOCTL );
extern int DRM(agp_unbind)( DRM_OS_IOCTL );
extern int DRM(agp_bind)( DRM_OS_IOCTL );
extern agp_memory *DRM(agp_allocate_memory)(size_t pages, u32 type);
extern int DRM(agp_free_memory)(agp_memory *handle);
extern int DRM(agp_bind_memory)(agp_memory *handle, off_t start);
@ -782,8 +791,8 @@ extern int DRM(proc_cleanup)(int minor,
#if __HAVE_SG
/* Scatter Gather Support (drm_scatter.h) */
extern void DRM(sg_cleanup)(drm_sg_mem_t *entry);
extern int DRM(sg_alloc)( DRM_OS_IOCTL )
extern int DRM(sg_free)( DRM_OS_IOCTL )
extern int DRM(sg_alloc)( DRM_OS_IOCTL );
extern int DRM(sg_free)( DRM_OS_IOCTL );
#endif
/* ATI PCIGART support (ati_pcigart.h) */

View file

@ -172,7 +172,7 @@
} while(0)
#ifdef __linux__
typedef int drm_ioctl_t( DRM_OS_IOCTL )
typedef int drm_ioctl_t( DRM_OS_IOCTL );
#endif
typedef struct drm_ioctl_desc {
@ -554,16 +554,25 @@ extern void DRM(parse_options)( char *s );
extern int DRM(cpu_valid)( void );
/* Driver support (drm_drv.h) */
extern int DRM(version)( DRM_OS_IOCTL )
extern int DRM(version)( DRM_OS_IOCTL );
#ifdef __linux__
extern int DRM(open)(struct inode *inode, struct file *filp);
extern int DRM(release)(struct inode *inode, struct file *filp);
extern int DRM(ioctl)( DRM_OS_IOCTL )
extern int DRM(lock)( DRM_OS_IOCTL )
extern int DRM(unlock)( DRM_OS_IOCTL )
#endif
extern int DRM(ioctl)( DRM_OS_IOCTL );
extern int DRM(lock)( DRM_OS_IOCTL );
extern int DRM(unlock)( DRM_OS_IOCTL );
/* Device support (drm_fops.h) */
#ifdef __linux__
extern int DRM(open_helper)(struct inode *inode, struct file *filp,
drm_device_t *dev);
#endif
#ifdef __FreeBSD__
extern drm_file_t *DRM(find_file_by_proc)(drm_device_t *dev, struct proc *p);
extern int DRM(open_helper)(dev_t kdev, int flags, int fmt, struct proc *p,
#endif
extern int DRM(flush)(struct file *filp);
extern int DRM(release_fuck)(struct inode *inode, struct file *filp);
extern int DRM(fasync)(int fd, struct file *filp, int on);
@ -633,21 +642,21 @@ extern int DRM(unbind_agp)(agp_memory *handle);
#endif
/* Misc. IOCTL support (drm_ioctl.h) */
extern int DRM(irq_busid)( DRM_OS_IOCTL )
extern int DRM(getunique)( DRM_OS_IOCTL )
extern int DRM(setunique)( DRM_OS_IOCTL )
extern int DRM(getmap)( DRM_OS_IOCTL )
extern int DRM(getclient)( DRM_OS_IOCTL )
extern int DRM(getstats)( DRM_OS_IOCTL )
extern int DRM(irq_busid)( DRM_OS_IOCTL );
extern int DRM(getunique)( DRM_OS_IOCTL );
extern int DRM(setunique)( DRM_OS_IOCTL );
extern int DRM(getmap)( DRM_OS_IOCTL );
extern int DRM(getclient)( DRM_OS_IOCTL );
extern int DRM(getstats)( DRM_OS_IOCTL );
/* Context IOCTL support (drm_context.h) */
extern int DRM(resctx)( DRM_OS_IOCTL )
extern int DRM(addctx)( DRM_OS_IOCTL )
extern int DRM(modctx)( DRM_OS_IOCTL )
extern int DRM(getctx)( DRM_OS_IOCTL )
extern int DRM(switchctx)( DRM_OS_IOCTL )
extern int DRM(newctx)( DRM_OS_IOCTL )
extern int DRM(rmctx)( DRM_OS_IOCTL )
extern int DRM(resctx)( DRM_OS_IOCTL );
extern int DRM(addctx)( DRM_OS_IOCTL );
extern int DRM(modctx)( DRM_OS_IOCTL );
extern int DRM(getctx)( DRM_OS_IOCTL );
extern int DRM(switchctx)( DRM_OS_IOCTL );
extern int DRM(newctx)( DRM_OS_IOCTL );
extern int DRM(rmctx)( DRM_OS_IOCTL );
extern int DRM(context_switch)(drm_device_t *dev, int old, int new);
extern int DRM(context_switch_complete)(drm_device_t *dev, int new);
@ -657,23 +666,23 @@ extern int DRM(ctxbitmap_init)( drm_device_t *dev );
extern void DRM(ctxbitmap_cleanup)( drm_device_t *dev );
#endif
extern int DRM(setsareactx)( DRM_OS_IOCTL )
extern int DRM(getsareactx)( DRM_OS_IOCTL )
extern int DRM(setsareactx)( DRM_OS_IOCTL );
extern int DRM(getsareactx)( DRM_OS_IOCTL );
/* Drawable IOCTL support (drm_drawable.h) */
extern int DRM(adddraw)( DRM_OS_IOCTL )
extern int DRM(rmdraw)( DRM_OS_IOCTL )
extern int DRM(adddraw)( DRM_OS_IOCTL );
extern int DRM(rmdraw)( DRM_OS_IOCTL );
/* Authentication IOCTL support (drm_auth.h) */
extern int DRM(add_magic)(drm_device_t *dev, drm_file_t *priv,
drm_magic_t magic);
extern int DRM(remove_magic)(drm_device_t *dev, drm_magic_t magic);
extern int DRM(getmagic)( DRM_OS_IOCTL )
extern int DRM(authmagic)( DRM_OS_IOCTL )
extern int DRM(getmagic)( DRM_OS_IOCTL );
extern int DRM(authmagic)( DRM_OS_IOCTL );
/* Locking IOCTL support (drm_lock.h) */
extern int DRM(block)( DRM_OS_IOCTL )
extern int DRM(unblock)( DRM_OS_IOCTL )
extern int DRM(block)( DRM_OS_IOCTL );
extern int DRM(unblock)( DRM_OS_IOCTL );
extern int DRM(lock_take)(__volatile__ unsigned int *lock,
unsigned int context);
extern int DRM(lock_transfer)(drm_device_t *dev,
@ -682,7 +691,7 @@ extern int DRM(lock_transfer)(drm_device_t *dev,
extern int DRM(lock_free)(drm_device_t *dev,
__volatile__ unsigned int *lock,
unsigned int context);
extern int DRM(finish)( DRM_OS_IOCTL )
extern int DRM(finish)( DRM_OS_IOCTL );
extern int DRM(flush_unblock)(drm_device_t *dev, int context,
drm_lock_flags_t flags);
extern int DRM(flush_block_and_flush)(drm_device_t *dev, int context,
@ -691,14 +700,14 @@ extern int DRM(notifier)(void *priv);
/* Buffer management support (drm_bufs.h) */
extern int DRM(order)( unsigned long size );
extern int DRM(addmap)( DRM_OS_IOCTL )
extern int DRM(rmmap)( DRM_OS_IOCTL )
extern int DRM(addmap)( DRM_OS_IOCTL );
extern int DRM(rmmap)( DRM_OS_IOCTL );
#if __HAVE_DMA
extern int DRM(addbufs)( DRM_OS_IOCTL )
extern int DRM(infobufs)( DRM_OS_IOCTL )
extern int DRM(markbufs)( DRM_OS_IOCTL )
extern int DRM(freebufs)( DRM_OS_IOCTL )
extern int DRM(mapbufs)( DRM_OS_IOCTL )
extern int DRM(addbufs)( DRM_OS_IOCTL );
extern int DRM(infobufs)( DRM_OS_IOCTL );
extern int DRM(markbufs)( DRM_OS_IOCTL );
extern int DRM(freebufs)( DRM_OS_IOCTL );
extern int DRM(mapbufs)( DRM_OS_IOCTL );
/* DMA support (drm_dma.h) */
extern int DRM(dma_setup)(drm_device_t *dev);
@ -715,7 +724,7 @@ extern int DRM(dma_enqueue)(drm_device_t *dev, drm_dma_t *dma);
extern int DRM(dma_get_buffers)(drm_device_t *dev, drm_dma_t *dma);
#endif
#if __HAVE_DMA_IRQ
extern int DRM(control)( DRM_OS_IOCTL )
extern int DRM(control)( DRM_OS_IOCTL );
extern int DRM(irq_install)( drm_device_t *dev, int irq );
extern int DRM(irq_uninstall)( drm_device_t *dev );
extern void DRM(dma_service)( int irq, void *device,
@ -749,15 +758,15 @@ extern drm_buf_t *DRM(freelist_get)(drm_freelist_t *bl, int block);
/* AGP/GART support (drm_agpsupport.h) */
extern drm_agp_head_t *DRM(agp_init)(void);
extern void DRM(agp_uninit)(void);
extern int DRM(agp_acquire)( DRM_OS_IOCTL )
extern int DRM(agp_acquire)( DRM_OS_IOCTL );
extern void DRM(agp_do_release)(void);
extern int DRM(agp_release)( DRM_OS_IOCTL )
extern int DRM(agp_enable)( DRM_OS_IOCTL )
extern int DRM(agp_info)( DRM_OS_IOCTL )
extern int DRM(agp_alloc)( DRM_OS_IOCTL )
extern int DRM(agp_free)( DRM_OS_IOCTL )
extern int DRM(agp_unbind)( DRM_OS_IOCTL )
extern int DRM(agp_bind)( DRM_OS_IOCTL )
extern int DRM(agp_release)( DRM_OS_IOCTL );
extern int DRM(agp_enable)( DRM_OS_IOCTL );
extern int DRM(agp_info)( DRM_OS_IOCTL );
extern int DRM(agp_alloc)( DRM_OS_IOCTL );
extern int DRM(agp_free)( DRM_OS_IOCTL );
extern int DRM(agp_unbind)( DRM_OS_IOCTL );
extern int DRM(agp_bind)( DRM_OS_IOCTL );
extern agp_memory *DRM(agp_allocate_memory)(size_t pages, u32 type);
extern int DRM(agp_free_memory)(agp_memory *handle);
extern int DRM(agp_bind_memory)(agp_memory *handle, off_t start);
@ -782,8 +791,8 @@ extern int DRM(proc_cleanup)(int minor,
#if __HAVE_SG
/* Scatter Gather Support (drm_scatter.h) */
extern void DRM(sg_cleanup)(drm_sg_mem_t *entry);
extern int DRM(sg_alloc)( DRM_OS_IOCTL )
extern int DRM(sg_free)( DRM_OS_IOCTL )
extern int DRM(sg_alloc)( DRM_OS_IOCTL );
extern int DRM(sg_free)( DRM_OS_IOCTL );
#endif
/* ATI PCIGART support (ati_pcigart.h) */