removed internalSubscriber, adjusted comments (5a55df6f) · Commits · ITS - Intelligent Transport Systems / ECall_HLAP

ttcn/LibItsECall_Functions.ttcn

+0 −3

Original line number	Diff line number	Diff line
		@@ -724,8 +724,6 @@ module LibItsECall_Functions {
		map(self:modem, system:modem);

		// Final configuration
		p_configuration.internalSubscriber := PX_INTERNAL_SUBSCRIBER;

		adapterControl.send(m_setConfig(PX_MODEM_INSTANCE, v_ivsConfig));
		f_adapterExpect(p_e := mw_ivsConfigChanged(PX_MODEM_INSTANCE, ?, ?), p_ignoreOtherMessages := true);

		@@ -1158,7 +1156,6 @@ module LibItsECall_Functions {
		var ModemConfiguration v_psapConfig := {mode := PSAP};

		// Final configuration
		p_configuration.internalSubscriber := p_workerConf.internalSubscriber;
		p_configuration.eCallMessage := v_eCallMessage;

		adapterControl.send(m_setConfig(PX_MODEM_INSTANCES[0].id, v_psapConfig));

ttcn/LibItsECall_Pixits.ttcn

+1 −7

Original line number	Diff line number	Diff line
		@@ -36,8 +36,7 @@ module LibItsECall_Pixits {
		modulepar WorkerConfArray PX_MODEM_INSTANCES := {
		{
		id := 0,
		phoneNumber := "",
		internalSubscriber := ""
		phoneNumber := ""
		}
		};

		@@ -51,11 +50,6 @@ module LibItsECall_Pixits {
		*/
		modulepar TelephoneNumber PX_IVS_PHONE_NUMBER := "";

		/**
		* @desc SIP uri of internal subscriber or "inactive"
		*/
		modulepar TelephoneNumber PX_INTERNAL_SUBSCRIBER := "inactive";

		/**
		* @desc Time to wait before issuing a clear down command
		*/

ttcn/LibItsECall_Templates.ttcn

+0 −4

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ module LibItsECall_Templates {
		t6Timer := c_t6_timer,
		t7Timer := c_t7_timer,
		inbandDirection := PULL,
		internalSubscriber := "",
		ignoreAlClearDown := false,
		simulateCrcError := false,
		disableInitiationSignal := false
		@@ -64,7 +63,6 @@ module LibItsECall_Templates {
		automaticAlAck := true,
		alAckValue := c_positiveAlAck,
		inbandDirection := PULL,
		internalSubscriber := "",
		noAckOfMsd := false,
		ignoreSendSignal := false
		} with {
		@@ -580,7 +578,6 @@ module LibItsECall_Templates {
		automaticAlAck := *,
		alAckValue := *,
		inbandDirection := p_parameters.inbandDirection,
		internalSubscriber := p_parameters.internalSubscriber,
		ignoreAlClearDown := p_parameters.ignoreAlClearDown,
		noAckOfMsd := *,
		simulateCrcError := p_parameters.simulateCrcError,
		@@ -619,7 +616,6 @@ module LibItsECall_Templates {
		automaticAlAck := p_parameters.automaticAlAck,
		alAckValue := p_parameters.alAckValue,
		inbandDirection := p_parameters.inbandDirection,
		internalSubscriber := p_parameters.internalSubscriber,
		ignoreAlClearDown := *,
		noAckOfMsd := p_parameters.noAckOfMsd,
		simulateCrcError := *,

ttcn/LibItsECall_TypesAndValues.ttcn

+3 −15

Original line number	Diff line number	Diff line
		@@ -39,12 +39,10 @@ module LibItsECall_TypesAndValues {
		* @desc Data structure for simulator's worker
		* @member id id or the worker
		* @member phoneNumber associated phone number
		* @member internalSubscriber internal suscriber
		*/
		type record WorkerConf {
		integer id,
		TelephoneNumber phoneNumber,
		TelephoneNumber internalSubscriber
		TelephoneNumber phoneNumber
		}

		/**
		@@ -65,7 +63,6 @@ module LibItsECall_TypesAndValues {
		* @member inbandState P,I: Only useful if inband_control is MANUAL
		* @member inbandControl P,I: (default: AUTO)
		* @member inbandDirection P,I: (default: PUSH)
		* @member internalSubscriber P,I: Gets called when inband_state FULL->HALF or FULL -> OFF AND call is not yet established
		* @member ignoreAlClearDown I: Whether a received ALACK with clear-down flag shall be ignored (default: false)
		* @member noAckOfMsd P: Do not acknoledge the MSD
		* @member simulateCrcError I: Calculate and transmit a wrong CRC value
		@@ -87,7 +84,6 @@ module LibItsECall_TypesAndValues {
		boolean automaticAlAck optional,
		AckValueType alAckValue optional,
		ModemDirectionType inbandDirection optional,
		TelephoneNumber internalSubscriber optional,
		boolean ignoreAlClearDown optional,
		boolean noAckOfMsd optional,
		boolean simulateCrcError optional,
		@@ -108,7 +104,6 @@ module LibItsECall_TypesAndValues {
		variant (alAckValue) "al_ack_value";
		variant (automaticAlAck) "automatic_al_ack";
		variant (inbandDirection) "inband_direction";
		variant (internalSubscriber) "internal_subscriber";
		variant (ignoreAlClearDown) "ignore_al_clear_down";
		variant (simulateCrcError) "simulate_crc_error";
		variant (noAckOfMsd) "no_ack_of_msd";
		@@ -391,7 +386,7 @@ module LibItsECall_TypesAndValues {
		}

		/**
		* @desc End a call in progress. Always ends both the external call and the internal call
		* @desc End a call in progress.
		* @member worker Target worker process
		* @remark mode: PSAP, IVS
		*/
		@@ -508,7 +503,6 @@ module LibItsECall_TypesAndValues {
		* @desc Generated when an incoming call is cancelled by the remote end before it was accepted or rejected
		* @member worker Worker process that generated this event
		* @member time Event timestamp
		* @member callRef INTERNAL/EXTERNAL
		* @remark mode: PSAP, IVS
		*/
		type record CallCanceledEvent {
		@@ -526,7 +520,6 @@ module LibItsECall_TypesAndValues {
		* @member time Event timestamp
		* @member from_ Caller ID
		* @member to_ Calling ID
		* @member callRef INTERNAL/EXTERNAL
		* @remark mode: PSAP, IVS
		*/
		type record CallIncomingEvent {
		@@ -548,7 +541,6 @@ module LibItsECall_TypesAndValues {
		* @member time Event timestamp
		* @member from_ Caller ID
		* @member to_ Calling ID
		* @member callRef INTERNAL/EXTERNAL
		* @remark mode: PSAP, IVS
		*/
		type record CallOutgoingEvent {
		@@ -568,7 +560,6 @@ module LibItsECall_TypesAndValues {
		* @desc Generated when a call is established and thus data exchange is possible
		* @member worker Worker process that generated this event
		* @member time Event timestamp
		* @member callRef INTERNAL/EXTERNAL
		* @remark mode: PSAP, IVS
		*/
		type record CallEstablishedEvent {
		@@ -584,7 +575,6 @@ module LibItsECall_TypesAndValues {
		* @desc Generated when a call was rejected
		* @member worker Worker process that generated this event
		* @member time Event timestamp
		* @member callRef INTERNAL/EXTERNAL
		* @remark mode: PSAP, IVS
		*/
		type record CallRejectedEvent {
		@@ -600,7 +590,6 @@ module LibItsECall_TypesAndValues {
		* @desc Informs about the end of a call
		* @member worker Worker process that generated this event
		* @member time Event timestamp
		* @member callRef Indicates who hung up (INTERNAL/EXTERNAL)
		* @remark mode: PSAP, IVS
		*/
		type record CallHangUpEvent {
		@@ -616,7 +605,6 @@ module LibItsECall_TypesAndValues {
		* @desc Generated when a call ends and neither call_hang_up nor call_cancelled nor call_rejected are applicable
		* @member worker Worker process that generated this event
		* @member time Event timestamp
		* @member callRef INTERNAL/EXTERNAL
		* @member reason A hint to why the call was aborted
		* @remark mode: PSAP, IVS
		*/