Module Name: xsrc
Committed By: christos
Date: Wed Jan 2 02:55:41 UTC 2019
Modified Files:
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common: xf86.h
xf86Mode.c xf86str.h xf86xvmc.h
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/modes: xf86Crtc.c
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/ramdac: xf86Cursor.h
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/vbe: vbeModes.c
vbeModes.h
xsrc/external/mit/xorg-server.old/dist/include: misc.h
xsrc/external/mit/xorg-server.old/include: dix-config.h
Log Message:
Add compatibility to xorg-server-120
- Convert display modes arguments to const.
- Provive bswap* in misc.h
- Provide missing cursor function
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86.h \
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86Mode.c \
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86str.h \
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86xvmc.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/modes/xf86Crtc.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/ramdac/xf86Cursor.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.c \
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/include/misc.h
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server.old/include/dix-config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86.h
diff -u xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86.h:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86.h:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86.h:1.1.1.1 Thu Jun 9 05:07:58 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86.h Tue Jan 1 21:55:40 2019
@@ -306,7 +306,7 @@ extern _X_EXPORT ModeStatus xf86InitialC
extern _X_EXPORT ModeStatus xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,
int flags);
extern _X_EXPORT int xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
- char **modeNames, ClockRangePtr clockRanges,
+ const char **modeNames, ClockRangePtr clockRanges,
int *linePitches, int minPitch, int maxPitch,
int minHeight, int maxHeight, int pitchInc,
int virtualX, int virtualY, int apertureSize,
Index: xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86Mode.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86Mode.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86Mode.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86Mode.c:1.1.1.1 Thu Jun 9 05:07:58 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86Mode.c Tue Jan 1 21:55:40 2019
@@ -1346,7 +1346,7 @@ scanLineWidth(
int
xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
- char **modeNames, ClockRangePtr clockRanges,
+ const char **modeNames, ClockRangePtr clockRanges,
int *linePitches, int minPitch, int maxPitch, int pitchInc,
int minHeight, int maxHeight, int virtualX, int virtualY,
int apertureSize, LookupModeFlags strategy)
Index: xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86str.h
diff -u xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86str.h:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86str.h:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86str.h:1.1.1.1 Thu Jun 9 05:07:58 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86str.h Tue Jan 1 21:55:40 2019
@@ -413,7 +413,7 @@ typedef struct {
rgb blackColour;
rgb whiteColour;
int defaultVisual;
- char ** modes;
+ const char ** modes;
pointer options;
} DispRec, *DispPtr;
Index: xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86xvmc.h
diff -u xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86xvmc.h:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86xvmc.h:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86xvmc.h:1.1.1.1 Thu Jun 9 05:07:58 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86xvmc.h Tue Jan 1 21:55:40 2019
@@ -129,7 +129,7 @@ typedef void (*xf86XvMCDestroySubpicture
typedef struct {
- char *name;
+ const char *name;
int num_surfaces;
XF86MCSurfaceInfoPtr *surfaces;
int num_subpictures;
Index: xsrc/external/mit/xorg-server.old/dist/hw/xfree86/modes/xf86Crtc.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/xfree86/modes/xf86Crtc.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/xfree86/modes/xf86Crtc.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/xfree86/modes/xf86Crtc.c:1.1.1.1 Thu Jun 9 05:07:58 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/xfree86/modes/xf86Crtc.c Tue Jan 1 21:55:40 2019
@@ -1449,7 +1449,7 @@ preferredMode(ScrnInfoPtr pScrn, xf86Out
return preferred_mode;
if (pScrn->display->modes && *pScrn->display->modes)
- preferred_mode = *pScrn->display->modes;
+ preferred_mode = (char *)(intptr_t)*pScrn->display->modes;
return preferred_mode;
}
Index: xsrc/external/mit/xorg-server.old/dist/hw/xfree86/ramdac/xf86Cursor.h
diff -u xsrc/external/mit/xorg-server.old/dist/hw/xfree86/ramdac/xf86Cursor.h:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/xfree86/ramdac/xf86Cursor.h:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/xfree86/ramdac/xf86Cursor.h:1.1.1.1 Thu Jun 9 05:07:59 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/xfree86/ramdac/xf86Cursor.h Tue Jan 1 21:55:40 2019
@@ -29,6 +29,7 @@ extern _X_EXPORT Bool xf86InitCursor(Scr
extern _X_EXPORT xf86CursorInfoPtr xf86CreateCursorInfoRec(void);
extern _X_EXPORT void xf86DestroyCursorInfoRec(xf86CursorInfoPtr);
extern _X_EXPORT void xf86ForceHWCursor (ScreenPtr pScreen, Bool on);
+extern _X_EXPORT void xf86CursorResetCursor(ScreenPtr pScreen);
#define HARDWARE_CURSOR_INVERT_MASK 0x00000001
#define HARDWARE_CURSOR_AND_SOURCE_WITH_MASK 0x00000002
Index: xsrc/external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.c:1.1.1.1 Thu Jun 9 05:07:59 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.c Tue Jan 1 21:55:41 2019
@@ -432,7 +432,7 @@ VBESetModeParameters(ScrnInfoPtr pScrn,
*/
int
VBEValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
- char **modeNames, ClockRangePtr clockRanges,
+ const char **modeNames, ClockRangePtr clockRanges,
int *linePitches, int minPitch, int maxPitch, int pitchInc,
int minHeight, int maxHeight, int virtualX, int virtualY,
int apertureSize, LookupModeFlags strategy)
Index: xsrc/external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.h
diff -u xsrc/external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.h:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.h:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.h:1.1.1.1 Thu Jun 9 05:07:59 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.h Tue Jan 1 21:55:41 2019
@@ -80,7 +80,7 @@ extern _X_EXPORT void VBESetModeParamete
* usually just wrap the standard helpers.
*/
extern _X_EXPORT int VBEValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
- char **modeNames, ClockRangePtr clockRanges,
+ const char **modeNames, ClockRangePtr clockRanges,
int *linePitches, int minPitch, int maxPitch,
int pitchInc, int minHeight, int maxHeight,
int virtualX, int virtualY, int apertureSize,
Index: xsrc/external/mit/xorg-server.old/dist/include/misc.h
diff -u xsrc/external/mit/xorg-server.old/dist/include/misc.h:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/include/misc.h:1.2
--- xsrc/external/mit/xorg-server.old/dist/include/misc.h:1.1.1.1 Thu Jun 9 05:08:00 2016
+++ xsrc/external/mit/xorg-server.old/dist/include/misc.h Tue Jan 1 21:55:41 2019
@@ -230,6 +230,20 @@ xstrtokenize(const char *str, const char
#define SwapRestL(stuff) \
SwapLongs((CARD32 *)(stuff + 1), LengthRestL(stuff))
+#ifndef bswap_16
+#define bswap_16(value) \
+ ((((value) & 0xff) << 8) | ((value) >> 8))
+
+#define bswap_32(value) \
+ (((uint32_t)bswap_16((uint16_t)((value) & 0xffff)) << 16) | \
+ (uint32_t)bswap_16((uint16_t)((value) >> 16)))
+
+#define bswap_64(value) \
+ (((uint64_t)bswap_32((uint32_t)((value) & 0xffffffff)) \
+ << 32) | \
+ (uint64_t)bswap_32((uint32_t)((value) >> 32)))
+#endif
+
/* byte swap a 32-bit value */
#define swapl(x, n) { \
n = ((char *) (x))[0];\
Index: xsrc/external/mit/xorg-server.old/include/dix-config.h
diff -u xsrc/external/mit/xorg-server.old/include/dix-config.h:1.4 xsrc/external/mit/xorg-server.old/include/dix-config.h:1.5
--- xsrc/external/mit/xorg-server.old/include/dix-config.h:1.4 Wed Mar 8 02:44:16 2017
+++ xsrc/external/mit/xorg-server.old/include/dix-config.h Tue Jan 1 21:55:41 2019
@@ -436,6 +436,7 @@
/* Define to 1 if the DTrace Xserver provider probes should be built in */
/* #undef XSERVER_DTRACE */
+#ifndef bswap_16
/* Define to 16-bit byteswap macro */
#define bswap_16 bswap16
@@ -444,6 +445,7 @@
/* Define to 64-bit byteswap macro */
#define bswap_64 bswap64
+#endif
/* Need the strcasecmp function. */
/* #undef NEED_STRCASECMP */
