Add comments (3b317d2b) · Commits · TTCN-3 Libraries / LibIts

ttcn/FSAP/LibItsFsap_Functions.ttcn3

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -358,8 +358,8 @@ module LibItsFsap_Functions {
	}		}

	/**		/**
	* @desc TODO		* @desc Get non-IP information on services offered, with no session phase and no channel change requested
	* @return TODO		* @return The non-IP information on services offered
	* @see PX_NO_IP_SERVICE_WITH_NO_SESSION_AND_NO_CHANGE_CHANNEL		* @see PX_NO_IP_SERVICE_WITH_NO_SESSION_AND_NO_CHANGE_CHANNEL
	*/		*/
	function f_getIutServicelistWithNoSessionAndNoChannelChange() return ServiceList {		function f_getIutServicelistWithNoSessionAndNoChannelChange() return ServiceList {
	@@ -367,8 +367,8 @@ module LibItsFsap_Functions {
	}		}

	/**		/**
	* @desc TODO		* @desc Get non-IP information on services offered, with session phase and no channel change requested
	* @return TODO		* @return The non-IP information on services offered
	* @see PX_NO_IP_SERVICE_WITH_SESSION_AND_NO_CHANGE_CHANNEL		* @see PX_NO_IP_SERVICE_WITH_SESSION_AND_NO_CHANGE_CHANNEL
	*/		*/
	function f_getIutServicelistWithSessionAndNoChangeChannel() return ServiceList {		function f_getIutServicelistWithSessionAndNoChangeChannel() return ServiceList {
	@@ -376,8 +376,8 @@ module LibItsFsap_Functions {
	}		}

	/**		/**
	* @desc TODO		* @desc Get non-IP information on services offered, with no session phase and channel change requested
	* @return TODO		* @return The non-IP information on services offered
	* @see PX_NO_IP_SERVICE_WITH_SESSION_AND_CHANNEL_CHANGE		* @see PX_NO_IP_SERVICE_WITH_SESSION_AND_CHANNEL_CHANGE
	*/		*/
	function f_getIutServicelistWithSessionAndChangeChannel() return ServiceList {		function f_getIutServicelistWithSessionAndChangeChannel() return ServiceList {
	@@ -385,8 +385,8 @@ module LibItsFsap_Functions {
	}		}

	/**		/**
	* @desc TODO		* @desc Get non-IP information on an unknown services offered, with session phase and no channel change requested
	* @return TODO		* @return The non-IP information on services offered
	* @see PX_NO_IP_SERVICE_WITH_UNKNOWN_SERVICE_ID		* @see PX_NO_IP_SERVICE_WITH_UNKNOWN_SERVICE_ID
	*/		*/
	function f_getIutServicelistWithUnknownServiceID() return ServiceList {		function f_getIutServicelistWithUnknownServiceID() return ServiceList {
	@@ -394,8 +394,8 @@ module LibItsFsap_Functions {
	}		}

	/**		/**
	* @desc TODO		* @desc Get non-IP information on services offered, with session phase and channel change requested on an unknown channel
	* @return TODO		* @return The non-IP information on services offered
	* @see PX_NO_IP_SERVICE_WITH_UNKNOWN_CHANNEL		* @see PX_NO_IP_SERVICE_WITH_UNKNOWN_CHANNEL
	*/		*/
	function f_getIutServicelistWithUnknownChannel() return ServiceList {		function f_getIutServicelistWithUnknownChannel() return ServiceList {

ttcn/FSAP/LibItsFsap_Pics.ttcn3

+10 −11

Original line number	Original line	Diff line number	Diff line
	@@ -10,31 +10,31 @@ module LibItsFsap_Pics {

	/**		/**
	* @desc Is FSAP Service Provider role ?		* @desc Is FSAP Service Provider role ?
	* @see ETSI TS 102 797-1 v0.0.0 C.1/1		* @see ETSI TS 102 797-1 v0.0.8 C.1/1
	*/		*/
	modulepar boolean PICS_FSAP_ROLE_SP := false;		modulepar boolean PICS_FSAP_ROLE_SP := false;

	/**		/**
	* @desc Is FSAP Service User role ?		* @desc Is FSAP Service User role ?
	* @see ETSI TS 102 797-1 v0.0.0 C.1/2		* @see ETSI TS 102 797-1 v0.0.8 C.1/2
	*/		*/
	modulepar boolean PICS_FSAP_ROLE_SU := false;		modulepar boolean PICS_FSAP_ROLE_SU := false;

	/**		/**
	* @desc Is FSAP Service operation phase ?		* @desc Is FSAP Service operation phase ?
	* @see ETSI TS 102 797-1 v0.0.0 C.2/1		* @see ETSI TS 102 797-1 v0.0.8 C.2/1
	*/		*/
	modulepar boolean PICS_SOP := false;		modulepar boolean PICS_SOP := false;

	/**		/**
	* @desc Is supported SIP with support of CTX message mode ?		* @desc Is supported SIP with support of CTX message mode ?
	* @see ETSI TS 102 797-1 v0.0.0 C.3/1		* @see ETSI TS 102 797-1 v0.0.8 C.3/1
	*/		*/
	modulepar boolean PICS_SIP_W_CTX := false;		modulepar boolean PICS_SIP_W_CTX := false;

	/**		/**
	* @desc Is supported SIP without support of CTX message mode ?		* @desc Is supported SIP without support of CTX message mode ?
	* @see ETSI TS 102 797-1 v0.0.0 C.3/2		* @see ETSI TS 102 797-1 v0.0.8 C.3/2
	*/		*/
	modulepar boolean PICS_SIP_N_CTX := false;		modulepar boolean PICS_SIP_N_CTX := false;

	@@ -42,25 +42,25 @@ module LibItsFsap_Pics {

	/**		/**
	* @desc Is IUT an host only?		* @desc Is IUT an host only?
	* @see ETSI TS 102 797-1 v0.0.0 C.5/1		* @see ETSI TS 102 797-1 v0.0.8 C.5/1
	*/		*/
	modulepar boolean PICS_ROLE_RONLY := false;		modulepar boolean PICS_ROLE_RONLY := false;

	/**		/**
	* @desc Is IUT a router only?		* @desc Is IUT a router only?
	* @see ETSI TS 102 797-1 v0.0.0 C.5/2		* @see ETSI TS 102 797-1 v0.0.8 C.5/2
	*/		*/
	modulepar boolean PICS_ROLE_HONLY := false;		modulepar boolean PICS_ROLE_HONLY := false;

	/**		/**
	* @desc Is IUT both host and router?		* @desc Is IUT both host and router?
	* @see ETSI TS 102 797-1 v0.0.0 C.5/3		* @see ETSI TS 102 797-1 v0.0.8 C.5/3
	*/		*/
	modulepar boolean PICS_ROLE_RH := false;		modulepar boolean PICS_ROLE_RH := false;

	/**		/**
	* @desc Does the architecture implement ITS station-internal network?		* @desc Does the architecture implement ITS station-internal network?
	* @see ETSI TS 102 797-1 v0.0.0 C.6/1		* @see ETSI TS 102 797-1 v0.0.8 C.6/1
	*/		*/
	modulepar boolean PICS_ITS_S_INW := false;		modulepar boolean PICS_ITS_S_INW := false;

	@@ -70,10 +70,9 @@ module LibItsFsap_Pics {
	*/		*/
	modulepar integer PICS_SAM_RETRANSMIT_TIMER := 3000;		modulepar integer PICS_SAM_RETRANSMIT_TIMER := 3000;

	// FIXME Upgrade Draft ETSI TS 102 797-1 V<0.0.7> (2011-12) documents
	/**		/**
	* @desc Is IISC available?		* @desc Is IISC available?
	* @see ISO/WD 24102-4		* @see ISO 24102-4
	*/		*/
	modulepar boolean PICS_IICP_MGM := true;		modulepar boolean PICS_IICP_MGM := true;

ttcn/FSAP/LibItsFsap_Pixits.ttcn3

+18 −10

Original line number	Original line	Diff line number	Diff line
	@@ -210,7 +210,8 @@ module LibItsFsap_Pixits {
	group sam_ {		group sam_ {

	/**		/**
	* @desc TODO		* @desc Non-IP information on services offered, with no session phase and no channel change requested
			* @see ISO 24102-5 Figure 9 — serviceList
	*/		*/
	modulepar NonipService PX_NO_IP_SERVICE_WITH_NO_SESSION_AND_NO_CHANGE_CHANNEL := {		modulepar NonipService PX_NO_IP_SERVICE_WITH_NO_SESSION_AND_NO_CHANGE_CHANNEL := {
	serviceID := PX_ITS_AID,		serviceID := PX_ITS_AID,
	@@ -220,7 +221,8 @@ module LibItsFsap_Pixits {
	} // End of modulepar PX_NO_IP_SERVICE_WITH_NO_SESSION_AND_NO_CHANGE_CHANNEL		} // End of modulepar PX_NO_IP_SERVICE_WITH_NO_SESSION_AND_NO_CHANGE_CHANNEL

	/**		/**
	* @desc TODO		* @desc Non-IP information on services offered, with session phase and no channel change requested
			* @see ISO 24102-5 Figure 9 — serviceList
	*/		*/
	modulepar NonipService PX_NO_IP_SERVICE_WITH_SESSION_AND_NO_CHANGE_CHANNEL := {		modulepar NonipService PX_NO_IP_SERVICE_WITH_SESSION_AND_NO_CHANGE_CHANNEL := {
	serviceID := PX_ITS_AID,		serviceID := PX_ITS_AID,
	@@ -230,7 +232,8 @@ module LibItsFsap_Pixits {
	} // End of modulepar PX_NO_IP_SERVICE_WITH_SESSION_AND_NO_CHANGE_CHANNEL		} // End of modulepar PX_NO_IP_SERVICE_WITH_SESSION_AND_NO_CHANGE_CHANNEL

	/**		/**
	* @desc TODO		* @desc Non-IP information on services offered, with no session phase and channel change requested
			* @see ISO 24102-5 Figure 9 — serviceList
	*/		*/
	modulepar NonipService PX_NO_IP_SERVICE_WITH_SESSION_AND_CHANNEL_CHANGE := {		modulepar NonipService PX_NO_IP_SERVICE_WITH_SESSION_AND_CHANNEL_CHANGE := {
	serviceID := PX_ITS_AID,		serviceID := PX_ITS_AID,
	@@ -240,7 +243,8 @@ module LibItsFsap_Pixits {
	} // End of modulepar PX_NO_IP_SERVICE_WITH_SESSION_AND_CHANNEL_CHANGE		} // End of modulepar PX_NO_IP_SERVICE_WITH_SESSION_AND_CHANNEL_CHANGE

	/**		/**
	* @desc TODO		* @desc Non-IP information on an unknown services offered, with session phase and no channel change requested
			* @see ISO 24102-5 Figure 9 — serviceList
	*/		*/
	modulepar NonipService PX_NO_IP_SERVICE_WITH_UNKNOWN_SERVICE_ID := {		modulepar NonipService PX_NO_IP_SERVICE_WITH_UNKNOWN_SERVICE_ID := {
	serviceID := PX_UNKNOWN_ITS_AID,		serviceID := PX_UNKNOWN_ITS_AID,
	@@ -250,7 +254,8 @@ module LibItsFsap_Pixits {
	} // End of modulepar PX_NO_IP_SERVICE_WITH_UNKNOWN_SERVICE_ID		} // End of modulepar PX_NO_IP_SERVICE_WITH_UNKNOWN_SERVICE_ID

	/**		/**
	* @desc TODO		* @desc Non-IP information on services offered, with session phase and channel change requested on an unknown channel
			* @see ISO 24102-5 Figure 9 — serviceList
	*/		*/
	modulepar NonipService PX_NO_IP_SERVICE_WITH_UNKNOWN_CHANNEL := {		modulepar NonipService PX_NO_IP_SERVICE_WITH_UNKNOWN_CHANNEL := {
	serviceID := PX_ITS_AID,		serviceID := PX_ITS_AID,
	@@ -267,17 +272,20 @@ module LibItsFsap_Pixits {
	modulepar float PX_WAIT_FOR_IUT_READY := 1.0;		modulepar float PX_WAIT_FOR_IUT_READY := 1.0;

	/**		/**
	* @desc TODO		* @desc SAM tag identifier
			* @see ISO 24102-5 Clause 7.2.1 Overview
	*/		*/
	modulepar FmtID PX_FMTID_SAM := 0; // TODO Use CLAMfsap.FmtID_sam_		modulepar FmtID PX_FMTID_SAM := 0; // FIXME Check why TTWB raises an error using CLAMfsap.FmtID_sam_

	/**		/**
	* @desc TODO		* @desc CTX tag identifier
			* @see ISO 24102-5 Clause 7.2.1 Overview
	*/		*/
	modulepar FmtID PX_FMTID_CTX := 1; // TODO Use CLAMfsap.FmtID_ctx_		modulepar FmtID PX_FMTID_CTX := 1; // FIXME Check why TTWB raises an error using CLAMfsap.FmtID_ctx_

	/**		/**
	* @desc TODO		* @desc FSAP version number
			* @see ISO 24102-5 Clause 7.2.2 Service advertisement message
	*/		*/
	modulepar VersionFSAP PX_VERSION_FSAP := 0;		modulepar VersionFSAP PX_VERSION_FSAP := 0;

ttcn/FSAP/LibItsFsap_TypesAndValues.ttcn3

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -35,10 +35,6 @@ module LibItsFsap_TypesAndValues {
	MF_Request_request mfRequestReq		MF_Request_request mfRequestReq
	}		}

	// type union UtFsapCommandConfirm { // FIXME To be removed
	// IIC_Response iicResp
	// }

	} // End of group utPrimitives		} // End of group utPrimitives

	group acPrimitives {		group acPrimitives {

Admin message