doc: fix carriage return

[platform/core/uifw/libtdm.git] / tools / tdm_test_client.c

diff --git a/tools/tdm_test_client.c b/tools/tdm_test_client.c
index 1ec8f93..1031685 100644 (file)
--- a/tools/tdm_test_client.c
+++ b/tools/tdm_test_client.c
@@ -9,7 +9,7 @@
  *          Taeheon Kim <th908.kim@samsung.com>,
  *          YoungJun Cho <yj44.cho@samsung.com>,
  *          SooChan Lim <sc1.lim@samsung.com>,
- *          Boram Park <sc1.lim@samsung.com>
+ *          Boram Park <boram1288.park@samsung.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -41,7 +41,7 @@
 #include <time.h>
 #include <stdint.h>
 
-#include <tdm_client.h>
+#include "tdm_client.h"
 #include "tdm_macro.h"
 
 typedef struct _tdm_test_client_arg {
@@ -60,7 +60,6 @@ typedef struct _tdm_test_client {
 
        int do_query;
        int do_vblank;
-       int do_set_fps;
        int waiting;
 
        tdm_client *client;
@@ -94,7 +93,6 @@ static struct typestrings typestrs[] = {
 static struct optstrings optstrs[] = {
        {OPT_QRY, "qo", "output objects info", "<output_name>", "primary"},
        {OPT_TST, "v", "vblank test", "<output_name>[,<sync>][@<fps>][~<interval>][+<offset>][*fake][^vblank_name]", "primary,0@60~1+0*1^test"},
-       {OPT_TST, "f", "fps setting test", "<pid>[,<vblank_name>]@<fps>", "<pid>@60"},
 };
 
 static void
@@ -178,30 +176,6 @@ parse_arg_v(tdm_test_client *data, char *arg)
        }
 }
 
-//"<pid>@<fps>"
-static void
-parse_arg_f(tdm_test_client *data, char *arg)
-{
-       char *end = arg;
-
-       data->args.pid = strtol(arg, &end, 10);
-
-       if (*end == ',') {
-               char name[TDM_NAME_LEN];
-               arg = end + 1;
-               end = strtostr(name, TDM_NAME_LEN, arg, TDM_DELIM);
-               data->args.vblank_name = strndup(name, TDM_NAME_LEN);
-       }
-
-       if (*end != '@') {
-               printf("failed: no fps value\n");
-               exit(0);
-       }
-
-       arg = end + 1;
-       data->args.fps = strtol(arg, &end, 10);
-}
-
 static void
 parse_args(tdm_test_client *data, int argc, char *argv[])
 {
@@ -222,9 +196,6 @@ parse_args(tdm_test_client *data, int argc, char *argv[])
                } else if (!strncmp(argv[i] + 1, "v", 1)) {
                        data->do_vblank = 1;
                        parse_arg_v(data, argv[++i]);
-               } else if (!strncmp(argv[i] + 1, "f", 1)) {
-                       data->do_set_fps = 1;
-                       parse_arg_f(data, argv[++i]);
                } else {
                        usage(argv[0]);
                        exit(0);
@@ -302,9 +273,12 @@ do_query(tdm_test_client *data)
                return;
        }
 
-       tdm_client_output_get_conn_status(output, &status);
-       tdm_client_output_get_dpms(output, &dpms);
-       tdm_client_output_get_refresh_rate(output, &refresh);
+       error = tdm_client_output_get_conn_status(output, &status);
+       TDM_WARNING_IF_FAIL(error == TDM_ERROR_NONE);
+       error = tdm_client_output_get_dpms(output, &dpms);
+       TDM_WARNING_IF_FAIL(error == TDM_ERROR_NONE);
+       error = tdm_client_output_get_refresh_rate(output, &refresh);
+       TDM_WARNING_IF_FAIL(error == TDM_ERROR_NONE);
 
        printf("tdm_output \"%s\"\n", data->args.output_name);
        printf("\tstatus : %s\n", conn_str[status]);
@@ -327,7 +301,8 @@ do_vblank(tdm_test_client *data)
                return;
        }
 
-       tdm_client_output_add_change_handler(output, _client_output_handler, NULL);
+       error = tdm_client_output_add_change_handler(output, _client_output_handler, NULL);
+       TDM_WARNING_IF_FAIL(error == TDM_ERROR_NONE);
 
        vblank = tdm_client_output_create_vblank(output, &error);
        if (error != TDM_ERROR_NONE) {
@@ -335,12 +310,18 @@ do_vblank(tdm_test_client *data)
                return;
        }
 
-       tdm_client_vblank_set_name(vblank, data->args.vblank_name);
-       tdm_client_vblank_set_enable_fake(vblank, data->args.enable_fake);
-       tdm_client_vblank_set_sync(vblank, data->args.sync);
-       if (data->args.fps > 0)
-               tdm_client_vblank_set_fps(vblank, data->args.fps);
-       tdm_client_vblank_set_offset(vblank, data->args.offset);
+       error = tdm_client_vblank_set_name(vblank, data->args.vblank_name);
+       TDM_WARNING_IF_FAIL(error == TDM_ERROR_NONE);
+       error = tdm_client_vblank_set_enable_fake(vblank, data->args.enable_fake);
+       TDM_WARNING_IF_FAIL(error == TDM_ERROR_NONE);
+       error = tdm_client_vblank_set_sync(vblank, data->args.sync);
+       TDM_WARNING_IF_FAIL(error == TDM_ERROR_NONE);
+       if (data->args.fps > 0) {
+               error = tdm_client_vblank_set_fps(vblank, data->args.fps);
+               TDM_WARNING_IF_FAIL(error == TDM_ERROR_NONE);
+       }
+       error = tdm_client_vblank_set_offset(vblank, data->args.offset);
+       TDM_WARNING_IF_FAIL(error == TDM_ERROR_NONE);
 
        error = tdm_client_get_fd(data->client, &fd);
        if (error != TDM_ERROR_NONE || fd < 0) {
@@ -393,18 +374,6 @@ done:
                tdm_client_vblank_destroy(vblank);
 }
 
-static void
-do_set_fps(tdm_test_client *data)
-{
-       tdm_error error;
-
-       error = tdm_client_set_client_vblank_fps(data->client, data->args.pid, data->args.vblank_name, data->args.fps);
-       if (error != TDM_ERROR_NONE) {
-               printf("tdm_client_set_client_vblank_fps failed\n");
-               return;
-       }
-}
-
 static tdm_test_client ttc_data;
 
 int
@@ -440,8 +409,6 @@ main(int argc, char *argv[])
                do_query(data);
        if (data->do_vblank)
                do_vblank(data);
-       if (data->do_set_fps)
-               do_set_fps(data);
 
 done:
        if (data->args.output_name)