From 921239f9501499a34457320bc63f10f5d9243106 Mon Sep 17 00:00:00 2001 From: "sh.pi" Date: Fri, 7 Sep 2012 16:03:26 +0900 Subject: [PATCH] pm_change_state is moved to managed API. --- CMakeLists.txt | 2 +- debian/changelog | 8 ++++++++ packaging/libslp-pm.spec | 1 + pmapi.h | 23 +++------------------ pmapi_managed.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 65 insertions(+), 21 deletions(-) create mode 100644 pmapi_managed.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 0875ff4..89dc12a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ PROJECT(pmapi C) SET(SRCS pm.c) -SET(HEADERS pmapi.h SLP_pm_PG.h) +SET(HEADERS pmapi.h pmapi_managed.h SLP_pm_PG.h) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") diff --git a/debian/changelog b/debian/changelog index f1d9431..7183bd0 100755 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libslp-pm (1.2.4-23) unstable; urgency=low + + * pm_change_state is moved to managed API. + * Git: slp/pkgs/l/libslp-pm + * Tag: libslp-pm_1.2.4-23 + + -- Seunghun Pi Fri, 07 Aug 2012 11:11:27 +0900 + libslp-pm (1.2.4-21) unstable; urgency=low * Add parameters for pm_lock_state() : HOLD_KEY_BLOCK diff --git a/packaging/libslp-pm.spec b/packaging/libslp-pm.spec index a2be75b..206f549 100755 --- a/packaging/libslp-pm.spec +++ b/packaging/libslp-pm.spec @@ -54,6 +54,7 @@ rm -rf %{buildroot} %files devel %defattr(-,root,root,-) %{_includedir}/pmapi.h +%{_includedir}/pmapi_managed.h %{_includedir}/SLP_pm_PG.h %{_libdir}/pkgconfig/pmapi.pc %{_libdir}/libpmapi.so diff --git a/pmapi.h b/pmapi.h index 8efb250..1bb2a40 100644 --- a/pmapi.h +++ b/pmapi.h @@ -23,8 +23,10 @@ #ifndef __POWER_MANAGER_LIBRARY_H__ #define __POWER_MANAGER_LIBRARY_H__ +#include "pmapi_managed.h" + /** - * @defgroup POWER_MANAGER Power manager library + * @defgroup POWER_MANAGER Power manager library * @ingroup SYSTEM_FRAMEWORK * @brief Power manager control API library * @@ -177,25 +179,6 @@ extern "C" { int pm_unlock_state(unsigned int, unsigned int); /** - * @fn int pm_change_state(unsigned int state); - * @brief This API is used to change the power manager state by force. - * @param[in] state power manager state - LCD_NORMAL, LCD_DIM, LCD_OFF - * @return 0 on success, -1 if failed. - * @see pm_lock_state(), pm_unlock_state() - * @pat Example - * @code - * ... - * result = pm_change_state(LCD_OFF); - * if( result < 0 ) - * printf("[ERROR] return value result =%d, \n",result); - * else - * printf("[SUCCESS]return value result =%d \n",result); - * ... - * @endcode - */ - int pm_change_state(unsigned int); - -/** * @} */ diff --git a/pmapi_managed.h b/pmapi_managed.h new file mode 100644 index 0000000..4deb80d --- /dev/null +++ b/pmapi_managed.h @@ -0,0 +1,52 @@ +/* + * libslp-pm + * + * Copyright (c) 2000 - 2012 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Seunghun Pi + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * +*/ + + +#ifndef __POWER_MANAGER_LIBRARY_MANAGED_H__ +#define __POWER_MANAGER_LIBRARY_MANAGED_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @fn int pm_change_state(unsigned int state); + * @brief This API is used to change the power manager state by force. + * @param[in] state power manager state - LCD_NORMAL, LCD_DIM, LCD_OFF + * @return 0 on success, -1 if failed. + * @see pm_lock_state(), pm_unlock_state() + * @pat Example + * @code + * ... + * result = pm_change_state(LCD_OFF); + * if( result < 0 ) + * printf("[ERROR] return value result =%d, \n",result); + * else + * printf("[SUCCESS]return value result =%d \n",result); + * ... + * @endcode + */ + int pm_change_state(unsigned int); + +#ifdef __cplusplus +} +#endif +#endif /* __POWER_MANAGER_LIBRARY_MANAGED_H__ */ -- 2.7.4