renamed all worker references to modemInstance (025cbc3d) · Commits · ITS - Intelligent Transport Systems / ECall_HLAP

ttcn/LibItsECall_Functions.ttcn

+13 −13

Original line number	Diff line number	Diff line
		@@ -584,7 +584,7 @@ module LibItsECall_Functions {
		repeat;
		}

		[] modem.receive(mw_timerExpired(p_worker := PX_MODEM_INSTANCES[0].id)) -> value v_modemEvent {
		[] modem.receive(mw_timerExpired(p_modemInstance := PX_MODEM_INSTANCES[0].id)) -> value v_modemEvent {
		f_stopPsapTestcase(fail, "Timer " & v_modemEvent.timerExpired.name & " expired");
		}

		@@ -646,15 +646,15 @@ module LibItsECall_Functions {
		repeat;
		}

		[] modem.receive(mw_inbandMsdReceived(p_worker := PX_MODEM_INSTANCES[0].id)) -> value v_modemEvent {
		[] modem.receive(mw_inbandMsdReceived(p_modemInstance := PX_MODEM_INSTANCES[0].id)) -> value v_modemEvent {
		f_stopIvsTestcase(fail, "Unexpected MSD received, could not decode");
		}

		[] modem.receive(mw_callVoiceConnectionEstablished(p_worker := PX_MODEM_INSTANCES[0].id)) {
		[] modem.receive(mw_callVoiceConnectionEstablished(p_modemInstance := PX_MODEM_INSTANCES[0].id)) {
		f_stopIvsTestcase(fail, "Switch to voice communication was not expected");
		}

		[] modem.receive(mw_timerExpired(p_worker := PX_MODEM_INSTANCES[0].id)) -> value v_modemEvent {
		[] modem.receive(mw_timerExpired(p_modemInstance := PX_MODEM_INSTANCES[0].id)) -> value v_modemEvent {
		f_stopIvsTestcase(fail, "Timer " & v_modemEvent.timerExpired.name & " expired");
		}

		@@ -719,7 +719,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};
		var ModemConfiguration v_ivsConfig := {mode := IVS} with {optional "implicit omit";};

		map(self:modem, system:modem);

		@@ -771,7 +771,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};
		var ModemConfiguration v_ivsConfig := {mode := IVS} with {optional "implicit omit";};

		// clear down any ongoing call
		f_clearDown(NETWORK, c_now);
		@@ -984,7 +984,7 @@ module LibItsECall_Functions {
		function f_setMSD(in integer 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 := v_eCallMessage};
		var ModemConfiguration v_newConfig := {eCallMessage := v_eCallMessage} with {optional "implicit omit";};

		adapterControl.send(m_setConfig(PX_MODEM_INSTANCES[0].id, v_newConfig));
		}
		@@ -1147,22 +1147,22 @@ module LibItsECall_Functions {

		/**
		* @desc Sets the initial simulator configuration (IVS mode), all previous state is lost.
		* @param p_workerConf Worker to use
		* @param p_modemInstanceConf Modem instance to use
		* @param p_configuration Configuration to use
		*/
		function f_setSimulatorConfigurationIvs(in WorkerConf p_workerConf, in template(value) ModemConfiguration p_configuration) runs on IvsMtc {
		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};
		var ModemConfiguration v_psapConfig := {mode := PSAP} with {optional "implicit omit";};

		// Final configuration
		p_configuration.eCallMessage := v_eCallMessage;

		adapterControl.send(m_setConfig(PX_MODEM_INSTANCES[0].id, v_psapConfig));
		f_adapterExpectPsap(p_e := mw_ivsConfigChanged(p_workerConf.id, ?, ?), p_ignoreOtherMessages := true);
		f_adapterExpectPsap(p_e := mw_ivsConfigChanged(p_modemInstanceConf.id, ?, ?), p_ignoreOtherMessages := true);

		adapterControl.send(m_setConfig(PX_MODEM_INSTANCES[0].id, p_configuration));
		f_adapterExpectPsap(p_e := mw_ivsConfigChanged(p_workerConf.id, ?, p_configuration), p_ignoreOtherMessages := true);
		f_adapterExpectPsap(p_e := mw_ivsConfigChanged(p_modemInstanceConf.id, ?, p_configuration), p_ignoreOtherMessages := true);
		}
		}
		}

ttcn/LibItsECall_Pixits.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ module LibItsECall_Pixits {
		/**
		* @desc IDs of available modem instances
		*/
		modulepar WorkerConfArray PX_MODEM_INSTANCES := {
		modulepar ModemInstanceConfArray PX_MODEM_INSTANCES := {
		{
		id := 0,
		phoneNumber := ""

ttcn/LibItsECall_Templates.ttcn

+130 −105

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/LibItsECall_TypesAndValues.ttcn

+85 −87

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/LibLogger.ttcn

+5 −5

Original line number	Diff line number	Diff line
		@@ -45,19 +45,19 @@ module LibLogger {

		/**
		* @desc Log message
		* @member worker ID of the worker emitting this log message
		* @member modemInstance ID of the modem instance emitting this log message
		* @member time Timestamp
		* @member level Criticality of the log message
		* @member text Log message
		*/
		type record LogMessage {
		integer worker,
		integer modemInstance,
		charstring time,
		LogLevel level,
		charstring text
		} with {
		variant "log";
		variant (worker) "worker";
		variant (modemInstance) "worker";
		variant (time) "time";
		variant (level) "level";
		variant (text) "text";
		@@ -71,7 +71,7 @@ module LibLogger {
		* @desc Receive template for 'debug' log message
		*/
		template LogMessage mw_debugLogMessage := {
		worker := ?,
		modemInstance := ?,
		time := ?,
		level := e_debug,
		text := ?
		@@ -81,7 +81,7 @@ module LibLogger {
		* @desc Receive template for 'info' log message
		*/
		template LogMessage mw_infoLogMessage := {
		worker := ?,
		modemInstance := ?,
		time := ?,
		level := e_info,
		text := ?