Review IVIM, MAPEM/SPATEM and SREM/SSEM (1ec7c7d7) · Commits · TTCN-3 Libraries / LibIts

ttcn/Common/LibItsCommon_ASN1_NamedNumbers1.ttcn→ttcn/Common/LibItsCommon_ASN1_NamedNumbers.ttcn

+0 −0

File moved.

ttcn/GeoNetworking/LibItsGeoNetworking_Pixits.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -175,7 +175,7 @@ module LibItsGeoNetworking_Pixits {
		* @desc The IUT's upper layer
		* @see ETSI TS 102 871-3 Table B.7
		*/
		modulepar NextHeader PX_GN_UPPER_LAYER := e_btpB;
		modulepar NextHeader PX_GN_UPPER_LAYER := e_any;

		/**
		* @desc Is BTP header present in IUT's UT indication. Only applicable if PX_GN_UPPER_LAYER == e_btpA or e_btpB.

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

+22 −22

Original line number	Diff line number	Diff line
		@@ -539,11 +539,11 @@ module LibItsGeoNetworking_Templates {
		in template (value) CommonHeader p_commonHeader,
		in template (value) ExtendedHeader p_extHeader
		) := {
		packet := valueof({
		commonHeader := p_commonHeader,
		extendedHeader := p_extHeader,
		packet := {
		commonHeader := valueof(p_commonHeader),
		extendedHeader := valueof(p_extHeader),
		payload := char2oct("DEFAULT_PAYLOAD")
		}),
		},
		securedMsg := omit
		}

		@@ -1749,17 +1749,17 @@ module LibItsGeoNetworking_Templates {
		in template (value) UInt16 p_seqNumber,
		in template (value) GeoBroadcastArea p_broadcastArea
		) := {
		geoBroadcastHeader := valueof({
		seqNumber := p_seqNumber,
		geoBroadcastHeader := {
		seqNumber := valueof(p_seqNumber),
		reserved := c_uInt8Zero,
		srcPosVector := p_sourceLongPosVec,
		geoAreaPosLatitude := p_broadcastArea.geoBroadcastArea.geoAreaPosLatitude,
		geoAreaPosLongitude := p_broadcastArea.geoBroadcastArea.geoAreaPosLongitude,
		distanceA := p_broadcastArea.geoBroadcastArea.distanceA,
		distanceB := p_broadcastArea.geoBroadcastArea.distanceB,
		angle := p_broadcastArea.geoBroadcastArea.angle,
		srcPosVector := valueof(p_sourceLongPosVec),
		geoAreaPosLatitude := valueof(p_broadcastArea.geoBroadcastArea.geoAreaPosLatitude),
		geoAreaPosLongitude := valueof(p_broadcastArea.geoBroadcastArea.geoAreaPosLongitude),
		distanceA := valueof(p_broadcastArea.geoBroadcastArea.distanceA),
		distanceB := valueof(p_broadcastArea.geoBroadcastArea.distanceB),
		angle := valueof(p_broadcastArea.geoBroadcastArea.angle),
		reserved2 := c_uInt24Zero
		})
		}
		}

		/**
		@@ -1858,17 +1858,17 @@ module LibItsGeoNetworking_Templates {
		in template (value) UInt16 p_seqNumber,
		in template (value) GeoAnycastArea p_anycastArea
		) := {
		geoAnycastHeader := valueof({
		seqNumber := p_seqNumber,
		geoAnycastHeader := {
		seqNumber := valueof(p_seqNumber),
		reserved := c_uInt8Zero,
		srcPosVector := p_sourceLongPosVec,
		geoAreaPosLatitude := p_anycastArea.geoAnycastArea.geoAreaPosLatitude,
		geoAreaPosLongitude := p_anycastArea.geoAnycastArea.geoAreaPosLongitude,
		distanceA := p_anycastArea.geoAnycastArea.distanceA,
		distanceB := p_anycastArea.geoAnycastArea.distanceB,
		angle := p_anycastArea.geoAnycastArea.angle,
		srcPosVector := valueof(p_sourceLongPosVec),
		geoAreaPosLatitude := valueof(p_anycastArea.geoAnycastArea.geoAreaPosLatitude),
		geoAreaPosLongitude := valueof(p_anycastArea.geoAnycastArea.geoAreaPosLongitude),
		distanceA := valueof(p_anycastArea.geoAnycastArea.distanceA),
		distanceB := valueof(p_anycastArea.geoAnycastArea.distanceB),
		angle := valueof(p_anycastArea.geoAnycastArea.angle),
		reserved2 := c_uInt24Zero
		})
		}
		}

		/**

ttcn/IVIM/LibItsIvim_EncdecDeclarations.ttcn

+9 −3

Original line number	Diff line number	Diff line
		module LibItsIvim_EncdecDeclarations {

		// LibIts
		import from IVIM_PDU_Descriptions all;
		import from IVIM_PDU_Descriptions language "ASN.1:1997" all;

		// LibItsIvim
		import from LibItsIvim_TypesAndValues all;
		@@ -29,12 +29,18 @@ module LibItsIvim_EncdecDeclarations {
		external function fx_enc_UtIvimInitialize (UtIvimInitialize p) return bitstring
		with {extension "prototype(convert) encode(UpperTester)"}

		external function fx_enc_UtIvimChangePosition (UtIvimChangePosition p) return bitstring
		with {extension "prototype(convert) encode(UpperTester)"}
		/* external function fx_enc_UtIvimChangePosition (UtIvimChangePosition p) return bitstring
		with {extension "prototype(convert) encode(UpperTester)"}*/

		external function fx_enc_UtIvimTrigger (UtIvimTrigger p) return bitstring
		with {extension "prototype(convert) encode(UpperTester)"}

		external function fx_enc_UtIvimUpdate (UtIvimUpdate p) return bitstring
		with {extension "prototype(convert) encode(UpperTester)"}

		external function fx_enc_UtIvimTermination (UtIvimTermination p) return bitstring
		with {extension "prototype(convert) encode(UpperTester)"}

		external function fx_dec_UtIvimResults (inout bitstring b, out UtIvimResults p) return integer
		with {extension "prototype(sliding) decode(UpperTester)"}

ttcn/IVIM/LibItsIvim_TypesAndValues.ttcn

+2 −22

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ module LibItsIvim_TypesAndValues {
		boolean utIvimInitializeResult,
		UtIvimTriggerResult utIvimTriggerResult,
		UtIvimUpdateResult utIvimUpdateResult,
		UtIvimTermination utIvimTerminationResult
		boolean utIvimTerminationResult
		} with {
		variant ""
		} // End of type UtIvimResults
		@@ -143,27 +143,7 @@ module LibItsIvim_TypesAndValues {
		/**
		* @desc Upper Tester result message of termination of an event on Ivim IUT
		*/
		type boolean UtIvimTerminationResult;

		/**
		* @desc Upper Tester message to change the position of IUT. Values a relatives
		*/
		type record UtIvimChangePosition {
		Int32 latitude,
		Int32 longitude,
		Int32 elevation
		} with {
		variant "FIELDORDER(msb)"
		}

		/**
		* @desc Upper Tester message to change the pseudonym of the DENM IUT
		*/
		type record UtIvimChangePseudonym {
		// empty on purpose
		} with {
		variant "FIELDORDER(msb)"
		}
		//type boolean UtIvimTerminationResult;

		/**
		* @desc Upper Tester message to check event/status on Ivim IUT