compiler.h: Remove dead STANDALONE_MMIO
The only drivers I can find that used this are the r128 and radeon DRI drivers. r128 is dead and the radeon driver wasn't including Xorg's compiler.h and still worked. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
parent
d2a6962474
commit
49fe4ee7b7
|
@ -1036,18 +1036,7 @@ inl(unsigned short port)
|
||||||
/* entry points for Mmio memory access routines */
|
/* entry points for Mmio memory access routines */
|
||||||
extern _X_EXPORT int (*xf86ReadMmio8) (void *, unsigned long);
|
extern _X_EXPORT int (*xf86ReadMmio8) (void *, unsigned long);
|
||||||
extern _X_EXPORT int (*xf86ReadMmio16) (void *, unsigned long);
|
extern _X_EXPORT int (*xf86ReadMmio16) (void *, unsigned long);
|
||||||
|
|
||||||
#ifndef STANDALONE_MMIO
|
|
||||||
extern _X_EXPORT int (*xf86ReadMmio32) (void *, unsigned long);
|
extern _X_EXPORT int (*xf86ReadMmio32) (void *, unsigned long);
|
||||||
#else
|
|
||||||
/* Some DRI 3D drivers need MMIO_IN32. */
|
|
||||||
static __inline__ int
|
|
||||||
xf86ReadMmio32(void *Base, unsigned long Offset)
|
|
||||||
{
|
|
||||||
mem_barrier();
|
|
||||||
return *(volatile unsigned int *) ((unsigned long) Base + (Offset));
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
extern _X_EXPORT void (*xf86WriteMmio8) (int, void *, unsigned long);
|
extern _X_EXPORT void (*xf86WriteMmio8) (int, void *, unsigned long);
|
||||||
extern _X_EXPORT void (*xf86WriteMmio16) (int, void *, unsigned long);
|
extern _X_EXPORT void (*xf86WriteMmio16) (int, void *, unsigned long);
|
||||||
extern _X_EXPORT void (*xf86WriteMmio32) (int, void *, unsigned long);
|
extern _X_EXPORT void (*xf86WriteMmio32) (int, void *, unsigned long);
|
||||||
|
@ -1059,11 +1048,7 @@ extern _X_EXPORT void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int);
|
||||||
/* Changed to kill noise generated by gcc's -Wcast-align */
|
/* Changed to kill noise generated by gcc's -Wcast-align */
|
||||||
#define MMIO_IN8(base, offset) (*xf86ReadMmio8)(base, offset)
|
#define MMIO_IN8(base, offset) (*xf86ReadMmio8)(base, offset)
|
||||||
#define MMIO_IN16(base, offset) (*xf86ReadMmio16)(base, offset)
|
#define MMIO_IN16(base, offset) (*xf86ReadMmio16)(base, offset)
|
||||||
#ifndef STANDALONE_MMIO
|
|
||||||
#define MMIO_IN32(base, offset) (*xf86ReadMmio32)(base, offset)
|
#define MMIO_IN32(base, offset) (*xf86ReadMmio32)(base, offset)
|
||||||
#else
|
|
||||||
#define MMIO_IN32(base, offset) xf86ReadMmio32(base, offset)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define MMIO_OUT32(base, offset, val) \
|
#define MMIO_OUT32(base, offset, val) \
|
||||||
do { \
|
do { \
|
||||||
|
|
Loading…
Reference in New Issue
Block a user