xserver: Branch 'master' - 9 commits
Keith Packard
keithp at kemper.freedesktop.org
Thu Jul 24 16:48:47 PDT 2014
configure.ac | 3
include/dix-config.h.in | 3
include/servermd.h | 285 +-----------------------------------------------
3 files changed, 11 insertions(+), 280 deletions(-)
New commits:
commit 4302484ef2e67b2e05756c7ee0834dce938f1b44
Author: Adam Jackson <ajax at redhat.com>
Date: Mon Jul 21 10:06:53 2014 -0400
dix: Remove arch awareness from servermd.h (v2)
At this point we have no architectures where image byte order is
different from bitmap bit order, or where either of those two are not
also the native word endianness. Hooray, one more place where we don't
have to worry about enabling new CPU architectures.
v2: Rebase to master to handle the addition of ppc64le, arc, and xtensa,
and use autoconf's endianness detection instead of gcc predefines.
Signed-off-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/configure.ac b/configure.ac
index 4338dc5..0479fd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,7 +139,8 @@ AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h dlfcn.h stropts.h \
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_C_TYPEOF
-AC_C_BIGENDIAN([ENDIAN="X_BIG_ENDIAN"], [ENDIAN="X_LITTLE_ENDIAN"])
+AC_C_BIGENDIAN(AC_DEFINE(X_BYTE_ORDER, X_BIG_ENDIAN, [byte order]),
+ AC_DEFINE(X_BYTE_ORDER, X_LITTLE_ENDIAN, [byte order]))
AC_CHECK_SIZEOF([unsigned long])
if test "$ac_cv_sizeof_unsigned_long" = 8; then
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index f980a3d..2203f82 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -493,4 +493,7 @@
/* Build glamor's GBM-based EGL support */
#undef GLAMOR_HAS_GBM
+/* byte order */
+#undef X_BYTE_ORDER
+
#endif /* _DIX_CONFIG_H_ */
diff --git a/include/servermd.h b/include/servermd.h
index dd1da7d..0132d67 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -47,195 +47,18 @@ SOFTWARE.
#ifndef SERVERMD_H
#define SERVERMD_H 1
-/*
- * Note: much of this is vestigial from mfb/cfb times. This should
- * really be simplified even further.
- */
-
-#ifdef __avr32__
-
-#define IMAGE_BYTE_ORDER MSBFirst
-#define BITMAP_BIT_ORDER MSBFirst
-
-#endif /* __avr32__ */
-
-#ifdef __arm32__
+#include "dix-config.h"
+#if X_BYTE_ORDER == X_LITTLE_ENDIAN
#define IMAGE_BYTE_ORDER LSBFirst
#define BITMAP_BIT_ORDER LSBFirst
-
-#endif /* __arm32__ */
-
-#if defined(__nds32__)
-
-#define IMAGE_BYTE_ORDER LSBFirst
-
-#endif /* __nds32__ */
-
-#if defined __hppa__
-
-#define IMAGE_BYTE_ORDER MSBFirst
-#define BITMAP_BIT_ORDER MSBFirst
-#endif /* hpux || __hppa__ */
-
-#if defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__)
-
-#if defined(__LITTLE_ENDIAN__)
-#define IMAGE_BYTE_ORDER LSBFirst
-#define BITMAP_BIT_ORDER LSBFirst
-#else
-#define IMAGE_BYTE_ORDER MSBFirst
-#define BITMAP_BIT_ORDER MSBFirst
-#endif
-
-#endif /* PowerPC */
-
-#if defined(__sh__)
-
-#if defined(__BIG_ENDIAN__)
-#define IMAGE_BYTE_ORDER MSBFirst
-#define BITMAP_BIT_ORDER MSBFirst
-#else
-#define IMAGE_BYTE_ORDER LSBFirst
-#define BITMAP_BIT_ORDER LSBFirst
-#endif
-
-#endif /* SuperH */
-
-#if defined(__m32r__)
-
-#if defined(__BIG_ENDIAN__)
-#define IMAGE_BYTE_ORDER MSBFirst
-#define BITMAP_BIT_ORDER MSBFirst
-#else
-#define IMAGE_BYTE_ORDER LSBFirst
-#define BITMAP_BIT_ORDER LSBFirst
-#endif
-
-#endif /* __m32r__ */
-
-#if defined(sun386) || defined(sun5)
-#define IMAGE_BYTE_ORDER LSBFirst /* Values for the SUN only */
-#define BITMAP_BIT_ORDER LSBFirst
-#else
-#define IMAGE_BYTE_ORDER MSBFirst /* Values for the SUN only */
-#define BITMAP_BIT_ORDER MSBFirst
-#endif
-
-#if (defined(mips) || defined(__mips))
-
-#if defined(MIPSEL) || defined(__MIPSEL__)
-#define IMAGE_BYTE_ORDER LSBFirst /* Values for the PMAX only */
-#define BITMAP_BIT_ORDER LSBFirst
-#else
-#define IMAGE_BYTE_ORDER MSBFirst /* Values for the MIPS only */
-#define BITMAP_BIT_ORDER MSBFirst
-#endif
-
-#endif /* mips */
-
-#if defined(__alpha) || defined(__alpha__)
-#define IMAGE_BYTE_ORDER LSBFirst /* Values for the Alpha only */
-#define BITMAP_BIT_ORDER LSBFirst
-#endif /* alpha */
-
-#if defined (linux) && defined (__s390__)
-
-#define IMAGE_BYTE_ORDER MSBFirst
-#define BITMAP_BIT_ORDER MSBFirst
-
-#endif /* linux/s390 */
-
-#if defined (linux) && defined (__s390x__)
-
-#define IMAGE_BYTE_ORDER MSBFirst
-#define BITMAP_BIT_ORDER MSBFirst
-
-#endif /* linux/s390x */
-
-#if defined(__ia64__) || defined(ia64)
-
-#define IMAGE_BYTE_ORDER LSBFirst
-#define BITMAP_BIT_ORDER LSBFirst
-
-#endif /* ia64 */
-
-#if defined(__amd64__) || defined(amd64) || defined(__amd64)
-#define IMAGE_BYTE_ORDER LSBFirst
-#define BITMAP_BIT_ORDER LSBFirst
-#endif /* AMD64 */
-
-#if defined(SVR4) && (defined(__i386__) || defined(__i386) ) || \
- defined(__alpha__) || defined(__alpha) || \
- defined(__i386__)
-
-#ifndef IMAGE_BYTE_ORDER
-#define IMAGE_BYTE_ORDER LSBFirst
-#endif
-
-#ifndef BITMAP_BIT_ORDER
-#define BITMAP_BIT_ORDER LSBFirst
-#endif
-
-#endif /* SVR4 / BSD / i386 */
-
-#if defined (linux) && defined (__mc68000__)
-
-#define IMAGE_BYTE_ORDER MSBFirst
-#define BITMAP_BIT_ORDER MSBFirst
-
-#endif /* linux/m68k */
-
-/* linux on ARM */
-#if defined(linux) && defined(__arm__)
-#define IMAGE_BYTE_ORDER LSBFirst
-#define BITMAP_BIT_ORDER LSBFirst
-#endif
-
-/* linux on IBM S/390 */
-#if defined (linux) && defined (__s390__)
-#define IMAGE_BYTE_ORDER MSBFirst
-#define BITMAP_BIT_ORDER MSBFirst
-#endif /* linux/s390 */
-
-#ifdef __aarch64__
-
-#ifdef __AARCH64EL__
-#define IMAGE_BYTE_ORDER LSBFirst
-#define BITMAP_BIT_ORDER LSBFirst
-#endif
-#ifdef __AARCH64EB__
+#elif X_BYTE_ORDER == X_BIG_ENDIAN
#define IMAGE_BYTE_ORDER MSBFirst
#define BITMAP_BIT_ORDER MSBFirst
-#endif
-
-#endif /* __aarch64__ */
-
-#if defined(__arc__)
-
-#if defined(__BIG_ENDIAN__)
-#define IMAGE_BYTE_ORDER MSBFirst
-#define BITMAP_BIT_ORDER MSBFirst
#else
-#define IMAGE_BYTE_ORDER LSBFirst
-#define BITMAP_BIT_ORDER LSBFirst
+#error "Too weird to live."
#endif
-#endif /* ARC */
-
-#ifdef __xtensa__
-
-#ifdef __XTENSA_EL__
-#define IMAGE_BYTE_ORDER LSBFirst
-#define BITMAP_BIT_ORDER LSBFirst
-#endif
-#ifdef __XTENSA_EB__
-#define IMAGE_BYTE_ORDER MSBFirst
-#define BITMAP_BIT_ORDER MSBFirst
-#endif
-
-#endif /* __xtensa__ */
-
#ifndef GLYPHPADBYTES
#define GLYPHPADBYTES 4
#endif
commit 860cd209679a2e56460977882b3b3826ddcb8710
Author: Adam Jackson <ajax at redhat.com>
Date: Mon Jul 21 10:06:52 2014 -0400
dix: Remove a weird case of little-endian s390
I really don't think this was ever correct, but I'm also not sure what
non-Linux Unix this was meant to enable. The only one I know of was
OS/390 / z/OS / OpenEdition, but I think that was big-endian too.
At any rate this is all about to go away, so this is just removing an
edge case.
Signed-off-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/include/servermd.h b/include/servermd.h
index a544ce5..dd1da7d 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -167,8 +167,7 @@ SOFTWARE.
#if defined(SVR4) && (defined(__i386__) || defined(__i386) ) || \
defined(__alpha__) || defined(__alpha) || \
- defined(__i386__) || \
- defined(__s390x__) || defined(__s390__)
+ defined(__i386__)
#ifndef IMAGE_BYTE_ORDER
#define IMAGE_BYTE_ORDER LSBFirst
commit f593d76de76a645e29af5dd457ad1fd5a30736cc
Author: Adam Jackson <ajax at redhat.com>
Date: Mon Jul 21 10:06:51 2014 -0400
dix: Remove wacky sparc special casing (v2)
This appears to be defining sparc if ever __sparc or __sparc__ were
defined, which is almost reasonable, but these days we want to be using
the __arch__ style. Why any of this would ever be triggered on m68k is
truly a mystery for the ages.
v2: Fix commit message, as noted by nix
Signed-off-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/include/servermd.h b/include/servermd.h
index 72ce6c0..a544ce5 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -114,16 +114,6 @@ SOFTWARE.
#endif /* __m32r__ */
-#if (defined(sun) && (defined(__sparc) || defined(sparc))) || \
- (defined(__uxp__) && (defined(sparc) || defined(mc68000))) || \
- defined(__sparc__) || defined(__mc68000__)
-
-#if defined(__sparc) || defined(__sparc__)
-#if !defined(sparc)
-#define sparc 1
-#endif
-#endif
-
#if defined(sun386) || defined(sun5)
#define IMAGE_BYTE_ORDER LSBFirst /* Values for the SUN only */
#define BITMAP_BIT_ORDER LSBFirst
@@ -131,7 +121,6 @@ SOFTWARE.
#define IMAGE_BYTE_ORDER MSBFirst /* Values for the SUN only */
#define BITMAP_BIT_ORDER MSBFirst
#endif
-#endif /* sun && !(i386 && SVR4) */
#if (defined(mips) || defined(__mips))
commit 17c3347f14822b9f7da4253c71f6ed51be2b38d1
Author: Adam Jackson <ajax at redhat.com>
Date: Mon Jul 21 10:06:50 2014 -0400
dix: Default GLYPHPADBYTES to 4
This effectively no longer varied across architectures anyway.
Signed-off-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/include/servermd.h b/include/servermd.h
index 83eaad5..72ce6c0 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -52,26 +52,10 @@ SOFTWARE.
* really be simplified even further.
*/
-/*
- * Machine dependent values:
- * GLYPHPADBYTES should be chosen with consideration for the space-time
- * trade-off. Padding to 0 bytes means that there is no wasted space
- * in the font bitmaps (both on disk and in memory), but that access of
- * the bitmaps will cause odd-address memory references. Padding to
- * 2 bytes would ensure even address memory references and would
- * be suitable for a 68010-class machine, but at the expense of wasted
- * space in the font bitmaps. Padding to 4 bytes would be good
- * for real 32 bit machines, etc. Be sure that you tell the font
- * compiler what kind of padding you want because its defines are
- * kept separate from this. See server/include/font.h for how
- * GLYPHPADBYTES is used.
- */
-
#ifdef __avr32__
#define IMAGE_BYTE_ORDER MSBFirst
#define BITMAP_BIT_ORDER MSBFirst
-#define GLYPHPADBYTES 4
#endif /* __avr32__ */
@@ -79,7 +63,6 @@ SOFTWARE.
#define IMAGE_BYTE_ORDER LSBFirst
#define BITMAP_BIT_ORDER LSBFirst
-#define GLYPHPADBYTES 4
#endif /* __arm32__ */
@@ -87,16 +70,12 @@ SOFTWARE.
#define IMAGE_BYTE_ORDER LSBFirst
-#define GLYPHPADBYTES 4
-
#endif /* __nds32__ */
#if defined __hppa__
#define IMAGE_BYTE_ORDER MSBFirst
#define BITMAP_BIT_ORDER MSBFirst
-#define GLYPHPADBYTES 4 /* to make fb work */
- /* byte boundries */
#endif /* hpux || __hppa__ */
#if defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__)
@@ -108,7 +87,6 @@ SOFTWARE.
#define IMAGE_BYTE_ORDER MSBFirst
#define BITMAP_BIT_ORDER MSBFirst
#endif
-#define GLYPHPADBYTES 4
#endif /* PowerPC */
@@ -117,11 +95,9 @@ SOFTWARE.
#if defined(__BIG_ENDIAN__)
#define IMAGE_BYTE_ORDER MSBFirst
#define BITMAP_BIT_ORDER MSBFirst
-#define GLYPHPADBYTES 4
#else
#define IMAGE_BYTE_ORDER LSBFirst
#define BITMAP_BIT_ORDER LSBFirst
-#define GLYPHPADBYTES 4
#endif
#endif /* SuperH */
@@ -131,11 +107,9 @@ SOFTWARE.
#if defined(__BIG_ENDIAN__)
#define IMAGE_BYTE_ORDER MSBFirst
#define BITMAP_BIT_ORDER MSBFirst
-#define GLYPHPADBYTES 4
#else
#define IMAGE_BYTE_ORDER LSBFirst
#define BITMAP_BIT_ORDER LSBFirst
-#define GLYPHPADBYTES 4
#endif
#endif /* __m32r__ */
@@ -157,9 +131,6 @@ SOFTWARE.
#define IMAGE_BYTE_ORDER MSBFirst /* Values for the SUN only */
#define BITMAP_BIT_ORDER MSBFirst
#endif
-
-#define GLYPHPADBYTES 4
-
#endif /* sun && !(i386 && SVR4) */
#if (defined(mips) || defined(__mips))
@@ -167,11 +138,9 @@ SOFTWARE.
#if defined(MIPSEL) || defined(__MIPSEL__)
#define IMAGE_BYTE_ORDER LSBFirst /* Values for the PMAX only */
#define BITMAP_BIT_ORDER LSBFirst
-#define GLYPHPADBYTES 4
#else
#define IMAGE_BYTE_ORDER MSBFirst /* Values for the MIPS only */
#define BITMAP_BIT_ORDER MSBFirst
-#define GLYPHPADBYTES 4
#endif
#endif /* mips */
@@ -179,15 +148,12 @@ SOFTWARE.
#if defined(__alpha) || defined(__alpha__)
#define IMAGE_BYTE_ORDER LSBFirst /* Values for the Alpha only */
#define BITMAP_BIT_ORDER LSBFirst
-#define GLYPHPADBYTES 4
-
#endif /* alpha */
#if defined (linux) && defined (__s390__)
#define IMAGE_BYTE_ORDER MSBFirst
#define BITMAP_BIT_ORDER MSBFirst
-#define GLYPHPADBYTES 4
#endif /* linux/s390 */
@@ -195,7 +161,6 @@ SOFTWARE.
#define IMAGE_BYTE_ORDER MSBFirst
#define BITMAP_BIT_ORDER MSBFirst
-#define GLYPHPADBYTES 4
#endif /* linux/s390x */
@@ -203,15 +168,12 @@ SOFTWARE.
#define IMAGE_BYTE_ORDER LSBFirst
#define BITMAP_BIT_ORDER LSBFirst
-#define GLYPHPADBYTES 4
#endif /* ia64 */
#if defined(__amd64__) || defined(amd64) || defined(__amd64)
#define IMAGE_BYTE_ORDER LSBFirst
#define BITMAP_BIT_ORDER LSBFirst
-#define GLYPHPADBYTES 4
-/* ???? */
#endif /* AMD64 */
#if defined(SVR4) && (defined(__i386__) || defined(__i386) ) || \
@@ -227,17 +189,12 @@ SOFTWARE.
#define BITMAP_BIT_ORDER LSBFirst
#endif
-#ifndef GLYPHPADBYTES
-#define GLYPHPADBYTES 4
-#endif
-
#endif /* SVR4 / BSD / i386 */
#if defined (linux) && defined (__mc68000__)
#define IMAGE_BYTE_ORDER MSBFirst
#define BITMAP_BIT_ORDER MSBFirst
-#define GLYPHPADBYTES 4
#endif /* linux/m68k */
@@ -245,14 +202,12 @@ SOFTWARE.
#if defined(linux) && defined(__arm__)
#define IMAGE_BYTE_ORDER LSBFirst
#define BITMAP_BIT_ORDER LSBFirst
-#define GLYPHPADBYTES 4
#endif
/* linux on IBM S/390 */
#if defined (linux) && defined (__s390__)
#define IMAGE_BYTE_ORDER MSBFirst
#define BITMAP_BIT_ORDER MSBFirst
-#define GLYPHPADBYTES 4
#endif /* linux/s390 */
#ifdef __aarch64__
@@ -265,7 +220,6 @@ SOFTWARE.
#define IMAGE_BYTE_ORDER MSBFirst
#define BITMAP_BIT_ORDER MSBFirst
#endif
-#define GLYPHPADBYTES 4
#endif /* __aarch64__ */
@@ -278,7 +232,6 @@ SOFTWARE.
#define IMAGE_BYTE_ORDER LSBFirst
#define BITMAP_BIT_ORDER LSBFirst
#endif
-#define GLYPHPADBYTES 4
#endif /* ARC */
@@ -292,10 +245,13 @@ SOFTWARE.
#define IMAGE_BYTE_ORDER MSBFirst
#define BITMAP_BIT_ORDER MSBFirst
#endif
-#define GLYPHPADBYTES 4
#endif /* __xtensa__ */
+#ifndef GLYPHPADBYTES
+#define GLYPHPADBYTES 4
+#endif
+
/* size of buffer to use with GetImage, measured in bytes. There's obviously
* a trade-off between the amount of heap used and the number of times the
* ddx routine has to be called.
commit 094b76735cb99b9f26e21f32170614454c644653
Author: Adam Jackson <ajax at redhat.com>
Date: Mon Jul 21 10:06:49 2014 -0400
dix: Remove some cfb leftovers
These macros meant something in cfb, but not in fb.
Signed-off-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/include/servermd.h b/include/servermd.h
index b599847..83eaad5 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -88,9 +88,6 @@ SOFTWARE.
#define IMAGE_BYTE_ORDER LSBFirst
#define GLYPHPADBYTES 4
-#define GETLEFTBITS_ALIGNMENT 1
-#define LARGE_INSTRUCTION_CACHE
-#define AVOID_MEMORY_READ
#endif /* __nds32__ */
@@ -192,8 +189,6 @@ SOFTWARE.
#define BITMAP_BIT_ORDER MSBFirst
#define GLYPHPADBYTES 4
-#define FAST_UNALIGNED_READ
-
#endif /* linux/s390 */
#if defined (linux) && defined (__s390x__)
@@ -202,8 +197,6 @@ SOFTWARE.
#define BITMAP_BIT_ORDER MSBFirst
#define GLYPHPADBYTES 4
-#define FAST_UNALIGNED_READ
-
#endif /* linux/s390x */
#if defined(__ia64__) || defined(ia64)
commit fee9a1536651ace9324b956df809ef22a63938f8
Author: Adam Jackson <ajax at redhat.com>
Date: Mon Jul 21 10:06:48 2014 -0400
dix: Remove some dead macros
Signed-off-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/include/servermd.h b/include/servermd.h
index 16e39a2..b599847 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -361,8 +361,4 @@ extern _X_EXPORT PaddingInfo PixmapWidthPaddingInfo[];
#define BitmapBytePad(w) \
(((int)((w) + BITMAP_SCANLINE_PAD - 1) >> LOG2_BITMAP_PAD) << LOG2_BYTES_PER_SCANLINE_PAD)
-#define PixmapWidthInPadUnitsProto(w, d) PixmapWidthInPadUnits(w, d)
-#define PixmapBytePadProto(w, d) PixmapBytePad(w, d)
-#define BitmapBytePadProto(w) BitmapBytePad(w)
-
#endif /* SERVERMD_H */
commit 634aa310c5130ef4d38f339bb26b01b5a7bad4e9
Author: Adam Jackson <ajax at redhat.com>
Date: Mon Jul 21 10:06:47 2014 -0400
dix: (Don't) change BITMAP_SCANLINE_UNIT on Linux s390{, x}
Every other architecture sets this to 32, and I can't think of any
benefit s390 would derive from changing it. It is, at any rate,
something the client already copes with, and the only internal code
impact seems to be some complicated math in miGetPlane, which you never
hit if you're using fb.
Signed-off-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/include/servermd.h b/include/servermd.h
index 6e71db4..16e39a2 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -192,7 +192,6 @@ SOFTWARE.
#define BITMAP_BIT_ORDER MSBFirst
#define GLYPHPADBYTES 4
-#define BITMAP_SCANLINE_UNIT 8
#define FAST_UNALIGNED_READ
#endif /* linux/s390 */
@@ -203,7 +202,6 @@ SOFTWARE.
#define BITMAP_BIT_ORDER MSBFirst
#define GLYPHPADBYTES 4
-#define BITMAP_SCANLINE_UNIT 8
#define FAST_UNALIGNED_READ
#endif /* linux/s390x */
commit f6469f1910c72add358b7263d69bd116b4450ece
Author: Adam Jackson <ajax at redhat.com>
Date: Mon Jul 21 10:06:46 2014 -0400
dix: Remove some XFree86 3.x leftovers
Signed-off-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/include/servermd.h b/include/servermd.h
index 77cc418..6e71db4 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -87,16 +87,6 @@ SOFTWARE.
#define IMAGE_BYTE_ORDER LSBFirst
-#if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
-#define BITMAP_BIT_ORDER MSBFirst
-#else
-#define BITMAP_BIT_ORDER LSBFirst
-#endif
-
-#if defined(XF86MONOVGA) || defined(XF86VGA16)
-#define BITMAP_SCANLINE_UNIT 8
-#endif
-
#define GLYPHPADBYTES 4
#define GETLEFTBITS_ALIGNMENT 1
#define LARGE_INSTRUCTION_CACHE
commit 5aaacb501ff26bad391664cc7367bfe5164f72c7
Author: Adam Jackson <ajax at redhat.com>
Date: Mon Jul 21 10:06:45 2014 -0400
dix: Remove an ancient IBM configuration
Whatever unix this was meant to be is either no longer in circulation,
or is AIX, which we don't claim to support anyway.
Signed-off-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/include/servermd.h b/include/servermd.h
index e413314..77cc418 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -175,23 +175,6 @@ SOFTWARE.
#endif /* sun && !(i386 && SVR4) */
-#if defined(ibm032) || defined (ibm)
-
-#ifdef __i386__
-#define IMAGE_BYTE_ORDER LSBFirst /* Value for PS/2 only */
-#else
-#define IMAGE_BYTE_ORDER MSBFirst /* Values for the RT only */
-#endif
-#define BITMAP_BIT_ORDER MSBFirst
-#define GLYPHPADBYTES 1
-/* ibm pcc doesn't understand pragmas. */
-
-#ifdef __i386__
-#define BITMAP_SCANLINE_UNIT 8
-#endif
-
-#endif /* ibm */
-
#if (defined(mips) || defined(__mips))
#if defined(MIPSEL) || defined(__MIPSEL__)
More information about the xorg-commit
mailing list