Module Name: xsrc
Committed By: mrg
Date: Thu Aug 18 09:32:26 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-igs/dist/src: igs.h igs_accel.c
igs_cursor.c igs_driver.c
Removed Files:
xsrc/external/mit/xf86-video-igs/include: config.h
Log Message:
clean up header files for this (local) driver. don't need a config.h.
partly ported to xorg-server 1.18, but needs compat-api.h treatment.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-video-igs/dist/src/igs.h
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-igs/dist/src/igs_cursor.c
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c
cvs rdiff -u -r1.1 -r0 xsrc/external/mit/xf86-video-igs/include/config.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-igs/dist/src/igs.h
diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs.h:1.6 xsrc/external/mit/xf86-video-igs/dist/src/igs.h:1.7
--- xsrc/external/mit/xf86-video-igs/dist/src/igs.h:1.6 Wed Dec 14 23:58:54 2011
+++ xsrc/external/mit/xf86-video-igs/dist/src/igs.h Thu Aug 18 09:32:26 2016
@@ -1,5 +1,5 @@
/* $OpenBSD: wsfb_driver.c,v 1.18 2003/04/02 16:42:13 jason Exp $ */
-/* $NetBSD: igs.h,v 1.6 2011/12/14 23:58:54 macallan Exp $ */
+/* $NetBSD: igs.h,v 1.7 2016/08/18 09:32:26 mrg Exp $ */
/*
* Copyright (c) 2001 Matthieu Herrb
* 2009 Michael Lorenz
@@ -43,8 +43,11 @@
#include <sys/time.h>
#include <dev/wscons/wsconsio.h>
+/* all driver need this */
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
+#include "compiler.h"
#include "xf86RamDac.h"
#include "exa.h"
Index: xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c
diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.9 xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.10
--- xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.9 Mon Aug 25 15:27:00 2014
+++ xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c Thu Aug 18 09:32:26 2016
@@ -21,15 +21,10 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $NetBSD: igs_accel.c,v 1.9 2014/08/25 15:27:00 macallan Exp $ */
+/* $NetBSD: igs_accel.c,v 1.10 2016/08/18 09:32:26 mrg Exp $ */
#include <sys/types.h>
-/* all driver need this */
-#include "xf86.h"
-#include "xf86_OSproc.h"
-#include "compiler.h"
-
#include "igs.h"
/*#define DEBUG*/
Index: xsrc/external/mit/xf86-video-igs/dist/src/igs_cursor.c
diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs_cursor.c:1.3 xsrc/external/mit/xf86-video-igs/dist/src/igs_cursor.c:1.4
--- xsrc/external/mit/xf86-video-igs/dist/src/igs_cursor.c:1.3 Sat May 28 13:26:54 2011
+++ xsrc/external/mit/xf86-video-igs/dist/src/igs_cursor.c Thu Aug 18 09:32:26 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: igs_cursor.c,v 1.3 2011/05/28 13:26:54 christos Exp $ */
+/* $NetBSD: igs_cursor.c,v 1.4 2016/08/18 09:32:26 mrg Exp $ */
/*
* Copyright (c) 2005 Michael Lorenz
* All rights reserved.
@@ -37,11 +37,6 @@
#include <sys/ioctl.h>
#include <errno.h>
-/* all driver need this */
-#include "xf86.h"
-#include "xf86_OSproc.h"
-#include "compiler.h"
-
#include "igs.h"
static void IgsLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src);
Index: xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c
diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.12 xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.13
--- xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.12 Tue Aug 16 01:27:46 2016
+++ xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c Thu Aug 18 09:32:26 2016
@@ -1,5 +1,5 @@
/* $OpenBSD: wsfb_driver.c,v 1.19 2003/04/27 16:42:32 matthieu Exp $ */
-/* $NetBSD: igs_driver.c,v 1.12 2016/08/16 01:27:46 mrg Exp $ */
+/* $NetBSD: igs_driver.c,v 1.13 2016/08/18 09:32:26 mrg Exp $ */
/*
* Copyright (c) 2001 Matthieu Herrb
* 2009 Michael Lorenz
@@ -43,10 +43,6 @@
* adapted from wsfb
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#include <fcntl.h>
#include <sys/types.h>
#include <sys/time.h>
@@ -55,9 +51,7 @@
#include <errno.h>
#include <dev/wscons/wsconsio.h>
-/* all driver need this */
-#include "xf86.h"
-#include "xf86_OSproc.h"
+#include "igs.h"
#include "mipointer.h"
#include "micmap.h"
@@ -66,9 +60,6 @@
#include "shadow.h"
#include "dgaproc.h"
-/* Everything using inb/outb, etc needs "compiler.h" */
-#include "compiler.h"
-
/* for visuals */
#include "fb.h"
@@ -81,8 +72,6 @@
#include "xf86xv.h"
#endif
-#include "igs.h"
-
#include <sys/mman.h>
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) > 6
