debrix-driver-ati/radeon Makefile.am, NONE, 1.1 radeon.h, 1.2, 1.3 radeon_accel.c, 1.2, 1.3 radeon_accelfuncs.c, 1.2, 1.3 radeon_common.h, 1.2, 1.3 radeon_cursor.c, 1.2, 1.3 radeon_dga.c, 1.2, 1.3 radeon_dri.c, 1.2, 1.3 radeon_dri.h, 1.2, 1.3 radeon_dripriv.h, 1.2, 1.3 radeon_driver.c, 1.2, 1.3 radeon_macros.h, 1.2, 1.3 radeon_misc.c, 1.2, 1.3 radeon_reg.h, 1.2, 1.3 radeon_sarea.h, 1.2, 1.3 radeon_version.h, 1.2, 1.3 radeon_video.c, 1.2, 1.3

[Daniel Stone]

Committed by: daniel

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

Modified Files:
	radeon.h radeon_accel.c radeon_accelfuncs.c radeon_common.h 
	radeon_cursor.c radeon_dga.c radeon_dri.c radeon_dri.h 
	radeon_dripriv.h radeon_driver.c radeon_macros.h radeon_misc.c 
	radeon_reg.h radeon_sarea.h radeon_version.h radeon_video.c 
Added Files:
	Makefile.am 
Log Message:
Initial import from modular sources.


--- NEW FILE: Makefile.am ---
driver_LTLIBRARIES = libradeon.la
man_MANS = radeon.3

if DRI
RADEONDRI_SOURCES = \
        radeon_dri.c \
        radeon_dri.h \
        radeon_dripriv.h
endif

libradeon_la_SOURCES = \
	radeon.h \
	radeon_accel.c \
	radeon_common.h \
	radeon_cursor.c \
	radeon_dga.c \
	radeon_driver.c \
	radeon_macros.h \
	radeon_misc.c \
	radeon_reg.h \
	radeon_sarea.h \
	radeon_version.h \
	radeon_video.c \
	$(RADEONDRI_SOURCES)

EXTRA_DIST = radeon_accelfuncs.c

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

Index: radeon_accel.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/radeon/radeon_accel.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- radeon_accel.c	23 Apr 2004 19:26:46 -0000	1.2
+++ radeon_accel.c	12 Jun 2004 15:36:23 -0000	1.3
@@ -71,6 +71,9 @@
  */
 
 				/* Driver data structures */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "radeon.h"
 #include "radeon_macros.h"
 #include "radeon_probe.h"
@@ -110,8 +113,6 @@
     { RADEON_ROP3_ONE,  RADEON_ROP3_ONE  }  /* GXset          */
 };
 
-extern int gRADEONEntityIndex;
-
 /* The FIFO has 64 slots.  This routines waits until at least `entries'
  * of these slots are empty.
  */

Index: radeon_accelfuncs.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/radeon/radeon_accelfuncs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- radeon_accelfuncs.c	23 Apr 2004 19:26:46 -0000	1.2
+++ radeon_accelfuncs.c	12 Jun 2004 15:36:23 -0000	1.3
@@ -71,6 +71,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #if defined(ACCEL_MMIO) && defined(ACCEL_CP)
 #error Cannot define both MMIO and CP acceleration!
 #endif

Index: radeon_common.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/radeon/radeon_common.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- radeon_common.h	23 Apr 2004 19:26:46 -0000	1.2
+++ radeon_common.h	12 Jun 2004 15:36:23 -0000	1.3
@@ -31,11 +31,14 @@
  * Converted to common header format:
  *   Jens Owen <jens at tungstengraphics.com>
  *
- * $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h,v 1.1.4.2 2003/12/06 13:24:24 kaleb Exp $
+ * $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h,v 1.1.4.3.4.1 2004/03/04 17:47:39 eich Exp $
  * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h,v 1.8tsi Exp $
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _RADEON_COMMON_H_
 #define _RADEON_COMMON_H_
 

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

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

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

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

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

Index: radeon_driver.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/radeon/radeon_driver.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- radeon_driver.c	23 Apr 2004 19:26:46 -0000	1.2
+++ radeon_driver.c	12 Jun 2004 15:36:23 -0000	1.3
@@ -59,6 +59,9 @@
  */
 
 				/* Driver data structures */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "radeon.h"
 #include "radeon_macros.h"
 #include "radeon_probe.h"
