diff options
| author | Michel Daenzer <michel@daenzer.net> | 2003-07-25 10:50:39 +0000 |
|---|---|---|
| committer | Michel Daenzer <michel@daenzer.net> | 2003-07-25 10:50:39 +0000 |
| commit | bef7017749c9d3af733bdca4863a012f5d6506d3 (patch) | |
| tree | 8152d62dfe6515a9f89c21934c5beb48b53180d2 /bsd | |
| parent | 32ef0f59a8d62460da338568af347286aa450146 (diff) | |
Compile fixes for recent 2.5/2.6 Linux kernels. I hope this doesn't break
the i830 driver or the BSDs. :)
Diffstat (limited to 'bsd')
| -rw-r--r-- | bsd/drmP.h | 2 | ||||
| -rw-r--r-- | bsd/drm_dma.h | 2 | ||||
| -rw-r--r-- | bsd/drm_os_freebsd.h | 3 | ||||
| -rw-r--r-- | bsd/drm_os_netbsd.h | 3 |
4 files changed, 8 insertions, 2 deletions
@@ -446,7 +446,7 @@ extern void DRM(reclaim_buffers)(drm_device_t *dev, DRMFILE filp); #if __HAVE_DMA_IRQ 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)( DRM_IRQ_ARGS ); +extern DRM_IRQ_RET DRM(dma_service)( DRM_IRQ_ARGS ); extern void DRM(driver_irq_preinstall)( drm_device_t *dev ); extern void DRM(driver_irq_postinstall)( drm_device_t *dev ); extern void DRM(driver_irq_uninstall)( drm_device_t *dev ); diff --git a/bsd/drm_dma.h b/bsd/drm_dma.h index 10c26e37..88ca2e39 100644 --- a/bsd/drm_dma.h +++ b/bsd/drm_dma.h @@ -217,7 +217,7 @@ int DRM(irq_install)( drm_device_t *dev, int irq ) if ( retcode ) { #elif defined(__NetBSD__) dev->irqh = pci_intr_establish(&dev->pa.pa_pc, dev->ih, IPL_TTY, - (int (*)(DRM_IRQ_ARGS))DRM(dma_service), dev); + (DRM_IRQ_RET (*)(DRM_IRQ_ARGS))DRM(dma_service), dev); if ( !dev->irqh ) { #endif DRM_LOCK; diff --git a/bsd/drm_os_freebsd.h b/bsd/drm_os_freebsd.h index 52f7aa2a..0ab201ae 100644 --- a/bsd/drm_os_freebsd.h +++ b/bsd/drm_os_freebsd.h @@ -112,6 +112,9 @@ #define DRM_SUSER(p) suser(p) #define DRM_TASKQUEUE_ARGS void *arg, int pending #define DRM_IRQ_ARGS void *arg +#define DRM_IRQ_RET void +#define DRM_NONE +#define DRM_HANDLED #define DRM_DEVICE drm_device_t *dev = kdev->si_drv1 #define DRM_MALLOC(size) malloc( size, DRM(M_DRM), M_NOWAIT ) #define DRM_FREE(pt,size) free( pt, DRM(M_DRM) ) diff --git a/bsd/drm_os_netbsd.h b/bsd/drm_os_netbsd.h index 6dfea613..d58f668a 100644 --- a/bsd/drm_os_netbsd.h +++ b/bsd/drm_os_netbsd.h @@ -85,6 +85,9 @@ extern struct cfdriver DRM(cd); #define DRM_SUSER(p) suser(p->p_ucred, &p->p_acflag) #define DRM_TASKQUEUE_ARGS void *dev, int pending #define DRM_IRQ_ARGS void *arg +#define DRM_IRQ_RET int +#define DRM_NONE /* FIXME */ +#define DRM_HANDLED /* FIXME */ #define DRM_DEVICE drm_device_t *dev = device_lookup(&DRM(cd), minor(kdev)) /* XXX Not sure if this is the 'right' version.. */ #if __NetBSD_Version__ >= 106140000 |