align DBus xml files by adding error output arguments to some methods

11 files changed, 48 insertions, 47 deletions

diff --git a/api/franca/navigation/NavigationTypes.fidl b/api/franca/navigation/NavigationTypes.fidl
index 856cdc2..3202f2e 100755
--- a/api/franca/navigation/NavigationTypes.fidl
+++ b/api/franca/navigation/NavigationTypes.fidl
@@ -60,10 +60,6 @@ typeCollection NavigationTypes {
 		

 

 /* enumerations */

-	enumeration BasicError {

-		NoError = 0	

-	}	

-	

 	enumeration BasicEnum {

 		INVALID 	= 0

 		ALL 		= 65535

@@ -101,8 +97,4 @@ typeCollection NavigationTypes {
 		String scriptCode						

 	}

 	

-	enumeration NotificationNavigation {

-		SESSION_ERROR_NOMORESESSIONHANDLES

-		SESSION_ERROR_SESSIONNOTAVAILABLE

-	}

 }
\ No newline at end of file
diff --git a/api/franca/navigation/mapviewer/MapViewerControl.fidl b/api/franca/navigation/mapviewer/MapViewerControl.fidl
index a7df0c3..4c4ba08 100755
--- a/api/franca/navigation/mapviewer/MapViewerControl.fidl
+++ b/api/franca/navigation/mapviewer/MapViewerControl.fidl
@@ -8,7 +8,6 @@ package org.genivi.navigation.mapviewer
 
 import org.genivi.CommonTypes.* from "../../CommonTypes.fidl"
 import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"
-import org.genivi.navigation.mapviewer.MapViewerTypes.* from "./MapViewerTypes.fidl"
 
 <**
 	@description : MapViewerControl = This interface offers functions to control the MapViewer
diff --git a/api/franca/navigation/mapviewer/MapViewerTypes.fidl b/api/franca/navigation/mapviewer/MapViewerTypes.fidl
deleted file mode 100644
index 2e2613d..0000000
--- a/api/franca/navigation/mapviewer/MapViewerTypes.fidl
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-License-Identifier: MPL-2.0
-// Copyright (C) 2014, PCA Peugeot Citro�n, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH,  Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD.,  Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH
-// This Source Code Form is subject to the terms of the
-// Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
-// this file, you can obtain one at http://mozilla.org/MPL/2.0/.
-
-package org.genivi.navigation.mapviewer
-import org.genivi.CommonTypes.* from "../../CommonTypes.fidl"
-import org.genivi.navigation.NavigationTypes.* from "../NavigationTypes.fidl"
-
-typeCollection MapViewerTypes {
-	version {
-		major 4 
-		minor 0
-	}
-	enumeration Notification extends NotificationNavigation{
-		MAPVIEWERCONTROL_ERROR_NOMOREMAPVIEWINSTANCEHANDLES
-		MAPVIEWERCONTROL_ERROR_MAPVIEWINSTANCENOTAVAILABLE	
-	}
-}
diff --git a/api/franca/navigation/navigationcore/NavigationCoreTypes.fidl b/api/franca/navigation/navigationcore/NavigationCoreTypes.fidl
index e04be6e..ee411bd 100644
--- a/api/franca/navigation/navigationcore/NavigationCoreTypes.fidl
+++ b/api/franca/navigation/navigationcore/NavigationCoreTypes.fidl
@@ -24,20 +24,4 @@ typeCollection NavigationCoreTypes {
 		ALTITUDE	= 162
 	}	
 	
-	enumeration Notification extends NotificationNavigation{
-		GUIDANCE_ERROR_NOMANEUVER = 0
-		GUIDANCE_ERROR_VOICENOTALLOWED
-		LOCATIONINPUT_ERROR_NOMORELOCATIONINPUTHANDLES
-		LOCATIONINPUT_ERROR_LOCATIONINPUTNOTAVAILABLE
-		MAPMATCHEDPOSITION_ERROR_NOPOSITION
-		MAPMATCHEDPOSITION_ERROR_NOMAP
-		MAPMATCHEDPOSITION_ERROR_OUTOFKNOWNMAP
-		ROUTING_ERROR_NOMOREROUTEHANDLES
-		ROUTING_ERROR_ROUTENOTAVAILABLE
-		ROUTING_ERROR_OPERATIONNOTALLOWED
-		ROUTING_ERROR_ROUTEPREFERENCENOTSUPPORTED
-		ROUTING_ERROR_WAYPOINTCANNOTBECHANGED
-		ROUTING_ERROR_TOOMANYWAYPOINTS
-	}
-	
 }
