Module Name: xsrc
Committed By: mrg
Date: Fri Aug 19 19:16:01 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-suncg6/dist/src: cg6.h cg6_driver.c
xsrc/external/mit/xf86-video-sunffb/dist/src: ffb.h ffb_accel.c
ffb_accel_common.c ffb_dac.c ffb_driver.c ffb_exa.c
Log Message:
partial port to xorg-server 1.18. both cg6 and ffb need more help.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel_common.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_dac.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_exa.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-suncg6/dist/src/cg6.h
diff -u xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h:1.5 xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h:1.6
--- xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h:1.5 Fri Nov 27 13:41:20 2015
+++ xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h Fri Aug 19 19:16:01 2016
@@ -24,6 +24,7 @@
#ifndef CG6_H
#define CG6_H
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86RamDac.h"
Index: xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c
diff -u xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c:1.10 xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c:1.11
--- xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c:1.10 Fri Nov 27 13:41:20 2015
+++ xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c Fri Aug 19 19:16:01 2016
@@ -30,6 +30,7 @@
#include <string.h>
+#include "cg6.h"
#include "xf86.h"
#include "xf86_OSproc.h"
#include "mipointer.h"
@@ -37,7 +38,6 @@
#include "fb.h"
#include "xf86cmap.h"
-#include "cg6.h"
#include "compat-api.h"
Index: xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h
diff -u xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h:1.7 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h:1.8
--- xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h:1.7 Sun Aug 16 17:47:39 2015
+++ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h Fri Aug 19 19:16:01 2016
@@ -28,6 +28,7 @@
#ifndef FFB_H
#define FFB_H
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86RamDac.h"
Index: xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c
diff -u xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c:1.5 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c:1.6
--- xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c:1.5 Sun Aug 16 17:47:39 2015
+++ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c Fri Aug 19 19:16:01 2016
@@ -29,6 +29,12 @@
#include "config.h"
#endif
+#include "ffb.h"
+#include "ffb_fifo.h"
+#include "ffb_rcache.h"
+#include "ffb_loops.h"
+#include "ffb_regs.h"
+
#include "scrnintstr.h"
#include "pixmapstr.h"
#include "regionstr.h"
@@ -36,12 +42,6 @@
#include "miline.h"
#include "fb.h"
-#include "ffb.h"
-#include "ffb_fifo.h"
-#include "ffb_rcache.h"
-#include "ffb_loops.h"
-#include "ffb_regs.h"
-
#ifdef HAVE_XAA_H
/* VISmoveImage.s */
extern void VISmoveImageRL(unsigned char *src, unsigned char *dst, long w, long h, long skind, long dkind);
Index: xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel_common.c
diff -u xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel_common.c:1.1 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel_common.c:1.2
--- xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel_common.c:1.1 Sun Aug 16 17:47:39 2015
+++ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel_common.c Fri Aug 19 19:16:01 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ffb_accel_common.c,v 1.1 2015/08/16 17:47:39 macallan Exp $ */
+/* $NetBSD: ffb_accel_common.c,v 1.2 2016/08/19 19:16:01 mrg Exp $ */
/*
* Copyright (C) 1998,1999,2000 Jakub Jelinek ([email protected])
* Copyright (C) 1998 Michal Rehacek ([email protected])
@@ -28,17 +28,17 @@
#include <sys/types.h>
+#include "ffb_fifo.h"
+#include "ffb_rcache.h"
+#include "ffb.h"
+#include "ffb_regs.h"
+
/* all driver need this */
#include "xf86.h"
#include "xf86_OSproc.h"
#include "compiler.h"
#include "exa.h"
-#include "ffb_fifo.h"
-#include "ffb_rcache.h"
-#include "ffb.h"
-#include "ffb_regs.h"
-
void FFB_SetupTextureAttrs(FFBPtr pFfb)
{
ffb_fbcPtr ffb = pFfb->regs;
Index: xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_dac.c
diff -u xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_dac.c:1.4 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_dac.c:1.5
--- xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_dac.c:1.4 Tue Jun 4 22:20:42 2013
+++ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_dac.c Fri Aug 19 19:16:01 2016
@@ -34,6 +34,7 @@
#include "xf86_OSproc.h"
#include "xf86DDC.h"
+#include "xf86Privstr.h"
/*
* Used for stabilize time after playing with power management on the display
Index: xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c
diff -u xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c:1.8 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c:1.9
--- xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c:1.8 Tue Aug 11 03:57:36 2015
+++ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c Fri Aug 19 19:16:01 2016
@@ -27,6 +27,8 @@
#include <string.h>
+#include "ffb.h"
+
#include "xf86.h"
#include "xf86_OSproc.h"
#include "mipointer.h"
@@ -35,8 +37,6 @@
#include "xf86cmap.h"
-#include "ffb.h"
-
static const OptionInfoRec * FFBAvailableOptions(int chipid, int busid);
static void FFBIdentify(int flags);
static Bool FFBProbe(DriverPtr drv, int flags);
Index: xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_exa.c
diff -u xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_exa.c:1.2 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_exa.c:1.3
--- xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_exa.c:1.2 Sun Aug 16 17:47:39 2015
+++ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_exa.c Fri Aug 19 19:16:01 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ffb_exa.c,v 1.2 2015/08/16 17:47:39 macallan Exp $ */
+/* $NetBSD: ffb_exa.c,v 1.3 2016/08/19 19:16:01 mrg Exp $ */
/*
* Copyright (c) 2015 Michael Lorenz
* All rights reserved.
@@ -31,17 +31,17 @@
#include <sys/types.h>
+#include "ffb_fifo.h"
+#include "ffb_rcache.h"
+#include "ffb.h"
+#include "ffb_regs.h"
+
/* all driver need this */
#include "xf86.h"
#include "xf86_OSproc.h"
#include "compiler.h"
#include "exa.h"
-#include "ffb_fifo.h"
-#include "ffb_rcache.h"
-#include "ffb.h"
-#include "ffb_regs.h"
-
extern void VISmoveImageRL(unsigned char *, unsigned char *, long, long, long, long);
extern void VISmoveImageLR(unsigned char *, unsigned char *, long, long, long, long);
