From 54c5e965fe8f9a53a78834028fd65c792493da2b Mon Sep 17 00:00:00 2001
From: christian linke <christian.linke@bmw.de>
Date: Mon, 17 Dec 2012 16:15:11 +0100
Subject: * added new interfaces & nsm support + nsm tests + fixed some unit
 tests + fixed rundown

Signed-off-by: christian linke <christian.linke@bmw.de>
---
 cmake/LifecycleConsumer.xml       | 23 +++++++++++++++++++++++
 cmake/config.cmake                |  5 +++++
 cmake/genivi.audiomanager.service |  2 +-
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 cmake/LifecycleConsumer.xml

(limited to 'cmake')

diff --git a/cmake/LifecycleConsumer.xml b/cmake/LifecycleConsumer.xml
new file mode 100644
index 0000000..ec1162b
--- /dev/null
+++ b/cmake/LifecycleConsumer.xml
@@ -0,0 +1,23 @@
+<node>
+  <!--
+	org.genivi.NodeStateManager.LifeCycleConsumer:
+	@short_description: Interface of a life cycle client.
+	
+	This interface contains functions, which need to be implemented by life cycle clients, to be able to receive life cycle requests.
+  -->
+  <interface name="org.genivi.NodeStateManager.LifeCycleConsumer">
+    <!-- 
+    	LifecycleRequest:
+    	@Request:     The type of the life cycle request. Can be NSM_SHUTDOWNTYPE_RUNUP, NSM_SHUTDOWNTYPE_NORMAL or NSM_SHUTDOWNTYPE_FAST.
+    	@RequestId:   The Id of the client (current request). This Id needs to be passed to the NSM again via the interface "LifecycleRequestComplete", when the client has processed the "LifecycleRequest".
+    	@ErrorCode:   Client's return value, passed to the NodeStateManager. Based upon NsmErrorStatus_e. NsmErrorStatus_Ok: Request was successfully processed. NsmErrorStatus_ResponsePending: Processing of request started. LifecycleRequestComplete will be called to pass the status after completion. NsmErrorStatus_Error: An error occured, the request could not be processed. 
+    
+    	The method has to be implemented by every life cycle client and is called by the NodeStateManager, when the node is shutting down (fast or normal) or an ongoing shutdown is cancelled (run up).
+    -->
+    <method name="LifecycleRequest">
+      <arg name="Request"   direction="in"  type="u"/>
+      <arg name="RequestId" direction="in"  type="u"/>
+      <arg name="ErrorCode" direction="out" type="i"/>
+    </method>
+  </interface>
+</node>
diff --git a/cmake/config.cmake b/cmake/config.cmake
index a8989e5..cab37fc 100644
--- a/cmake/config.cmake
+++ b/cmake/config.cmake
@@ -22,4 +22,9 @@
 
 #cmakedefine EXECUTABLE_OUTPUT_PATH "@EXECUTABLE_OUTPUT_PATH@" 
 
+#cmakedefine NSM_BUS_INTERFACE "@NSM_BUS_INTERFACE@"
+#cmakedefine NSM_PATH "@NSM_PATH@"
+#cmakedefine NSM_INTERFACE "@NSM_INTERFACE@"
+#cmakedefine NSM_INTROSPECTION_FILE "@NSM_INTROSPECTION_FILE@"
+
 #endif /* _CONFIG_H */
diff --git a/cmake/genivi.audiomanager.service b/cmake/genivi.audiomanager.service
index 7cfbb34..d7b58dc 100644
--- a/cmake/genivi.audiomanager.service
+++ b/cmake/genivi.audiomanager.service
@@ -23,7 +23,7 @@
 Description=The GENIVI AudioManager
 
 [Service]
-#Type=notify
+Type=notify
 User=christian
 ExecStart=/usr/bin/AudioManager
 Restart=always
-- 
cgit v1.2.1