debrix-driver-ati/r128 Makefile.am, NONE, 1.1 r128.h, 1.2, 1.3 r128_accel.c, 1.2, 1.3 r128_common.h, 1.2, 1.3 r128_cursor.c, 1.2, 1.3 r128_dga.c, 1.2, 1.3 r128_dri.c, 1.2, 1.3 r128_dri.h, 1.2, 1.3 r128_dripriv.h, 1.2, 1.3 r128_driver.c, 1.2, 1.3 r128_misc.c, 1.2, 1.3 r128_reg.h, 1.2, 1.3 r128_sarea.h, 1.2, 1.3 r128_version.h, 1.2, 1.3 r128_video.c, 1.2, 1.3

Daniel Stone <xserver-commit-u7BhqnqprCWvj1b/[email protected]>
Newsgroups gmane.comp.freedesktop.xserver.cvs
Message-ID <[email protected]> 
Committed by: daniel

Update of /cvs/xserver/debrix-driver-ati/r128
In directory pdx:/home/daniel/x/debrix/debrix-driver-ati/r128

Modified Files:
	r128.h r128_accel.c r128_common.h r128_cursor.c r128_dga.c 
	r128_dri.c r128_dri.h r128_dripriv.h r128_driver.c r128_misc.c 
	r128_reg.h r128_sarea.h r128_version.h r128_video.c 
Added Files:
	Makefile.am 
Log Message:
Initial import from modular sources.


--- NEW FILE: Makefile.am ---
driver_LTLIBRARIES = libr128.la
man_MANS = r128.3

if DRI
R128DRI_SOURCES = \
        r128_dri.c \
        r128_dri.h
endif

libr128_la_SOURCES = \
	r128.h \
	r128_accel.c \
	r128_common.h \
	r128_cursor.c \
	r128_dga.c \
	r128_dripriv.h \
	r128_driver.c \
	r128_misc.c \
	r128_reg.h \
	r128_sarea.h \
	r128_version.h \
	r128_video.c \
	$(R128DRI_SOURCES)

Index: r128.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/r128/r128.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- r128.h	23 Apr 2004 19:26:46 -0000	1.2
+++ r128.h	12 Jun 2004 15:35:38 -0000	1.3
@@ -35,6 +35,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _R128_H_
 #define _R128_H_
 

Index: r128_accel.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/r128/r128_accel.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- r128_accel.c	23 Apr 2004 19:26:46 -0000	1.2
+++ r128_accel.c	12 Jun 2004 15:35:38 -0000	1.3
@@ -77,6 +77,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define R128_TRAPEZOIDS 0       /* Trapezoids don't work               */
 
 				/* Driver data structures */

Index: r128_common.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/r128/r128_common.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- r128_common.h	23 Apr 2004 19:26:46 -0000	1.2
+++ r128_common.h	12 Jun 2004 15:35:38 -0000	1.3
@@ -35,6 +35,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _R128_COMMON_H_
 #define _R128_COMMON_H_
 

Index: r128_cursor.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/r128/r128_cursor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- r128_cursor.c	23 Apr 2004 19:26:46 -0000	1.2
+++ r128_cursor.c	12 Jun 2004 15:35:38 -0000	1.3
@@ -45,6 +45,9 @@
  */
 
 				/* Driver data structures */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "r128.h"
 #include "r128_reg.h"
 

Index: r128_dga.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/r128/r128_dga.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- r128_dga.c	23 Apr 2004 19:26:46 -0000	1.2
+++ r128_dga.c	12 Jun 2004 15:35:38 -0000	1.3
@@ -6,6 +6,9 @@
  */
 
 				/* Driver data structures */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "r128.h"
 #include "r128_probe.h"
 

Index: r128_dri.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/r128/r128_dri.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- r128_dri.c	23 Apr 2004 19:26:46 -0000	1.2
+++ r128_dri.c	12 Jun 2004 15:35:38 -0000	1.3
@@ -38,6 +38,9 @@
  */
 
 				/* Driver data structures */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "r128.h"
 #include "r128_dri.h"
 #include "r128_reg.h"

Index: r128_dri.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/r128/r128_dri.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- r128_dri.h	23 Apr 2004 19:26:46 -0000	1.2
+++ r128_dri.h	12 Jun 2004 15:35:38 -0000	1.3
@@ -36,6 +36,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _R128_DRI_
 #define _R128_DRI_
 

