From ec32ae5dd5e1a4eb10451e804892860629d13ca2 Mon Sep 17 00:00:00 2001 From: Robert Noland Date: Tue, 13 Nov 2007 19:21:47 -0500 Subject: [PATCH] freebsd: bus_space functions were imported back in 3.0 --- bsd-core/drmP.h | 25 ++++++------------------- 1 files changed, 6 insertions(+), 19 deletions(-) diff --git a/bsd-core/drmP.h b/bsd-core/drmP.h index f61de88..e6da444 100644 --- a/bsd-core/drmP.h +++ b/bsd-core/drmP.h @@ -305,26 +305,9 @@ typedef u_int8_t u8; "lock; addl $0,0(%%rsp)" : : : "memory"); #endif -#ifdef __FreeBSD__ -#define DRM_READ8(map, offset) \ - *(volatile u_int8_t *) (((unsigned long)(map)->handle) + (offset)) -#define DRM_READ16(map, offset) \ - *(volatile u_int16_t *) (((unsigned long)(map)->handle) + (offset)) -#define DRM_READ32(map, offset) \ - *(volatile u_int32_t *)(((unsigned long)(map)->handle) + (offset)) -#define DRM_WRITE8(map, offset, val) \ - *(volatile u_int8_t *) (((unsigned long)(map)->handle) + (offset)) = val -#define DRM_WRITE16(map, offset, val) \ - *(volatile u_int16_t *) (((unsigned long)(map)->handle) + (offset)) = val -#define DRM_WRITE32(map, offset, val) \ - *(volatile u_int32_t *)(((unsigned long)(map)->handle) + (offset)) = val - -#define DRM_VERIFYAREA_READ( uaddr, size ) \ - (!useracc(__DECONST(caddr_t, uaddr), size, VM_PROT_READ)) - -#else /* __FreeBSD__ */ - +#ifndef __FreeBSD__ typedef vaddr_t vm_offset_t; +#endif #define DRM_READ8(map, offset) \ bus_space_read_1( (map)->bst, (map)->bsh, (offset)) @@ -339,6 +322,10 @@ typedef vaddr_t vm_offset_t; #define DRM_WRITE32(map, offset, val) \ bus_space_write_4((map)->bst, (map)->bsh, (offset), (val)) +#ifdef __FreeBSD__ +#define DRM_VERIFYAREA_READ( uaddr, size ) \ + (!useracc(__DECONST(caddr_t, uaddr), size, VM_PROT_READ)) +#else /* __FreeBSD__ */ #define DRM_VERIFYAREA_READ( uaddr, size ) \ (!uvm_useracc((caddr_t)uaddr, size, VM_PROT_READ)) #endif /* !__FreeBSD__ */ -- 1.5.3.2