Module Name: xsrc
Committed By: macallan
Date: Fri Aug 19 21:12:46 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-tdfx/dist/src: tdfx_dri.c tdfx_driver.c
Log Message:
adapt to new Xserver
untested
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c
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-tdfx/dist/src/tdfx_dri.c
diff -u xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c:1.4 xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c:1.5
--- xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c:1.4 Thu Jul 23 01:19:16 2015
+++ xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c Fri Aug 19 21:12:46 2016
@@ -3,6 +3,7 @@
#include "config.h"
#endif
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Pci.h"
Index: xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c
diff -u xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c:1.7 xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c:1.8
--- xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c:1.7 Fri Jul 1 22:31:42 2016
+++ xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c Fri Aug 19 21:12:46 2016
@@ -49,6 +49,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
/*
* These are X and server generic header files.
*/
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
@@ -2256,7 +2257,8 @@ TDFXScreenInit(SCREEN_INIT_ARGS_DECL) {
vgaHWGetIOBase(hwp);
#else
/* access VGA registers through the IO BAR, not legacy decoding */
- hwp->PIOOffset = pTDFX->PIOBase[0] - 0x300;
+/* XXX */
+/* hwp->PIOOffset = pTDFX->PIOBase[0] - 0x300;*/
#endif
/* Map VGA memory only for primary cards (to save/restore textmode data). */
if (pTDFX->Primary) {
