From: Taeyoung Kim Date: Mon, 7 Mar 2016 09:55:34 +0000 (+0900) Subject: display lock: change display lock api from pmapi to libdeviced X-Git-Tag: accepted/tizen/mobile/20160308.023935 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Faccepted%2Ftizen%2Fmobile%2F20160308.023935;p=platform%2Fcore%2Fconnectivity%2Fnfc-manager-neard.git display lock: change display lock api from pmapi to libdeviced - pmapi is deprecated. Thus the apis to lock display are changed to use libdeviced. Change-Id: I190aa9d39fede8e22186192146a0def1b64e7ef4 Signed-off-by: Taeyoung Kim --- diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt index 7ec36b1..c8a6f7d 100755 --- a/daemon/CMakeLists.txt +++ b/daemon/CMakeLists.txt @@ -18,12 +18,12 @@ INCLUDE(FindPkgConfig) IF(ARM_TARGET) pkg_check_modules(daemon_pkgs REQUIRED aul glib-2.0 gio-unix-2.0 vconf dlog tapi appsvc libcurl libssl libcrypto feedback capi-media-wav-player - pkgmgr pkgmgr-info capi-network-wifi pmapi capi-network-wifi-direct + pkgmgr pkgmgr-info capi-network-wifi deviced capi-network-wifi-direct libtzplatform-config neardal ${WIN_PKG}) ELSE(ARM_TARGET) pkg_check_modules(daemon_pkgs REQUIRED aul glib-2.0 gio-unix-2.0 vconf dlog tapi appsvc libcurl libssl libcrypto feedback capi-media-wav-player - pkgmgr pkgmgr-info capi-network-wifi pmapi libtzplatform-config neardal + pkgmgr pkgmgr-info capi-network-wifi deviced libtzplatform-config neardal ${WIN_PKG}) ENDIF(ARM_TARGET) diff --git a/daemon/net_nfc_server_controller.c b/daemon/net_nfc_server_controller.c index e769ec9..752ecee 100644 --- a/daemon/net_nfc_server_controller.c +++ b/daemon/net_nfc_server_controller.c @@ -24,7 +24,7 @@ #include #include -#include /*for pm lock*/ +#include /*for pm lock*/ #include "net_nfc_oem_controller.h" #include "net_nfc_server_controller.h" @@ -337,9 +337,9 @@ bool net_nfc_controller_secure_element_open( { int ret_val = 0; - ret_val = pm_lock_state(LCD_NORMAL, GOTO_STATE_NOW, 0); + ret_val = display_lock_state(LCD_NORMAL, GOTO_STATE_NOW, 0); - NFC_DBG("pm_lock_state [%d]!!", ret_val); + NFC_DBG("display_lock_state [%d]!!", ret_val); if (g_interface.secure_element_open != NULL) { @@ -391,8 +391,8 @@ bool net_nfc_controller_secure_element_close(net_nfc_target_handle_s *handle, { int ret_val = 0; - ret_val = pm_unlock_state(LCD_NORMAL, PM_RESET_TIMER); - NFC_DBG("pm_unlock_state [%d]!!", ret_val); + ret_val = display_unlock_state(LCD_NORMAL, PM_RESET_TIMER); + NFC_DBG("display_unlock_state [%d]!!", ret_val); if (g_interface.secure_element_close != NULL) { @@ -426,9 +426,9 @@ bool net_nfc_controller_connect(net_nfc_target_handle_s *handle, { int ret_val = 0; - ret_val = pm_lock_state(LCD_NORMAL, GOTO_STATE_NOW, 0); + ret_val = display_lock_state(LCD_NORMAL, GOTO_STATE_NOW, 0); - NFC_DBG("net_nfc_controller_connect pm_lock_state [%d]!!", ret_val); + NFC_DBG("net_nfc_controller_connect display_lock_state [%d]!!", ret_val); if (g_interface.connect != NULL) { @@ -447,9 +447,9 @@ bool net_nfc_controller_disconnect(net_nfc_target_handle_s *handle, { int ret_val = 0; - ret_val = pm_unlock_state(LCD_NORMAL, PM_RESET_TIMER); + ret_val = display_unlock_state(LCD_NORMAL, PM_RESET_TIMER); - NFC_ERR("net_nfc_controller_disconnect pm_lock_state [%d]!!", ret_val); + NFC_ERR("net_nfc_controller_disconnect display_unlock_state [%d]!!", ret_val); if (g_interface.disconnect != NULL) { @@ -870,9 +870,9 @@ bool net_nfc_controller_llcp_connect_by_url(net_nfc_target_handle_s *handle, { int ret_val = 0; - ret_val = pm_lock_state(LCD_NORMAL, GOTO_STATE_NOW, 0); + ret_val = display_lock_state(LCD_NORMAL, GOTO_STATE_NOW, 0); - NFC_DBG("pm_lock_state[%d]!!", ret_val); + NFC_DBG("display_lock_state[%d]!!", ret_val); if (g_interface.connect_llcp_by_url != NULL) { @@ -910,9 +910,9 @@ bool net_nfc_controller_llcp_connect(net_nfc_target_handle_s *handle, { int ret_val = 0; - ret_val = pm_lock_state(LCD_NORMAL, GOTO_STATE_NOW, 0); + ret_val = display_lock_state(LCD_NORMAL, GOTO_STATE_NOW, 0); - NFC_DBG("net_nfc_controller_llcp_connect pm_lock_state [%d]!!", ret_val); + NFC_DBG("net_nfc_controller_llcp_connect display_lock_state [%d]!!", ret_val); if (g_interface.connect_llcp != NULL) { @@ -960,9 +960,9 @@ bool net_nfc_controller_llcp_disconnect(net_nfc_target_handle_s *handle, { int ret_val = 0; - ret_val = pm_unlock_state(LCD_NORMAL, PM_RESET_TIMER); + ret_val = display_unlock_state(LCD_NORMAL, PM_RESET_TIMER); - NFC_DBG("net_nfc_controller_llcp_disconnect pm_unlock_state [%d]!!", ret_val); + NFC_DBG("net_nfc_controller_llcp_disconnect display_unlock_state [%d]!!", ret_val); if (g_interface.disconnect_llcp != NULL) { diff --git a/daemon/net_nfc_server_llcp.c b/daemon/net_nfc_server_llcp.c index 79b6f16..7b386fb 100644 --- a/daemon/net_nfc_server_llcp.c +++ b/daemon/net_nfc_server_llcp.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include /*for pm lock*/ +#include /*for pm lock*/ #include "net_nfc_debug_internal.h" #include "net_nfc_util_internal.h" @@ -864,8 +864,8 @@ static void llcp_handle_disconnect_thread_func(gpointer user_data) int ret_val; net_nfc_server_free_target_info(); - ret_val = pm_unlock_state(LCD_NORMAL, PM_RESET_TIMER); - NFC_DBG("net_nfc_controller_disconnect pm_unlock_state[%d]!!", ret_val); + ret_val = display_unlock_state(LCD_NORMAL, PM_RESET_TIMER); + NFC_DBG("net_nfc_controller_disconnect display_unlock_state[%d]!!", ret_val); } ret = net_nfc_controller_llcp_disconnect(GUINT_TO_POINTER(data->handle), diff --git a/packaging/nfc-manager-neard.spec b/packaging/nfc-manager-neard.spec index b56998c..45b885e 100755 --- a/packaging/nfc-manager-neard.spec +++ b/packaging/nfc-manager-neard.spec @@ -36,7 +36,7 @@ BuildRequires: pkgconfig(ecore-x) %if %{with wayland} BuildRequires: pkgconfig(ecore-wayland) %endif -BuildRequires: pkgconfig(pmapi) +BuildRequires: pkgconfig(deviced) BuildRequires: pkgconfig(libtzplatform-config) BuildRequires: pkgconfig(neardal) BuildRequires: python diff --git a/src/manager/CMakeLists.txt b/src/manager/CMakeLists.txt index b5aa801..8687220 100644 --- a/src/manager/CMakeLists.txt +++ b/src/manager/CMakeLists.txt @@ -20,7 +20,7 @@ IF(WAYLAND_SUPPORT) SET(WIN_PKG "${WIN_PKG} ecore-wayland") ENDIF(WAYLAND_SUPPORT) INCLUDE(FindPkgConfig) -pkg_check_modules(manager_pkges REQUIRED aul glib-2.0 gobject-2.0 dbus-glib-1 vconf dlog tapi appsvc libcurl bluetooth-api heynoti smartcard-service smartcard-service-common libssl pmapi feedback capi-media-wav-player pkgmgr pkgmgr-info ${WIN_PKG}) +pkg_check_modules(manager_pkges REQUIRED aul glib-2.0 gobject-2.0 dbus-glib-1 vconf dlog tapi appsvc libcurl bluetooth-api heynoti smartcard-service smartcard-service-common libssl deviced feedback capi-media-wav-player pkgmgr pkgmgr-info ${WIN_PKG}) IF(WAYLAND_SUPPORT) ADD_DEFINITIONS("-DHAVE_WAYLAND")