Module Name: xsrc
Committed By: mrg
Date: Tue Aug 16 08:09:12 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-r128/dist/src: r128.h r128_driver.c
r128_output.c r128_probe.h
Log Message:
include xorg-server.h which is normally included by config.h.
(as an unmaintained version, this change doubly isn't a candidate
for upstream.)
include xf86Privstr.h and switch screenFd to consoleFd.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-r128/dist/src/r128.h
cvs rdiff -u -r1.16 -r1.17 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.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/xf86-video-r128/dist/src/r128.h
diff -u xsrc/external/mit/xf86-video-r128/dist/src/r128.h:1.7 xsrc/external/mit/xf86-video-r128/dist/src/r128.h:1.8
--- xsrc/external/mit/xf86-video-r128/dist/src/r128.h:1.7 Wed Jul 29 18:15:38 2015
+++ xsrc/external/mit/xf86-video-r128/dist/src/r128.h Tue Aug 16 08:09:12 2016
@@ -38,6 +38,7 @@
#define _R128_H_
#include <unistd.h>
+#include "xorg-server.h"
#include "xf86str.h"
/* PCI support */
Index: xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
diff -u xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.16 xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.17
--- xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.16 Wed Jul 29 19:27:37 2015
+++ xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c Tue Aug 16 08:09:12 2016
@@ -94,6 +94,7 @@
#include "xf86xv.h"
#include "vbe.h"
#include "xf86Priv.h"
+#include "xf86Privstr.h"
/* fbdevhw & vgahw */
#ifdef WITH_VGAHW
@@ -608,7 +609,7 @@ fallback:
*/
struct wsdisplay_fbinfo fbinfo;
- if (ioctl(xf86Info.screenFd, WSDISPLAYIO_GINFO, &fbinfo) == 0) {
+ if (ioctl(xf86Info.consoleFd, WSDISPLAYIO_GINFO, &fbinfo) == 0) {
r128_output->PanelXRes = fbinfo.width;
r128_output->PanelYRes = fbinfo.height;
}
@@ -1348,7 +1349,7 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int
/* now check if this is the console */
info->HaveWSDisplay = FALSE;
info->HaveBacklightControl = FALSE;
- if (ioctl(xf86Info.screenFd, WSDISPLAYIO_GET_BUSID, &bid) != -1) {
+ if (ioctl(xf86Info.consoleFd, WSDISPLAYIO_GET_BUSID, &bid) != -1) {
if ((bid.bus_type == WSDISPLAYIO_BUS_PCI) &&
(bid.ubus.pci.bus == PCI_DEV_BUS(info->PciInfo)) &&
(bid.ubus.pci.device == PCI_DEV_DEV(info->PciInfo)) &&
@@ -1359,7 +1360,7 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int
/* now see if we have hacklight control */
p.param = WSDISPLAYIO_PARAM_BACKLIGHT;
- if (ioctl(xf86Info.screenFd, WSDISPLAYIO_GETPARAM, &p) != -1) {
+ if (ioctl(xf86Info.consoleFd, WSDISPLAYIO_GETPARAM, &p) != -1) {
xf86Msg(X_INFO, "... and we have backlight control\n");
info->HaveBacklightControl = TRUE;
}
Index: xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c
diff -u xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c:1.4 xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c:1.5
--- xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c:1.4 Mon Aug 15 03:06:07 2016
+++ xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c Tue Aug 16 08:09:12 2016
@@ -41,6 +41,7 @@
#include "r128_probe.h"
#include "r128_reg.h"
#include "xf86Priv.h"
+#include "xf86Privstr.h"
#ifdef __NetBSD__
#include <sys/time.h>
@@ -195,7 +196,7 @@ void R128DPMSSetOn(xf86OutputPtr output)
p.param = WSDISPLAYIO_PARAM_BACKLIGHT;
p.curval = 1;
- ioctl(xf86Info.screenFd, WSDISPLAYIO_SETPARAM, &p);
+ ioctl(xf86Info.consoleFd, WSDISPLAYIO_SETPARAM, &p);
} else
#endif
{
@@ -235,7 +236,7 @@ void R128DPMSSetOff(xf86OutputPtr output
p.param = WSDISPLAYIO_PARAM_BACKLIGHT;
p.curval = 0;
- ioctl(xf86Info.screenFd, WSDISPLAYIO_SETPARAM, &p);
+ ioctl(xf86Info.consoleFd, WSDISPLAYIO_SETPARAM, &p);
} else
#endif
{
@@ -278,7 +279,7 @@ static R128MonitorType R128DisplayDDCCon
buffer = malloc(1024);
ei.edid_data = buffer;
ei.buffer_size = 1024;
- if (ioctl(xf86Info.screenFd, WSDISPLAYIO_GET_EDID, &ei) != -1) {
+ if (ioctl(xf86Info.consoleFd, WSDISPLAYIO_GET_EDID, &ei) != -1) {
xf86Msg(X_INFO, "got %d bytes worth of EDID from wsdisplay\n",
ei.data_size);
tmp = xf86InterpretEEDID(pScrn->scrnIndex, buffer);
Index: xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h
diff -u xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h:1.1.1.3 xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h:1.2
--- xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h:1.1.1.3 Mon Jul 20 00:23:09 2015
+++ xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h Tue Aug 16 08:09:12 2016
@@ -36,6 +36,7 @@
#ifndef _R128_PROBE_H_
#define _R128_PROBE_H_ 1
+#include "xorg-server.h"
#include "xf86str.h"
#include "xf86DDC.h"
#include "randrstr.h"
