Commit 049479f6 authored by garciay's avatar garciay
Browse files

Merge CAM/DENM/GN STF455/STF462

Final review for milestone F, validation with Commsignia device
parent a5886a0f
Loading
Loading
Loading
Loading
+176 −174
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ module LibItsBtp_TypesAndValues {

    group btpPayload {
        
        type octetstring BtpRawPayload;
        
        /**
         * @desc The payload of the BTP packet
         * @member decodedPayload The decoded payload
@@ -91,7 +93,7 @@ module LibItsBtp_TypesAndValues {
         */
        type record BtpPayload {
            DecodedBtpPayload decodedPayload optional,
            octetstring rawPayload
            BtpRawPayload rawPayload
        }
        
        /**
@@ -148,7 +150,7 @@ module LibItsBtp_TypesAndValues {
	        type boolean UtResult;
        }
        with {
            encode "LibItsCommon_TypesAndValues"
            encode "LibItsCommon"
        }
                
        /**
@@ -170,5 +172,5 @@ module LibItsBtp_TypesAndValues {
    
}
with {
    encode "LibItsBtp_TypesAndValues"
    encode "LibItsBtp"
}
+332 −134

File changed.

Preview size limit exceeded, changes collapsed.

+3 −1
Original line number Diff line number Diff line
@@ -6,7 +6,9 @@
 */
module LibItsAtsp_Pics {
    

    /**
	 * @desc ATSP PICS
	 */
    group atspPics {
        
        /**
+33 −56
Original line number Diff line number Diff line
@@ -57,54 +57,46 @@ module LibItsAtsp_Templates {
				
				/**
	        	* @desc    Send template
				* CfEvent for sending MI-REQUEST.confirm over cfPort
				* CfAtspEvent for sending MI-REQUEST.confirm over cfPort
	        	* @param   p_miReqConfirm:  The MI-REQUEST.confirm primitive
	        	*/
				template CfEvent m_cfAtspMIRequest_confirm(
				template CfAtspEvent m_cfAtspMIRequest_confirm(
					in template(value) MI_Request_confirm p_miReqConfirm
				) := {
					cfAtspEvent:= {
					miRequestConfirm := p_miReqConfirm
					}
				} // End of template m_cfAtspMIRequest_confirm
				
				/**
	        	* @desc    Send template
				* CfEvent for sending MI-GET.request over cfPort
				* CfAtspEvent for sending MI-GET.request over cfPort
	        	* @param   p_miGetRequest:		Get request to send
	        	*/
				template CfEvent m_cfAtspGetReqEvent(
				template CfAtspEvent m_cfAtspGetReqEvent(
					in template(value) MI_Get_request p_miGetRequest
				) := {
					cfAtspEvent:= {
					miGetRequest := p_miGetRequest
					}
				} // End of template m_cfAtspGetReqEvent
				
				/**
	        	* @desc    Send template
				* CfEvent for sending MI-SET.request over cfPort
				* CfAtspEvent for sending MI-SET.request over cfPort
	        	* @param   p_miSetRequest:		Set request to send
	        	*/
				template CfEvent m_cfAtspSetReqEvent(
				template CfAtspEvent m_cfAtspSetReqEvent(
					in template(value) MI_Set_request p_miSetRequest
				) := {
					cfAtspEvent:= {
					miSetRequest := p_miSetRequest
					}
				} // End of template m_cfAtspSetReqEvent
		
				/**
	        	* @desc    Send template
				* CfEvent for sending MI-COMMAND.request over cfPort
				* CfAtspEvent for sending MI-COMMAND.request over cfPort
	        	* @param   p_miCommandRequest:		Command request to send
	        	*/
				template CfEvent m_cfAtspCommandReqEvent(
				template CfAtspEvent m_cfAtspCommandReqEvent(
					in template(value) MI_Command_request p_miCommandRequest
				) := {
					cfAtspEvent:= {
					miCommandRequest := p_miCommandRequest
					}
				} // End of template m_cfAtspCommandReqEvent
		
			} // End of group cfPort
@@ -400,28 +392,24 @@ module LibItsAtsp_Templates {
				
				/**
	        	* @desc    Send template INsapPrimitivesDown
				* UtEvent for sending any of the IN SAP primitives over utPort
				* UtAtspEvent for sending any of the IN SAP primitives over utPort
	        	* @param   p_inSapPrimitiveDown:	IN SAP primitive to send
	        	*/
				template UtEvent m_utAtspEventDown(
				template UtAtspEvent m_utAtspEventDown(
					in template(value) INsapPrimitivesDown p_inSapPrimitiveDown
				) := {
					utAtspEvent:= {
					inSapPrimitivesDown := p_inSapPrimitiveDown
					}
				} // End of template m_utAtspEventDown
				
				/**
	        	* @desc    Receive template INsapPrimitivesUp
				* UtEvent for receiving any of the IN SAP primitives over utPort
				* UtAtspEvent for receiving any of the IN SAP primitives over utPort
	        	* @param   p_inSapPrimitiveUp:	IN SAP primitive to be received
	        	*/
				template UtEventInd m_utAtspEventInd(
				template UtAtspEventInd m_utAtspEventInd(
					in template(value) INsapPrimitivesUp p_inSapPrimitiveUp
				) := {
					utAtspEventInd:= {
					inSapPrimitivesUp := p_inSapPrimitiveUp
					}
				} // End of template m_utAtspEventUp

			} // End of group utPort
@@ -430,7 +418,7 @@ module LibItsAtsp_Templates {
				
				/**
	        	* @desc    Send template
				* UtEvent for sending IN-UNITDATA.request 
				* UtAtspEvent for sending IN-UNITDATA.request 
	        	* @param   p_inUnitdataRequest:		IN-UNITDATA.request primitive to send
	        	*/
				template INsapPrimitivesDown m_inPrimitivesDownUDR(
@@ -542,46 +530,38 @@ module LibItsAtsp_Templates {
				
				/**
	            * @desc    Receive template
				* CfEventInd to notify reception of an expected frame given by p_miRequestReq
				* CfAtspEventInd to notify reception of an expected frame given by p_miRequestReq
	            * @param   p_miRequestReq:  The MI_REQUEST.request primitive
	            */
				template CfEventInd mw_cfAtspRequestRequest(in template MI_Request_request p_miRequestReq) := {
					cfAtspEventInd:= {
				template CfAtspEventInd mw_cfAtspRequestRequest(in template MI_Request_request p_miRequestReq) := {
					miRequestRequest:= p_miRequestReq
					}
				} // End of template mw_cfAtspRequestRequest
				
				/**
	            * @desc    Receive template
				* CfEventInd to notify reception of an expected frame given by p_miCommandConfirm
				* CfAtspEventInd to notify reception of an expected frame given by p_miCommandConfirm
	            * @param   p_miCommandConfirm:  The MI-COMMAND.confirm primitive
	            */
				template CfEventInd mw_cfAtspCommandConfirm(in template MI_Command_confirm p_miCommandConfirm) := {
					cfAtspEventInd:= {
				template CfAtspEventInd mw_cfAtspCommandConfirm(in template MI_Command_confirm p_miCommandConfirm) := {
					miCommandConfirm:= p_miCommandConfirm
					}
				} // End of template mw_cfAtspCommandConfirm
				
				/**
	            * @desc    Receive template
				* CfEventInd to notify reception of an expected frame given by p_miGetConfirm
				* CfAtspEventInd to notify reception of an expected frame given by p_miGetConfirm
	            * @param   p_miGetConfirm:  The MI-GET.confirm primitive
	            */
				template CfEventInd mw_cfAtspEventIndGetConf(in template MI_Get_confirm p_miGetConfirm) := {
					cfAtspEventInd:= {
				template CfAtspEventInd mw_cfAtspEventIndGetConf(in template MI_Get_confirm p_miGetConfirm) := {
					miGetConfirm := p_miGetConfirm
					}
				} // End of template mw_cfAtspEventIndGetConf
				
				/**
	            * @desc    Receive template
				* CfEventInd to notify reception of an expected frame given by p_miSetConfirm
				* CfAtspEventInd to notify reception of an expected frame given by p_miSetConfirm
	            * @param   p_miSetConfirm:  The MI-SET.confirm primitive
	            */
				template CfEventInd mw_cfAtspEventIndSetConf(in template MI_Set_confirm p_miSetConfirm) := {
					cfAtspEventInd:= {
				template CfAtspEventInd mw_cfAtspEventIndSetConf(in template MI_Set_confirm p_miSetConfirm) := {
					miSetConfirm := p_miSetConfirm
					}
				} // End of template mw_cfAtspEventIndSetConf
				
			} // End of group cfPort
@@ -822,11 +802,8 @@ module LibItsAtsp_Templates {
					localCIID := ?
				} // End of template mw_miLinkIndAny
					
				template CfEventInd mw_miEventMI_RequestRequest_any := { 
					cfAtspEventInd := 
					{
				template CfAtspEventInd mw_miEventMI_RequestRequest_any := { 
					miRequestRequest := ?
					}
				} // End of template mw_miEventMI_RequestRequest_any
				
				/**
+373 −164

File changed.

Preview size limit exceeded, changes collapsed.

Loading