@@ -142,7 +145,7 @@
     OPTION_MIN_DOTCLOCK
 } RADEONOpts;
 
-const OptionInfoRec RADEONOptions[] = {
+static const OptionInfoRec RADEONOptions[] = {
     { OPTION_NOACCEL,        "NoAccel",          OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_SW_CURSOR,      "SWcursor",         OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_DAC_6BIT,       "Dac6Bit",          OPTV_BOOLEAN, {0}, FALSE },
@@ -337,6 +340,11 @@
     NULL
 };
 
+/* hack for radeon_probe.c */
+OptionInfoRec *RADEONOptionsWeak(void) {
+    return RADEONOptions;
+}
+
 void RADEONLoaderRefSymLists(void)
 {
     /*
@@ -406,7 +414,7 @@
     {{15000, 0xb0155}, {0xffffffff, 0xb01cb}, {0, 0}, {0, 0}},	/*CHIP_FAMILY_RV350*/
 };
 
-extern int gRADEONEntityIndex;
+extern int getRADEONEntityIndex();
 
 struct RADEONInt10Save {
 	CARD32 MEM_CNTL;
@@ -422,7 +430,7 @@
     DevUnion     *pPriv;
     RADEONInfoPtr  info   = RADEONPTR(pScrn);
     pPriv = xf86GetEntityPrivate(info->pEnt->index,
-                                 gRADEONEntityIndex);
+                                 getRADEONEntityIndex());
     return pPriv->ptr;
 }
 
@@ -7323,3 +7331,22 @@
     if (info->CPStarted) DRIUnlock(pScrn->pScreen);
 #endif
 }
+
+void RADEONFillInScreenInfo(ScrnInfoPtr pScrn)
+{
+    pScrn->driverVersion = RADEON_VERSION_CURRENT;
+    pScrn->driverName    = RADEON_DRIVER_NAME;
+    pScrn->name          = RADEON_NAME;
+    pScrn->Probe         = RADEONProbe;
+    pScrn->PreInit       = RADEONPreInit;
+    pScrn->ScreenInit    = RADEONScreenInit;
+    pScrn->SwitchMode    = RADEONSwitchMode;
+#ifdef X_XF86MiscPassMessage
+    pScrn->HandleMessage = RADEONHandleMessage;
+#endif
+    pScrn->AdjustFrame   = RADEONAdjustFrame;
+    pScrn->EnterVT       = RADEONEnterVT;
+    pScrn->LeaveVT       = RADEONLeaveVT;
+    pScrn->FreeScreen    = RADEONFreeScreen;
+    pScrn->ValidMode     = RADEONValidMode;
+}

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

Index: radeon_misc.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/radeon/radeon_misc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- radeon_misc.c	23 Apr 2004 19:26:46 -0000	1.2
+++ radeon_misc.c	12 Jun 2004 15:36:23 -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: radeon_reg.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/radeon/radeon_reg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- radeon_reg.h	23 Apr 2004 19:26:46 -0000	1.2
+++ radeon_reg.h	12 Jun 2004 15:36:23 -0000	1.3
@@ -50,6 +50,9 @@
  * AND CONTAINS REGISTERS AND REGISTER DEFINITIONS THAT ARE NOT CORRECT
  * ON THE RADEON.  A FULL AUDIT OF THIS CODE IS NEEDED!  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _RADEON_REG_H_
 #define _RADEON_REG_H_
 

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

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

Index: radeon_video.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/radeon/radeon_video.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- radeon_video.c	23 Apr 2004 19:26:46 -0000	1.2
+++ radeon_video.c	12 Jun 2004 15:36:23 -0000	1.3
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_video.c,v 1.30 2003/11/10 18:22:18 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "radeon.h"
 #include "radeon_macros.h"
 #include "radeon_probe.h"
@@ -8,7 +11,7 @@
 #include "xf86.h"
 #include "dixstruct.h"
 
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
 #include "fourcc.h"
 
 #define OFF_DELAY       250  /* milliseconds */
@@ -20,8 +23,6 @@
 
 #define TIMER_MASK      (OFF_TIMER | FREE_TIMER)
 
-extern int gRADEONEntityIndex;
-
 static void RADEONInitOffscreenImages(ScreenPtr);
 
 static XF86VideoAdaptorPtr RADEONSetupImageVideo(ScreenPtr);