Commit a1e011ac authored by fischerjo's avatar fischerjo
Browse files

ATSP ToDo No. 3, 12-23, 55, 56

parent 3b4c28de
Loading
Loading
Loading
Loading
+9 −75
Original line number Diff line number Diff line
@@ -323,25 +323,24 @@ module LibItsCalm_Interface {
        group accessLayerPrimitives { 
            
            /**
             * @desc FNTP output protocol port primitive 
             * @member msgOut Message to send to the protocol port (INsapPrimitivesUp)
             * @desc ATSP (output from ITS test system) port primitive 
             * @member msgOut Message to send to the protocol port (INsapPrimitivesDown)
             * used to communicate with the radio box connected to the ITS test system 
             */
            type record AtspReq { 
                // TODO To be completed 
                INsapPrimitivesDown    msgOut
            } with { 
                encode "LibIts_Interface"
                encode "LibItsCALMllsap_asn1"
            }
            
            /**
             * @desc FNTP input protocol port primitive (INsapPrimitivesDown) 
             * @desc ATSP (input to ITS test system) port primitive (INsapPrimitivesUp) 
             * @member msgIn Message monitored on the protocol port (INsapPrimitivesUp)
             * @member receptionTime Timestamp when then message is received by the test adapter (different than the generation generation timestamp)
             */
            type record AtspInd { 
                // TODO To be completed, 
                Time48IAT              receptionTime 
				INsapPrimitivesUp    msgIn
            } with { 
                encode "LibIts_Interface"
                encode "LibItsCALMllsap_asn1"
            }
            
        } // End of group accessLayerPrimitives
@@ -479,71 +478,6 @@ module LibItsCalm_Interface {
        
        } // End of function f_utInitializeIut 
        
        // TODO To be removed 
        /**
         * @desc    Triggers event from the application layer
         * @param   p_event The event to trigger.
         */
//        function f_utTriggerEvent(template (value) UtEvent p_event) runs on ItsCalm {
//            var template (value) UtTrigger v_utMsg := { p_event };
//        
//            utPort.send(v_utMsg);
//            alt {
//                [] utPort.receive(UtResult:true) {
//                    tc_wait.stop;
//                }
//                [] utPort.receive {
//                    tc_wait.stop;
//                }
//                [] tc_wait.timeout {
//                }
//                [else] { // Shortcut defaults
//                    repeat; 
//                }
//            }
//        }
        
        // TODO To be removed 
//        /**
//         * @desc Checks that the event was indicated at the application layer
//         * @param p_event The event to check.
//         * @param   p_discard The event should not appear. Default value: FALSE.
//         */
//        function f_utCheckEvent(template (value) UtEvent p_event, boolean p_discard) runs on ItsCalm {
//            var template (value) UtCheck v_utMsg := { p_event };
//        
//            utPort.send(v_utMsg);
//            tc_wait.start;
//            alt {
//                [] utPort.receive(UtResult:true) {
//                    tc_wait.stop;
//                    if (p_discard == false) {
//                        log("*** f_utCheckEvent: INFO: Event correctly indicated at application layer ***");
//                    }
//                    else {
//                        log("*** f_utCheckEvent: ERROR: Event indicated at application layer where it should be discarded ***");
//                        f_selfOrClientSyncAndVerdict("error", e_error);
//                    }
//                }
//                [] utPort.receive(UtResult:false) {
//                    tc_wait.stop;
//                    if (p_discard == false) {
//                        log("*** f_utCheckEvent: ERROR: Event not correctly indicated at application layer ***");
//                        f_selfOrClientSyncAndVerdict("error", e_error);
//                    }
//                    else {
//                        log("*** f_utCheckEvent: INFO: Event not indicated at application layer***");
//                    }
//                }
//                [] tc_wait.timeout {
//                    log("*** f_utCheckEvent: ERROR: Timeout while waiting for event check result ***");
//                    f_selfOrClientSyncAndVerdict("error", e_timeout);                    
//                }
//                [else] { // Shortcut defaults
//                    repeat; 
//                }
//            }
//        }
       
        /**
         * @desc    Send a command request primitive and wait for the command confirm response