Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit fix various errors and warnings with xorg-ser...
details: https://anonhg.NetBSD.org/xsrc/rev/ca46f0c9f0bc
branches: trunk
changeset: 10063:ca46f0c9f0bc
user: mrg <mrg%NetBSD.org@localhost>
date: Tue Jan 01 00:34:52 2019 +0000
description:
fix various errors and warnings with xorg-server 1.20:
- no Error() in scope
- more wakeup/blockhandler ABI changes
- more notify fd API changes
- more xf86CursorResetCursor changes
- lots of char* -> const char*
- fix ati kms config.h now HAVE_XF86_CURSOR_RESET_CURSOR is available
- another xf86GetOS() is removed fix
- OsBlockSIGIO() etc, -> old, but still around API until properly converted
- don't free const char * data owned by some other system
diffstat:
external/mit/xf86-input-elographics/dist/src/xf86Elo.c | 2 +-
external/mit/xf86-input-ws/dist/src/emumb.c | 12 ++++-
external/mit/xf86-input-ws/dist/src/ws.h | 6 ++
external/mit/xf86-video-ati-kms/dist/src/radeon_video.c | 2 +-
external/mit/xf86-video-ati-kms/dist/src/radeon_video.h | 2 +-
external/mit/xf86-video-ati-kms/dist/src/radeon_xvmc.c | 2 +-
external/mit/xf86-video-ati-kms/include/config.h | 3 +-
external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c | 23 +++++++++++
external/mit/xf86-video-ati/dist/src/compat-api.h | 4 +
external/mit/xf86-video-ati/dist/src/drmmode_display.c | 13 ++++++
external/mit/xf86-video-ati/dist/src/legacy_output.c | 2 +-
external/mit/xf86-video-ati/dist/src/radeon_atombios.c | 2 +-
external/mit/xf86-video-ati/dist/src/radeon_crtc.c | 4 +
external/mit/xf86-video-ati/dist/src/radeon_driver.c | 8 +-
external/mit/xf86-video-ati/dist/src/radeon_kms.c | 2 +-
external/mit/xf86-video-ati/dist/src/radeon_modes.c | 2 +-
external/mit/xf86-video-ati/dist/src/radeon_video.h | 2 +-
external/mit/xf86-video-ati/dist/src/radeon_xvmc.c | 2 +-
external/mit/xf86-video-ati/xorg-server-copy/msp3430.c | 6 +-
external/mit/xf86-video-geode/dist/src/geode.h | 2 +-
external/mit/xf86-video-geode/dist/src/lx_display.c | 4 +
external/mit/xf86-video-geode/dist/src/lx_driver.c | 2 +-
external/mit/xf86-video-geode/dist/src/lx_panel.c | 2 +-
external/mit/xf86-video-glint/dist/src/pm2_video.c | 9 +---
external/mit/xf86-video-intel/dist/src/sna/sna_display.c | 3 +-
external/mit/xf86-video-intel/dist/src/uxa/intel_display.c | 21 ++++++++++
external/mit/xf86-video-nouveau/dist/src/drmmode_display.c | 4 +
external/mit/xf86-video-nouveau/dist/src/vl_hwmc.c | 2 +-
external/mit/xf86-video-nouveau/dist/src/vl_hwmc.h | 2 +-
external/mit/xf86-video-openchrome/dist/src/via_display.c | 8 +++
external/mit/xf86-video-openchrome/dist/src/via_kms.c | 4 +
external/mit/xf86-video-trident/dist/src/trident_driver.c | 2 +-
external/mit/xf86-video-vmware/dist/src/vmware.c | 4 -
external/mit/xf86-video-vmware/dist/src/vmwaremodes.c | 2 +-
34 files changed, 130 insertions(+), 40 deletions(-)
diffs (truncated from 635 to 300 lines):
diff -r 0cb6482b8526 -r ca46f0c9f0bc external/mit/xf86-input-elographics/dist/src/xf86Elo.c
--- a/external/mit/xf86-input-elographics/dist/src/xf86Elo.c Mon Dec 31 22:17:20 2018 +0000
+++ b/external/mit/xf86-input-elographics/dist/src/xf86Elo.c Tue Jan 01 00:34:52 2019 +0000
@@ -338,7 +338,7 @@
* Okay, give up.
*/
if (num_bytes != ELO_UNFRAMED_SIZE) {
- Error("System error while reading from Elographics touchscreen.");
+ ErrorF("System error while reading from Elographics touchscreen.");
return !Success;
}
DBG(4, ErrorF("Read %d bytes\n", num_bytes));
diff -r 0cb6482b8526 -r ca46f0c9f0bc external/mit/xf86-input-ws/dist/src/emumb.c
--- a/external/mit/xf86-input-ws/dist/src/emumb.c Mon Dec 31 22:17:20 2018 +0000
+++ b/external/mit/xf86-input-ws/dist/src/emumb.c Tue Jan 01 00:34:52 2019 +0000
@@ -279,8 +279,12 @@
void
wsmbEmuWakeupHandler(pointer data,
- int i,
- pointer LastSelectMask)
+/* XXX compat-api.h */
+ int i
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(23, 0)
+ , pointer LastSelectMask
+#endif
+ )
{
InputInfoPtr pInfo = (InputInfoPtr)data;
WSDevicePtr priv = (WSDevicePtr)pInfo->private;
@@ -295,7 +299,9 @@
void
wsmbEmuBlockHandler(pointer data,
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(23, 0)
struct timeval **waitTime,
+#endif
pointer LastSelectMask)
{
InputInfoPtr pInfo = (InputInfoPtr) data;
@@ -306,7 +312,9 @@
ms = priv->emulateMB.expires - GetTimeInMillis();
if (ms <= 0)
ms = 0;
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(23, 0)
AdjustWaitForDelay(waitTime, ms);
+#endif
}
}
diff -r 0cb6482b8526 -r ca46f0c9f0bc external/mit/xf86-input-ws/dist/src/ws.h
--- a/external/mit/xf86-input-ws/dist/src/ws.h Mon Dec 31 22:17:20 2018 +0000
+++ b/external/mit/xf86-input-ws/dist/src/ws.h Tue Jan 01 00:34:52 2019 +0000
@@ -60,8 +60,14 @@
extern int wsmbEmuTimer(InputInfoPtr);
extern BOOL wsmbEmuFilterEvent(InputInfoPtr, int, BOOL);
+/* XXX compat-api.h */
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(23, 0)
extern void wsmbEmuWakeupHandler(pointer, int, pointer);
extern void wsmbEmuBlockHandler(pointer, struct timeval **, pointer);
+#else
+extern void wsmbEmuWakeupHandler(pointer, int);
+extern void wsmbEmuBlockHandler(pointer, pointer);
+#endif
extern void wsmbEmuPreInit(InputInfoPtr);
extern void wsmbEmuOn(InputInfoPtr);
extern void wsmbEmuFinalize(InputInfoPtr);
diff -r 0cb6482b8526 -r ca46f0c9f0bc external/mit/xf86-video-ati-kms/dist/src/radeon_video.c
--- a/external/mit/xf86-video-ati-kms/dist/src/radeon_video.c Mon Dec 31 22:17:20 2018 +0000
+++ b/external/mit/xf86-video-ati-kms/dist/src/radeon_video.c Tue Jan 01 00:34:52 2019 +0000
@@ -173,7 +173,7 @@
xf86XVScreenInit(pScreen, adaptors, num_adaptors);
if(texturedAdaptor) {
- XF86MCAdaptorPtr xvmcAdaptor = RADEONCreateAdaptorXvMC(pScreen, (char *)texturedAdaptor->name);
+ XF86MCAdaptorPtr xvmcAdaptor = RADEONCreateAdaptorXvMC(pScreen, texturedAdaptor->name);
if(xvmcAdaptor) {
if(!xf86XvMCScreenInit(pScreen, 1, &xvmcAdaptor))
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "[XvMC] Failed to initialize extension.\n");
diff -r 0cb6482b8526 -r ca46f0c9f0bc external/mit/xf86-video-ati-kms/dist/src/radeon_video.h
--- a/external/mit/xf86-video-ati-kms/dist/src/radeon_video.h Mon Dec 31 22:17:20 2018 +0000
+++ b/external/mit/xf86-video-ati-kms/dist/src/radeon_video.h Tue Jan 01 00:34:52 2019 +0000
@@ -85,7 +85,7 @@
RADEONSetupImageTexturedVideo(ScreenPtr pScreen);
XF86MCAdaptorPtr
-RADEONCreateAdaptorXvMC(ScreenPtr pScreen, char *xv_adaptor_name);
+RADEONCreateAdaptorXvMC(ScreenPtr pScreen, const char *xv_adaptor_name);
void
RADEONCopyData(ScrnInfoPtr pScrn,
diff -r 0cb6482b8526 -r ca46f0c9f0bc external/mit/xf86-video-ati-kms/dist/src/radeon_xvmc.c
--- a/external/mit/xf86-video-ati-kms/dist/src/radeon_xvmc.c Mon Dec 31 22:17:20 2018 +0000
+++ b/external/mit/xf86-video-ati-kms/dist/src/radeon_xvmc.c Tue Jan 01 00:34:52 2019 +0000
@@ -120,7 +120,7 @@
};
XF86MCAdaptorPtr
-RADEONCreateAdaptorXvMC(ScreenPtr pScreen, char *xv_adaptor_name)
+RADEONCreateAdaptorXvMC(ScreenPtr pScreen, const char *xv_adaptor_name)
{
XF86MCAdaptorPtr adaptor;
ScrnInfoPtr pScrn;
diff -r 0cb6482b8526 -r ca46f0c9f0bc external/mit/xf86-video-ati-kms/include/config.h
--- a/external/mit/xf86-video-ati-kms/include/config.h Mon Dec 31 22:17:20 2018 +0000
+++ b/external/mit/xf86-video-ati-kms/include/config.h Tue Jan 01 00:34:52 2019 +0000
@@ -66,9 +66,8 @@
/* xextproto 7.1 available */
#define HAVE_XEXTPROTO_71 1
-// XXXMRG
/* Have xf86CursorResetCursor API */
-#undef HAVE_XF86_CURSOR_RESET_CURSOR
+#define HAVE_XF86_CURSOR_RESET_CURSOR 1
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#define LT_OBJDIR ".libs/"
diff -r 0cb6482b8526 -r ca46f0c9f0bc external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c
--- a/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c Mon Dec 31 22:17:20 2018 +0000
+++ b/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c Tue Jan 01 00:34:52 2019 +0000
@@ -215,6 +215,29 @@
pParserTempData->IndirectData &= ~((0xFFFFFFFF >> (32-pParserTempData->IndirectIOTablePointer[1])) << pParserTempData->IndirectIOTablePointer[2]);
}
+/* from xorg-server 1.18 compiler.h */
+struct __una_u64 { uint64_t x __attribute__((packed)); };
+struct __una_u32 { uint32_t x __attribute__((packed)); };
+
+static __inline__ uint16_t ldw_u(uint16_t *p)
+{
+ uint16_t ret;
+ memmove(&ret, p, sizeof(*p));
+ return ret;
+}
+
+static __inline__ uint32_t ldl_u(uint32_t *p)
+{
+ uint32_t ret;
+ memmove(&ret, p, sizeof(*p));
+ return ret;
+}
+
+static __inline__ void stl_u(uint32_t val, uint32_t *p)
+{
+ struct __una_u32 *ptr = (struct __una_u32 *) p;
+ ptr->x = val;
+}
UINT32 IndirectInputOutput(PARSER_TEMP_DATA STACK_BASED * pParserTempData)
{
diff -r 0cb6482b8526 -r ca46f0c9f0bc external/mit/xf86-video-ati/dist/src/compat-api.h
--- a/external/mit/xf86-video-ati/dist/src/compat-api.h Mon Dec 31 22:17:20 2018 +0000
+++ b/external/mit/xf86-video-ati/dist/src/compat-api.h Tue Jan 01 00:34:52 2019 +0000
@@ -38,6 +38,10 @@
#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
#endif
+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(22,0)
+#define HAVE_NOTIFY_FD 1
+#endif
+
#ifndef XF86_SCRN_INTERFACE
#define SCRN_ARG_TYPE int
diff -r 0cb6482b8526 -r ca46f0c9f0bc external/mit/xf86-video-ati/dist/src/drmmode_display.c
--- a/external/mit/xf86-video-ati/dist/src/drmmode_display.c Mon Dec 31 22:17:20 2018 +0000
+++ b/external/mit/xf86-video-ati/dist/src/drmmode_display.c Tue Jan 01 00:34:52 2019 +0000
@@ -432,7 +432,11 @@
if (pScrn->pScreen &&
!xf86ReturnOptValBool(info->Options, OPTION_SW_CURSOR, FALSE))
+#ifdef HAVE_XF86_CURSOR_RESET_CURSOR
+ xf86CursorResetCursor(pScrn->pScreen);
+#else
xf86_reload_cursors(pScrn->pScreen);
+#endif
done:
if (!ret) {
@@ -1477,6 +1481,14 @@
}
+#if HAVE_NOTIFY_FD
+static void drmmode_notify_fd(int fd, int notify, void *data)
+{
+ drmmode_ptr drmmode = data;
+
+ drmHandleEvent(fd, &drmmode->event_context);
+}
+#else
static void
drm_wakeup_handler(pointer data, int err, pointer p)
{
@@ -1487,6 +1499,7 @@
drmHandleEvent(drmmode->fd, &drmmode->event_context);
}
}
+#endif
Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp)
{
diff -r 0cb6482b8526 -r ca46f0c9f0bc external/mit/xf86-video-ati/dist/src/legacy_output.c
--- a/external/mit/xf86-video-ati/dist/src/legacy_output.c Mon Dec 31 22:17:20 2018 +0000
+++ b/external/mit/xf86-video-ati/dist/src/legacy_output.c Tue Jan 01 00:34:52 2019 +0000
@@ -228,7 +228,7 @@
{
RADEONInfoPtr info = RADEONPTR(pScrn);
radeon_native_mode_ptr native_mode = &lvds->native_mode;
- char* s;
+ const char* s;
if (!RADEONGetLVDSInfoFromBIOS(pScrn, lvds))
RADEONGetPanelInfoFromReg(pScrn, lvds);
diff -r 0cb6482b8526 -r ca46f0c9f0bc external/mit/xf86-video-ati/dist/src/radeon_atombios.c
--- a/external/mit/xf86-video-ati/dist/src/radeon_atombios.c Mon Dec 31 22:17:20 2018 +0000
+++ b/external/mit/xf86-video-ati/dist/src/radeon_atombios.c Tue Jan 01 00:34:52 2019 +0000
@@ -1605,7 +1605,7 @@
ATOM_I2C_RECORD *Record, int i)
{
RADEONInfoPtr info = RADEONPTR (pScrn);
- uint8_t *temp = &Record->sucI2cId;
+ uint8_t *temp = (uint8_t *)&Record->sucI2cId;
info->BiosConnector[i].i2c_line_mux = *temp;
info->BiosConnector[i].ucI2cId = *temp;
diff -r 0cb6482b8526 -r ca46f0c9f0bc external/mit/xf86-video-ati/dist/src/radeon_crtc.c
--- a/external/mit/xf86-video-ati/dist/src/radeon_crtc.c Mon Dec 31 22:17:20 2018 +0000
+++ b/external/mit/xf86-video-ati/dist/src/radeon_crtc.c Tue Jan 01 00:34:52 2019 +0000
@@ -507,7 +507,11 @@
radeon_crtc_mode_commit(xf86CrtcPtr crtc)
{
if (crtc->scrn->pScreen != NULL)
+#ifdef HAVE_XF86_CURSOR_RESET_CURSOR
+ xf86CursorResetCursor(crtc->scrn->pScreen);
+#else
xf86_reload_cursors(crtc->scrn->pScreen);
+#endif
}
void
diff -r 0cb6482b8526 -r ca46f0c9f0bc external/mit/xf86-video-ati/dist/src/radeon_driver.c
--- a/external/mit/xf86-video-ati/dist/src/radeon_driver.c Mon Dec 31 22:17:20 2018 +0000
+++ b/external/mit/xf86-video-ati/dist/src/radeon_driver.c Tue Jan 01 00:34:52 2019 +0000
@@ -2636,8 +2636,8 @@
uint16_t bios_header;
uint16_t pll_info_block;
#ifdef XvExtension
- char* microc_path = NULL;
- char* microc_type = NULL;
+ const char* microc_path = NULL;
+ const char* microc_type = NULL;
MessageType from;
if (xf86GetOptValInteger(info->Options, OPTION_VIDEO_KEY,
@@ -2871,7 +2871,7 @@
RADEONInfoPtr info = RADEONPTR(pScrn);
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
int o;
- char *s;
+ const char *s;
if ((s = xf86GetOptValString(info->Options, OPTION_ZAPHOD_HEADS))) {
for (o = config->num_output; o > 0; o--) {
@@ -3460,7 +3460,7 @@
int hasDRI = 0;
#ifdef RENDER
int subPixelOrder = SubPixelUnknown;
- char* s;
+ const char* s;
#endif
diff -r 0cb6482b8526 -r ca46f0c9f0bc external/mit/xf86-video-ati/dist/src/radeon_kms.c
--- a/external/mit/xf86-video-ati/dist/src/radeon_kms.c Mon Dec 31 22:17:20 2018 +0000
+++ b/external/mit/xf86-video-ati/dist/src/radeon_kms.c Tue Jan 01 00:34:52 2019 +0000
@@ -926,7 +926,7 @@
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
RADEONInfoPtr info = RADEONPTR(pScrn);
int subPixelOrder = SubPixelUnknown;
- char* s;
+ const char* s;
void *front_ptr;
int ret;
diff -r 0cb6482b8526 -r ca46f0c9f0bc external/mit/xf86-video-ati/dist/src/radeon_modes.c
--- a/external/mit/xf86-video-ati/dist/src/radeon_modes.c Mon Dec 31 22:17:20 2018 +0000
+++ b/external/mit/xf86-video-ati/dist/src/radeon_modes.c Tue Jan 01 00:34:52 2019 +0000
@@ -258,7 +258,7 @@
DisplayModePtr first = NULL;
int count = 0;
int i, width, height;
- char **ppModeName = pScrn->display->modes;
+ const char **ppModeName = pScrn->display->modes;
first = last = *modeList;
diff -r 0cb6482b8526 -r ca46f0c9f0bc external/mit/xf86-video-ati/dist/src/radeon_video.h
--- a/external/mit/xf86-video-ati/dist/src/radeon_video.h Mon Dec 31 22:17:20 2018 +0000
Home |
Main Index |
Thread Index |
Old Index