Index: r128_dripriv.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/r128/r128_dripriv.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- r128_dripriv.h	23 Apr 2004 19:26:46 -0000	1.2
+++ r128_dripriv.h	12 Jun 2004 15:35:38 -0000	1.3
@@ -35,6 +35,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _R128_DRIPRIV_H_
 #define _R128_DRIPRIV_H_
 

Index: r128_driver.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/r128/r128_driver.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- r128_driver.c	23 Apr 2004 19:26:46 -0000	1.2
+++ r128_driver.c	12 Jun 2004 15:35:38 -0000	1.3
@@ -59,6 +59,9 @@
 
 
 				/* Driver data structures */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "r128.h"
 #include "r128_probe.h"
 #include "r128_reg.h"
@@ -137,7 +140,7 @@
   OPTION_SHOW_CACHE
 } R128Opts;
 
-const OptionInfoRec R128Options[] = {
+static const OptionInfoRec R128Options[] = {
   { OPTION_NOACCEL,      "NoAccel",          OPTV_BOOLEAN, {0}, FALSE },
   { OPTION_SW_CURSOR,    "SWcursor",         OPTV_BOOLEAN, {0}, FALSE },
   { OPTION_DAC_6BIT,     "Dac6Bit",          OPTV_BOOLEAN, {0}, FALSE },
@@ -3672,4 +3675,20 @@
 	OUTREG(R128_LVDS_GEN_CNTL, lvds_gen_cntl);
 
 	return 0;
- }
+}
+
+void R128FillInScreenInfo(ScrnInfoPtr pScrn)
+{
+        pScrn->driverVersion = R128_VERSION_CURRENT;
+        pScrn->driverName    = R128_DRIVER_NAME;
+        pScrn->name          = R128_NAME;
+        pScrn->Probe         = R128Probe;
+        pScrn->PreInit       = R128PreInit;
+        pScrn->ScreenInit    = R128ScreenInit;
+        pScrn->SwitchMode    = R128SwitchMode;
+        pScrn->AdjustFrame   = R128AdjustFrame;
+        pScrn->EnterVT       = R128EnterVT;
+        pScrn->LeaveVT       = R128LeaveVT;
+        pScrn->FreeScreen    = R128FreeScreen;
+        pScrn->ValidMode     = R128ValidMode;
+}

Index: r128_misc.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/r128/r128_misc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- r128_misc.c	23 Apr 2004 19:26:46 -0000	1.2
+++ r128_misc.c	12 Jun 2004 15:35:38 -0000	1.3
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef XFree86LOADER
 
 #include "ativersion.h"

Index: r128_reg.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/r128/r128_reg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- r128_reg.h	23 Apr 2004 19:26:46 -0000	1.2
+++ r128_reg.h	12 Jun 2004 15:35:38 -0000	1.3
@@ -45,6 +45,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _R128_REG_H_
 #define _R128_REG_H_
 

Index: r128_sarea.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/r128/r128_sarea.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- r128_sarea.h	23 Apr 2004 19:26:46 -0000	1.2
+++ r128_sarea.h	12 Jun 2004 15:35:38 -0000	1.3
@@ -35,10 +35,13 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _R128_SAREA_H_
 #define _R128_SAREA_H_
 
-#include "Xmd.h"
+#include <X11/Xmd.h>
 
 /* WARNING: If you change any of these defines, make sure to change the
  * defines in the kernel file (r128_drm.h)

Index: r128_version.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/r128/r128_version.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- r128_version.h	23 Apr 2004 19:26:46 -0000	1.2
+++ r128_version.h	12 Jun 2004 15:35:38 -0000	1.3
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _R128_VERSION_H_
 #define _R128_VERSION_H_ 1
 

Index: r128_video.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/r128/r128_video.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- r128_video.c	23 Apr 2004 19:26:46 -0000	1.2
+++ r128_video.c	12 Jun 2004 15:35:38 -0000	1.3
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_video.c,v 1.30 2003/11/10 18:22:18 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "r128.h"
 #include "r128_reg.h"
 
@@ -11,7 +14,7 @@
 #include "xf86.h"
 #include "dixstruct.h"
 
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
 #include "fourcc.h"
 
 #define OFF_DELAY       250  /* milliseconds */
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.