Commit 549db39a authored by garciay's avatar garciay
Browse files

Implement IICP TSS&TPs

Add comments
Renaming
parent 7e556f2d
Loading
Loading
Loading
Loading
+0 −38
Original line number Diff line number Diff line
@@ -280,44 +280,6 @@ module LibItsFntp_Functions {
            } // End of 'alt' statement
        } // End of function f_mnSapAwaitFWTupdate()
        
        /**
         * @desc    Generate a correctly formatted GCctxTxCmd message via IN-SAP interface
         * @param   p_commandRef  Unique cyclic reference number of command. Same value as in related MN-REQUEST.request
         * @param   p_linkID      Link ID of the peer station
         * @param   p_clientID    TODO
         * @verdict Unchanged
         */
        // FIXME To be removed - Moved on NF-SAP
//        function f_mnSapGenerateGCctxTxCmd(in CommandRef p_commandRef, in Link_ID p_linkID, in ITSaid p_clientID) runs on ItsCalm {
//            f_mgtGenerateGCctxTxCmd(
//                p_commandRef, 
//                m_gCctxTxCmd(
//                    f_getIutINSapAddress(), 
//                    p_linkID, 
//                    p_clientID
//                )
//            );
//        }
        
        /**
         * @desc    Generate a correctly formatted SAM/CTXrxNot message from peer station via IN-SAP interface
         * @param   p_commandRef  Unique cyclic reference number of command. Same value as in related MN-REQUEST.request
         * @param   p_linkID      Link ID of the peer station
         * @param   p_clientID    
         * @verdict Unchanged
         */
        // FIXME To be removed - Moved on NF-SAP
//        function f_mnSapGenerateCTXrxNot(in CommandRef p_commandRef, in Link_ID p_linkID, in ITSaid p_clientID) runs on ItsCalm {
//            f_mgtGenerateCTXrxNot(
//                p_commandRef, 
//                m_cTXrxNot(
//                    f_getIutINSapAddress(), 
//                    p_linkID, 
//                    p_clientID
//                )
//            );
//        }
        
    } // End of group testerFunctions
    
    group adapterControl {
+21 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ module LibItsIicp_Functions {
            IIC_Request, 
            ITS_SCUtype 
    };
    import from LibItsMgt_TypesAndValues {
        type IParamNoList, IParamList 
    };
    import from LibItsIicp_Templates all;
    import from LibItsIicp_Pics all;
    import from LibItsIicp_Pixits all;
@@ -373,6 +376,24 @@ module LibItsIicp_Functions {
            return PX_MF_RCMD_STATECINOTIFY;
        }
        
        /**
         * @desc    TODO
         * @return  TODO
         * @see     PX_MI_IPARAMNOLIST
         */
        function f_getIutIParamNoList() return IParamNoList {
            return PX_MI_IPARAMNOLIST;
        }
        
        /**
         * @desc    TODO
         * @return  TODO
         * @see     PX_MI_IPARAMNOLIST
         */
        function f_getIutIParamList() return IParamList {
            return PX_MI_IPARAMLIST;
        }
        
    } // End of group iutFunctions
    
} // End of module LibItsIicp_Functions
 No newline at end of file
