From 65cacfff17867aac958cdc1f1021864732fe277d Mon Sep 17 00:00:00 2001
From: Marco Residori <marco.residori@xse.de>
Date: Wed, 2 Jul 2014 08:00:54 -0700
Subject: Clean up

---
 enhanced-position-service/src/configuration.cpp             | 2 +-
 enhanced-position-service/src/configuration.h               | 3 ---
 enhanced-position-service/src/enhanced-position.cpp         | 2 +-
 enhanced-position-service/src/main.cpp                      | 3 +--
 enhanced-position-service/src/position-feedback.cpp         | 2 +-
 enhanced-position-service/test/enhanced-position-client.cpp | 5 +++--
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/enhanced-position-service/src/configuration.cpp b/enhanced-position-service/src/configuration.cpp
index e29e93c..e99ccc2 100644
--- a/enhanced-position-service/src/configuration.cpp
+++ b/enhanced-position-service/src/configuration.cpp
@@ -16,7 +16,6 @@
 * @licence end@
 **************************************************************************/
 
-#include <stdio.h>
 #include "configuration.h"
 #include "positioning-constants.h"
 #include "log.h"
@@ -117,6 +116,7 @@ void Configuration::run()
 
 void Configuration::shutdown()
 {
+  LOG_INFO_MSG(gCtx,"Shutting down Configuration dispatcher...");
 }
 
 
diff --git a/enhanced-position-service/src/configuration.h b/enhanced-position-service/src/configuration.h
index 093a511..78c319a 100644
--- a/enhanced-position-service/src/configuration.h
+++ b/enhanced-position-service/src/configuration.h
@@ -20,9 +20,6 @@
 
 #include <dbus-c++/dbus.h>
 #include "configuration-adaptor.h"
-#include "gnss.h"
-#include "gnss-simple.h"
-#include "gnss-ext.h"
 
 class Configuration
   : public org::genivi::positioning::Configuration_adaptor
diff --git a/enhanced-position-service/src/enhanced-position.cpp b/enhanced-position-service/src/enhanced-position.cpp
index ead6f50..a934883 100644
--- a/enhanced-position-service/src/enhanced-position.cpp
+++ b/enhanced-position-service/src/enhanced-position.cpp
@@ -604,7 +604,7 @@ void EnhancedPosition::run()
 
 void EnhancedPosition::shutdown()
 {
-  LOG_INFO_MSG(gCtx,"shutting down...");
+  LOG_INFO_MSG(gCtx,"Shutting down EnhancedPosition dispatcher...");
 
   gnssSimpleDeregisterPositionCallback(&cbPosition);
   gnssSimpleDeregisterCourseCallback(&cbCourse);
diff --git a/enhanced-position-service/src/main.cpp b/enhanced-position-service/src/main.cpp
index 69c4177..bc08563 100644
--- a/enhanced-position-service/src/main.cpp
+++ b/enhanced-position-service/src/main.cpp
@@ -16,7 +16,6 @@
 * @licence end@
 **************************************************************************/
 
-#include <stdio.h>
 #include <signal.h>
 #include <dbus-c++/dbus.h>
 
@@ -46,7 +45,7 @@ void sighandler(int sig)
 int main()
 {
   DLT_REGISTER_APP("ENHP", "EnhancedPositionService");
-  DLT_REGISTER_CONTEXT(gCtx,"EPSR", "Global Context");
+  DLT_REGISTER_CONTEXT(gCtx,"EPSR", "Global Context");  // EPSR = EnhancedPositionService Server Application
   LOG_INFO_MSG(gCtx,"Starting EnhancedPositionService...");
 
   signal(SIGTERM, sighandler);
diff --git a/enhanced-position-service/src/position-feedback.cpp b/enhanced-position-service/src/position-feedback.cpp
index be5f59e..b36fc65 100644
--- a/enhanced-position-service/src/position-feedback.cpp
+++ b/enhanced-position-service/src/position-feedback.cpp
@@ -16,7 +16,6 @@
 * @licence end@
 **************************************************************************/
 
-#include <stdio.h>
 #include "position-feedback.h"
 #include "log.h"
 
@@ -55,6 +54,7 @@ void PositionFeedback::run()
 
 void PositionFeedback::shutdown()
 {
+  LOG_INFO_MSG(gCtx,"Shutting down PositionFeedback dispatcher...");
 }
 
 
diff --git a/enhanced-position-service/test/enhanced-position-client.cpp b/enhanced-position-service/test/enhanced-position-client.cpp
index a5fc698..b68c1e2 100644
--- a/enhanced-position-service/test/enhanced-position-client.cpp
+++ b/enhanced-position-service/test/enhanced-position-client.cpp
@@ -105,7 +105,7 @@ void signalhandler(int sig)
 int main()
 {
   DLT_REGISTER_APP("ENHPOS", "EnhancedPositionClient");
-  DLT_REGISTER_CONTEXT(gCtx,"EPCL", "Global Context");
+  DLT_REGISTER_CONTEXT(gCtx,"EPCL", "Global Context"); // EPCL = EnhancedPositionService Client Application
 
   LOG_INFO_MSG(gCtx,"Starting EnhancedPositionClient...");
 
@@ -119,7 +119,8 @@ int main()
 
   DBus::Connection conn = DBus::Connection::SessionBus();
 
-  EnhancedPositionClient client(conn, "/org/genivi/positioning/EnhancedPosition",
+  EnhancedPositionClient client(conn, 
+                                "/org/genivi/positioning/EnhancedPosition",
                                 "org.genivi.positioning.EnhancedPosition");
 
   // dispatch
-- 
cgit v1.2.1