projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
common
/
mmio.h
diff --git
a/src/mesa/drivers/dri/common/mmio.h
b/src/mesa/drivers/dri/common/mmio.h
index 89871aab59ea1e860fd549eaa56bf03535804463..ce95d8c90759f56d8be6b7d02d782a1e66a1dc3e 100644
(file)
--- a/
src/mesa/drivers/dri/common/mmio.h
+++ b/
src/mesa/drivers/dri/common/mmio.h
@@
-33,14
+33,14
@@
#ifndef MMIO_H
#define MMIO_H
#ifndef MMIO_H
#define MMIO_H
-#include "glheader.h"
+#include "
main/
glheader.h"
#if defined( __powerpc__ )
#if defined( __powerpc__ )
-static INLINE u
_
int32_t
+static INLINE uint32_t
read_MMIO_LE32( volatile void * base, unsigned long offset )
{
read_MMIO_LE32( volatile void * base, unsigned long offset )
{
- u
_
int32_t val;
+ uint32_t val;
__asm__ __volatile__( "lwbrx %0, %1, %2 ; eieio"
: "=r" (val)
__asm__ __volatile__( "lwbrx %0, %1, %2 ; eieio"
: "=r" (val)
@@
-50,10
+50,10
@@
read_MMIO_LE32( volatile void * base, unsigned long offset )
#else
#else
-static INLINE u
_
int32_t
+static INLINE uint32_t
read_MMIO_LE32( volatile void * base, unsigned long offset )
{
read_MMIO_LE32( volatile void * base, unsigned long offset )
{
- volatile u
_int32_t * p = (volatile u_
int32_t *) (((volatile char *) base) + offset);
+ volatile u
int32_t * p = (volatile u
int32_t *) (((volatile char *) base) + offset);
return LE32_TO_CPU( p[0] );
}
return LE32_TO_CPU( p[0] );
}