Add error messages of csr

Change-Id: I3975201ffccb7070df95c1d7c5ace978ac476afa

diff --git a/error_messages/csr-framework.xml b/error_messages/csr-framework.xml
deleted file mode 100644 (file)
index 9fbc67b..0000000
--- a/error_messages/csr-framework.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package uri="platform/upstream/csr-framework">
-       <error name="CSR_ERROR_SOCKET">
-               <value>TIZEN_ERROR_CSR | 0x01</value>
-               <msg>Socket error between client and server</msg>
-       </error>
-       <error name="CSR_ERROR_INVALID_HANDLE">
-               <value>TIZEN_ERROR_CSR | 0x02</value>
-               <msg>The given handle is invalid</msg>
-       </error>
-       <error name="CSR_ERROR_SERVER">
-               <value>TIZEN_ERROR_CSR | 0x03</value>
-               <msg>Server has been failed for some reason</msg>
-       </error>
-       <error name="CSR_ERROR_NO_TASK">
-               <value>TIZEN_ERROR_CSR | 0x04</value>
-               <msg>No Task exists</msg>
-       </error>
-       <error name="CSR_ERROR_DB">
-               <value>TIZEN_ERROR_CSR | 0x05</value>
-               <msg>DB transaction error</msg>
-       </error>
-       <error name="CSR_ERROR_REMOVE_FAILED">
-               <value>TIZEN_ERROR_CSR | 0x06</value>
-               <msg>Removing file or application is failed</msg>
-       </error>
-       <error name="CSR_ERROR_FILE_DO_NOT_EXIST">
-               <value>TIZEN_ERROR_CSR | 0x07</value>
-               <msg>File not exist</msg>
-       </error>
-       <error name="CSR_ERROR_FILE_CHANGED">
-               <value>TIZEN_ERROR_CSR | 0x08</value>
-               <msg>File changed after detection</msg>
-       </error>
-       <error name="CSR_ERROR_FILE_SYSTEM">
-               <value>TIZEN_ERROR_CSR | 0x09</value>
-               <msg>File type is invalid</msg>
-       </error>
-       <error name="CSR_ERROR_ENGINE_PERMISSION">
-               <value>TIZEN_ERROR_CSR | 0x11</value>
-               <msg>Insufficient permission of engine</msg>
-       </error>
-       <error name="CSR_ERROR_ENGINE_NOT_EXIST">
-               <value>TIZEN_ERROR_CSR | 0x12</value>
-               <msg>No engine exists</msg>
-       </error>
-       <error name="CSR_ERROR_ENGINE_DISABLED">
-               <value>TIZEN_ERROR_CSR | 0x13</value>
-               <msg>Engine is in disabled state</msg>
-       </error>
-       <error name="CSR_ERROR_ENGINE_NOT_ACTIVATED">
-               <value>TIZEN_ERROR_CSR | 0x14</value>
-               <msg>Engine is not activated</msg>
-       </error>
-       <error name="CSR_ERROR_ENGINE_INTERNAL">
-               <value>TIZEN_ERROR_CSR | 0x19</value>
-               <msg>Engine internal error</msg>
-       </error>
-       <error name="CSR_ERROR_SYSTEM">
-               <value>TIZEN_ERROR_CSR | 0xFF</value>
-               <msg>System error</msg>
-       </error>
-</package>
-

