RADEON: unify connectortype handling

1 files changed, 10 insertions, 33 deletions

diff --git a/src/radeon_probe.h b/src/radeon_probe.h
index 7c757dc..bac2f51 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -54,17 +54,6 @@
 
 typedef enum
 {
-    DDC_NONE_DETECTED,
-    DDC_MONID,
-    DDC_DVI,
-    DDC_VGA,
-    DDC_CRT2,
-    DDC_LCD,
-    DDC_GPIO,
-} RADEONDDCType;
-
-typedef enum
-{
     MT_UNKNOWN = -1,
     MT_NONE    = 0,
     MT_CRT     = 1,
@@ -80,34 +69,22 @@ typedef enum
 typedef enum
 {
     CONNECTOR_NONE,
-    CONNECTOR_PROPRIETARY,
-    CONNECTOR_CRT,
+    CONNECTOR_VGA,
     CONNECTOR_DVI_I,
     CONNECTOR_DVI_D,
-    CONNECTOR_CTV,
+    CONNECTOR_DVI_A,
     CONNECTOR_STV,
+    CONNECTOR_CTV,
+    CONNECTOR_LVDS,
+    CONNECTOR_DIGITAL,
+    CONNECTOR_SCART,
+    CONNECTOR_HDMI_TYPE_A,
+    CONNECTOR_HDMI_TYPE_B,
+    CONNECTOR_DIN,
+    CONNECTOR_DISPLAY_PORT,
     CONNECTOR_UNSUPPORTED
 } RADEONConnectorType;
 
-typedef enum
-{
-    CONNECTOR_NONE_ATOM,
-    CONNECTOR_VGA_ATOM,
-    CONNECTOR_DVI_I_ATOM,
-    CONNECTOR_DVI_D_ATOM,
-    CONNECTOR_DVI_A_ATOM,
-    CONNECTOR_STV_ATOM,
-    CONNECTOR_CTV_ATOM,
-    CONNECTOR_LVDS_ATOM,
-    CONNECTOR_DIGITAL_ATOM,
-    CONNECTOR_SCART_ATOM,
-    CONNECTOR_HDMI_TYPE_A_ATOM,
-    CONNECTOR_HDMI_TYPE_B_ATOM,
-    CONNECTOR_CASE_1_ATOM,
-    CONNECTOR_DISPLAY_PORT_ATOM,
-    CONNECTOR_UNSUPPORTED_ATOM
-} RADEONConnectorTypeATOM;
-
 typedef enum {
     OUTPUT_NONE_ATOM,
     OUTPUT_DAC_EXTERNAL_ATOM,