[xserver-commit] xfree86/drivers/nsc durango.c,1.5,1.6 nsc_driver.c,1.5,1.6 nsc_galfns.c,1.3,1.4 nsc_galstub.c,1.2,1.3 nsc_gx1_accel.c,1.8,1.9 nsc_gx1_cursor.c,1.6,1.7 nsc_gx1_dga.c,1.2,1.3 nsc_gx1_driver.c,1.11,1.12 nsc_gx1_shadow.c,1.2,1.3 nsc_gx1_video.c,1.8,1.9 nsc_gx2_accel.c,1.5,1.6 nsc_gx2_cursor.c,1.6,1.7 nsc_gx2_dga.c,1.2,1.3 nsc_gx2_driver.c,1.10,1.11 nsc_gx2_shadow.c,1.2,1.3 nsc_gx2_vga.c,1.3,1.4 nsc_gx2_video.c,1.7,1.8 nsc_regacc.c,1.2,1.3 panel.c,1.3,1.4

Keith Packard xserver-commit@pdx.freedesktop.org


Committed by: keithp

Update of /cvs/xserver/xfree86/drivers/nsc
In directory pdx:/tmp/cvs-serv14744/drivers/nsc

Modified Files:
	durango.c nsc_driver.c nsc_galfns.c nsc_galstub.c 
	nsc_gx1_accel.c nsc_gx1_cursor.c nsc_gx1_dga.c 
	nsc_gx1_driver.c nsc_gx1_shadow.c nsc_gx1_video.c 
	nsc_gx2_accel.c nsc_gx2_cursor.c nsc_gx2_dga.c 
	nsc_gx2_driver.c nsc_gx2_shadow.c nsc_gx2_vga.c 
	nsc_gx2_video.c nsc_regacc.c panel.c 
Log Message:
	* Makefile.am
	* *.c
	Ok, everyone gets #include <config.h>
	Other than that, I fixed a few extension header paths and
	whacked at the Makefile.am.  Makefile.am is a hacked version
	of xserver/Makefile.am; expect them to diverge until we can
	stick the xfree86 DDX stuff into the standard Makefile.am.


Index: durango.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nsc/durango.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/durango.c	24 Jan 2003 17:16:52 -0000	1.5
+++ b/durango.c	28 Feb 2004 01:27:39 -0000	1.6
@@ -153,6 +153,9 @@
  * of chipsets. 
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define GFX_DISPLAY_DYNAMIC			1	/* runtime selection */
 #define GFX_DISPLAY_GU1				1	/* 1st generation display controller */
 #define GFX_DISPLAY_GU2				1	/* 2nd generation display controller */

Index: nsc_driver.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nsc/nsc_driver.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/nsc_driver.c	23 Apr 2003 21:51:41 -0000	1.5
+++ b/nsc_driver.c	28 Feb 2004 01:27:39 -0000	1.6
@@ -143,6 +143,9 @@
  *
  * END_NSC_LIC_GPL */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define DEBUG(x)
 #define NSC_TRACE 0
 #define CFB 0

Index: nsc_galfns.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nsc/nsc_galfns.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/nsc_galfns.c	5 Feb 2003 18:38:42 -0000	1.3
+++ b/nsc_galfns.c	28 Feb 2004 01:27:39 -0000	1.4
@@ -140,6 +140,9 @@
  *
  * END_NSC_LIC_GPL */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef XFree86LOADER
 #include <stdio.h>
 #include <stdarg.h>

Index: nsc_galstub.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nsc/nsc_galstub.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/nsc_galstub.c	14 Jan 2003 09:34:31 -0000	1.2
+++ b/nsc_galstub.c	28 Feb 2004 01:27:39 -0000	1.3
@@ -139,6 +139,9 @@
  *
  * END_NSC_LIC_GPL */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #if defined(STB_X)
 /* all driver need this */
 #include "xf86.h"

Index: nsc_gx1_accel.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nsc/nsc_gx1_accel.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/nsc_gx1_accel.c	7 Dec 2003 23:18:16 -0000	1.8
+++ b/nsc_gx1_accel.c	28 Feb 2004 01:27:39 -0000	1.9
@@ -147,6 +147,9 @@
  */
 
 /* Xfree86 header files */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "vgaHW.h"
 #include "xf86.h"
 #include "xf86_ansic.h"

Index: nsc_gx1_cursor.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nsc/nsc_gx1_cursor.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/nsc_gx1_cursor.c	3 Nov 2003 05:11:20 -0000	1.6
+++ b/nsc_gx1_cursor.c	28 Feb 2004 01:27:39 -0000	1.7
@@ -140,6 +140,9 @@
  *
  * END_NSC_LIC_GPL */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: nsc_gx1_dga.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nsc/nsc_gx1_dga.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/nsc_gx1_dga.c	14 Jan 2003 09:34:31 -0000	1.2
+++ b/nsc_gx1_dga.c	28 Feb 2004 01:27:39 -0000	1.3
@@ -143,6 +143,9 @@
  *
  * END_NSC_LIC_GPL */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: nsc_gx1_driver.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nsc/nsc_gx1_driver.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- a/nsc_gx1_driver.c	3 Nov 2003 05:11:20 -0000	1.11