diff --git a/error_messages/csr.xml b/error_messages/csr.xml
new file mode 100644 (file)
index 0000000..9fbc67b
--- /dev/null
+++ b/error_messages/csr.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package uri="platform/upstream/csr-framework">
+       <error name="CSR_ERROR_SOCKET">
+               <value>TIZEN_ERROR_CSR | 0x01</value>
+               <msg>Socket error between client and server</msg>
+       </error>
+       <error name="CSR_ERROR_INVALID_HANDLE">
+               <value>TIZEN_ERROR_CSR | 0x02</value>
+               <msg>The given handle is invalid</msg>
+       </error>
+       <error name="CSR_ERROR_SERVER">
+               <value>TIZEN_ERROR_CSR | 0x03</value>
+               <msg>Server has been failed for some reason</msg>
+       </error>
+       <error name="CSR_ERROR_NO_TASK">
+               <value>TIZEN_ERROR_CSR | 0x04</value>
+               <msg>No Task exists</msg>
+       </error>
+       <error name="CSR_ERROR_DB">
+               <value>TIZEN_ERROR_CSR | 0x05</value>
+               <msg>DB transaction error</msg>
+       </error>
+       <error name="CSR_ERROR_REMOVE_FAILED">
+               <value>TIZEN_ERROR_CSR | 0x06</value>
+               <msg>Removing file or application is failed</msg>
+       </error>
+       <error name="CSR_ERROR_FILE_DO_NOT_EXIST">
+               <value>TIZEN_ERROR_CSR | 0x07</value>
+               <msg>File not exist</msg>
+       </error>
+       <error name="CSR_ERROR_FILE_CHANGED">
+               <value>TIZEN_ERROR_CSR | 0x08</value>
+               <msg>File changed after detection</msg>
+       </error>
+       <error name="CSR_ERROR_FILE_SYSTEM">
+               <value>TIZEN_ERROR_CSR | 0x09</value>
+               <msg>File type is invalid</msg>
+       </error>
+       <error name="CSR_ERROR_ENGINE_PERMISSION">
+               <value>TIZEN_ERROR_CSR | 0x11</value>
+               <msg>Insufficient permission of engine</msg>
+       </error>
+       <error name="CSR_ERROR_ENGINE_NOT_EXIST">
+               <value>TIZEN_ERROR_CSR | 0x12</value>
+               <msg>No engine exists</msg>
+       </error>
+       <error name="CSR_ERROR_ENGINE_DISABLED">
+               <value>TIZEN_ERROR_CSR | 0x13</value>
+               <msg>Engine is in disabled state</msg>
+       </error>
+       <error name="CSR_ERROR_ENGINE_NOT_ACTIVATED">
+               <value>TIZEN_ERROR_CSR | 0x14</value>
+               <msg>Engine is not activated</msg>
+       </error>
+       <error name="CSR_ERROR_ENGINE_INTERNAL">
+               <value>TIZEN_ERROR_CSR | 0x19</value>
+               <msg>Engine internal error</msg>
+       </error>
+       <error name="CSR_ERROR_SYSTEM">
+               <value>TIZEN_ERROR_CSR | 0xFF</value>
+               <msg>System error</msg>
+       </error>
+</package>
+

