GT-3012 changes as decided in 23-July-2014 conference call, step 2b: code adaptations after renaming gnss.h and sns.h

13 files changed, 15 insertions, 51 deletions

diff --git a/enhanced-position-service/src/enhanced-position.h b/enhanced-position-service/src/enhanced-position.h
index a9ec84f..b16f61b 100644
--- a/enhanced-position-service/src/enhanced-position.h
+++ b/enhanced-position-service/src/enhanced-position.h
@@ -21,7 +21,7 @@
 #include <dbus-c++/dbus.h>
 
 #include "enhanced-position-adaptor.h"
-#include "gnss.h"
+#include "gnss-init.h"
 #include "gnss-ext.h"
 
 class EnhancedPosition
diff --git a/gnss-service/api/gnss-ext.h b/gnss-service/api/gnss-ext.h
index ef47d6e..6aff56e 100644
--- a/gnss-service/api/gnss-ext.h
+++ b/gnss-service/api/gnss-ext.h
@@ -294,21 +294,7 @@ typedef void (*GNSSSatelliteDetailCallback)(const TGNSSSatelliteDetail satellite
 typedef void (*GNSSPositionCallback)(const TGNSSPosition position[], uint16_t numElements);
 
 /**
- * Initialization of the extended GNSS service.
- * Must be called before using the extended GNSS service to set up the service.
- * @return True if initialization has been successfull.
- */
-bool gnssExtendedInit();
-
-/**
- * Destroy the extended GNSS service.
- * Must be called after using the extended GNSS service to shut down the service.
- * @return True if shutdown has been successfull.
- */
-bool gnssExtendedDestroy();
-
-/**
- * Provide meta information about extended GNSS service.
+ * Provide meta information about GNSS service.
  * The meta data of a service provides information about it's name, version, type, subtype, sampling frequency etc.
  * @param data Meta data content about the sensor service.
  * @return True if meta data is available.
@@ -320,7 +306,7 @@ bool gnssGetMetaData(TGnssMetaData *data);
  * @param distance After calling the method the currently available antenna configuration data is written into this parameter.
  * @return Is true if data can be provided and false otherwise, e.g. missing initialization
  *
- * Static configuration data for the extended GNSS service.
+ * Static configuration data for the GNSS service.
  * The reference point mentioned in the vehicle configuration lies underneath the center of the rear axle on the surface of the road.
  * The reference coordinate system is the car reference system as provided in the documentation.
  * See https://collab.genivi.org/wiki/display/genivi/LBSSensorServiceRequirementsBorg#LBSSensorServiceRequirementsBorg-ReferenceSystem
@@ -336,7 +322,7 @@ bool gnssGetAntennaPosition(TGNSSDistance3D *distance);
 bool gnssGetTime(TGNSSTime *utc);
 
 /**
- * Register extended GNSS UTC time callback.
+ * Register GNSS UTC time callback.
  * The callback will be invoked when new time data is available from the GNSS receiver.
  * The valid flags is updated. The data is only guaranteed to be updated when the valid flag is true.
  * @param callback The callback which should be registered.
@@ -345,7 +331,7 @@ bool gnssGetTime(TGNSSTime *utc);
 bool gnssRegisterTimeCallback(GNSSTimeCallback callback);
 
 /**
- * Deregister extended GNSS UTC time callback.
+ * Deregister GNSS UTC time callback.
  * After calling this method no new time will be delivered to the client.
  * @param callback The callback which should be deregistered.
  * @return True if callback has been deregistered successfully.
diff --git a/gnss-service/api/gnss-init.h b/gnss-service/api/gnss-init.h
index d42d3f2..ee1765c 100644
--- a/gnss-service/api/gnss-init.h
+++ b/gnss-service/api/gnss-init.h
@@ -26,7 +26,7 @@ extern "C" {
 
 
 // API Version
-#define GENIVI_GNSS_API_MAJOR 2
+#define GENIVI_GNSS_API_MAJOR 3
 #define GENIVI_GNSS_API_MINOR 0
 #define GENIVI_GNSS_API_MICRO 0
 
diff --git a/gnss-service/src/globals.h b/gnss-service/src/globals.h
index c3b9afd..b30c293 100644
--- a/gnss-service/src/globals.h
+++ b/gnss-service/src/globals.h
@@ -23,7 +23,7 @@
 #include <pthread.h>
 #include <time.h>
 
-#include "gnss.h"
+#include "gnss-init.h"
 #include "gnss-ext.h"
 #include "gnss-meta-data.h"
 
diff --git a/gnss-service/src/gnss-ext.c b/gnss-service/src/gnss-ext.c
index 4260f01..aaa6b58 100644
--- a/gnss-service/src/gnss-ext.c
+++ b/gnss-service/src/gnss-ext.c
@@ -28,16 +28,6 @@ GNSSPositionCallback cbPosition = 0;
 TGNSSTime gTime;
 GNSSTimeCallback cbTime = 0;
 
-bool gnssExtendedInit()
-{
-    return true;
-}
-
-bool gnssExtendedDestroy()
-{
-    return true;
-}
-
 
 bool gnssRegisterSatelliteDetailCallback(GNSSSatelliteDetailCallback callback)
 {
diff --git a/gnss-service/src/gnss-use-gpsd.c b/gnss-service/src/gnss-use-gpsd.c
index 39a6112..bd80e57 100644
--- a/gnss-service/src/gnss-use-gpsd.c
+++ b/gnss-service/src/gnss-use-gpsd.c
@@ -26,7 +26,7 @@
 #include <math.h>
 
 #include "globals.h"
-#include "gnss.h"
+#include "gnss-init.h"
 #include "log.h"
 #include "gps.h"
 
diff --git a/gnss-service/src/gnss-use-replayer.c b/gnss-service/src/gnss-use-replayer.c
index 0db3a6c..e64b4f3 100644
--- a/gnss-service/src/gnss-use-replayer.c
+++ b/gnss-service/src/gnss-use-replayer.c
@@ -33,7 +33,7 @@
 #include <memory.h>
 
 #include "globals.h"
-#include "gnss.h"
+#include "gnss-init.h"
 #include "log.h"
 
 #define BUFLEN 256
diff --git a/gnss-service/test/compliance-test/gnss-service-compliance-test.c b/gnss-service/test/compliance-test/gnss-service-compliance-test.c
index 5f9661d..ae4ed9c 100644
--- a/gnss-service/test/compliance-test/gnss-service-compliance-test.c
+++ b/gnss-service/test/compliance-test/gnss-service-compliance-test.c
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include <unistd.h>
 
-#include "gnss.h"
+#include "gnss-init.h"
 #include "gnss-ext.h"
 #include "log.h"
 
@@ -80,11 +80,6 @@ bool init()
         return false;
     }
 
-    if(!gnssExtendedInit())
-    {
-        return false;
-    }
-
     return true;
 }
 
@@ -111,7 +106,6 @@ int main()
         //deregister
         gnssDeregisterPositionCallback(&cbPosition);        
 
-        gnssExtendedDestroy();
         gnssDestroy();
     }
     
diff --git a/gnss-service/test/gnss-service-client.c b/gnss-service/test/gnss-service-client.c
index 67c0b6e..6f29085 100644
--- a/gnss-service/test/gnss-service-client.c
+++ b/gnss-service/test/gnss-service-client.c
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include <unistd.h>
 
-#include "gnss.h"
+#include "gnss-init.h"
 #include "gnss-ext.h"
 #include "log.h"
 
@@ -109,11 +109,6 @@ void init()
     {
         exit(EXIT_FAILURE);
     }
-
-    if(!gnssExtendedInit())
-    {
-        exit(EXIT_FAILURE);
-    }
 }
 
 int main()
@@ -139,7 +134,6 @@ int main()
     gnssDeregisterSatelliteDetailCallback(&cbSatelliteDetail);
     gnssDeregisterPositionCallback(&cbPosition);
 
-    gnssExtendedDestroy();
     gnssDestroy();
 
     return EXIT_SUCCESS;
diff --git a/sensors-service/src/globals.h b/sensors-service/src/globals.h
index 67cadce..c9280f7 100644
--- a/sensors-service/src/globals.h
+++ b/sensors-service/src/globals.h
@@ -23,7 +23,7 @@
 #include <pthread.h>
 #include <time.h>
 
-#include "sns.h"
+#include "sns-init.h"
 #include "wheel.h"
 #include "gyroscope.h"
 #include "vehicle-speed.h"
diff --git a/sensors-service/src/sns-use-iphone.c b/sensors-service/src/sns-use-iphone.c
index 6201f39..78d9c97 100644
--- a/sensors-service/src/sns-use-iphone.c
+++ b/sensors-service/src/sns-use-iphone.c
@@ -33,7 +33,7 @@
 #include <memory.h>
 
 #include "globals.h"
-#include "sns.h"
+#include "sns-init.h"
 #include "log.h"
 
 #define BUFLEN 256
diff --git a/sensors-service/src/sns-use-replayer.c b/sensors-service/src/sns-use-replayer.c
index c78132c..46df7e5 100644
--- a/sensors-service/src/sns-use-replayer.c
+++ b/sensors-service/src/sns-use-replayer.c
@@ -33,7 +33,7 @@
 #include <memory.h>
 
 #include "globals.h"
-#include "sns.h"
+#include "sns-init.h"
 #include "log.h"
 
 #define BUFLEN 256
diff --git a/sensors-service/test/sensors-service-client.c b/sensors-service/test/sensors-service-client.c
index e2dc43c..c0b9b1a 100644
--- a/sensors-service/test/sensors-service-client.c
+++ b/sensors-service/test/sensors-service-client.c
@@ -24,7 +24,7 @@
 
 //include all sns header files here even if they are not yet used.
 //this helps us to find syntax error during compilation
-#include "sns.h"
+#include "sns-init.h"
 #include "acceleration.h"
 #include "gyroscope.h"
 #include "inclination.h"