Tizen 2.1 base

9 files changed, 307 insertions, 39 deletions

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/LICENSE.APLv2 b/LICENSE.APLv2
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/LICENSE.APLv2
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..08a1d59
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,3 @@
+Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
+Except as noted, This software is licensed under Apache License, Version 2.
+Please, see the LICENSE.APLv2 file for Apache License terms and conditions.
diff --git a/debian/changelog b/debian/changelog
index b1d608f..7183bd0 100644..100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,23 @@
+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 <sh.pi@samsung.com>  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
+  * Git: slp/pkgs/l/libslp-pm
+  * Tag: libslp-pm_1.2.4-21
+
+ -- Seunghun Pi <sh.pi@samsung.com>  Sun, 29 Jul 2012 16:17:27 +0900
+
 libslp-pm (1.2.4-20) unstable; urgency=low
 
   * source clean up (remove unnecessary comments, and so on)
-  * Git: 165.213.180.234:slp/pkgs/l/libslp-pm
+  * Git: slp/pkgs/l/libslp-pm
   * Tag: libslp-pm_1.2.4-20
 
  -- Jinkun Jang <jinkun.jang@samsung.com>  Tue, 06 Dec 2011 16:39:27 +0900
diff --git a/libslp-pm.manifest b/libslp-pm.manifest
new file mode 100644
index 0000000..41a9320
--- /dev/null
+++ b/libslp-pm.manifest
@@ -0,0 +1,6 @@
+<manifest>
+    <request>
+        <domain name="_"/>
+    </request>
+</manifest>
+
diff --git a/packaging/libslp-pm.spec b/packaging/libslp-pm.spec
index b6e46a2..73fd653 100644..100755
--- a/packaging/libslp-pm.spec
+++ b/packaging/libslp-pm.spec
@@ -1,12 +1,10 @@
-
 Name:       libslp-pm
 Summary:    Power manager library
-Version:    1.2.4
-Release:    2.1
-Group:      TO_BE/FILLED_IN
-License:    TO BE FILLED IN
+Version:    1.2.5
+Release:    1
+Group:      framework/system
+License:    APLv2
 Source0:    libslp-pm-%{version}.tar.bz2
-Patch0:     remove_tests.patch
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  cmake
@@ -29,7 +27,6 @@ SLP power manager client library (devel)
 
 %prep
 %setup -q 
-%patch0 -p1
 
 
 %build
@@ -43,25 +40,22 @@ rm -rf %{buildroot}
 %make_install
 
 
-
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 
 
-
-
 %files
 %defattr(-,root,root,-)
-%doc COPYING
+%manifest libslp-pm.manifest
 %{_libdir}/libpmapi.so.1.2
 
 
 %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/pm.c b/pm.c
index 32cfe59..90b7430 100644
--- a/pm.c
+++ b/pm.c
@@ -35,6 +35,7 @@
 #define SHIFT_UNLOCK			4
 #define SHIFT_UNLOCK_PARAMETER		12
 #define SHIFT_CHANGE_STATE		8
+#define SHIFT_HOLD_KEY_BLOCK		16
 #define TIMEOUT_RESET_BIT		0x80
 
 struct pwr_msg {
@@ -113,6 +114,9 @@ API int pm_lock_state(unsigned int s_bits, unsigned int flag,
 	if (flag & GOTO_STATE_NOW)
 		/* if the flag is true, go to the locking state directly */
 		s_bits = s_bits | (s_bits << SHIFT_CHANGE_STATE);
+	if (flag & HOLD_KEY_BLOCK)
+		s_bits = s_bits | (1 << SHIFT_HOLD_KEY_BLOCK);
+
 	return send_msg(s_bits, timeout);
 }
 
diff --git a/pmapi.h b/pmapi.h
index fbd9c6c..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
  *
@@ -100,8 +102,9 @@ extern "C" {
 #define SETALL (LCD_DIM | LCD_OFF | LCD_NORMAL)	/*< select all state - not supported yet */
 
 /* parameters for pm_lock_state() */
-#define GOTO_STATE_NOW	0x1
 #define STAY_CUR_STATE	0x0
+#define GOTO_STATE_NOW	0x1
+#define HOLD_KEY_BLOCK	0x2
 
 /* paramters for pm_unlcok_state() - details are described at 162 line */
 #define PM_SLEEP_MARGIN	0x0	/**< keep guard time for unlock */
@@ -115,13 +118,20 @@ extern "C" {
  * @brief This API is used to lock a particular power-state as the current power-state.\n
  * 		The parameter state specifies the power state which you want to lock LCD_NORMAL, LCD_DIM, LCD_OFF. \n
  * 		The second parameter Flag is set if you want to go the requested lock state directly.\n
- * 		The third parameter timeout specifies lock-timeout in milliseconds. 
+ * 		The third parameter timeout specifies lock-timeout in milliseconds.
  * 		If the value 0 is selected, the power state remains locked until pm_unlock_state is called.
  * @param[in] state target power state which you want to lock - LCD_NORMAL, LCD_DIM, LCD_OFF
- * @param[in] flag set if you want to go the lock state directly - GOTO_STATE_NOW, STAY_CUR_STATE
- * @param[in] timeout lock-timeout in miliseconds. 
+ * @param[in] flag set if you want to go the lock state directly
+ *		GOTO_STATE_NOW - State is changed directly you want to lock.
+ *		STAY_CUR_STATE - State is not changed directly and phone stay current state until timeout expired.
+ * 				 (Default if there is no value in flag.)
+ *		HOLD_KEY_BLOCK - Hold key is blocked during locking LCD_NORMAL or LCD_DIM.
+ *				 Then LCD state transition to LCD_OFF is blocked.
+ *				 If this flag is not set, phone state is lcd off after pressing hold key.
+ *		GOTO_STATE_NOW and STAY_CUR_STATE can't be applied at the same time.
+ * @param[in] timeout lock-timeout in miliseconds.
  * 					  0 is always lock until calling pm_unlock_state
- * 					  If you call this function with same state in duplicate, 
+ * 					  If you call this function with same state in duplicate,
  * 					  only last one will be processed and others are ignored.
  * @return 0 on success, -1 if failed
  * @see pm_unlock_state(), pm_change_state()
@@ -169,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 <sh.pi@samsung.com>
+ *
+ * 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__ */