+29 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ module LibItsIicp_Pixits {
    import from CALMfntp language "ASN.1:1997" {
        type PortNumber
    };
    import from LibItsMgt_TypesAndValues {
        type IParamNoList, IParamList
    };
    
    /**
     * @desc Defines the active CI link identifier
@@ -133,4 +136,30 @@ module LibItsIicp_Pixits {
        }
    } 
    
    /**
     * @desc List of reference number of parameter to be monitored
     * NOTE that this PIXIT is used just for compiling purposes. The real PIXIT shall be written according to the IUT capabilities
     * @see ISO 21218 Table A.1 — I parameters
     */
    modulepar IParamNoList PX_MI_IPARAMNOLIST := { 
        0, // AuxiliaryChannel 
        1 // ControlChannel 
    }
    
    modulepar IParamList PX_MI_IPARAMLIST := {
        { 
            fill := '00'B, 
            param_ := { 
                errors := {
                    {
                        paramNo := 0, 
                        fill := '0000000'B,
                        med := { },
                        errStatus := 0 
                    }
                }
            } // End of field 'param_'
        } // End of list
    }
    
} // End of module LibItsIicp_Pixits
+76 −3
Original line number Diff line number Diff line
@@ -711,7 +711,7 @@ module LibItsIicp_Templates {
                 * 
                 * Note that all fields are mandatory
                 */
                template IIC_Request mw_iicpRequest_any := { // FIXME Check if it is useful
                template IIC_Request mw_iicpRequest_any := { 
                    sourceITS_scuId := ?,
                    destinationITS_scuId := ?,
                    pduCounter := ?,
@@ -769,7 +769,9 @@ module LibItsIicp_Templates {
            group remoteCommands {
                
                /**
                 * @desc TODO
                 * @desc Unspecified receive template for IICRequestTx service primitive
                 * Used for:
                 * <li>modifying restrictif template</li>
                 */
                template IICrequestTX mw_iicRequestTx_any := { 
                    sourceITS_scuId := ?, 
@@ -783,7 +785,9 @@ module LibItsIicp_Templates {
                } // End of template mw_iicRequestTx_any 
                
                /**
                 * @desc TODO
                 * @desc Unspecified receive template for IICResponseTx service primitive
                 * Used for:
                 * <li>modifying restrictif template</li>
                 */
                template IICresponseTX mw_iicResponseTx_any := { 
                    sourceITS_scuId := ?, 
@@ -822,6 +826,54 @@ module LibItsIicp_Templates {
                    
                } // End of group miCommands
                
                group miGetSet {
                    
                    /**
                     * @desc    Receive template for IICrequestTX/remote command message
                     * @param   p_sourceITS_scuId       The source ITS-SCU-ID
                     * @param   p_destinationITS_scuId  The other ITS-SCU-ID
                     * @param   p_mi_rget               The MI-GET.request message
                     * @see ISO 24102-3 Clause 6.3.1 MI-GET.request
                     * @see ISO 24102-4 Clause 8.2.1 IIC-Request PDU 
                     */
                    template IICrequestTX mdw_iicRequestTx_miGetRequest( 
                        in template (present) ITS_scuId p_sourceITS_scuId, 
                        in template (present) ITS_scuId p_destinationITS_scuId, 
                        in template (present) MI_Get_request p_mi_rget 
                    ) modifies mw_iicRequestTx_any := {
                        sourceITS_scuId := p_sourceITS_scuId, 
                        destinationITS_scuId := p_destinationITS_scuId, 
                        pduRequest := { 
                            requests := { 
                                mi_rget := p_mi_rget 
                            } // End of 'requests' field 
                        } // End of 'pduRequest' field 
                    } // End of template mdw_iicRequestTx_miGetRequest 
                    
                    /**
                     * @desc    Receive template for IICrequestTX/remote command message
                     * @param   p_sourceITS_scuId       The source ITS-SCU-ID
                     * @param   p_destinationITS_scuId  The other ITS-SCU-ID
                     * @param   p_mi_rget               The MI-SET.request message
                     * @see ISO 24102-3 Clause 6.2.1 MI-SET.request
                     * @see ISO 24102-4 Clause 8.2.1 IIC-Request PDU 
                     */
                    template IICrequestTX mdw_iicRequestTx_miSetRequest( 
                        in template (present) ITS_scuId p_sourceITS_scuId, 
                        in template (present) ITS_scuId p_destinationITS_scuId, 
                        in template (present) MI_Set_request p_mi_rset 
                    ) modifies mw_iicRequestTx_any := {
                        sourceITS_scuId := p_sourceITS_scuId, 
                        destinationITS_scuId := p_destinationITS_scuId, 
                        pduRequest := { 
                            requests := { 
                                mi_rset := p_mi_rset 
                            } // End of 'requests' field 
                        } // End of 'pduRequest' field 
                    } // End of template mdw_iicRequestTx_miGetRequest 
                    
                } // End of group miCommands
                
                group mnCommands {
                    
                    /**
@@ -870,6 +922,27 @@ module LibItsIicp_Templates {
                        } // End of 'pduRequest' field 
                    } // End of template mdw_iicRequestTx_mfCommandRequest 
                    
                    /**
                     * @desc    Receive template for IICresponseTX message
                     * @param   p_sourceITS_scuId       The source ITS-SCU-ID
                     * @param   p_destinationITS_scuId  The destination ITS-SCU-ID
                     * @param   p_mf_rcmd               The MF-COMMAND.confirm message
                     * @see ISO 24102-4 Clause 8.2.2 IIC-Response PDU 
                     */
                    template IICresponseTX mdw_iicResponseTx_mfCommandRequest( 
                        in template (present) ITS_scuId p_sourceITS_scuId, 
                        in template (present) ITS_scuId p_destinationITS_scuId, 
                        in template (present) MF_Command_confirm p_mf_rcmd 
                    ) modifies mw_iicResponseTx_any := {
                        sourceITS_scuId := p_sourceITS_scuId, 
                        destinationITS_scuId := p_destinationITS_scuId, 
                        pduResponse := { 
                            responses := { 
                                mf_rcmd := p_mf_rcmd 
                            } // End of 'requests' field 
                        } // End of 'pduRequest' field 
                    } // End of template mdw_iicResponseTx_mfCommandRequest 
                    
                } // End of group mfCommands
                
            } // End of group remoteCommands
+46 −14
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ module LibItsMgt_Templates {
    import from CALMfntp language "ASN.1:1997" { 
        type PortNumber 
    }; 
    import from LibItsMgt_TypesAndValues {
        type IParamNoList, IParamList
    };
    import from LibItsMgt_Pixits {
        modulepar PX_PDU_REQUEST_FILL_FIELD_VALUE
    };
@@ -87,16 +90,6 @@ module LibItsMgt_Templates {
                msgIn := p_command_confirm
            }
            
//            /**
//             * @desc  Receive template for MF-SAP service primitives
//             * @param p_msg MF-COMMAND.request service primitive to be sent
//             */
//            template MgtMFSapCommandInd mw_mgtMFSapCommandInd(
//                in template (present) MF_Command_request p_msg
//            ) := {
//                msgIn := p_msg
//            }
//            
            /**
             * @desc  Receive template for MF-SAP service primitives
             * @param p_msg MF-REQUEST.confirm service primitive to be received
@@ -217,7 +210,7 @@ module LibItsMgt_Templates {
                     * @see  a_mgtMFSapPortDefault altstep statement
                     */
                    template MF_Request_confirm mw_mfRequestConfirm(
                        in template ErrStatus p_errorStatus
                        in template (present) ErrStatus p_errorStatus
                    ) := {
                        commandRef := ?,
                        reqConfirm := {
@@ -517,9 +510,12 @@ module LibItsMgt_Templates {
                
                /**
                 * @desc    Receive template for MI-COMMAND.request service primitive
                 * @see 6.4.2 MI-COMMAND.request
                 * @param   p_linkID        Link ID of the peer station
                 * @param   p_commandRef    Unique cyclic reference number of command. Same value as in related MN-REQUEST.request
                 * @param   p_miCmd         MI-Command message description 
                 * @see ISO 24102-3 6.4.2 MI-COMMAND.request
                 */
                template MI_Command_request mw_miCommandRequest( 
                template (present) MI_Command_request mw_miCommandRequest( 
                    in template (present) Link_ID p_linkID, 
                    in template (present) CommandRef p_commandRef, 
                    in template (present) MI_Command p_miCmd 
@@ -529,6 +525,42 @@ module LibItsMgt_Templates {
                    command_param := p_miCmd 
                }  // End of template mw_miCommandRequest
                
                /**
                 * @desc Receive template for MI-GET service primitive
                 * @param   p_linkID        Link ID of the peer station
                 * @param   p_commandRef    Unique cyclic reference number of command. Same value as in related MN-REQUEST.request
                 * @param   p_get_param_no  Reference number of parameter to be monitored
                 * @see ISO 24102-3 6.3.1 MI-GET.request
                 * @see ISO 21218 Annex A (normative) I parameters
                 */
                template (present) MI_Get_request mw_miGetRequest( 
                    in template (present) Link_ID p_linkID,
                    in template (present) CommandRef p_commandRef,
                    in template (present) IParamNoList p_get_param_no
                ) := {
                    linkID := p_linkID, 
                    commandRef := p_commandRef, 
                    get_param_no := p_get_param_no
                } // End of template mw_miGetRequest
                
                /**
                 * @desc Receive template for MI-SET service primitive
                 * @param   p_linkID        Link ID of the peer station
                 * @param   p_commandRef    Unique cyclic reference number of command. Same value as in related MN-REQUEST.request
                 * @param   p_set_param     Reference number of parameter to be monitored
                 * @see ISO 24102-3 6.3.1 MI-SET.request
                 * @see ISO 21218 Annex A (normative) I parameters
                 */
                template (present) MI_Set_request mw_miSetRequest( 
                    in template (present) Link_ID p_linkID,
                    in template (present) CommandRef p_commandRef,
                    in template (present) IParamList p_set_param
                ) := {
                    linkID := p_linkID, 
                    commandRef := p_commandRef, 
                    set_param := p_set_param
                } // End of template mw_miSetRequest
                
            } // End of mgtMISapTemplatesRecv
            
        } // End of group mgtMISapTemplates
Loading