Fixed compilation issues (Elvior) (7f725a5e) · Commits · TTCN-3 Libraries / LibIts

ttcn/CAM/LibItsCam_Functions.ttcn

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -472,14 +472,13 @@ group externalFunctions {
	v_generationTime := fx_generateTime();		v_generationTime := fx_generateTime();
	if (v_generationTime!=0)		if (v_generationTime!=0)
	{		{
	return v_generationTime ;
	log("* f_generateTime: INFO: OK - generationTime = " & int2str(v_generationTime) & " *");		log("* f_generateTime: INFO: OK - generationTime = " & int2str(v_generationTime) & " *");
			return v_generationTime ;
	}		}
	else {		else {
	log("* f_generateTime: ERROR: timestamp could not be generated *");		log("* f_generateTime: ERROR: timestamp could not be generated *");
	setverdict( inconc ) ;		setverdict( inconc ) ;
	return v_generationTime ;		return v_generationTime ;
	stop;
	}		}
	} // end function f_generateTime		} // end function f_generateTime

ttcn/DENM/LibItsDenm_Functions.ttcn

+28 −13

Original line number	Original line	Diff line number	Diff line
	@@ -127,7 +127,7 @@ module LibItsDenm_Functions {
	function f_poCancelEvent(template (value) Trigger p_trigger, template (value) Situation p_event) runs on ItsFa {		function f_poCancelEvent(template (value) Trigger p_trigger, template (value) Situation p_event) runs on ItsFa {
	var FncRetCode v_ret := e_success;		var FncRetCode v_ret := e_success;

	if (p_trigger == e_ets) {		if (valueof(p_trigger) == e_ets) {
	f_sendDenMessage(		f_sendDenMessage(
	m_denmReq(		m_denmReq(
	m_denmPdu(		m_denmPdu(
	@@ -370,7 +370,7 @@ module LibItsDenm_Functions {
	* @param p_rcvdMsg The received message - OUT.		* @param p_rcvdMsg The received message - OUT.
	* @return		* @return
	*/		*/
	function f_awaitDenMessageOut(in template (present) DenmInd p_rcvMsg, out template (value) DenmInd p_rcvdMsg) runs on ItsFa return FncRetCode {		function f_awaitDenMessageOut(in template (present) DenmInd p_rcvMsg, out DenmInd p_rcvdMsg) runs on ItsFa return FncRetCode {
	var FncRetCode v_ret := e_timeout;		var FncRetCode v_ret := e_timeout;

	tc_ac.start;		tc_ac.start;
	@@ -405,7 +405,7 @@ module LibItsDenm_Functions {
	* @return		* @return
	*/		*/
	function f_getIutDefaultEventDuration() return TimeStamp {		function f_getIutDefaultEventDuration() return TimeStamp {
	var TimeStamp v_iutDefaultEventDuration;		var TimeStamp v_iutDefaultEventDuration := 0;

	//TODO get the value from PIXIT or MIB		//TODO get the value from PIXIT or MIB

	@@ -421,7 +421,7 @@ module LibItsDenm_Functions {
	* @return		* @return
	*/		*/
	function f_getStationId() return StationID {		function f_getStationId() return StationID {
	var StationID v_stationId;		var StationID v_stationId := 0;

	//TODO get the value from PIXIT or MIB		//TODO get the value from PIXIT or MIB

	@@ -433,7 +433,22 @@ module LibItsDenm_Functions {
	* @return		* @return
	*/		*/
	function f_getCurrentPosition() return DecentralizedSituationLocation.eventPosition {		function f_getCurrentPosition() return DecentralizedSituationLocation.eventPosition {
	var DecentralizedSituationLocation.eventPosition v_eventPos;		var DecentralizedSituationLocation.eventPosition v_eventPos
			:= {
			eventPositionCurrentDefinition := {
			refPosition := {
			longitude := {hemisphere := east, degree := 0},
			latitude := {hemisphere := north, degree := 0},
			elevation := 0,
			heading := omit,
			streetName := omit,
			positionConfidence := omit,
			elevationConfidence := omit,
			roadSegmentID :=0
			},
			eventSpeed := omit
			}
			};

	//TODO get the value from PIXIT or ...		//TODO get the value from PIXIT or ...

	@@ -445,7 +460,7 @@ module LibItsDenm_Functions {
	* @return		* @return
	*/		*/
	function f_getCurrentTime() return TimeStamp {		function f_getCurrentTime() return TimeStamp {
	var TimeStamp v_timeStamp;		var TimeStamp v_timeStamp := 0;

	//TODO get the value from xf ...		//TODO get the value from xf ...

Admin message