lib: move connector_type_str and co to drmtest

These are used by multiple test cases, so make them shared.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>

1 files changed, 4 insertions, 54 deletions

diff --git a/demos/intel_sprite_on.c b/demos/intel_sprite_on.c
index 62bd98e3..783f9af2 100644
--- a/demos/intel_sprite_on.c
+++ b/demos/intel_sprite_on.c
@@ -53,56 +53,6 @@
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 
-struct type_name {
-	int                 type;
-	const char          *name;
-};
-
-#define type_name_fn(res) \
-	static const char * res##_str(int type) {		\
-		unsigned int i;					\
-		for (i = 0; i < ARRAY_SIZE(res##_names); i++) { \
-			if (res##_names[i].type == type)	\
-			return res##_names[i].name;		\
-		}						\
-		return "(invalid)";				\
-	}
-
-struct type_name encoder_type_names[] = {
-	{ DRM_MODE_ENCODER_NONE, "none" },
-	{ DRM_MODE_ENCODER_DAC, "DAC" },
-	{ DRM_MODE_ENCODER_TMDS, "TMDS" },
-	{ DRM_MODE_ENCODER_LVDS, "LVDS" },
-	{ DRM_MODE_ENCODER_TVDAC, "TVDAC" },
-};
-type_name_fn(encoder_type)
-
-struct type_name connector_status_names[] = {
-	{ DRM_MODE_CONNECTED, "connected" },
-	{ DRM_MODE_DISCONNECTED, "disconnected" },
-	{ DRM_MODE_UNKNOWNCONNECTION, "unknown" },
-};
-type_name_fn(connector_status)
-
-struct type_name connector_type_names[] = {
-	{ DRM_MODE_CONNECTOR_Unknown, "unknown" },
-	{ DRM_MODE_CONNECTOR_VGA, "VGA" },
-	{ DRM_MODE_CONNECTOR_DVII, "DVI-I" },
-	{ DRM_MODE_CONNECTOR_DVID, "DVI-D" },
-	{ DRM_MODE_CONNECTOR_DVIA, "DVI-A" },
-	{ DRM_MODE_CONNECTOR_Composite, "composite" },
-	{ DRM_MODE_CONNECTOR_SVIDEO, "s-video" },
-	{ DRM_MODE_CONNECTOR_LVDS, "LVDS" },
-	{ DRM_MODE_CONNECTOR_Component, "component" },
-	{ DRM_MODE_CONNECTOR_9PinDIN, "9-pin DIN" },
-	{ DRM_MODE_CONNECTOR_DisplayPort, "DisplayPort" },
-	{ DRM_MODE_CONNECTOR_HDMIA, "HDMI-A" },
-	{ DRM_MODE_CONNECTOR_HDMIB, "HDMI-B" },
-	{ DRM_MODE_CONNECTOR_TV, "TV" },
-	{ DRM_MODE_CONNECTOR_eDP, "Embedded DisplayPort" },
-};
-type_name_fn(connector_type)
-
 /*
  * Mode setting with the kernel interfaces is a bit of a chore.
  * First you have to find the connector in question and make sure the
@@ -157,8 +107,8 @@ static void dump_connectors(int gfx_fd, drmModeRes *resources)
 		printf("%d\t%d\t%s\t%s\t%dx%d\t\t%d\n",
 			connector->connector_id,
 			connector->encoder_id,
-			connector_status_str(connector->connection),
-			connector_type_str(connector->connector_type),
+			kmstest_connector_status_str(connector->connection),
+			kmstest_connector_type_str(connector->connector_type),
 			connector->mmWidth, connector->mmHeight,
 			connector->count_modes);
 
@@ -744,14 +694,14 @@ static void ricochet(int tiled, int sprite_w, int sprite_h,
 				curr_connector.mode.flags,
 				curr_connector.encoder->encoder_id,
 				curr_connector.encoder->encoder_type,
-				encoder_type_str(curr_connector.encoder->encoder_type),
+				kmstest_encoder_type_str(curr_connector.encoder->encoder_type),
 				curr_connector.encoder->crtc_id,
 				curr_connector.encoder->possible_crtcs,
 				curr_connector.encoder->possible_clones,
 				curr_connector.connector->connector_id,
 				curr_connector.connector->encoder_id,
 				curr_connector.connector->connector_type,
-				connector_type_str(curr_connector.connector->connector_type),
+				kmstest_connector_type_str(curr_connector.connector->connector_type),
 				curr_connector.connector->connector_type_id);
 
 			printf("Sprite surface dimensions = %dx%d\n"