Commit ca18dd7e authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed: missing UT port deactivation

parent 50b57771

ttcn/AtsSecurity/ItsSecurity_Functions.ttcn

+15 −2
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ module ItsSecurity_Functions { 
            log(">>> fb_setCamFrequencyGreatherThan1Hz");

            

            map(self:utPort, system:camUtPort);

            // FIXME Does not compile with CYGWIN vc_default := activate(LibItsCam_Functions.a_utDefault());

            vc_default := activate(LibItsCam_Functions.a_utDefault());

            

            for (v_cntSpeed := 0; v_cntSpeed < lengthof(v_speedValues); v_cntSpeed:=v_cntSpeed + 1) {

                LibItsCam_Functions.f_utTriggerEvent(valueof(m_changeSpeed(v_speedValues[v_cntSpeed])));
@@ -736,10 +736,16 @@ module ItsSecurity_Functions { 
        function f_triggerDenmEvent() runs on ItsBaseComponent return ItsDenm {

            var ItsDenm v_denmComponent;

            

            //deactivate gnPort default alts

            vc_gnDefaultActive := false;

            

            v_denmComponent := ItsDenm.create("DENM Trigger") alive;

            v_denmComponent.start(fb_secTriggerDenmEvent());

            v_denmComponent.done;

            

            //activate gnPort default alts

            vc_gnDefaultActive := true;

            

            return v_denmComponent;

        } // End of function f_triggerDenmEvent
@@ -751,9 +757,16 @@ module ItsSecurity_Functions { 
        function f_cancelDenmEvent(ItsDenm p_denmComponent) runs on ItsBaseComponent {

            var ItsDenm v_denmComponent;

            

            //deactivate gnPort default alts

            vc_gnDefaultActive := false;

            

            p_denmComponent.start(fb_secCancelDenmEvent());

            p_denmComponent.done;

            p_denmComponent.kill;

            

            //activate gnPort default alts

            vc_gnDefaultActive := true;

            

        } // End of function f_cancelDenmEvent

        

        /**
@@ -766,7 +779,7 @@ module ItsSecurity_Functions { 


            log(">>> fb_secTriggerDenmEvent: ", v_situation);

            map(self:utPort, system:denmUtPort);

            // FIXME Does not compile with CYGWIN vc_default := activate(LibItsDenm_Functions.a_utDefault());

            vc_default := activate(LibItsDenm_Functions.a_utDefault());



            log("fb_secTriggerDenmEvent: Call LibItsDenm_Functions.f_utTriggerEvent with ", m_utTriggerEvent(v_situation, defaultValidity));

            vc_utActionIDs[0] := LibItsDenm_Functions.f_utTriggerEvent(m_utTriggerEvent(v_situation, defaultValidity));