diff --git a/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml b/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml
index 5335bfb..1104ead 100644
--- a/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml
+++ b/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml
@@ -51,6 +51,8 @@
           <line>with respect to the display viewport could be (0;0) and (hres/2;0) respectively</line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <arg name="mapViewInstanceHandle" type="u" direction="out">
         <doc>
           <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
@@ -76,6 +78,8 @@
           <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <error name="org.genivi.mapviewer.MapViewerControl.Error.MapViewInstanceNotAvailable">
         <doc>
           <line>This error is generated if an application tries to delete a map view instance handle that is not available</line>
diff --git a/api/map-viewer/genivi-mapviewer-session.xml b/api/map-viewer/genivi-mapviewer-session.xml
index 604c509..28aaae2 100644
--- a/api/map-viewer/genivi-mapviewer-session.xml
+++ b/api/map-viewer/genivi-mapviewer-session.xml
@@ -37,6 +37,8 @@
           <line>This parameter can be used to identify the client application and determine if a given feature is enabled for it</line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <arg name="sessionHandle" type="u" direction="out">
         <doc>
           <line>sessionHandle = Session handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
@@ -57,6 +59,8 @@
           <line>sessionHandle = Session handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <error name="org.genivi.mapviewer.Session.Error.SessionNotAvailable">
         <doc>
           <line>This error is generated if an application tries to delete a session handle that is not available</line>
diff --git a/api/navigation-core/genivi-navigationcore-guidance.xml b/api/navigation-core/genivi-navigationcore-guidance.xml
index f3fb951..3d18cb2 100644
--- a/api/navigation-core/genivi-navigationcore-guidance.xml
+++ b/api/navigation-core/genivi-navigationcore-guidance.xml
@@ -102,6 +102,8 @@
       <doc>
         <line>PlayVoiceManeuver = This method plays or repeats the last voice guidance</line>
       </doc>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <error name="org.genivi.navigationcore.Guidance.Error.VoiceNotAllowed">
         <doc>
           <line>This error is generated if the voice generation is inactive </line>
@@ -237,6 +239,8 @@
           <line>maneuverOffset = the offset of the first maneuver to retrieve</line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <arg name="numberOfManeuvers" type="q" direction="out">
         <doc>
           <line>numberOfManeuvers = the number of retrieved maneuvers</line>
@@ -311,6 +315,8 @@
           <line>sessionHandle = Session handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <error name="org.genivi.navigationcore.Guidance.Error.NoManeuver">
         <doc>
           <line>This error is generated in case there's no maneuver until the destination</line>
@@ -346,6 +352,8 @@
           <line>DISABLED_PROMPT means that the client application will the voice generator component directly to play the messages (bypassing the NavigationCore)</line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
     </method>
     <method name="GetVoiceGuidanceSettings">
       <doc>
diff --git a/api/navigation-core/genivi-navigationcore-locationinput.xml b/api/navigation-core/genivi-navigationcore-locationinput.xml
index 113f53c..2761d5d 100644
--- a/api/navigation-core/genivi-navigationcore-locationinput.xml
+++ b/api/navigation-core/genivi-navigationcore-locationinput.xml
@@ -35,6 +35,8 @@
           <line>sessionHandle = Session handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <arg name="locationInputHandle" type="u" direction="out">
         <doc>
           <line>locationInputHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
@@ -60,6 +62,8 @@
           <line>locationInputHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <error name="org.genivi.navigationcore.LocationInput.Error.LocationInputNotAvailable">
         <doc>
           <line>This error is generated if an application tries to delete a location input handle that is not available</line>
diff --git a/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml b/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml
index 60b5541..2d9a590 100644
--- a/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml
+++ b/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml
@@ -175,6 +175,8 @@
           <line>key = enum(INVALID,TIMESTAMP,LATITUDE,LONGITUDE,ALTITUDE,HEADING,SPEED,CLIMB,GNSS_FIX_STATUS,DR_STATUS,MM_STATUS,SIMULATION_MODE, ... ,ALL)</line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <arg name="position" type="a{i(yv)}" direction="out">
         <doc>
           <line>position = dictionary[key,value]</line>
@@ -241,9 +243,9 @@
         </doc>
       </arg>
     </signal>
-    <method name="GetAddress">
+    <method name="GetCurrentAddress">
       <doc>
-        <line>GetAddress = This method returns the current address</line>
+        <line>GetCurrentAddress = This method returns the current address</line>
       </doc>
       <arg name="valuesToReturn" type="ai" direction="in">
         <doc>
