debrix-driver-ati/ati ati.c, 1.2, 1.3 ati.h, 1.2, 1.3 atiadapter.c,
1.2, 1.3 atiadapter.h, 1.2, 1.3 atibus.c, 1.2, 1.3 atibus.h,
1.2, 1.3 atichip.c, 1.2, 1.3 atichip.h, 1.2, 1.3 atiident.c,
1.2, 1.3 atiident.h, 1.2, 1.3 atimodule.c, 1.2,
1.3 atimodule.h, 1.2, 1.3 atioption.c, 1.2, 1.3 atioption.h,
1.2, 1.3 atiprobe.c, 1.2, 1.3 atiprobe.h, 1.2, 1.3 ativgaio.c,
1.2, 1.3 ativgaio.h, 1.2, 1.3 atividmem.c, 1.2,
1.3 atividmem.h, 1.2, 1.3 r128_probe.c, 1.2, 1.3 r128_probe.h,
1.2, 1.3 radeon_probe.c, 1.2, 1.3 radeon_probe.h, 1.2, 1.3
Daniel Stone
xserver-commit at pdx.freedesktop.org
Sat Jun 12 08:33:24 PDT 2004
- Previous message: debrix/xkb XKBMAlloc.c,NONE,1.1
- Next message: debrix-driver-ati/atimisc Makefile.am, NONE, 1.1 atiaccel.c, 1.2,
1.3 atiaccel.h, 1.2, 1.3 atiadjust.c, 1.2, 1.3 atiadjust.h,
1.2, 1.3 atiaudio.c, 1.2, 1.3 atiaudio.h, 1.2, 1.3 atibank.c,
1.2, 1.3 atibank.h, 1.2, 1.3 aticlock.c, 1.2, 1.3 aticlock.h,
1.2, 1.3 aticonfig.c, 1.2, 1.3 aticonfig.h, 1.2,
1.3 aticonsole.c, 1.2, 1.3 aticonsole.h, 1.2, 1.3 aticrtc.h,
1.2, 1.3 aticursor.c, 1.2, 1.3 aticursor.h, 1.2, 1.3 atidac.c,
1.2, 1.3 atidac.h, 1.2, 1.3 atidecoder.c, 1.2,
1.3 atidecoder.h, 1.2, 1.3 atidga.c, 1.2, 1.3 atidga.h, 1.2,
1.3 atidsp.c, 1.2, 1.3 atidsp.h, 1.2, 1.3 atifillin.c, NONE,
1.1 atifillin.h, NONE, 1.1 atii2c.c, 1.2, 1.3 atii2c.h, 1.2,
1.3 atiio.h, 1.2, 1.3 atiload.c, 1.2, 1.3 atiload.h, 1.2,
1.3 atilock.c, 1.2, 1.3 atilock.h, 1.2, 1.3 atimach64.c, 1.2,
1.3 atimach64.h, 1.2, 1.3 atimach64accel.c, 1.2,
1.3 atimach64accel.h, 1.2, 1.3 atimach64cursor.c, 1.2,
1.3 atimach64cursor.h, 1.2, 1.3 atimach64i2c.c, 1.2,
1.3 atimach64i2c.h, 1.2, 1.3 atimach64io.c, 1.2,
1.3 atimach64io.h, 1.2, 1.3 atimach64xv.c, 1.2,
1.3 atimach64xv.h, 1.2, 1.3 atimisc.c, 1.2, 1.3 atimode.c, 1.2,
1.3 atimode.h, 1.2, 1.3 atimono.h, 1.2, 1.3 atipreinit.c, 1.2,
1.3 atipreinit.h, 1.2, 1.3 atiprint.c, 1.2, 1.3 atiprint.h,
1.2, 1.3 atipriv.h, 1.2, 1.3 atiproto.h, 1.2, 1.3 atiregs.h,
1.2, 1.3 atirgb514.c, 1.2, 1.3 atirgb514.h, 1.2,
1.3 atiscreen.c, 1.2, 1.3 atiscreen.h, 1.2, 1.3 atistruct.h,
1.2, 1.3 atituner.c, 1.2, 1.3 atituner.h, 1.2, 1.3 atiutil.c,
1.2, 1.3 atiutil.h, 1.2, 1.3 ativalid.c, 1.2, 1.3 ativalid.h,
1.2, 1.3 ativersion.h, 1.2, 1.3 ativga.c, 1.2, 1.3 ativga.h,
1.2, 1.3 atiwonder.c, 1.2, 1.3 atiwonder.h, 1.2,
1.3 atiwonderio.c, 1.2, 1.3 atiwonderio.h, 1.2, 1.3 atixv.c,
1.2, 1.3 atixv.h, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: daniel
Update of /cvs/xserver/debrix-driver-ati/ati
In directory pdx:/home/daniel/x/debrix/debrix-driver-ati/ati
Modified Files:
ati.c ati.h atiadapter.c atiadapter.h atibus.c atibus.h
atichip.c atichip.h atiident.c atiident.h atimodule.c
atimodule.h atioption.c atioption.h atiprobe.c atiprobe.h
ativgaio.c ativgaio.h atividmem.c atividmem.h r128_probe.c
r128_probe.h radeon_probe.c radeon_probe.h
Log Message:
Initial import form the modular tree.
Index: ati.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/ati.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ati.c 23 Apr 2004 19:26:46 -0000 1.2
+++ ati.c 12 Jun 2004 15:33:22 -0000 1.3
@@ -54,6 +54,9 @@
* V3, including OEM counterparts.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "atiident.h"
#include "atioption.h"
#include "atiprobe.h"
Index: ati.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/ati.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ati.h 23 Apr 2004 19:26:46 -0000 1.2
+++ ati.h 12 Jun 2004 15:33:22 -0000 1.3
@@ -21,6 +21,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifndef ___ATI_H___
#define ___ATI_H___ 1
Index: atiadapter.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/atiadapter.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- atiadapter.c 23 Apr 2004 19:26:46 -0000 1.2
+++ atiadapter.c 12 Jun 2004 15:33:22 -0000 1.3
@@ -21,6 +21,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "atiadapter.h"
/*
Index: atiadapter.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/atiadapter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- atiadapter.h 23 Apr 2004 19:26:46 -0000 1.2
+++ atiadapter.h 12 Jun 2004 15:33:22 -0000 1.3
@@ -21,6 +21,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifndef ___ATIADAPTER_H___
#define ___ATIADAPTER_H___ 1
Index: atibus.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/atibus.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- atibus.c 23 Apr 2004 19:26:46 -0000 1.2
+++ atibus.c 12 Jun 2004 15:33:22 -0000 1.3
@@ -21,6 +21,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "ati.h"
#include "atiadapter.h"
#include "atibus.h"
Index: atibus.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/atibus.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- atibus.h 23 Apr 2004 19:26:46 -0000 1.2
+++ atibus.h 12 Jun 2004 15:33:22 -0000 1.3
@@ -21,6 +21,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifndef ___ATIBUS_H___
#if !defined(___ATI_H___) && defined(XFree86Module)
Index: atichip.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/atichip.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- atichip.c 23 Apr 2004 19:26:46 -0000 1.2
+++ atichip.c 12 Jun 2004 15:33:22 -0000 1.3
@@ -21,6 +21,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "ati.h"
#include "atibus.h"
#include "atichip.h"
Index: atichip.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/atichip.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- atichip.h 23 Apr 2004 19:26:46 -0000 1.2
+++ atichip.h 12 Jun 2004 15:33:22 -0000 1.3
@@ -21,13 +21,16 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifndef ___ATICHIP_H___
#define ___ATICHIP_H___ 1
#include "atipriv.h"
#include "atiregs.h"
-#include "Xmd.h"
+#include <X11/Xmd.h>
/*
* Chip-related definitions.
Index: atiident.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/atiident.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- atiident.c 23 Apr 2004 19:26:46 -0000 1.2
+++ atiident.c 12 Jun 2004 15:33:22 -0000 1.3
@@ -21,6 +21,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "ati.h"
#include "atiident.h"
#include "atiutil.h"
Index: atiident.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/atiident.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- atiident.h 23 Apr 2004 19:26:46 -0000 1.2
+++ atiident.h 12 Jun 2004 15:33:22 -0000 1.3
@@ -21,6 +21,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifndef ___ATIIDENT_H___
#define ___ATIIDENT_H___ 1
Index: atimodule.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/atimodule.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- atimodule.c 23 Apr 2004 19:26:46 -0000 1.2
+++ atimodule.c 12 Jun 2004 15:33:22 -0000 1.3
@@ -21,6 +21,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifdef XFree86LOADER
#include "ati.h"
Index: atimodule.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/atimodule.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- atimodule.h 23 Apr 2004 19:26:46 -0000 1.2
+++ atimodule.h 12 Jun 2004 15:33:22 -0000 1.3
@@ -21,6 +21,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#if defined(XFree86LOADER) && !defined(___ATIMODULE_H___)
#define ___ATIMODULE_H___ 1
Index: atioption.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/atioption.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- atioption.c 23 Apr 2004 19:26:46 -0000 1.2
+++ atioption.c 12 Jun 2004 15:33:22 -0000 1.3
@@ -21,6 +21,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "atioption.h"
#include "atiutil.h"
Index: atioption.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/atioption.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- atioption.h 23 Apr 2004 19:26:46 -0000 1.2
+++ atioption.h 12 Jun 2004 15:33:22 -0000 1.3
@@ -21,6 +21,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifndef ___ATIOPTION_H___
#define ___ATIOPTION_H___ 1
Index: atiprobe.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/atiprobe.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- atiprobe.c 23 Apr 2004 19:26:46 -0000 1.2
+++ atiprobe.c 12 Jun 2004 15:33:22 -0000 1.3
@@ -21,12 +21,16 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "ati.h"
#include "atiadapter.h"
#include "atiadjust.h"
#include "atibus.h"
#include "atichip.h"
#include "aticonsole.h"
+#include "atifillin.h"
#include "atiident.h"
#include "atimach64io.h"
#include "atimodule.h"
@@ -57,32 +61,6 @@
* largely ignored.
*/
-#ifdef XFree86LOADER
-
-/*
- * The following exists to prevent the compiler from considering entry points
- * defined in a separate module from being constants.
- */
-static xf86PreInitProc * const volatile PreInitProc = ATIPreInit;
-static xf86ScreenInitProc * const volatile ScreenInitProc = ATIScreenInit;
-static xf86SwitchModeProc * const volatile SwitchModeProc = ATISwitchMode;
-static xf86AdjustFrameProc * const volatile AdjustFrameProc = ATIAdjustFrame;
-static xf86EnterVTProc * const volatile EnterVTProc = ATIEnterVT;
-static xf86LeaveVTProc * const volatile LeaveVTProc = ATILeaveVT;
-static xf86FreeScreenProc * const volatile FreeScreenProc = ATIFreeScreen;
-static xf86ValidModeProc * const volatile ValidModeProc = ATIValidMode;
-
-#define ATIPreInit PreInitProc
-#define ATIScreenInit ScreenInitProc
-#define ATISwitchMode SwitchModeProc
-#define ATIAdjustFrame AdjustFrameProc
-#define ATIEnterVT EnterVTProc
-#define ATILeaveVT LeaveVTProc
-#define ATIFreeScreen FreeScreenProc
-#define ATIValidMode ValidModeProc
-
-#endif
-
/* Used as a temporary buffer */
#define Identifier ((char *)(pATI->MMIOCache))
@@ -2299,18 +2277,7 @@
ATIPtrs[j - 1] = NULL;
/* Fill in probe data */
- pScreenInfo->driverVersion = ATI_VERSION_CURRENT;
- pScreenInfo->driverName = ATI_DRIVER_NAME;
- pScreenInfo->name = ATI_NAME;
- pScreenInfo->Probe = ATIProbe;
- pScreenInfo->PreInit = ATIPreInit;
- pScreenInfo->ScreenInit = ATIScreenInit;
- pScreenInfo->SwitchMode = ATISwitchMode;
- pScreenInfo->AdjustFrame = ATIAdjustFrame;
- pScreenInfo->EnterVT = ATIEnterVT;
- pScreenInfo->LeaveVT = ATILeaveVT;
- pScreenInfo->FreeScreen = ATIFreeScreen;
- pScreenInfo->ValidMode = ATIValidMode;
+ ATIFillInScreenInfo(pScreenInfo);
pScreenInfo->driverPrivate = pATI;
Index: atiprobe.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/atiprobe.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- atiprobe.h 23 Apr 2004 19:26:46 -0000 1.2
+++ atiprobe.h 12 Jun 2004 15:33:22 -0000 1.3
@@ -21,6 +21,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifndef ___ATIPROBE_H___
#define ___ATIPROBE_H___ 1
Index: ativgaio.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/ativgaio.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ativgaio.c 23 Apr 2004 19:26:46 -0000 1.2
+++ ativgaio.c 12 Jun 2004 15:33:22 -0000 1.3
@@ -21,6 +21,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "ati.h"
#include "atistruct.h"
#include "ativgaio.h"
Index: ativgaio.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/ativgaio.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ativgaio.h 23 Apr 2004 19:26:46 -0000 1.2
+++ ativgaio.h 12 Jun 2004 15:33:22 -0000 1.3
@@ -21,6 +21,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifndef ___ATIVGAIO_H___
#if !defined(___ATI_H___) && defined(XFree86Module)
Index: atividmem.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/atividmem.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- atividmem.c 23 Apr 2004 19:26:46 -0000 1.2
+++ atividmem.c 12 Jun 2004 15:33:22 -0000 1.3
@@ -21,6 +21,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "ati.h"
#include "atiadapter.h"
#include "atistruct.h"
Index: atividmem.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/atividmem.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- atividmem.h 23 Apr 2004 19:26:46 -0000 1.2
+++ atividmem.h 12 Jun 2004 15:33:22 -0000 1.3
@@ -21,6 +21,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifndef ___ATIVIDMEM_H___
#define ___ATIVIDMEM_H___ 1
Index: r128_probe.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/r128_probe.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- r128_probe.c 23 Apr 2004 19:26:46 -0000 1.2
+++ r128_probe.c 12 Jun 2004 15:33:22 -0000 1.3
@@ -36,6 +36,9 @@
* Modified by Marc Aurele La France <tsi at xfree86.org> for ATI driver merge.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "atimodule.h"
#include "ativersion.h"
@@ -48,32 +51,6 @@
#include "xf86_ansic.h"
#include "xf86Resources.h"
-#ifdef XFree86LOADER
-
-/*
- * The following exists to prevent the compiler from considering entry points
- * defined in a separate module from being constants.
- */
-static xf86PreInitProc * const volatile PreInitProc = R128PreInit;
-static xf86ScreenInitProc * const volatile ScreenInitProc = R128ScreenInit;
-static xf86SwitchModeProc * const volatile SwitchModeProc = R128SwitchMode;
-static xf86AdjustFrameProc * const volatile AdjustFrameProc = R128AdjustFrame;
-static xf86EnterVTProc * const volatile EnterVTProc = R128EnterVT;
-static xf86LeaveVTProc * const volatile LeaveVTProc = R128LeaveVT;
-static xf86FreeScreenProc * const volatile FreeScreenProc = R128FreeScreen;
-static xf86ValidModeProc * const volatile ValidModeProc = R128ValidMode;
-
-#define R128PreInit PreInitProc
-#define R128ScreenInit ScreenInitProc
-#define R128SwitchMode SwitchModeProc
-#define R128AdjustFrame AdjustFrameProc
-#define R128EnterVT EnterVTProc
-#define R128LeaveVT LeaveVTProc
-#define R128FreeScreen FreeScreenProc
-#define R128ValidMode ValidModeProc
-
-#endif
-
SymTabRec R128Chipsets[] = {
/* FIXME: The chipsets with (PCI/AGP) are not known wether they are AGP or
* PCI, so I've labeled them as such in hopes users will submit
@@ -194,7 +171,7 @@
chipid -= PCI_VENDOR_ATI << 16;
for (i = 0; R128PciChipsets[i].PCIid > 0; i++) {
if (chipid == R128PciChipsets[i].PCIid)
- return R128Options;
+ return R128OptionsWeak();
}
return NULL;
}
@@ -280,18 +257,7 @@
#endif
- 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;
+ R128FillInScreenInfo(pScrn);
foundScreen = TRUE;
Index: r128_probe.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/r128_probe.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- r128_probe.h 23 Apr 2004 19:26:46 -0000 1.2
+++ r128_probe.h 12 Jun 2004 15:33:22 -0000 1.3
@@ -34,6 +34,9 @@
* Modified by Marc Aurele La France <tsi at xfree86.org> for ATI driver merge.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifndef _R128_PROBE_H_
#define _R128_PROBE_H_ 1
@@ -73,6 +76,9 @@
FunctionPrototype((int, DisplayModePtr, Bool,
int));
-extern const OptionInfoRec R128Options[];
+extern OptionInfoRec * R128OptionsWeak
+ FunctionPrototype((void));
+extern void R128FillInScreenInfo
+ FunctionPrototype((ScrnInfoPtr));
#endif /* _R128_PROBE_H_ */
Index: radeon_probe.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/radeon_probe.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- radeon_probe.c 23 Apr 2004 19:26:46 -0000 1.2
+++ radeon_probe.c 12 Jun 2004 15:33:22 -0000 1.3
@@ -35,6 +35,9 @@
* Modified by Marc Aurele La France <tsi at xfree86.org> for ATI driver merge.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "atimodule.h"
#include "ativersion.h"
@@ -46,42 +49,9 @@
#include "xf86.h"
#include "xf86_ansic.h"
#define _XF86MISC_SERVER_
-#include "xf86misc.h"
+#include <X11/extensions/xf86misc.h>
#include "xf86Resources.h"
-#ifdef XFree86LOADER
-
-/*
- * The following exists to prevent the compiler from considering entry points
- * defined in a separate module from being constants.
- */
-static xf86PreInitProc *const volatile PreInitProc = RADEONPreInit;
-static xf86ScreenInitProc *const volatile ScreenInitProc = RADEONScreenInit;
-static xf86SwitchModeProc *const volatile SwitchModeProc = RADEONSwitchMode;
-static xf86AdjustFrameProc *const volatile AdjustFrameProc = RADEONAdjustFrame;
-static xf86EnterVTProc *const volatile EnterVTProc = RADEONEnterVT;
-static xf86LeaveVTProc *const volatile LeaveVTProc = RADEONLeaveVT;
-static xf86FreeScreenProc *const volatile FreeScreenProc = RADEONFreeScreen;
-static xf86ValidModeProc *const volatile ValidModeProc = RADEONValidMode;
-#ifdef X_XF86MiscPassMessage
-static xf86HandleMessageProc *const volatile HandleMessageProc
- = RADEONHandleMessage;
-#endif
-
-#define RADEONPreInit PreInitProc
-#define RADEONScreenInit ScreenInitProc
-#define RADEONSwitchMode SwitchModeProc
-#define RADEONAdjustFrame AdjustFrameProc
-#define RADEONEnterVT EnterVTProc
-#define RADEONLeaveVT LeaveVTProc
-#define RADEONFreeScreen FreeScreenProc
-#define RADEONValidMode ValidModeProc
-#ifdef X_XF86MiscPassMessage
-# define RADEONHandleMessage HandleMessageProc
-#endif
-
-#endif
-
SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_RADEON_QD, "ATI Radeon QD (AGP)" },
{ PCI_CHIP_RADEON_QE, "ATI Radeon QE (AGP)" },
@@ -220,6 +190,8 @@
int gRADEONEntityIndex = -1;
+const int getRADEONEntityIndex() { return gRADEONEntityIndex; }
+
/* Return the options for supported chipset 'n'; NULL otherwise */
const OptionInfoRec *
RADEONAvailableOptions(int chipid, int busid)
@@ -234,7 +206,7 @@
chipid -= PCI_VENDOR_ATI << 16;
for (i = 0; RADEONPciChipsets[i].PCIid > 0; i++) {
if (chipid == RADEONPciChipsets[i].PCIid)
- return RADEONOptions;
+ return RADEONOptionsWeak();
}
return NULL;
}
@@ -317,21 +289,8 @@
xf86LoaderReqSymLists(RADEONSymbols, NULL);
#endif
- 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;
+ RADEONFillInScreenInfo(pScrn);
+
foundScreen = TRUE;
}
Index: radeon_probe.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-ati/ati/radeon_probe.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- radeon_probe.h 23 Apr 2004 19:26:46 -0000 1.2
+++ radeon_probe.h 12 Jun 2004 15:33:22 -0000 1.3
@@ -34,6 +34,9 @@
* Modified by Marc Aurele La France <tsi at xfree86.org> for ATI driver merge.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifndef _RADEON_PROBE_H_
#define _RADEON_PROBE_H_ 1
@@ -43,7 +46,7 @@
#include "xf86DDC.h"
#define _XF86MISC_SERVER_
-#include "xf86misc.h"
+#include <X11/extensions/xf86misc.h>
typedef struct
{
@@ -104,6 +107,10 @@
FunctionPrototype((int, DisplayModePtr, Bool,
int));
-extern const OptionInfoRec RADEONOptions[];
+extern OptionInfoRec * RADEONOptionsWeak
+ FunctionPrototype((void));
+
+extern void RADEONFillInScreenInfo
+ FunctionPrototype((ScrnInfoPtr));
#endif /* _RADEON_PROBE_H_ */
- Previous message: debrix/xkb XKBMAlloc.c,NONE,1.1
- Next message: debrix-driver-ati/atimisc Makefile.am, NONE, 1.1 atiaccel.c, 1.2,
1.3 atiaccel.h, 1.2, 1.3 atiadjust.c, 1.2, 1.3 atiadjust.h,
1.2, 1.3 atiaudio.c, 1.2, 1.3 atiaudio.h, 1.2, 1.3 atibank.c,
1.2, 1.3 atibank.h, 1.2, 1.3 aticlock.c, 1.2, 1.3 aticlock.h,
1.2, 1.3 aticonfig.c, 1.2, 1.3 aticonfig.h, 1.2,
1.3 aticonsole.c, 1.2, 1.3 aticonsole.h, 1.2, 1.3 aticrtc.h,
1.2, 1.3 aticursor.c, 1.2, 1.3 aticursor.h, 1.2, 1.3 atidac.c,
1.2, 1.3 atidac.h, 1.2, 1.3 atidecoder.c, 1.2,
1.3 atidecoder.h, 1.2, 1.3 atidga.c, 1.2, 1.3 atidga.h, 1.2,
1.3 atidsp.c, 1.2, 1.3 atidsp.h, 1.2, 1.3 atifillin.c, NONE,
1.1 atifillin.h, NONE, 1.1 atii2c.c, 1.2, 1.3 atii2c.h, 1.2,
1.3 atiio.h, 1.2, 1.3 atiload.c, 1.2, 1.3 atiload.h, 1.2,
1.3 atilock.c, 1.2, 1.3 atilock.h, 1.2, 1.3 atimach64.c, 1.2,
1.3 atimach64.h, 1.2, 1.3 atimach64accel.c, 1.2,
1.3 atimach64accel.h, 1.2, 1.3 atimach64cursor.c, 1.2,
1.3 atimach64cursor.h, 1.2, 1.3 atimach64i2c.c, 1.2,
1.3 atimach64i2c.h, 1.2, 1.3 atimach64io.c, 1.2,
1.3 atimach64io.h, 1.2, 1.3 atimach64xv.c, 1.2,
1.3 atimach64xv.h, 1.2, 1.3 atimisc.c, 1.2, 1.3 atimode.c, 1.2,
1.3 atimode.h, 1.2, 1.3 atimono.h, 1.2, 1.3 atipreinit.c, 1.2,
1.3 atipreinit.h, 1.2, 1.3 atiprint.c, 1.2, 1.3 atiprint.h,
1.2, 1.3 atipriv.h, 1.2, 1.3 atiproto.h, 1.2, 1.3 atiregs.h,
1.2, 1.3 atirgb514.c, 1.2, 1.3 atirgb514.h, 1.2,
1.3 atiscreen.c, 1.2, 1.3 atiscreen.h, 1.2, 1.3 atistruct.h,
1.2, 1.3 atituner.c, 1.2, 1.3 atituner.h, 1.2, 1.3 atiutil.c,
1.2, 1.3 atiutil.h, 1.2, 1.3 ativalid.c, 1.2, 1.3 ativalid.h,
1.2, 1.3 ativersion.h, 1.2, 1.3 ativga.c, 1.2, 1.3 ativga.h,
1.2, 1.3 atiwonder.c, 1.2, 1.3 atiwonder.h, 1.2,
1.3 atiwonderio.c, 1.2, 1.3 atiwonderio.h, 1.2, 1.3 atixv.c,
1.2, 1.3 atixv.h, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the xserver-commit
mailing list