update radeon driver to Intel driver xf86Crtc interfaces

1 files changed, 26 insertions, 27 deletions

diff --git a/src/radeon_probe.h b/src/radeon_probe.h
index ebd4babe..a7175047 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -43,8 +43,7 @@
 #define _XF86MISC_SERVER_
 #include <X11/extensions/xf86misc.h>
 
-#define RADEON_MAX_CRTC 2
-#define RADEON_MAX_CONNECTOR 2
+#include "radeon_xf86Crtc.h"
 
 typedef enum
 {
@@ -106,38 +105,34 @@ typedef enum
     TMDS_EXT     = 1
 } RADEONTmdsType;
 
-typedef struct
+typedef enum
 {
-    Bool IsUsed;
+    OUTPUT_NONE,
+    OUTPUT_VGA,
+    OUTPUT_DVI,
+    OUTPUT_LVDS,
+    OUTPUT_STV,
+    OUTPUT_CTX,
+} RADEONOutputType;
+
+typedef struct _RADEONCrtcPrivateRec {
+    int crtc;
+    int crtc_id;
+    int binding;
     Bool IsActive;
-    int binding; // which instance of the driver "owns" this controller
-    DisplayModePtr pCurMode;
-
-#ifdef RANDR_12_INTERFACE
-    RRCrtcPtr randr_crtc;
-#endif
-} RADEONController;
+    Bool IsUsed;
+} RADEONCrtcPrivateRec, *RADEONCrtcPrivatePtr;
 
-typedef struct
-{
+typedef struct _RADEONOutputPrivateRec {
+    RADEONOutputType type;
+    void *dev_priv;
     RADEONDDCType DDCType;
     RADEONDacType DACType;
     RADEONTmdsType TMDSType;
     RADEONConnectorType ConnectorType;
     RADEONMonitorType MonType;
-    xf86MonPtr MonInfo;
-
-    /* one connector can be bound to one CRTC */
     int crtc_num;
-
-    /* a list of probed modes on this connector */
-    DisplayModePtr probed_modes;
-#ifdef RANDR_12_INTERFACE
-    RROutputPtr randr_output;
-#endif
-} RADEONConnector;
-
-
+} RADEONOutputPrivateRec, *RADEONOutputPrivatePtr;
 
 #define RADEON_MAX_CONNECTOR 2
 #define RADEON_MAX_CRTC 2
@@ -158,8 +153,12 @@ typedef struct
 
     Bool ReversedDAC;	  /* TVDAC used as primary dac */
     Bool ReversedTMDS;    /* DDC_DVI is used for external TMDS */
-    RADEONConnector *PortInfo[RADEON_MAX_CONNECTOR];
-    RADEONController *Controller[RADEON_MAX_CRTC]; /* pointer to a controller */
+    xf86OutputPtr pOutput[RADEON_MAX_CONNECTOR];
+    RADEONOutputPrivatePtr PortInfo[RADEON_MAX_CONNECTOR];
+
+    xf86CrtcPtr pCrtc[RADEON_MAX_CRTC];
+    RADEONCrtcPrivatePtr Controller[RADEON_MAX_CRTC];
+
 } RADEONEntRec, *RADEONEntPtr;
 
 /* radeon_probe.c */