@@ -251,6 +253,8 @@
           <line>key = enum(INVALID,TIMESTAMP,COUNTRY,COUNTRYCODE,CITY,STREET,ROAD_NUMBER,HOUSENUMBER,HOUSENAME,CROSSING,DISTRICT,TIMEZONE_OFFSET,DAYLIGHT_OFFSET,MATCH_TYPE, ... ,ALL)</line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <arg name="address" type="a{i(yv)}" direction="out">
         <doc>
           <line>address = dictionary[key,value]</line>
diff --git a/api/navigation-core/genivi-navigationcore-routing.xml b/api/navigation-core/genivi-navigationcore-routing.xml
index 59e1a09..1ebb6f9 100644
--- a/api/navigation-core/genivi-navigationcore-routing.xml
+++ b/api/navigation-core/genivi-navigationcore-routing.xml
@@ -35,6 +35,8 @@
           <line>sessionHandle = Session handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <arg name="routeHandle" type="u" direction="out">
         <doc>
           <line>routeHandle = Route handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
@@ -60,6 +62,8 @@
           <line>routeHandle = Route handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <error name="org.genivi.navigationcore.Routing.Error.RouteNotAvailable">
         <doc>
           <line>This error is generated if an application tries to delete a route handle that is not available</line>
@@ -108,6 +112,8 @@
           <line>CHEAPEST = least fuel or electric charge to destination taking pricing into account </line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <error name="org.genivi.navigationcore.Routing.Error.OperationNotAllowed">
         <doc>
           <line>This error is generated if an application tries to set a cost model for a route which is not created manually (e.g. an alternative route calculated in the background)</line>
@@ -196,6 +202,8 @@
           <line>preferenceSource = enum(TRAFFIC_REALTIME, ...)</line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <error name="org.genivi.navigationcore.Routing.Error.OperationNotAllowed">
         <doc>
           <line>This error is generated if an application tries to set route preferences for a route which is not created manually (e.g. an alternative route calculated in the background)</line>
@@ -343,6 +351,8 @@
           <line>transportationMeans = enum(INVALID,BY_CAR,ON_FOOT,LONG_RANGE_TRAINS,PUBLIC_TRANSPORTATION,BY_BICYCLE,BY_TRUCK, ... )</line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <error name="org.genivi.navigationcore.Routing.Error.OperationNotAllowed">
         <doc>
           <line>This error is generated if an application tries to set transportation means for a route which is not created manually (e.g. an alternative route calculated in the background)</line>
@@ -400,6 +410,8 @@
           <line>Note: a polygon must have at least 3 vertexes</line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <error name="org.genivi.navigationcore.Routing.Error.OperationNotAllowed">
         <doc>
           <line>This error is generated if an application tries to set excluded areas for a route which is not created manually (e.g. an alternative route calculated in the background)</line>
@@ -459,6 +471,8 @@
           <line>Note: if the flag StartFromCurrentPosition=false, then at least two waypoints must be provided (starting point and destination)</line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <error name="org.genivi.navigationcore.Routing.Error.WaypointCannotBeChanged">
         <doc>
           <line>This error is sent when a client application tries to change the waypoints while the route guidance is active</line>
@@ -516,6 +530,8 @@
           <line>routeHandle = Route handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <error name="org.genivi.navigationcore.Routing.Error.OperationNotAllowed">
         <doc>
           <line>This error is generated if an application tries to calculate a route which is not created manually (e.g. an alternative route calculated in the background)</line>
@@ -632,6 +648,8 @@
           <line>calculatedRoute = Handle identifying an already calculated route. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <arg name="alternativeRoutesList" type="au" direction="out">
         <doc>
           <line>alternativeRoutesList = array[alternativeRoute]</line>
diff --git a/api/navigation-core/genivi-navigationcore-session.xml b/api/navigation-core/genivi-navigationcore-session.xml
index 26ffe8c..6012ad4 100644
--- a/api/navigation-core/genivi-navigationcore-session.xml
+++ b/api/navigation-core/genivi-navigationcore-session.xml
@@ -37,6 +37,8 @@
           <line>This parameter can be used to identify the client application and determine if a given feature is enabled for it</line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <arg name="sessionHandle" type="u" direction="out">
         <doc>
           <line>sessionHandle = Session handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
@@ -57,6 +59,8 @@
           <line>sessionHandle = Session handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
         </doc>
       </arg>
+      <arg name="error" type="i" direction="out">
+      </arg>
       <error name="org.genivi.navigationcore.Session.Error.SessionNotAvailable">
         <doc>
           <line>This error is generated if an application tries to delete a session handle that is not available</line>