Commit 9fef66f4 authored by berge's avatar berge
Browse files

fixed some issues to allow compilation with Titan tool

parent 7ee6482d

ttcn/LibItsECall_Functions.ttcn

+6 −3
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ 
    function f_setMSD(ECallMessageUnion p_eCall) runs on IvsMtc {

        var ConfigParameters v_newConfig := {eCallMessage := p_eCall};



        eCallControl.send(m_setConfig(PX_WORKERS[0].id, {eCallMessage := p_eCall}));

        eCallControl.send(m_setConfig(PX_WORKERS[0].id, v_newConfig));

    }



    function f_verifyMsdSentSuccesfully(template(present) AckValueType p_alAckValue := c_positiveAlAck) runs on IvsMtc {
@@ -155,13 +155,15 @@ 
      

    function f_setSimulatorConfiguration(in template(value) ConfigParameters p_configuration) runs on PsapMtc {



        var ConfigParameters v_ivsConfig := {mode := IVS};



		// Final configuration

	    p_configuration.t4Timer := PX_T4_TIMER;

        p_configuration.t6Timer := PX_T6_TIMER;

        p_configuration.t8Timer := PX_T8_TIMER;

        p_configuration.internalSubscriber := PX_INTERNAL_SUBSCRIBER;



        eCallControl.send(m_setConfig(PX_WORKER, {mode := IVS}));

        eCallControl.send(m_setConfig(PX_WORKER, v_ivsConfig));

        f_expectFeedback(p_e := mw_ivsConfigChanged(PX_WORKER, ?, ?), p_ignoreOtherMessages := true);



        eCallControl.send(m_setConfig(PX_WORKER, p_configuration));
@@ -176,6 +178,7 @@ 
*/

    function f_setSimulatorConfiguration2(in WorkerConf p_workerConf, in  template(value) ConfigParameters p_configuration) runs on IvsMtc {

        var ECallMessageUnion v_eCallMessageExpanded := valueof(f_expandMsd(p_configuration.eCallMessage));

        var ConfigParameters v_psapConfig := {mode := PSAP};

        

        // Final configuration

        p_configuration.t3Timer := PX_T3_TIMER;
@@ -187,7 +190,7 @@ 


        vc_eCallMessage := v_eCallMessageExpanded;



        eCallControl.send(m_setConfig(PX_WORKERS[0].id, {mode := PSAP}));

        eCallControl.send(m_setConfig(PX_WORKERS[0].id, v_psapConfig));

        f_expectFeedback(p_e := mw_ivsConfigChanged(p_workerConf.id, ?, ?), p_ignoreOtherMessages := true);



        eCallControl.send(m_setConfig(PX_WORKERS[0].id, p_configuration));

ttcn/LibItsECall_Templates.ttcn

+3 −3
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ module LibItsECall_Templates { 
            sendNecDisabler := false,

            numberOfAlAcks := 4,

            numberOfLlAcks := 4,

            alAckValue := 0,

            automaticAlAck := true,

            alAckValue := 0,

            inbandState := OFF,

            inbandControl := AUTO,

            inbandDirection := PULL,
@@ -142,8 +142,8 @@ module LibItsECall_Templates { 
                    numberOfAlAcks := *,

                    numberOfLlAcks := *,

                    eCallMessage := p_parameters.eCallMessage,

                    alAckValue := *,

                    automaticAlAck := *,

                    alAckValue := *,

                    inbandState := p_parameters.inbandState,

                    inbandControl := p_parameters.inbandControl,

                    inbandDirection := p_parameters.inbandDirection,
@@ -178,8 +178,8 @@ module LibItsECall_Templates { 
                    numberOfAlAcks := p_parameters.numberOfAlAcks,

                    numberOfLlAcks := p_parameters.numberOfLlAcks,

                    eCallMessage := *,

                    alAckValue := p_parameters.alAckValue,

                    automaticAlAck := p_parameters.automaticAlAck,

                    alAckValue := p_parameters.alAckValue,

                    inbandState := p_parameters.inbandState,

                    inbandControl := p_parameters.inbandControl,

                    inbandDirection := p_parameters.inbandDirection,