Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit/xorg-server.old Add compatibility to xorg-ser...
details: https://anonhg.NetBSD.org/xsrc/rev/f05b44553801
branches: trunk
changeset: 10066:f05b44553801
user: christos <christos%NetBSD.org@localhost>
date: Wed Jan 02 02:55:40 2019 +0000
description:
Add compatibility to xorg-server-120
- Convert display modes arguments to const.
- Provive bswap* in misc.h
- Provide missing cursor function
diffstat:
external/mit/xorg-server.old/dist/hw/xfree86/common/xf86.h | 2 +-
external/mit/xorg-server.old/dist/hw/xfree86/common/xf86Mode.c | 2 +-
external/mit/xorg-server.old/dist/hw/xfree86/common/xf86str.h | 2 +-
external/mit/xorg-server.old/dist/hw/xfree86/common/xf86xvmc.h | 2 +-
external/mit/xorg-server.old/dist/hw/xfree86/modes/xf86Crtc.c | 2 +-
external/mit/xorg-server.old/dist/hw/xfree86/ramdac/xf86Cursor.h | 1 +
external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.c | 2 +-
external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.h | 2 +-
external/mit/xorg-server.old/dist/include/misc.h | 14 ++++++++++
external/mit/xorg-server.old/include/dix-config.h | 2 +
10 files changed, 24 insertions(+), 7 deletions(-)
diffs (138 lines):
diff -r 4c90a7c151bd -r f05b44553801 external/mit/xorg-server.old/dist/hw/xfree86/common/xf86.h
--- a/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86.h Tue Jan 01 05:29:40 2019 +0000
+++ b/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86.h Wed Jan 02 02:55:40 2019 +0000
@@ -306,7 +306,7 @@
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,
diff -r 4c90a7c151bd -r f05b44553801 external/mit/xorg-server.old/dist/hw/xfree86/common/xf86Mode.c
--- a/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86Mode.c Tue Jan 01 05:29:40 2019 +0000
+++ b/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86Mode.c Wed Jan 02 02:55:40 2019 +0000
@@ -1346,7 +1346,7 @@
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)
diff -r 4c90a7c151bd -r f05b44553801 external/mit/xorg-server.old/dist/hw/xfree86/common/xf86str.h
--- a/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86str.h Tue Jan 01 05:29:40 2019 +0000
+++ b/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86str.h Wed Jan 02 02:55:40 2019 +0000
@@ -413,7 +413,7 @@
rgb blackColour;
rgb whiteColour;
int defaultVisual;
- char ** modes;
+ const char ** modes;
pointer options;
} DispRec, *DispPtr;
diff -r 4c90a7c151bd -r f05b44553801 external/mit/xorg-server.old/dist/hw/xfree86/common/xf86xvmc.h
--- a/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86xvmc.h Tue Jan 01 05:29:40 2019 +0000
+++ b/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86xvmc.h Wed Jan 02 02:55:40 2019 +0000
@@ -129,7 +129,7 @@
typedef struct {
- char *name;
+ const char *name;
int num_surfaces;
XF86MCSurfaceInfoPtr *surfaces;
int num_subpictures;
diff -r 4c90a7c151bd -r f05b44553801 external/mit/xorg-server.old/dist/hw/xfree86/modes/xf86Crtc.c
--- a/external/mit/xorg-server.old/dist/hw/xfree86/modes/xf86Crtc.c Tue Jan 01 05:29:40 2019 +0000
+++ b/external/mit/xorg-server.old/dist/hw/xfree86/modes/xf86Crtc.c Wed Jan 02 02:55:40 2019 +0000
@@ -1449,7 +1449,7 @@
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;
}
diff -r 4c90a7c151bd -r f05b44553801 external/mit/xorg-server.old/dist/hw/xfree86/ramdac/xf86Cursor.h
--- a/external/mit/xorg-server.old/dist/hw/xfree86/ramdac/xf86Cursor.h Tue Jan 01 05:29:40 2019 +0000
+++ b/external/mit/xorg-server.old/dist/hw/xfree86/ramdac/xf86Cursor.h Wed Jan 02 02:55:40 2019 +0000
@@ -29,6 +29,7 @@
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
diff -r 4c90a7c151bd -r f05b44553801 external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.c
--- a/external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.c Tue Jan 01 05:29:40 2019 +0000
+++ b/external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.c Wed Jan 02 02:55:40 2019 +0000
@@ -432,7 +432,7 @@
*/
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)
diff -r 4c90a7c151bd -r f05b44553801 external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.h
--- a/external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.h Tue Jan 01 05:29:40 2019 +0000
+++ b/external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.h Wed Jan 02 02:55:40 2019 +0000
@@ -80,7 +80,7 @@
* 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,
diff -r 4c90a7c151bd -r f05b44553801 external/mit/xorg-server.old/dist/include/misc.h
--- a/external/mit/xorg-server.old/dist/include/misc.h Tue Jan 01 05:29:40 2019 +0000
+++ b/external/mit/xorg-server.old/dist/include/misc.h Wed Jan 02 02:55:40 2019 +0000
@@ -230,6 +230,20 @@
#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];\
diff -r 4c90a7c151bd -r f05b44553801 external/mit/xorg-server.old/include/dix-config.h
--- a/external/mit/xorg-server.old/include/dix-config.h Tue Jan 01 05:29:40 2019 +0000
+++ b/external/mit/xorg-server.old/include/dix-config.h Wed Jan 02 02:55:40 2019 +0000
@@ -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 */
Home |
Main Index |
Thread Index |
Old Index