Attachment 12530 Details for Bug 13234 – The FreeBSD bus_space version was imported in FreeBSD 3.0.

[patch] The FreeBSD bus_space version was imported in FreeBSD 3.0.

0001-freebsd-bus_space-functions-were-imported-back-in-3.patch (text/plain), 1.96 KB, created by Robert Noland on 2007-11-13 16:24:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Noland

Created: 2007-11-13 16:24:43 UTC

Size: 1.96 KB

patch

obsolete

>From ec32ae5dd5e1a4eb10451e804892860629d13ca2 Mon Sep 17 00:00:00 2001
>From: Robert Noland <rnoland@squirrel.acs.internap.com>
>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
>

Actions: View | Splinter Review

Attachments on bug 13234: 12530

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.