From 270e349804a3ac7fa88c4c987714eab2da6ec087 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 13 Jan 2003 22:53:48 +0000 Subject: [PATCH] Remove some linuxisms that were left in drm_bufs.h, make some types match, and add a cast to drm_sysctl.h (not sure why this is necessary, but it's debug info anyway) --- bsd-core/drm_bufs.c | 11 +---------- bsd-core/drm_fops.c | 2 +- bsd-core/drm_sysctl.c | 2 +- bsd/drm_bufs.h | 11 +---------- bsd/drm_fops.h | 2 +- bsd/drm_sysctl.h | 2 +- 6 files changed, 6 insertions(+), 24 deletions(-) diff --git a/bsd-core/drm_bufs.c b/bsd-core/drm_bufs.c index 69f419fc..4a94812d 100644 --- a/bsd-core/drm_bufs.c +++ b/bsd-core/drm_bufs.c @@ -107,16 +107,10 @@ int DRM(addmap)( DRM_IOCTL_ARGS ) switch ( map->type ) { case _DRM_REGISTERS: case _DRM_FRAME_BUFFER: -#if !defined(__sparc__) && !defined(__alpha__) - if ( map->offset + map->size < map->offset - ) { + if ( map->offset + map->size < map->offset ) { DRM(free)( map, sizeof(*map), DRM_MEM_MAPS ); return DRM_ERR(EINVAL); } -#endif -#ifdef __alpha__ - map->offset += dev->hose->mem_space->start; -#endif #if __REALLY_HAVE_MTRR if ( map->type == _DRM_FRAME_BUFFER || (map->flags & _DRM_WRITE_COMBINING) ) { @@ -161,9 +155,6 @@ int DRM(addmap)( DRM_IOCTL_ARGS ) break; #if __REALLY_HAVE_AGP case _DRM_AGP: -#ifdef __alpha__ - map->offset += dev->hose->mem_space->start; -#endif map->offset += dev->agp->base; map->mtrr = dev->agp->agp_mtrr; /* for getmap */ break; diff --git a/bsd-core/drm_fops.c b/bsd-core/drm_fops.c index 68926c8b..c4152ac3 100644 --- a/bsd-core/drm_fops.c +++ b/bsd-core/drm_fops.c @@ -100,7 +100,7 @@ int DRM(open_helper)(dev_t kdev, int flags, int fmt, DRM_STRUCTPROC *p, the circular buffer), is based on Alessandro Rubini's LINUX DEVICE DRIVERS (Cambridge: O'Reilly, 1998), pages 111-113. */ -ssize_t DRM(read)(dev_t kdev, struct uio *uio, int ioflag) +int DRM(read)(dev_t kdev, struct uio *uio, int ioflag) { DRM_DEVICE; int left; diff --git a/bsd-core/drm_sysctl.c b/bsd-core/drm_sysctl.c index 55910583..7cb5be22 100644 --- a/bsd-core/drm_sysctl.c +++ b/bsd-core/drm_sysctl.c @@ -203,7 +203,7 @@ static int DRM(_queues_info)DRM_SYSCTL_HANDLER_ARGS q->read_queue ? 'r':'-', q->write_queue ? 'w':'-', q->flush_queue ? 'f':'-', - DRM_BUFCOUNT(&q->waitlist), + (int)DRM_BUFCOUNT(&q->waitlist), atomic_read(&q->total_flushed), atomic_read(&q->total_queued), atomic_read(&q->total_locks)); diff --git a/bsd/drm_bufs.h b/bsd/drm_bufs.h index 69f419fc..4a94812d 100644 --- a/bsd/drm_bufs.h +++ b/bsd/drm_bufs.h @@ -107,16 +107,10 @@ int DRM(addmap)( DRM_IOCTL_ARGS ) switch ( map->type ) { case _DRM_REGISTERS: case _DRM_FRAME_BUFFER: -#if !defined(__sparc__) && !defined(__alpha__) - if ( map->offset + map->size < map->offset - ) { + if ( map->offset + map->size < map->offset ) { DRM(free)( map, sizeof(*map), DRM_MEM_MAPS ); return DRM_ERR(EINVAL); } -#endif -#ifdef __alpha__ - map->offset += dev->hose->mem_space->start; -#endif #if __REALLY_HAVE_MTRR if ( map->type == _DRM_FRAME_BUFFER || (map->flags & _DRM_WRITE_COMBINING) ) { @@ -161,9 +155,6 @@ int DRM(addmap)( DRM_IOCTL_ARGS ) break; #if __REALLY_HAVE_AGP case _DRM_AGP: -#ifdef __alpha__ - map->offset += dev->hose->mem_space->start; -#endif map->offset += dev->agp->base; map->mtrr = dev->agp->agp_mtrr; /* for getmap */ break; diff --git a/bsd/drm_fops.h b/bsd/drm_fops.h index 68926c8b..c4152ac3 100644 --- a/bsd/drm_fops.h +++ b/bsd/drm_fops.h @@ -100,7 +100,7 @@ int DRM(open_helper)(dev_t kdev, int flags, int fmt, DRM_STRUCTPROC *p, the circular buffer), is based on Alessandro Rubini's LINUX DEVICE DRIVERS (Cambridge: O'Reilly, 1998), pages 111-113. */ -ssize_t DRM(read)(dev_t kdev, struct uio *uio, int ioflag) +int DRM(read)(dev_t kdev, struct uio *uio, int ioflag) { DRM_DEVICE; int left; diff --git a/bsd/drm_sysctl.h b/bsd/drm_sysctl.h index 55910583..7cb5be22 100644 --- a/bsd/drm_sysctl.h +++ b/bsd/drm_sysctl.h @@ -203,7 +203,7 @@ static int DRM(_queues_info)DRM_SYSCTL_HANDLER_ARGS q->read_queue ? 'r':'-', q->write_queue ? 'w':'-', q->flush_queue ? 'f':'-', - DRM_BUFCOUNT(&q->waitlist), + (int)DRM_BUFCOUNT(&q->waitlist), atomic_read(&q->total_flushed), atomic_read(&q->total_queued), atomic_read(&q->total_locks));