support tdm_value type

Change-Id: I88a97af9c00566cb6d21ce8062fb4d73eb678751

diff --git a/include/tdm_common.h b/include/tdm_common.h
index dc33494..dfb3f8e 100644 (file)
--- a/include/tdm_common.h
+++ b/include/tdm_common.h
@@ -262,6 +262,18 @@ typedef struct _tdm_pos {
 } tdm_pos;
 
 /**
+ * @brief The tdm value type enumeration
+ */
+typedef enum {
+       TDM_VALUE_TYPE_UNKNOWN,
+       TDM_VALUE_TYPE_PTR,
+       TDM_VALUE_TYPE_INT32,
+       TDM_VALUE_TYPE_UINT32,
+       TDM_VALUE_TYPE_INT64,
+       TDM_VALUE_TYPE_UINT64,
+} tdm_value_type;
+
+/**
  * @brief The value union
  */
 typedef union {

diff --git a/include/tdm_types.h b/include/tdm_types.h
index 3b62ff5..2cda6d6 100644 (file)
--- a/include/tdm_types.h
+++ b/include/tdm_types.h
@@ -85,6 +85,7 @@ typedef struct _tdm_output_mode {
 typedef struct _tdm_prop {
        unsigned int id;
        char name[TDM_NAME_LEN];
+       tdm_value_type type;
 } tdm_prop;
 
 /**

diff --git a/src/tdm_helper.c b/src/tdm_helper.c
index 90dd618..aaf7fbd 100644 (file)
--- a/src/tdm_helper.c
+++ b/src/tdm_helper.c
@@ -44,6 +44,7 @@
 #include <string.h>
 #include <time.h>
 #include <pixman.h>
+#include <inttypes.h>
 
 #include "tdm.h"
 #include "tdm_private.h"
@@ -854,7 +855,7 @@ tdm_helper_get_display_information(tdm_display *dpy, char *reply, int *len)
 
                TDM_SNPRINTF(reply, len, "\t%d properties:\n", private_output->caps.prop_count);
                if (private_output->caps.prop_count > 0) {
-                       TDM_SNPRINTF(reply, len, "\t\tname\tidx\tvalue\n");
+                       TDM_SNPRINTF(reply, len, "\t\tname\ttype\tidx\tvalue\n");
                        for (i = 0; i < private_output->caps.prop_count; i++) {
                                tdm_value value;
                                TDM_DBG_GOTO_IF_FAIL(func_output->output_get_property, unlock);
@@ -862,10 +863,28 @@ tdm_helper_get_display_information(tdm_display *dpy, char *reply, int *len)
                                                                                                           private_output->caps.props[i].id,
                                                                                                           &value);
                                TDM_DBG_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, unlock);
-                               TDM_SNPRINTF(reply, len, "\t\t%s\t%u\t%u\n",
+                               TDM_SNPRINTF(reply, len, "\t\t%s\t%s\t%u\t",
                                                         private_output->caps.props[i].name,
-                                                        private_output->caps.props[i].id,
-                                                        value.u32);
+                                                        tdm_value_type_str(private_output->caps.props[i].type),
+                                                        private_output->caps.props[i].id);
+                               switch (private_output->caps.props[i].type) {
+                               case TDM_VALUE_TYPE_PTR:
+                                       TDM_SNPRINTF(reply, len, "%p\n", value.ptr);
+                                       break;
+                               case TDM_VALUE_TYPE_INT32:
+                                       TDM_SNPRINTF(reply, len, "%d\n", value.s32);
+                                       break;
+                               case TDM_VALUE_TYPE_INT64:
+                                       TDM_SNPRINTF(reply, len, "%"PRId64"\n", value.s64);
+                                       break;
+                               case TDM_VALUE_TYPE_UINT64:
+                                       TDM_SNPRINTF(reply, len, "%"PRIu64"\n", value.u64);
+                                       break;
+                               case TDM_VALUE_TYPE_UINT32:
+                               default:
+                                       TDM_SNPRINTF(reply, len, "%u\n", value.u32);
+                                       break;
+                               }
                        }
                }
        }
@@ -937,7 +956,7 @@ tdm_helper_get_display_information(tdm_display *dpy, char *reply, int *len)
 
                        TDM_SNPRINTF(reply, len, "\t%u properties:\n", private_layer->caps.prop_count);
                        if (private_layer->caps.prop_count > 0) {
-                               TDM_SNPRINTF(reply, len, "\t\tname\tidx\tvalue\n");
+                               TDM_SNPRINTF(reply, len, "\t\tname\ttype\tidx\tvalue\n");
                                for (i = 0; i < private_layer->caps.prop_count; i++) {
                                        tdm_value value;
                                        TDM_DBG_GOTO_IF_FAIL(func_layer->layer_get_property, unlock);
@@ -945,10 +964,28 @@ tdm_helper_get_display_information(tdm_display *dpy, char *reply, int *len)
                                                                                                                 private_layer->caps.props[i].id,
                                                                                                                 &value);
                                        TDM_DBG_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, unlock);
-                                       TDM_SNPRINTF(reply, len, "\t\t%s\t%u\t%u\n",
+                                       TDM_SNPRINTF(reply, len, "\t\t%s\t%s\t%u\t",
                                                                 private_layer->caps.props[i].name,
-                                                                private_layer->caps.props[i].id,
-                                                                value.u32);
+                                                                tdm_value_type_str(private_output->caps.props[i].type),
+                                                                private_layer->caps.props[i].id);
+                               switch (private_layer->caps.props[i].type) {
+                               case TDM_VALUE_TYPE_PTR:
+                                       TDM_SNPRINTF(reply, len, "%p\n", value.ptr);
+                                       break;
+                               case TDM_VALUE_TYPE_INT32:
+                                       TDM_SNPRINTF(reply, len, "%d\n", value.s32);
+                                       break;
+                               case TDM_VALUE_TYPE_INT64:
+                                       TDM_SNPRINTF(reply, len, "%"PRId64"\n", value.s64);
+                                       break;
+                               case TDM_VALUE_TYPE_UINT64:
+                                       TDM_SNPRINTF(reply, len, "%"PRIu64"\n", value.u64);
+                                       break;
+                               case TDM_VALUE_TYPE_UINT32:
+                               default:
+                                       TDM_SNPRINTF(reply, len, "%u\n", value.u32);
+                                       break;
+                               }
                                }
                        }
                }

diff --git a/src/tdm_macro.h b/src/tdm_macro.h
index f377fae..6da02b4 100644 (file)
--- a/src/tdm_macro.h
+++ b/src/tdm_macro.h
@@ -219,6 +219,15 @@ static struct tdm_type_name tdm_transform_names[] = {
 };
 TDM_TYPE_NAME_FN(transform)
 
+static struct tdm_type_name tdm_value_type_names[] = {
+       { TDM_VALUE_TYPE_UNKNOWN, "unknown" },
+       { TDM_VALUE_TYPE_PTR, "ptr" },
+       { TDM_VALUE_TYPE_INT32, "int32" },
+       { TDM_VALUE_TYPE_UINT32, "uint32" },
+       { TDM_VALUE_TYPE_INT64, "int64" },
+       { TDM_VALUE_TYPE_UINT64, "uint64" },
+};
+TDM_TYPE_NAME_FN(value_type)
 
 #define TDM_BIT_NAME_FB(res)                                   \
 static inline const char * tdm_##res##_str(int type, char **reply, int *len)   \