From: Joerg Sonnenberger Date: Fri, 13 Feb 2004 01:23:57 +0000 (+0000) Subject: Add __DragonFly__ X-Git-Tag: v2.0.1~12038 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/4637ddfbb4e7a2d283e6f9247594e4dd73972b0b Add __DragonFly__ --- diff --git a/sys/dev/drm/ati_pcigart.h b/sys/dev/drm/ati_pcigart.h index 2a447d8ab3..48bd3d1e58 100644 --- a/sys/dev/drm/ati_pcigart.h +++ b/sys/dev/drm/ati_pcigart.h @@ -27,7 +27,7 @@ * Gareth Hughes * * $FreeBSD: src/sys/dev/drm/ati_pcigart.h,v 1.1.2.1 2003/04/26 07:05:27 anholt Exp $ - * $DragonFly: src/sys/dev/drm/Attic/ati_pcigart.h,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/drm/Attic/ati_pcigart.h,v 1.3 2004/02/13 01:23:57 joerg Exp $ */ #include "dev/drm/drmP.h" @@ -107,7 +107,7 @@ int DRM(ati_pcigart_cleanup)( drm_device_t *dev, return 0; } -#if __FreeBSD_version > 500000 +#if defined(__FreeBSD__) && __FreeBSD_version > 500000 contigfree( (void *)addr, (1 << ATI_PCIGART_TABLE_ORDER) * PAGE_SIZE, DRM(M_DRM)); /* Not available on 4.x */ #endif return 1; diff --git a/sys/dev/drm/drm.h b/sys/dev/drm/drm.h index 72e5854812..95eadd3020 100644 --- a/sys/dev/drm/drm.h +++ b/sys/dev/drm/drm.h @@ -31,7 +31,7 @@ * Dec 1999, Richard Henderson , move to generic cmpxchg. * * $FreeBSD: src/sys/dev/drm/drm.h,v 1.3.2.1 2003/04/26 07:05:27 anholt Exp $ - * $DragonFly: src/sys/dev/drm/drm.h,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/drm/drm.h,v 1.3 2004/02/13 01:23:57 joerg Exp $ */ #ifndef _DRM_H_ @@ -46,8 +46,8 @@ #define DRM_IOC_WRITE _IOC_WRITE #define DRM_IOC_READWRITE _IOC_READ|_IOC_WRITE #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size) -#elif defined(__FreeBSD__) || defined(__NetBSD__) -#if defined(__FreeBSD__) && defined(XFree86Server) +#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) +#if (defined(__DragonFly__) || defined(__FreeBSD__)) && defined(XFree86Server) /* Prevent name collision when including sys/ioccom.h */ #undef ioctl #include diff --git a/sys/dev/drm/drmP.h b/sys/dev/drm/drmP.h index b3259a1118..ab37c2f0a1 100644 --- a/sys/dev/drm/drmP.h +++ b/sys/dev/drm/drmP.h @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.4.2.1 2003/04/26 07:05:27 anholt Exp $ - * $DragonFly: src/sys/dev/drm/drmP.h,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/drm/drmP.h,v 1.3 2004/02/13 01:23:57 joerg Exp $ */ #ifndef _DRM_P_H_ @@ -62,7 +62,7 @@ typedef struct drm_file drm_file_t; /* There's undoubtably more of this file to go into these OS dependent ones. */ -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) #include "dev/drm/drm_os_freebsd.h" #elif defined __NetBSD__ #include "dev/drm/drm_os_netbsd.h" @@ -310,7 +310,7 @@ struct drm_device { const char *name; /* Simple driver name */ char *unique; /* Unique identifier: e.g., busid */ int unique_len; /* Length of unique field */ -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) device_t device; /* Device instance from newbus */ #endif dev_t devnode; /* Device number for mknod */ @@ -348,7 +348,7 @@ struct drm_device { /* Context support */ int irq; /* Interrupt used by board */ int irqrid; /* Interrupt used by board */ -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) struct resource *irqr; /* Resource for interrupt used by board */ #elif defined(__NetBSD__) struct pci_attach_args pa; @@ -358,7 +358,7 @@ struct drm_device { atomic_t context_flag; /* Context swapping flag */ struct callout timer; /* Timer for delaying ctx switch */ int last_context; /* Last current context */ -#if __FreeBSD_version >= 400005 +#if defined(__DragonFly__) || __FreeBSD_version >= 400005 struct task task; #endif #if __HAVE_VBL_IRQ @@ -370,7 +370,7 @@ struct drm_device { #endif #endif -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) struct sigio *buf_sigio; /* Processes waiting for SIGIO */ #elif defined(__NetBSD__) pid_t buf_pgid; diff --git a/sys/dev/drm/drm_bufs.h b/sys/dev/drm/drm_bufs.h index 9ccb7d3b3b..615d5809e6 100644 --- a/sys/dev/drm/drm_bufs.h +++ b/sys/dev/drm/drm_bufs.h @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * $FreeBSD: src/sys/dev/drm/drm_bufs.h,v 1.5.2.1 2003/04/26 07:05:28 anholt Exp $ - * $DragonFly: src/sys/dev/drm/Attic/drm_bufs.h,v 1.3 2003/07/21 07:57:40 dillon Exp $ + * $DragonFly: src/sys/dev/drm/Attic/drm_bufs.h,v 1.4 2004/02/13 01:23:57 joerg Exp $ */ #include "dev/drm/drmP.h" @@ -116,7 +116,7 @@ int DRM(addmap)( DRM_IOCTL_ARGS ) #if __REALLY_HAVE_MTRR if ( map->type == _DRM_FRAME_BUFFER || (map->flags & _DRM_WRITE_COMBINING) ) { -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) int retcode = 0, act; struct mem_range_desc mrdesc; mrdesc.mr_base = map->offset; @@ -240,7 +240,7 @@ int DRM(rmmap)( DRM_IOCTL_ARGS ) #if __REALLY_HAVE_MTRR if (map->mtrr >= 0) { int retcode; -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) int act; struct mem_range_desc mrdesc; mrdesc.mr_base = map->offset; @@ -901,7 +901,7 @@ int DRM(mapbufs)( DRM_IOCTL_ARGS ) int retcode = 0; const int zero = 0; vm_offset_t virtual, address; -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) struct vmspace *vms = p->td_proc->p_vmspace; #endif /* __FreeBSD__ */ #ifdef __NetBSD__ @@ -939,7 +939,7 @@ int DRM(mapbufs)( DRM_IOCTL_ARGS ) goto done; } -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) virtual = round_page((vm_offset_t)vms->vm_daddr + MAXDSIZ); retcode = vm_mmap(&vms->vm_map, &virtual, @@ -959,7 +959,7 @@ int DRM(mapbufs)( DRM_IOCTL_ARGS ) p->p_rlimit[RLIMIT_MEMLOCK].rlim_cur); #endif /* __NetBSD__ */ } else { -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) virtual = round_page((vm_offset_t)vms->vm_daddr + MAXDSIZ); retcode = vm_mmap(&vms->vm_map, &virtual, diff --git a/sys/dev/drm/drm_dma.h b/sys/dev/drm/drm_dma.h index f8808b8cc7..973c6df408 100644 --- a/sys/dev/drm/drm_dma.h +++ b/sys/dev/drm/drm_dma.h @@ -29,7 +29,7 @@ * Gareth Hughes * * $FreeBSD: src/sys/dev/drm/drm_dma.h,v 1.5.2.1 2003/04/26 07:05:28 anholt Exp $ - * $DragonFly: src/sys/dev/drm/Attic/drm_dma.h,v 1.3 2003/07/06 21:23:47 dillon Exp $ + * $DragonFly: src/sys/dev/drm/Attic/drm_dma.h,v 1.4 2004/02/13 01:23:57 joerg Exp $ */ #include "dev/drm/drmP.h" @@ -191,7 +191,7 @@ int DRM(irq_install)( drm_device_t *dev, int irq ) /* Install handler */ dev->irqrid = 0; -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) dev->irqr = bus_alloc_resource(dev->device, SYS_RES_IRQ, &dev->irqrid, 0, ~0, 1, RF_SHAREABLE); if (!dev->irqr) { @@ -205,8 +205,8 @@ int DRM(irq_install)( drm_device_t *dev, int irq ) return ENOENT; } -#ifdef __FreeBSD__ -#if __FreeBSD_version < 500000 +#if defined(__DragonFly__) || defined(__FreeBSD__) +#if defined(__DragonFly__) || __FreeBSD_version < 500000 retcode = bus_setup_intr(dev->device, dev->irqr, INTR_TYPE_TTY, DRM(dma_service), dev, &dev->irqh); #else @@ -220,7 +220,7 @@ int DRM(irq_install)( drm_device_t *dev, int irq ) if ( !dev->irqh ) { #endif DRM_LOCK; -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) bus_release_resource(dev->device, SYS_RES_IRQ, dev->irqrid, dev->irqr); #endif dev->irq = 0; @@ -254,7 +254,7 @@ int DRM(irq_uninstall)( drm_device_t *dev ) DRM(driver_irq_uninstall)( dev ); -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) bus_teardown_intr(dev->device, dev->irqr, dev->irqh); bus_release_resource(dev->device, SYS_RES_IRQ, irqrid, dev->irqr); #elif defined(__NetBSD__) diff --git a/sys/dev/drm/drm_drv.h b/sys/dev/drm/drm_drv.h index cdc26c3dae..8c9aa9a928 100644 --- a/sys/dev/drm/drm_drv.h +++ b/sys/dev/drm/drm_drv.h @@ -29,7 +29,7 @@ * Gareth Hughes * * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.13.2.1 2003/04/26 07:05:28 anholt Exp $ - * $DragonFly: src/sys/dev/drm/Attic/drm_drv.h,v 1.5 2003/07/22 17:03:28 dillon Exp $ + * $DragonFly: src/sys/dev/drm/Attic/drm_drv.h,v 1.6 2004/02/13 01:23:57 joerg Exp $ */ /* @@ -115,7 +115,7 @@ int DRM(flags) = 0; static int DRM(init)(device_t nbdev); static void DRM(cleanup)(device_t nbdev); -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) #define DRIVER_SOFTC(unit) \ ((drm_device_t *) devclass_get_softc(DRM(devclass), unit)) @@ -205,7 +205,7 @@ static drm_ioctl_desc_t DRM(ioctls)[] = { const char *DRM(find_description)(int vendor, int device); -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) static struct cdevsw DRM(cdevsw) = { .d_name = DRIVER_NAME, .d_maj = CDEV_MAJOR, @@ -479,13 +479,13 @@ static int DRM(setup)( drm_device_t *dev ) dev->irq = 0; dev->context_flag = 0; dev->last_context = 0; -#if __FreeBSD_version >= 500000 +#if defined(__FreeBSD__) && __FreeBSD_version >= 500000 callout_init( &dev->timer, 1 ); #else callout_init( &dev->timer ); #endif -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) dev->buf_sigio = NULL; #elif defined(__NetBSD__) dev->buf_pgid = 0; @@ -562,7 +562,7 @@ static int DRM(takedown)( drm_device_t *dev ) #if __REALLY_HAVE_MTRR if ( map->mtrr >= 0 ) { int retcode; -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) int act; struct mem_range_desc mrdesc; mrdesc.mr_base = map->offset; @@ -638,7 +638,7 @@ static int DRM(takedown)( drm_device_t *dev ) static int DRM(init)( device_t nbdev ) { int unit; -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) drm_device_t *dev; #elif defined(__NetBSD__) drm_device_t *dev = nbdev; @@ -649,7 +649,7 @@ static int DRM(init)( device_t nbdev ) DRM_DEBUG( "\n" ); DRIVER_PREINIT(); -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) unit = device_get_unit(nbdev); dev = device_get_softc(nbdev); memset( (void *)dev, 0, sizeof(*dev) ); @@ -676,7 +676,7 @@ static int DRM(init)( device_t nbdev ) if ( dev->agp == NULL ) { DRM_ERROR( "Cannot initialize the agpgart module.\n" ); DRM(sysctl_cleanup)( dev ); -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) destroy_dev(dev->devnode); #endif DRM(takedown)( dev ); @@ -685,7 +685,7 @@ static int DRM(init)( device_t nbdev ) #endif /* __MUST_HAVE_AGP */ #if __REALLY_HAVE_MTRR if (dev->agp) { -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) int retcode = 0, act; struct mem_range_desc mrdesc; mrdesc.mr_base = dev->agp->info.ai_aperture_base; @@ -713,7 +713,7 @@ static int DRM(init)( device_t nbdev ) if( retcode ) { DRM_ERROR( "Cannot allocate memory for context bitmap.\n" ); DRM(sysctl_cleanup)( dev ); -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) destroy_dev(dev->devnode); #endif DRM(takedown)( dev ); @@ -750,11 +750,11 @@ static void DRM(cleanup)(device_t nbdev) DRM_DEBUG( "\n" ); -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) dev = device_get_softc(nbdev); #endif DRM(sysctl_cleanup)( dev ); -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) destroy_dev(dev->devnode); #endif #if __HAVE_CTX_BITMAP @@ -831,7 +831,7 @@ int DRM(open)(dev_t kdev, int flags, int fmt, DRM_STRUCTPROC *p) if ( !retcode ) { atomic_inc( &dev->counts[_DRM_STAT_OPENS] ); DRM_SPINLOCK( &dev->count_lock ); -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) device_busy(dev->device); #endif if ( !dev->open_count++ ) @@ -862,7 +862,7 @@ int DRM(close)(dev_t kdev, int flags, int fmt, DRM_STRUCTPROC *p) * Begin inline drm_release */ -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) DRM_DEBUG( "pid = %d, device = 0x%lx, open_count = %d\n", DRM_CURRENTPID, (long)dev->device, dev->open_count ); #elif defined(__NetBSD__) @@ -924,7 +924,7 @@ int DRM(close)(dev_t kdev, int flags, int fmt, DRM_STRUCTPROC *p) #if defined (__FreeBSD__) && (__FreeBSD_version >= 500000) funsetown(&dev->buf_sigio); -#elif defined(__FreeBSD__) +#elif defined(__DragonFly__) || defined(__FreeBSD__) funsetown(dev->buf_sigio); #elif defined(__NetBSD__) dev->buf_pgid = 0; @@ -948,7 +948,7 @@ int DRM(close)(dev_t kdev, int flags, int fmt, DRM_STRUCTPROC *p) atomic_inc( &dev->counts[_DRM_STAT_CLOSES] ); DRM_SPINLOCK( &dev->count_lock ); -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) device_unbusy(dev->device); #endif if ( !--dev->open_count ) { @@ -975,7 +975,7 @@ int DRM(ioctl)(dev_t kdev, u_long cmd, caddr_t data, int flags, atomic_inc( &dev->counts[_DRM_STAT_IOCTLS] ); ++priv->ioctl_count; -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) DRM_DEBUG( "pid=%d, cmd=0x%02lx, nr=0x%02x, dev 0x%lx, auth=%d\n", DRM_CURRENTPID, cmd, nr, (long)dev->device, priv->authenticated ); #elif defined(__NetBSD__) @@ -991,12 +991,12 @@ int DRM(ioctl)(dev_t kdev, u_long cmd, caddr_t data, int flags, dev->flags |= FASYNC; return 0; -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) case FIOSETOWN: return fsetown(*(int *)data, &dev->buf_sigio); case FIOGETOWN: -#if (__FreeBSD_version >= 500000) +#if defined(__FreeBSD__) && (__FreeBSD_version >= 500000) *(int *) data = fgetown(&dev->buf_sigio); #else *(int *) data = fgetown(dev->buf_sigio); diff --git a/sys/dev/drm/drm_fops.h b/sys/dev/drm/drm_fops.h index 3f8251a228..5c552826ab 100644 --- a/sys/dev/drm/drm_fops.h +++ b/sys/dev/drm/drm_fops.h @@ -30,14 +30,14 @@ * Gareth Hughes * * $FreeBSD: src/sys/dev/drm/drm_fops.h,v 1.7.2.1 2003/04/26 07:05:28 anholt Exp $ - * $DragonFly: src/sys/dev/drm/Attic/drm_fops.h,v 1.3 2003/07/21 07:57:40 dillon Exp $ + * $DragonFly: src/sys/dev/drm/Attic/drm_fops.h,v 1.4 2004/02/13 01:23:57 joerg Exp $ */ #include "dev/drm/drmP.h" drm_file_t *DRM(find_file_by_proc)(drm_device_t *dev, DRM_STRUCTPROC *p) { -#if __FreeBSD_version >= 500021 +#if defined(__FreeBSD__) && __FreeBSD_version >= 500021 uid_t uid = p->td_ucred->cr_svuid; pid_t pid = p->td_proc->p_pid; #else @@ -73,7 +73,7 @@ int DRM(open_helper)(dev_t kdev, int flags, int fmt, DRM_STRUCTPROC *p, } else { priv = (drm_file_t *) DRM(alloc)(sizeof(*priv), DRM_MEM_FILES); bzero(priv, sizeof(*priv)); -#if __FreeBSD_version >= 500000 +#if defined(__FreeBSD__) && __FreeBSD_version >= 500000 priv->uid = p->td_ucred->cr_svuid; priv->pid = p->td_proc->p_pid; #else @@ -90,7 +90,7 @@ int DRM(open_helper)(dev_t kdev, int flags, int fmt, DRM_STRUCTPROC *p, TAILQ_INSERT_TAIL(&dev->files, priv, link); DRM_UNLOCK; } -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) kdev->si_drv1 = dev; #endif return 0; diff --git a/sys/dev/drm/drm_ioctl.h b/sys/dev/drm/drm_ioctl.h index ce7bf320db..07f87dba4e 100644 --- a/sys/dev/drm/drm_ioctl.h +++ b/sys/dev/drm/drm_ioctl.h @@ -29,14 +29,14 @@ * Gareth Hughes * * $FreeBSD: src/sys/dev/drm/drm_ioctl.h,v 1.4.2.1 2003/04/26 07:05:28 anholt Exp $ - * $DragonFly: src/sys/dev/drm/Attic/drm_ioctl.h,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/drm/Attic/drm_ioctl.h,v 1.3 2004/02/13 01:23:57 joerg Exp $ */ #include "dev/drm/drmP.h" int DRM(irq_busid)( DRM_IOCTL_ARGS ) { -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) drm_irq_busid_t id; devclass_t pci; device_t bus, dev; diff --git a/sys/dev/drm/drm_memory.h b/sys/dev/drm/drm_memory.h index 704a9dc372..74820a3a54 100644 --- a/sys/dev/drm/drm_memory.h +++ b/sys/dev/drm/drm_memory.h @@ -29,12 +29,12 @@ * Gareth Hughes * * $FreeBSD: src/sys/dev/drm/drm_memory.h,v 1.8.2.1 2003/04/26 07:05:28 anholt Exp $ - * $DragonFly: src/sys/dev/drm/Attic/drm_memory.h,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/drm/Attic/drm_memory.h,v 1.3 2004/02/13 01:23:57 joerg Exp $ */ #include "dev/drm/drmP.h" -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) #define malloctype DRM(M_DRM) /* The macros conflicted in the MALLOC_DEFINE */ @@ -106,7 +106,7 @@ void DRM(mem_uninit)(void) DRM_SPINUNINIT(DRM(mem_lock)); } -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) /* drm_mem_info is called whenever a process reads /dev/drm/mem. */ static int DRM(_mem_info)(drm_mem_stats_t *stats, struct sysctl_oid *oidp, void *arg1, @@ -249,7 +249,7 @@ void *DRM(ioremap)( drm_device_t *dev, drm_local_map_t *map ) map->iot = dev->pa.pa_memt; #endif -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) if (!(pt = pmap_mapdev(map->offset, map->size))) { #elif defined(__NetBSD__) if (bus_space_map(map->iot, map->offset, map->size, @@ -306,7 +306,7 @@ void DRM(ioremapfree)(drm_local_map_t *map) DRM_MEM_ERROR(DRM_MEM_MAPPINGS, "Attempt to free NULL pointer\n"); else -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) pmap_unmapdev((vm_offset_t) map->handle, map->size); #elif defined(__NetBSD__) bus_space_unmap(map->iot, map->ioh, map->size); diff --git a/sys/dev/drm/drm_os_freebsd.h b/sys/dev/drm/drm_os_freebsd.h index 82278cba7a..451f6c2daa 100644 --- a/sys/dev/drm/drm_os_freebsd.h +++ b/sys/dev/drm/drm_os_freebsd.h @@ -1,6 +1,6 @@ /* * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.10.2.1 2003/04/26 07:05:28 anholt Exp $ - * $DragonFly: src/sys/dev/drm/Attic/drm_os_freebsd.h,v 1.7 2003/08/07 21:16:55 dillon Exp $ + * $DragonFly: src/sys/dev/drm/Attic/drm_os_freebsd.h,v 1.8 2004/02/13 01:23:57 joerg Exp $ */ #include #include @@ -32,25 +32,25 @@ #include #include #include -#if __FreeBSD_version >= 500000 +#if defined(__FreeBSD__) && __FreeBSD_version >= 500000 #include #else #include #endif #include -#if __FreeBSD_version >= 400005 +#if defined(__DragonFly__) || __FreeBSD_version >= 400005 #include #endif -#if __FreeBSD_version >= 500000 +#if defined(__FreeBSD__) && __FreeBSD_version >= 500000 #include #endif -#if __FreeBSD_version >= 400006 +#if defined(__DragonFly__) || __FreeBSD_version >= 400006 #define __REALLY_HAVE_AGP __HAVE_AGP #endif #ifdef __i386__ -#define __REALLY_HAVE_MTRR (__HAVE_MTRR) && (__FreeBSD_version >= 500000) +#define __REALLY_HAVE_MTRR ((__HAVE_MTRR) && defined(__FreeBSD__) && __FreeBSD_version >= 500000) #else #define __REALLY_HAVE_MTRR 0 #endif @@ -82,7 +82,7 @@ #define DRM_DEV_GID 0 #define CDEV_MAJOR 145 -#if __FreeBSD_version >= 500000 +#if defined(__FreeBSD__) && __FreeBSD_version >= 500000 #define DRM_CURPROC curthread #define DRM_STRUCTPROC struct thread #define DRM_SPINTYPE struct mtx @@ -247,7 +247,7 @@ typedef u_int8_t u8; /* Fake this */ -#if __FreeBSD_version < 500000 +#if defined(__DragonFly__) || __FreeBSD_version < 500000 /* The extra atomic functions from 5.0 haven't been merged to 4.x */ static __inline int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src) @@ -324,7 +324,7 @@ find_first_zero_bit(volatile void *p, int max) * Fake out the module macros for versions of FreeBSD where they don't * exist. */ -#if (__FreeBSD_version < 500002 && __FreeBSD_version > 500000) || __FreeBSD_version < 420000 +#if defined(__FreeBSD__) && ((__FreeBSD_version < 500002 && __FreeBSD_version > 500000) || __FreeBSD_version < 420000) #define MODULE_VERSION(a,b) struct __hack #define MODULE_DEPEND(a,b,c,d,e) struct __hack #endif diff --git a/sys/dev/drm/drm_sysctl.h b/sys/dev/drm/drm_sysctl.h index 14ffaed199..8b701b09e2 100644 --- a/sys/dev/drm/drm_sysctl.h +++ b/sys/dev/drm/drm_sysctl.h @@ -1,9 +1,9 @@ /* * $FreeBSD: src/sys/dev/drm/drm_sysctl.h,v 1.3.2.1 2003/04/26 07:05:29 anholt Exp $ - * $DragonFly: src/sys/dev/drm/Attic/drm_sysctl.h,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/drm/Attic/drm_sysctl.h,v 1.3 2004/02/13 01:23:57 joerg Exp $ */ -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) #include diff --git a/sys/dev/drm/drm_vm.h b/sys/dev/drm/drm_vm.h index afabc16b7c..bbd56a6ea4 100644 --- a/sys/dev/drm/drm_vm.h +++ b/sys/dev/drm/drm_vm.h @@ -1,12 +1,12 @@ /* * $FreeBSD: src/sys/dev/drm/drm_vm.h,v 1.6.2.1 2003/04/26 07:05:29 anholt Exp $ - * $DragonFly: src/sys/dev/drm/Attic/drm_vm.h,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/drm/Attic/drm_vm.h,v 1.3 2004/02/13 01:23:57 joerg Exp $ */ #if defined(__FreeBSD__) && __FreeBSD_version >= 500102 static int DRM(dma_mmap)(dev_t kdev, vm_offset_t offset, vm_paddr_t *paddr, int prot) -#elif defined(__FreeBSD__) +#elif defined(__DragonFly__) || defined(__FreeBSD__) static int DRM(dma_mmap)(dev_t kdev, vm_offset_t offset, int prot) #elif defined(__NetBSD__) static paddr_t DRM(dma_mmap)(dev_t kdev, vm_offset_t offset, int prot) @@ -35,7 +35,7 @@ static paddr_t DRM(dma_mmap)(dev_t kdev, vm_offset_t offset, int prot) #if defined(__FreeBSD__) && __FreeBSD_version >= 500102 int DRM(mmap)(dev_t kdev, vm_offset_t offset, vm_paddr_t *paddr, int prot) -#elif defined(__FreeBSD__) +#elif defined(__DragonFly__) || defined(__FreeBSD__) int DRM(mmap)(dev_t kdev, vm_offset_t offset, int prot) #elif defined(__NetBSD__) paddr_t DRM(mmap)(dev_t kdev, off_t offset, int prot) diff --git a/sys/dev/drm/mga/mga_drv.c b/sys/dev/drm/mga/mga_drv.c index cfa5d89f88..1978d4d45c 100644 --- a/sys/dev/drm/mga/mga_drv.c +++ b/sys/dev/drm/mga/mga_drv.c @@ -29,7 +29,7 @@ * Gareth Hughes * * $FreeBSD: src/sys/dev/drm/mga_drv.c,v 1.5.2.1 2003/04/26 07:05:29 anholt Exp $ - * $DragonFly: src/sys/dev/drm/mga/Attic/mga_drv.c,v 1.3 2003/08/07 21:16:55 dillon Exp $ + * $DragonFly: src/sys/dev/drm/mga/Attic/mga_drv.c,v 1.4 2004/02/13 01:23:57 joerg Exp $ */ #include "mga.h" @@ -63,7 +63,7 @@ drm_chipinfo_t DRM(devicelist)[] = { #include "dev/drm/drm_vm.h" #include "dev/drm/drm_sysctl.h" -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) DRIVER_MODULE(mga, pci, mga_driver, mga_devclass, 0, 0); #elif defined(__NetBSD__) CFDRIVER_DECL(mga, DV_TTY, NULL); diff --git a/sys/dev/drm/r128/r128_drv.c b/sys/dev/drm/r128/r128_drv.c index 30d22f29a3..dc1f323b8c 100644 --- a/sys/dev/drm/r128/r128_drv.c +++ b/sys/dev/drm/r128/r128_drv.c @@ -29,7 +29,7 @@ * Gareth Hughes * * $FreeBSD: src/sys/dev/drm/r128_drv.c,v 1.5.2.1 2003/04/26 07:05:29 anholt Exp $ - * $DragonFly: src/sys/dev/drm/r128/Attic/r128_drv.c,v 1.3 2003/08/07 21:16:55 dillon Exp $ + * $DragonFly: src/sys/dev/drm/r128/Attic/r128_drv.c,v 1.4 2004/02/13 01:23:57 joerg Exp $ */ #include "r128.h" @@ -82,7 +82,7 @@ drm_chipinfo_t DRM(devicelist)[] = { #include "dev/drm/drm_scatter.h" #endif -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) DRIVER_MODULE(r128, pci, r128_driver, r128_devclass, 0, 0); #elif defined(__NetBSD__) CFDRIVER_DECL(r128, DV_TTY, NULL); diff --git a/sys/dev/drm/radeon/radeon_drv.c b/sys/dev/drm/radeon/radeon_drv.c index fdfed598da..9e99f627ba 100644 --- a/sys/dev/drm/radeon/radeon_drv.c +++ b/sys/dev/drm/radeon/radeon_drv.c @@ -27,7 +27,7 @@ * Gareth Hughes * * $FreeBSD: src/sys/dev/drm/radeon_drv.c,v 1.6.2.1 2003/04/26 07:05:29 anholt Exp $ - * $DragonFly: src/sys/dev/drm/radeon/Attic/radeon_drv.c,v 1.3 2003/08/07 21:16:55 dillon Exp $ + * $DragonFly: src/sys/dev/drm/radeon/Attic/radeon_drv.c,v 1.4 2004/02/13 01:23:57 joerg Exp $ */ #include "radeon.h" @@ -95,7 +95,7 @@ drm_chipinfo_t DRM(devicelist)[] = { #include "dev/drm/drm_scatter.h" #endif -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) DRIVER_MODULE(DRIVER_NAME, pci, DRM(driver), DRM(devclass), 0, 0); #elif defined(__NetBSD__) CFDRIVER_DECL(radeon, DV_TTY, NULL); diff --git a/sys/dev/drm/tdfx/tdfx_drv.c b/sys/dev/drm/tdfx/tdfx_drv.c index f7edeaa5c6..2fd231263d 100644 --- a/sys/dev/drm/tdfx/tdfx_drv.c +++ b/sys/dev/drm/tdfx/tdfx_drv.c @@ -30,7 +30,7 @@ * Gareth Hughes * * $FreeBSD: src/sys/dev/drm/tdfx_drv.c,v 1.4.2.1 2003/04/26 07:05:30 anholt Exp $ - * $DragonFly: src/sys/dev/drm/tdfx/Attic/tdfx_drv.c,v 1.3 2003/08/07 21:16:55 dillon Exp $ + * $DragonFly: src/sys/dev/drm/tdfx/Attic/tdfx_drv.c,v 1.4 2004/02/13 01:23:57 joerg Exp $ */ #include "tdfx.h" @@ -93,7 +93,7 @@ drm_chipinfo_t DRM(devicelist)[] = { #include "dev/drm/drm_vm.h" #include "dev/drm/drm_sysctl.h" -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) DRIVER_MODULE(tdfx, pci, tdfx_driver, tdfx_devclass, 0, 0); #elif defined(__NetBSD__) CFDRIVER_DECL(tdfx, DV_TTY, NULL);