DACDelay() used to be defined differently on platforms
that don't have legacy VGA support.
This distinction was removed with
commit 6d9efdce0d06df6b85f0681bea306c0b1e851502
Author: Adam Jackson <a...@redhat.com>
Date: Tue Sep 20 18:12:29 2011 -0400
vgahw: Port to pciaccess IO space routines
Reviewed-by: Jeremy Huddleston <jerem...@apple.com>
Tested-by: Jeremy Huddleston <jerem...@apple.com>
Signed-off-by: Adam Jackson <a...@redhat.com>
Reviewed-by: Jamey Sharp <ja...@minilop.net>
which has produced crashes at least on PowerPC.
Signed-off-by: Egbert Eich <e...@freedesktop.org>
---
hw/xfree86/vgahw/vgaHW.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h
index 937a8a5..c8b213f 100644
--- a/hw/xfree86/vgahw/vgaHW.h
+++ b/hw/xfree86/vgahw/vgaHW.h
@@ -168,11 +168,15 @@ typedef struct _vgaHWRec {
#define BITS_PER_GUN 6
#define COLORMAP_SIZE 256
-#define DACDelay(hw) \
+#if defined(__powerpc__) || defined(__arm__) || defined(__s390__) ||
defined(__nds32__)
+# define DACDelay(hw) /* No legacy VGA support */
+#else
+# define DACDelay(hw) \
do { \
(hw)->readST01((hw)); \
(hw)->readST01((hw)); \
} while (0)
+#endif
/* Function Prototypes */
--
1.8.1.4
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
