Fixed compilations issues with Titan (incorrect with statements, wrong field order in record) (2460fd5b) · Commits · ITS - Intelligent Transport Systems / ECall_HLAP

ttcn/LibItsECall_Functions.ttcn

+4 −4

Original line number	Diff line number	Diff line
		@@ -718,7 +718,7 @@ module LibItsECall_Functions {
		* @param p_configuration Simulator's configuration parameters (PSAP mode)
		*/
		function f_configIvsModemUp(in template (value)ModemConfiguration p_configuration) runs on PsapMtc {
		var ModemConfiguration v_ivsConfig := {mode := IVS} with {optional "implicit omit";};
		var ModemConfiguration v_ivsConfig := {mode := IVS};

		map(self:modem, system:modem);

		@@ -768,7 +768,7 @@ module LibItsECall_Functions {
		* @param p_configuration Simulator's configuration parameters (PSAP mode)
		*/
		function f_configIvsModemDown() runs on PsapMtc {
		var ModemConfiguration v_ivsConfig := {mode := IVS} with {optional "implicit omit";};
		var ModemConfiguration v_ivsConfig := {mode := IVS};

		// clear down any ongoing call
		f_clearDown(NETWORK, c_now);
		@@ -997,7 +997,7 @@ module LibItsECall_Functions {
		function f_setMSD(in UInt8 p_messageIdentifier) runs on IvsMtc {
		var MSDMessage v_msd := f_buildMSDMessage(p_messageIdentifier);
		var ECallMessage v_eCallMessage := f_buildECallMessage(c_msdVersion, v_msd);
		var ModemConfiguration v_newConfig := {eCallMessage := { decoded := v_eCallMessage } } with {optional "implicit omit";};
		var ModemConfiguration v_newConfig := {eCallMessage := { decoded := v_eCallMessage } };

		adapterControl.send(m_setConfig(PX_MODEM_INSTANCES[0].id, v_newConfig));
		}
		@@ -1166,7 +1166,7 @@ module LibItsECall_Functions {
		function f_setSimulatorConfigurationIvs(in ModemInstanceConf p_modemInstanceConf, in template(value) ModemConfiguration p_configuration) runs on IvsMtc {
		var MSDMessage v_msd := f_buildMSDMessage(c_initialMessageIdentifier);
		var ECallMessage v_eCallMessage := f_buildECallMessage(c_msdVersion, v_msd);
		var ModemConfiguration v_psapConfig := {mode := PSAP} with {optional "implicit omit";};
		var ModemConfiguration v_psapConfig := {mode := PSAP};

		// Final configuration
		p_configuration.eCallMessage := {decoded := v_eCallMessage};

ttcn/LibItsECall_Templates.ttcn

+13 −15

Original line number	Diff line number	Diff line
		@@ -30,15 +30,10 @@ module LibItsECall_Templates {
		template(value) ModemConfiguration m_defaultIVSSimulatorConfiguration := {
		mode := IVS,
		t3Timer := c_t3_timer,
		t4Timer:= omit,
		t5Timer := c_t5_timer,
		t6Timer := c_t6_timer,
		t7Timer := c_t7_timer,
		inbandDirection := PULL,
		ignoreAlClearDown := false,
		simulateCrcError := false,
		disableInitiationSignal := false,

		t4Timer:= omit,
		t8Timer:= omit,
		sendNecDisabler:= omit,
		numberOfAlAcks:= omit,
		@@ -46,8 +41,12 @@ module LibItsECall_Templates {
		eCallMessage:= omit,
		automaticAlAck:= omit,
		alAckValue:= omit,
		inbandDirection := PULL,
		ignoreAlClearDown := false,
		noAckOfMsd:= omit,
		ignoreSendSignal:= omit
		simulateCrcError := false,
		ignoreSendSignal:= omit,
		disableInitiationSignal := false
		}

		/**
		@@ -55,24 +54,23 @@ module LibItsECall_Templates {
		*/
		template(value) ModemConfiguration m_defaultPsapSimulatorConfiguration := {
		mode := PSAP,
		t3Timer := omit,
		t4Timer := c_t4_timer,
		t5Timer := omit,
		t6Timer := omit,
		t7Timer := omit,
		t8Timer := c_t8_timer,
		sendNecDisabler := false,
		numberOfAlAcks := 5,
		numberOfLlAcks := 5,
		eCallMessage := omit,
		automaticAlAck := true,
		alAckValue := c_positiveAlAck,
		inbandDirection := PULL,
		noAckOfMsd := false,
		ignoreSendSignal := false,

		t3Timer := omit,
		t5Timer := omit,
		t6Timer := omit,
		t7Timer := omit,
		eCallMessage := omit,
		ignoreAlClearDown := omit,
		noAckOfMsd := false,
		simulateCrcError := omit,
		ignoreSendSignal := false,
		disableInitiationSignal := omit
		}

Admin message