From: Boram Park Date: Mon, 8 Aug 2016 01:34:31 +0000 (+0900) Subject: fix syntax error X-Git-Tag: 1.4.0~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=733d6051c16439cac03928c3f8dd0a945a23471d;p=platform%2Fcore%2Fuifw%2Flibtdm.git fix syntax error Change-Id: I7050f9426ee4cfd62d3affae21416e2021791b82 --- diff --git a/doc/tdm_doc.h b/doc/tdm_doc.h index afe08eb..a98c7da 100644 --- a/doc/tdm_doc.h +++ b/doc/tdm_doc.h @@ -89,7 +89,7 @@ * ... * * memset(&drm_func_display, 0, sizeof(drm_func_display)); - * drm_func_display.display_get_capabilitiy = drm_display_get_capabilitiy; + * drm_func_display.display_get_capability = drm_display_get_capability; * ... * ret = tdm_backend_register_func_display(dpy, &drm_func_display); * if (ret != TDM_ERROR_NONE) @@ -134,7 +134,7 @@ $ git clone ssh://{user_id}@review.tizen.org:29418/platform/core/uifw/libtdm-drm * @endcode * \n - * After loading a TDM backend module, TDM will call @b display_get_capabilitiy(), + * After loading a TDM backend module, TDM will call @b display_get_capability(), * @b display_get_outputs(), @b output_get_capability(), @b output_get_layers(), * @b layer_get_capability() functions to get the hardware information. That is, * a TDM backend module @b SHOULD implement these 5 functions basically.\n diff --git a/include/tdm_backend.h b/include/tdm_backend.h index 8076fa2..bf270e2 100644 --- a/include/tdm_backend.h +++ b/include/tdm_backend.h @@ -73,7 +73,7 @@ typedef void (*tdm_output_status_handler)(tdm_output *output, /** * @brief The display capabilities structure of a backend module - * @see The display_get_capabilitiy() function of #tdm_func_display + * @see The display_get_capability() function of #tdm_func_display */ typedef struct _tdm_caps_display { int max_layer_count; /**< The maximum layer count. -1 means "not defined" */ @@ -205,7 +205,7 @@ typedef struct _tdm_func_display { * a backend module can set the max count to max_layer_count of #tdm_caps_display * structure. Otherwise, set -1. */ - tdm_error (*display_get_capabilitiy)(tdm_backend_data *bdata, tdm_caps_display *caps); + tdm_error (*display_get_capability)(tdm_backend_data *bdata, tdm_caps_display *caps); /** * @brief Get the pp capabilities of a backend module @@ -324,7 +324,8 @@ typedef struct _tdm_func_display { */ tdm_pp *(*display_create_pp)(tdm_backend_data *bdata, tdm_error *error); - void (*reserved1)(void); + tdm_error (*display_get_capabilitiy)(tdm_backend_data *bdata, tdm_caps_display *caps); + void (*reserved2)(void); void (*reserved3)(void); void (*reserved4)(void); diff --git a/src/tdm.c b/src/tdm.c index 2f83a78..8c7843a 100644 --- a/src/tdm.c +++ b/src/tdm.c @@ -676,15 +676,18 @@ _tdm_display_check_backend_functions(tdm_private_display *private_display) /* below functions should be implemented in backend side */ TDM_RETURN_VAL_IF_FAIL(func_display != NULL, TDM_ERROR_BAD_MODULE); - TDM_RETURN_VAL_IF_FAIL(func_display->display_get_capabilitiy, TDM_ERROR_BAD_MODULE); +// TDM_RETURN_VAL_IF_FAIL(func_display->display_get_capabilitiy, TDM_ERROR_BAD_MODULE); TDM_RETURN_VAL_IF_FAIL(func_display->display_get_outputs, TDM_ERROR_BAD_MODULE); TDM_RETURN_VAL_IF_FAIL(func_output->output_get_capability, TDM_ERROR_BAD_MODULE); TDM_RETURN_VAL_IF_FAIL(func_output->output_get_layers, TDM_ERROR_BAD_MODULE); TDM_RETURN_VAL_IF_FAIL(func_layer->layer_get_capability, TDM_ERROR_BAD_MODULE); - ret = func_display->display_get_capabilitiy(private_display->bdata, &private_display->caps_display); + if (func_display->display_get_capability) + ret = func_display->display_get_capability(private_display->bdata, &private_display->caps_display); + else + ret = func_display->display_get_capabilitiy(private_display->bdata, &private_display->caps_display); if (ret != TDM_ERROR_NONE) { - TDM_ERR("display_get_capabilitiy() failed"); + TDM_ERR("display_get_capability() failed"); return TDM_ERROR_BAD_MODULE; }