diff --git a/include/private/tizen_error_private.h b/include/private/tizen_error_private.h
index 47afe7b4ccd98694f17c15ef797a55e4317e5d92..900170bae5f3ff96d3a19821e315f7d939f745c9 100644 (file)
--- a/include/private/tizen_error_private.h
+++ b/include/private/tizen_error_private.h
@@ -71,6 +71,21 @@ static err_info err_list[] = {
        ERR_ENTRY("NOTIFICATION_ERROR_FROM_DBUS", TIZEN_ERROR_NOTIFICATION | 0x03, "Error from DBus"),
        ERR_ENTRY("NOTIFICATION_ERROR_NOT_EXIST_ID", TIZEN_ERROR_NOTIFICATION | 0x04, "Not exist private ID "),
        ERR_ENTRY("NOTIFICATION_ERROR_SERVICE_NOT_READY", TIZEN_ERROR_NOTIFICATION | 0x05, "No reponse from notification service"),
+       ERR_ENTRY("CSR_ERROR_SOCKET", TIZEN_ERROR_CSR | 0x01, "Socket error between client and server"),
+       ERR_ENTRY("CSR_ERROR_INVALID_HANDLE", TIZEN_ERROR_CSR | 0x02, "The given handle is invalid"),
+       ERR_ENTRY("CSR_ERROR_SERVER", TIZEN_ERROR_CSR | 0x03, "Server has been failed for some reason"),
+       ERR_ENTRY("CSR_ERROR_NO_TASK", TIZEN_ERROR_CSR | 0x04, "No Task exists"),
+       ERR_ENTRY("CSR_ERROR_DB", TIZEN_ERROR_CSR | 0x05, "DB transaction error"),
+       ERR_ENTRY("CSR_ERROR_REMOVE_FAILED", TIZEN_ERROR_CSR | 0x06, "Removing file or application is failed"),
+       ERR_ENTRY("CSR_ERROR_FILE_DO_NOT_EXIST", TIZEN_ERROR_CSR | 0x07, "File not exist"),
+       ERR_ENTRY("CSR_ERROR_FILE_CHANGED", TIZEN_ERROR_CSR | 0x08, "File changed after detection"),
+       ERR_ENTRY("CSR_ERROR_FILE_SYSTEM", TIZEN_ERROR_CSR | 0x09, "File type is invalid"),
+       ERR_ENTRY("CSR_ERROR_ENGINE_PERMISSION", TIZEN_ERROR_CSR | 0x11, "Insufficient permission of engine"),
+       ERR_ENTRY("CSR_ERROR_ENGINE_NOT_EXIST", TIZEN_ERROR_CSR | 0x12, "No engine exists"),
+       ERR_ENTRY("CSR_ERROR_ENGINE_DISABLED", TIZEN_ERROR_CSR | 0x13, "Engine is in disabled state"),
+       ERR_ENTRY("CSR_ERROR_ENGINE_NOT_ACTIVATED", TIZEN_ERROR_CSR | 0x14, "Engine is not activated"),
+       ERR_ENTRY("CSR_ERROR_ENGINE_INTERNAL", TIZEN_ERROR_CSR | 0x19, "Engine internal error"),
+       ERR_ENTRY("CSR_ERROR_SYSTEM", TIZEN_ERROR_CSR | 0xFF, "System error"),
        ERR_ENTRY("RADIO_ERROR_INVALID_STATE", TIZEN_ERROR_RADIO | 0x01, "Invalid state"),
        ERR_ENTRY("RADIO_ERROR_SOUND_POLICY", TIZEN_ERROR_RADIO | 0x02, "Sound policy error"),
        ERR_ENTRY("RADIO_ERROR_NO_ANTENNA", TIZEN_ERROR_RADIO | 0x03, "No Antenna error"),

diff --git a/include/tizen_error.h b/include/tizen_error.h
index 5f31c3cfac0eca467563ab30c3e26afd1a2cd1f6..1a42eeb97d46d192af16c00841c8ab114501a315 100644 (file)
--- a/include/tizen_error.h
+++ b/include/tizen_error.h
@@ -193,6 +193,8 @@ extern "C" {
 #define TIZEN_ERROR_KEY_MANAGER                -0x01E10000
 /* Tizen PRIVILEGE INFO Error */
 #define TIZEN_ERROR_PRIVILEGE_INFORMATION -0x01E20000
+/* Tizen CSR Error */
+#define TIZEN_ERROR_CSR -0x01E30000
 /* Tizen Calendar Error */
 #define TIZEN_ERROR_CALENDAR           -0x02000000
 /* Tizen Contacts Error */

diff --git a/packaging/capi-base-common.spec b/packaging/capi-base-common.spec
index b79e66f5df641906a9cd4864d2b6569528c0a20d..b498070ec233174448414f7f1594f0b513f1f611 100644 (file)
--- a/packaging/capi-base-common.spec
+++ b/packaging/capi-base-common.spec
@@ -1,6 +1,6 @@
 Name:       capi-base-common
 Summary:    Common header files of Tizen Native API
-Version:    0.4.6
+Version:    0.4.7
 Release:    1
 Group:      Base
 License:    Apache-2.0