+++ b/nsc_gx1_driver.c	28 Feb 2004 01:27:39 -0000	1.12
@@ -148,6 +148,9 @@
  * Alan Hourihane <alanh@fairlite.demon.co.uk>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define DEBUG(x)
 #define GEODE_TRACE 0
 #define CFB 0

Index: nsc_gx1_shadow.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nsc/nsc_gx1_shadow.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/nsc_gx1_shadow.c	14 Jan 2003 09:34:32 -0000	1.2
+++ b/nsc_gx1_shadow.c	28 Feb 2004 01:27:39 -0000	1.3
@@ -141,6 +141,9 @@
  *
  * END_NSC_LIC_GPL */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"

Index: nsc_gx1_video.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nsc/nsc_gx1_video.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/nsc_gx1_video.c	10 Nov 2003 18:22:23 -0000	1.8
+++ b/nsc_gx1_video.c	28 Feb 2004 01:27:39 -0000	1.9
@@ -144,6 +144,9 @@
  * Alan Hourihane <alanh@fairlite.demon.co.uk>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"

Index: nsc_gx2_accel.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nsc/nsc_gx2_accel.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/nsc_gx2_accel.c	3 Nov 2003 05:11:20 -0000	1.5
+++ b/nsc_gx2_accel.c	28 Feb 2004 01:27:39 -0000	1.6
@@ -142,6 +142,9 @@
  * END_NSC_LIC_GPL */
 
 /* Xfree86 header files */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "vgaHW.h"
 #include "xf86.h"
 #include "xf86_ansic.h"

Index: nsc_gx2_cursor.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nsc/nsc_gx2_cursor.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/nsc_gx2_cursor.c	3 Nov 2003 05:11:20 -0000	1.6
+++ b/nsc_gx2_cursor.c	28 Feb 2004 01:27:39 -0000	1.7
@@ -140,6 +140,9 @@
  *
  * END_NSC_LIC_GPL */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: nsc_gx2_dga.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nsc/nsc_gx2_dga.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/nsc_gx2_dga.c	14 Jan 2003 09:34:32 -0000	1.2
+++ b/nsc_gx2_dga.c	28 Feb 2004 01:27:39 -0000	1.3
@@ -143,6 +143,9 @@
  *
  * END_NSC_LIC_GPL */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: nsc_gx2_driver.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nsc/nsc_gx2_driver.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- a/nsc_gx2_driver.c	3 Nov 2003 05:11:20 -0000	1.10
+++ b/nsc_gx2_driver.c	28 Feb 2004 01:27:39 -0000	1.11
@@ -143,6 +143,9 @@
  *
  * END_NSC_LIC_GPL */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define DEBUG(x)
 #define GEODE_TRACE 0
 #define CFB 0

Index: nsc_gx2_shadow.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nsc/nsc_gx2_shadow.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/nsc_gx2_shadow.c	14 Jan 2003 09:34:32 -0000	1.2
+++ b/nsc_gx2_shadow.c	28 Feb 2004 01:27:39 -0000	1.3
@@ -141,6 +141,9 @@
  *
  * END_NSC_LIC_GPL */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"

Index: nsc_gx2_vga.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nsc/nsc_gx2_vga.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/nsc_gx2_vga.c	3 Nov 2003 05:11:21 -0000	1.3
+++ b/nsc_gx2_vga.c	28 Feb 2004 01:27:39 -0000	1.4
@@ -134,6 +134,9 @@
 
 /* VGA STRUCTURE */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define GU2_STD_CRTC_REGS 25
 #define GU2_EXT_CRTC_REGS 15
 #define GU2_GDC_REGS 9

Index: nsc_gx2_video.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nsc/nsc_gx2_video.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/nsc_gx2_video.c	10 Nov 2003 18:22:24 -0000	1.7
+++ b/nsc_gx2_video.c	28 Feb 2004 01:27:39 -0000	1.8
@@ -144,6 +144,9 @@
  * Alan Hourihane <alanh@fairlite.demon.co.uk>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"

Index: nsc_regacc.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nsc/nsc_regacc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/nsc_regacc.c	14 Jan 2003 09:34:32 -0000	1.2
+++ b/nsc_regacc.c	28 Feb 2004 01:27:39 -0000	1.3
@@ -225,6 +225,9 @@
    WRITE_VIP32(offset, value);
 }
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define SWAP_BITS_IN_BYTES(v) \
  (((0x01010101 & (v)) << 7) | ((0x02020202 & (v)) << 5) | \
   ((0x04040404 & (v)) << 3) | ((0x08080808 & (v)) << 1) | \

Index: panel.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nsc/panel.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/panel.c	14 Jan 2003 09:34:32 -0000	1.3
+++ b/panel.c	28 Feb 2004 01:27:39 -0000	1.4
@@ -140,6 +140,9 @@
  *
  * END_NSC_LIC_GPL */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #if defined(linux)			/* Linux */
 
 #ifdef __KERNEL__