add t prefix to tdm_display and tdm_output

change the var name below.
 - disp -> tdisplay
 - output -> toutput

Change-Id: I13616e456f772571d3a33b24294a1918eb98c96a

diff --git a/src/lib/tdm/tdm-common.c b/src/lib/tdm/tdm-common.c
index fe7f829..1c60b8f 100644 (file)
--- a/src/lib/tdm/tdm-common.c
+++ b/src/lib/tdm/tdm-common.c
@@ -36,7 +36,8 @@ __tdm_handle_event(int fd, uint32_t mask, void *data)
 {
        pepper_tdm_t *tdm = data;
 
-       tdm_display_handle_events(tdm->disp);
+       tdm_display_handle_events(tdm->tdisplay);
+
        return 0;
 }
 
@@ -52,11 +53,11 @@ pepper_tdm_create(pepper_compositor_t *compositor)
 
        tdm->fd = -1;
        tdm->compositor = compositor;
-       tdm->disp = tdm_display_init(&ret);
+       tdm->tdisplay = tdm_display_init(&ret);
        PEPPER_CHECK(ret == TDM_ERROR_NONE, goto error,
                                 "tdm_display_init() failed %d\n", ret);
 
-       ret = tdm_display_get_fd(tdm->disp, &tdm->fd);
+       ret = tdm_display_get_fd(tdm->tdisplay, &tdm->fd);
        PEPPER_CHECK(ret == TDM_ERROR_NONE, goto error,
                                 "tdm_display_get_fd() failed %d\n", ret);
        PEPPER_CHECK(tdm->fd >= 0, goto error,
@@ -109,8 +110,8 @@ pepper_tdm_destroy(pepper_tdm_t *tdm)
        if (tdm->bufmgr)
                tbm_bufmgr_deinit(tdm->bufmgr);
 
-       if (tdm->disp)
-               tdm_display_deinit(tdm->disp);
+       if (tdm->tdisplay)
+               tdm_display_deinit(tdm->tdisplay);
 
        if (tdm->fd != -1)
                close(tdm->fd);

diff --git a/src/lib/tdm/tdm-internal.h b/src/lib/tdm/tdm-internal.h
index 1a8d919..3f4cec3 100644 (file)
--- a/src/lib/tdm/tdm-internal.h
+++ b/src/lib/tdm/tdm-internal.h
@@ -55,7 +55,7 @@ typedef enum tdm_render_type {
 
 struct pepper_tdm {
        pepper_compositor_t        *compositor;
-       tdm_display                *disp;
+       tdm_display                *tdisplay;
        tbm_bufmgr                  bufmgr;
        int                         fd;
 
@@ -71,7 +71,7 @@ struct pepper_tdm {
 struct pepper_tdm_output {
        pepper_output_t        *base;
        pepper_tdm_t           *tdm;
-       pepper_tdm_output_t    *output;
+       tdm_output             *toutput;
        pepper_tdm_plane_t     *primary_plane;
 
        tbm_surface_queue_h     tbm_surface_queue;

diff --git a/src/lib/tdm/tdm-output.c b/src/lib/tdm/tdm-output.c
index 2e42952..cd0479c 100644 (file)
--- a/src/lib/tdm/tdm-output.c
+++ b/src/lib/tdm/tdm-output.c
@@ -152,7 +152,7 @@ __tdm_renderer_pixman_init(pepper_tdm_output_t *output)
 
        output->renderer = tdm->pixman_renderer;
 
-       err = tdm_output_get_mode(output->output, &mode);
+       err = tdm_output_get_mode(output->toutput, &mode);
        PEPPER_CHECK(err == TDM_ERROR_NONE, goto error,
                        "tdm_output_get_mode() failed.\n");
        output->tbm_surface_queue = tbm_surface_queue_create(3,
@@ -223,7 +223,7 @@ __tdm_renderer_gl_init(pepper_tdm_output_t *output)
 
        output->renderer = tdm->gl_renderer;
 
-       err = tdm_output_get_mode(output->output, &mode);
+       err = tdm_output_get_mode(output->toutput, &mode);
        PEPPER_CHECK(err == TDM_ERROR_NONE, goto error,
                                         "tdm_output_get_mode() failed.\n");
 
@@ -269,7 +269,7 @@ __tdm_output_plane_init(pepper_tdm_output_t *output)
 
        tdm_error err;
 
-       err = tdm_output_get_mode(output->output, &mode);
+       err = tdm_output_get_mode(output->toutput, &mode);
        PEPPER_CHECK(err == TDM_ERROR_NONE, return PEPPER_FALSE,
                                 "tdm_output_get_mode()\n");
 
@@ -286,14 +286,14 @@ __tdm_output_plane_init(pepper_tdm_output_t *output)
        info.src_config.pos.w = mode->hdisplay;
        info.src_config.pos.h = mode->vdisplay;
 
-       tdm_output_get_layer_count(output->output, &num_layer);
+       tdm_output_get_layer_count(output->toutput, &num_layer);
        PEPPER_CHECK(num_layer > 0, return PEPPER_FALSE, "number of tdm_layer is 0\n");
 
        for (i = 0; i < num_layer; i++) {
                plane = (pepper_tdm_plane_t *)calloc(1, sizeof(pepper_tdm_plane_t));
                PEPPER_CHECK(plane, return PEPPER_FALSE, "calloc failed\n");
 
-               plane->layer = (tdm_layer *)tdm_output_get_layer(output->output, i, &err);
+               plane->layer = (tdm_layer *)tdm_output_get_layer(output->toutput, i, &err);
                PEPPER_CHECK(err == TDM_ERROR_NONE, goto error,
                                         "tdm_output_get_layer failed err:%d\n", err);
 
@@ -371,7 +371,7 @@ pepper_tdm_output_get_subpixel_order(void *o)
        unsigned int subpixel;
        tdm_error ret;
 
-       ret = tdm_output_get_subpixel(output->output, &subpixel);
+       ret = tdm_output_get_subpixel(output->toutput, &subpixel);
        PEPPER_CHECK(ret == TDM_ERROR_NONE, return WL_OUTPUT_SUBPIXEL_UNKNOWN, "faile get subpixel\n");
 
        switch (subpixel) {
@@ -401,7 +401,7 @@ pepper_tdm_output_get_mode_count(void *o)
        int num_mode;
        const tdm_output_mode *modes;
 
-       tdm_output_get_available_modes(output->output, &modes, &num_mode);
+       tdm_output_get_available_modes(output->toutput, &modes, &num_mode);
        return num_mode;
 }
 
@@ -414,7 +414,7 @@ pepper_tdm_output_get_mode(void *o, int index, pepper_output_mode_t *mode)
        const tdm_output_mode *cur_mode;
        tdm_error error = TDM_ERROR_NONE;
 
-       tdm_output_get_available_modes(output->output, &modes, &num_mode);
+       tdm_output_get_available_modes(output->toutput, &modes, &num_mode);
        PEPPER_CHECK(index < num_mode, return, "mode index is invalid\n");
 
        mode->flags = 0;
@@ -425,7 +425,7 @@ pepper_tdm_output_get_mode(void *o, int index, pepper_output_mode_t *mode)
        if (modes[index].type & TDM_OUTPUT_MODE_TYPE_PREFERRED)
          mode->flags |= WL_OUTPUT_MODE_PREFERRED;
 
-       error = tdm_output_get_mode(output->output, &cur_mode);
+       error = tdm_output_get_mode(output->toutput, &cur_mode);
        if (error == TDM_ERROR_NONE) {
                  if (cur_mode == &modes[index])
                         mode->flags |= WL_OUTPUT_MODE_CURRENT;
@@ -440,12 +440,12 @@ pepper_tdm_output_set_mode(void *o, const pepper_output_mode_t *mode)
        const tdm_output_mode *modes;
        tdm_error err;
 
-       tdm_output_get_available_modes(output->output, &modes, &num_mode);
+       tdm_output_get_available_modes(output->toutput, &modes, &num_mode);
        for (i = 0; i < num_mode; i++) {
                if (mode->w == (int32_t)modes[i].hdisplay &&
                        mode->h == (int32_t)modes[i].vdisplay &&
                        mode->refresh == (int32_t)modes[i].vrefresh) {
-                       err = tdm_output_set_mode(output->output, &modes[i]);
+                       err = tdm_output_set_mode(output->toutput, &modes[i]);
                        PEPPER_CHECK(err == TDM_ERROR_NONE, return PEPPER_FALSE,
                                                 "tdm_output_set_mode() failed mode:%s\n", modes[i].name);
                        return PEPPER_TRUE;
@@ -503,7 +503,7 @@ pepper_tdm_output_repaint(void *o, const pepper_list_t *plane_list)
                                                                   output->back);
                PEPPER_CHECK(err == TDM_ERROR_NONE, return, "tdm_layer_set_buffer() failed");
 
-               err = tdm_output_commit(output->output, 0, __tdm_output_commit_cb, output);
+               err = tdm_output_commit(output->toutput, 0, __tdm_output_commit_cb, output);
                PEPPER_CHECK(err == TDM_ERROR_NONE, return, "tdm_output_commit() failed");
 
                output->page_flip_pending = PEPPER_TRUE;
@@ -570,7 +570,7 @@ pepper_tdm_output_init(pepper_tdm_t *tdm)
 
        const char        *render_env = getenv("PEPPER_RENDERER");
 
-       err = tdm_display_get_output_count(tdm->disp, &num_output);
+       err = tdm_display_get_output_count(tdm->tdisplay, &num_output);
        PEPPER_CHECK(err == TDM_ERROR_NONE, return PEPPER_FALSE, "Failed to get number of outputs\n");
        PEPPER_CHECK(num_output > 0, return PEPPER_FALSE, "Number of output is 0\n");
 
@@ -578,20 +578,20 @@ pepper_tdm_output_init(pepper_tdm_t *tdm)
                output = (pepper_tdm_output_t *)calloc(1, sizeof(pepper_tdm_output_t));
                PEPPER_CHECK(output, goto error, "Failed to allocate memory for pepper_tdm_output_t\n");
                output->tdm = tdm;
-               output->output = (tdm_output *)tdm_display_get_output(tdm->disp, num_output,
+               output->toutput = (tdm_output *)tdm_display_get_output(tdm->tdisplay, num_output,
                                                 &err);
-               PEPPER_CHECK((output->output && (err == TDM_ERROR_NONE)), goto error,
+               PEPPER_CHECK((output->toutput && (err == TDM_ERROR_NONE)), goto error,
                                         "tdm_display_get_output(%d) failed err:%d\n", num_output, err);
 
                /*Check connection state*/
-               err = tdm_output_get_conn_status(output->output, &status);
+               err = tdm_output_get_conn_status(output->toutput, &status);
                PEPPER_CHECK(err == TDM_ERROR_NONE, goto error,
                                         "tdm_display_get_output(%d) failed err:%d\n", num_output, err);
-               if (status != TDM_OUTPUT_CONN_STATUS_CONNECTED)
+               if (status == TDM_OUTPUT_CONN_STATUS_DISCONNECTED)
                        continue;
 
                /*Setup default mode*/
-               err = tdm_output_get_available_modes(output->output, &modes, &num_mode);
+               err = tdm_output_get_available_modes(output->toutput, &modes, &num_mode);
                PEPPER_CHECK(err == TDM_ERROR_NONE, goto error,
                                         "tdm_output_get_available_modes(%d) failed err:%d\n", num_output, err);
                for (i = 0; i < num_mode; i++) {
@@ -603,15 +603,15 @@ pepper_tdm_output_init(pepper_tdm_t *tdm)
                }
 
                if (preferred_mode) {
-                       err = tdm_output_set_mode(output->output, preferred_mode);
+                       err = tdm_output_set_mode(output->toutput, preferred_mode);
                        PEPPER_CHECK(err == TDM_ERROR_NONE, goto error,
                                                 "tdm_output_set_mode() failed err:%d\n", err);
                } else if (default_mode) {
-                       err = tdm_output_set_mode(output->output, default_mode);
+                       err = tdm_output_set_mode(output->toutput, default_mode);
                        PEPPER_CHECK(err == TDM_ERROR_NONE, goto error,
                                                 "tdm_output_set_mode() failed err:%d\n", err);
                } else {
-                       err = tdm_output_set_mode(output->output, &modes[0]);
+                       err = tdm_output_set_mode(output->toutput, &modes[0]);
                        PEPPER_CHECK(err == TDM_ERROR_NONE, goto error,
                                                 "tdm_output_set_mode() failed err:%d\n", err);
                }