Merge branch 'TTF0002' into cygwin (fc6e3678) · Commits · TTCN-3 Libraries / LibIts

asn1/IS/ISO_TS_14823/GDD.asn

+18 −110

Original line number	Diff line number	Diff line
		@@ -15,6 +15,10 @@ GDD {iso (1) standard (0) gdd(14823) version1 (0)}
		DEFINITIONS AUTOMATIC TAGS::=
		BEGIN

		IMPORTS
		Distance, DistanceOrDuration, DestinationPlace, DestinationPlaces, DestinationRoad, DestinationRoads, MonthDay, HoursMinutes, DayOfWeek, Weight, DDD-IO, DDD-IO-LIST
		FROM IVI {iso (1) standard (0) ivi (19321) version2 (2)};

		--Definition of GDD Structure

		GddStructure::= SEQUENCE{
		@@ -54,16 +58,16 @@ InternationalSign-applicablePeriod::= SEQUENCE {
		yearRangeEndYear INTEGER(2000..2127,...)
		} OPTIONAL,
		month-day SEQUENCE { -- contains dateRangeStartMonth&Date and dateRangeEndMonth&Date
		dateRangeStartGDD-MonthDay GDD-MonthDay,
		dateRangeEndGDD-MonthDay GDD-MonthDay
		dateRangeStartMonthDay MonthDay,
		dateRangeEndMonthDay MonthDay
		} OPTIONAL,
		repeatingPeriodDayTypes RepeatingPeriodDayTypes OPTIONAL,
		hourMinutes SEQUENCE { -- contains timeRangeStartTime and timeRangeEndTime
		timeRangeStartTime GDD-HoursMinutes,
		timeRangeEndTime GDD-HoursMinutes
		timeRangeStartTime HoursMinutes,
		timeRangeEndTime HoursMinutes
		} OPTIONAL,
		dateRangeOfWeek GDD-DayOfWeek OPTIONAL,
		durationHourMinute GDD-HoursMinutes OPTIONAL
		dateRangeOfWeek DayOfWeek OPTIONAL,
		durationHourMinute HoursMinutes OPTIONAL
		}

		InternationalSign-exemptedApplicablePeriod::= InternationalSign-applicablePeriod
		@@ -80,10 +84,10 @@ InternationalSign-directionalFlowOfLane::= INTEGER {
		} (1..8)

		InternationalSign-applicableVehicleDimensions::= SEQUENCE{
		vehicleHeight GDD-Distance OPTIONAL,
		vehicleWidth GDD-Distance OPTIONAL,
		vehicleLength GDD-Distance OPTIONAL,
		vehicleGDD-Weight GDD-Weight OPTIONAL
		vehicleHeight Distance OPTIONAL,
		vehicleWidth Distance OPTIONAL,
		vehicleLength Distance OPTIONAL,
		vehicleWeight Weight OPTIONAL
		}

		InternationalSign-speedLimits::= SEQUENCE{
		@@ -94,18 +98,18 @@ InternationalSign-speedLimits::= SEQUENCE{

		InternationalSign-rateOfIncline::= INTEGER(1..32)

		InternationalSign-distanceBetweenVehicles::= GDD-Distance
		InternationalSign-distanceBetweenVehicles::= Distance

		InternationalSign-destinationInformation::= SEQUENCE{
		junctionDirection INTEGER(1..128) OPTIONAL,
		roundaboutCwDirection INTEGER(1..128)OPTIONAL,
		roundaboutCcwDirection INTEGER(1..128)OPTIONAL,
		ioList GDD-DDD-IO-LIST
		ioList DDD-IO-LIST
		}

		InternationalSign-section::= SEQUENCE{
		startingPointLength GDD-Distance OPTIONAL,
		continuityLength GDD-Distance OPTIONAL
		startingPointLength Distance OPTIONAL,
		continuityLength Distance OPTIONAL
		}

		InternationalSign-numberOfLane::= INTEGER(0..99)
		@@ -131,102 +135,6 @@ Code-Units::= INTEGER {
		-- value 15 reserved for future use
		} (0..15)

		GDD-DayOfWeek::= BIT STRING {unused(0), monday(1), tuesday(2), wednesday(3), thursday(4), friday(5), saturday(6), sunday(7)} (SIZE (8))

		GDD-DDD-IO-LIST ::= SEQUENCE (SIZE (1..8,...)) OF GDD-DDD-IO

		GDD-DDD-IO::= SEQUENCE{
		arrowDirection INTEGER(0..7),
		destPlace GDD-DestinationPlaces OPTIONAL,
		destRoad GDD-DestinationRoads OPTIONAL,
		roadNumberIdentifier INTEGER(1..999) OPTIONAL,
		streetName INTEGER(1..999) OPTIONAL,
		streetNameText UTF8String OPTIONAL,
		distanceToDivergingPoint GDD-DistanceOrDuration OPTIONAL,
		distanceToGDD-DestinationPlace GDD-DistanceOrDuration OPTIONAL
		}

		GDD-DestinationPlace::= SEQUENCE{
		destType DestinationType,
		destRSCode GddStructure (WITH COMPONENTS {..., attributes ABSENT}) OPTIONAL,
		destBlob OCTET STRING OPTIONAL,
		placeNameIdentification INTEGER(1..999) OPTIONAL,
		placeNameText UTF8String OPTIONAL
		}

		GDD-DestinationPlaces ::= SEQUENCE (SIZE (1..4,...)) OF GDD-DestinationPlace

		GDD-DestinationRoad::= SEQUENCE{
		derType GDD-DestinationRoadType,
		roadNumberIdentifier INTEGER(1..999) OPTIONAL,
		roadNumberText UTF8String OPTIONAL
		}

		GDD-DestinationRoads ::= SEQUENCE (SIZE (1..4,...)) OF GDD-DestinationRoad

		GDD-DestinationRoadType::= INTEGER {
		none (0),
		nationalHighway (1),
		localHighway (2),
		tollExpresswayMotorway (3),
		internationalHighway (4),
		highway (5),
		expressway (6),
		nationalRoad (7),
		regionalProvincialRoad (8),
		localRoad (9),
		motorwayJunction (10),
		diversion (11),
		rfu1 (12),
		rfu2 (13),
		rfu3 (14),
		rfu4 (15)
		} (0..15, ...)

		DestinationType::= INTEGER {
		none (0),
		importantArea (1),
		principalArea (2),
		generalArea (3),
		wellKnownPoint (4),
		country (5),
		city (6),
		street (7),
		industrialArea (8),
		historicArea (9),
		touristicArea (10),
		culturalArea (11),
		touristicRoute (12),
		recommendedRoute (13),
		touristicAttraction (14),
		geographicArea (15)
		} (0..15, ...)

		GDD-Distance::= SEQUENCE{
		value INTEGER(1..16384),
		unit Code-Units(2..4\|6..8)
		}

		GDD-DistanceOrDuration::= SEQUENCE {
		value INTEGER(1..16384),
		unit Code-Units (2..9)
		}

		GDD-HoursMinutes::= SEQUENCE {
		hours INTEGER (0..23),-- number of hours after midnight
		mins INTEGER (0..59) -- number of minutes after the hour
		}

		GDD-MonthDay::= SEQUENCE {
		month INTEGER (1..12),
		day INTEGER (1..31)
		}

		RepeatingPeriodDayTypes::= BIT STRING {national-holiday (0), even-days(1), odd-days(2), market-day(3) } (SIZE (4))

		GDD-Weight::= SEQUENCE {
		value INTEGER(1..16384),
		unit Code-Units (10..12)
		}

		END

asn1/IS/ISO_TS_19321/IVI.asn

+13 −9

Original line number	Diff line number	Diff line
		@@ -556,15 +556,17 @@ DDD::= SEQUENCE{
		}
		-- changes: from DDD_IO to DDD-IO
		DDD-IO::= SEQUENCE{
		drn INTEGER(0..7),
		dp SEQUENCE (SIZE (1..4,...)) OF DestinationPlace OPTIONAL,
		dr SEQUENCE (SIZE (1..4,...)) OF DestinationRoad OPTIONAL,
		rne INTEGER(1..999) OPTIONAL,
		stnId INTEGER(1..999) OPTIONAL,
		stnText UTF8String OPTIONAL,
		dcp DistanceOrDuration OPTIONAL,
		ddp DistanceOrDuration OPTIONAL
		arrowDirection INTEGER(0..7),
		destPlace DestinationPlaces OPTIONAL,
		destRoad DestinationRoads OPTIONAL,
		roadNumberIdentifier INTEGER(1..999) OPTIONAL,
		streetName INTEGER(1..999) OPTIONAL,
		streetNameText UTF8String OPTIONAL,
		distanceToDivergingPoint DistanceOrDuration OPTIONAL,
		distanceToDestinationPlace DistanceOrDuration OPTIONAL
		}
		DDD-IO-LIST ::= SEQUENCE (SIZE (1..8,...)) OF DDD-IO

		-- changes: from DDD_DEP to DDD-DEP
		DestinationPlace::= SEQUENCE{
		depType DDD-DEP,
		@@ -575,12 +577,14 @@ DestinationPlace::= SEQUENCE{
		plnId INTEGER(1..999) OPTIONAL,
		plnText UTF8String OPTIONAL
		}
		DestinationPlaces ::= SEQUENCE (SIZE (1..4,...)) OF DestinationPlace
		-- changes: from DDD_DER to DDD-DER
		DestinationRoad::=SEQUENCE{
		derType DDD-DER,
		ronId INTEGER(1..999) OPTIONAL,
		ronText UTF8String OPTIONAL
		}
		DestinationRoads ::= SEQUENCE (SIZE (1..4,...)) OF DestinationRoad
		-- changes: from DDD_DER to DDD-DER
		DDD-DER::= INTEGER {
		none (0),

ttcn/Common/LibItsCommon_ASN1_NamedNumbers.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ module LibItsCommon_ASN1_NamedNumbers {
		const ItsPduHeader.messageID ItsPduHeader_messageID_ssem_ := 10;
		const ItsPduHeader.messageID ItsPduHeader_messageID_evcsn_ := 11;
		const ItsPduHeader.messageID ItsPduHeader_messageID_saem_ := 12;
		const ItsPduHeader.messageID ItsPduHeader_messageID_rtcem_ := 13;
		const ItsPduHeader.messageID ItsPduHeader_messageID_rtcmem_ := 13;

		const LongitudinalAccelerationValue LongitudinalAccelerationValue_unavailable_ := 161;

ttcn/MapemSpatem/LibItsMapemSpatem_Pics.ttcn

+85 −1

Original line number	Diff line number	Diff line
		@@ -16,10 +16,22 @@ module LibItsMapemSpatem_Pics {

		/**
		* @desc Is the IUT running in secured mode?
		* @see ETSI TS 103 191-1 Table A.1
		* @see ETSI TS 103 191-1 Table A.1.1
		*/
		modulepar boolean PICS_IS_IUT_SECURED := false;

		/**
		* @desc Support for MAPEM reception
		* @see ETSI TS 103 191-1 Table A.1.2
		*/
		modulepar boolean PICS_ETSI_STRICT := false;

		/**
		* @desc Support for MAPEM reception
		* @see ETSI TS 103 191-1 Table A.1.3
		*/
		modulepar boolean PICS_SHORT_RANGE := false;

		/**
		* @desc Support for MAPEM generation
		* @see ETSI TS 103 191-1 Table A.2
		@@ -32,6 +44,24 @@ module LibItsMapemSpatem_Pics {
		*/
		modulepar boolean PICS_MAPEM_RECEPTION := true;

		/**
		* @desc Support for MAPEM reception
		* @see TODO
		*/
		modulepar boolean PICS_MAPEM_HAS_LANE_WIDTH := false;

		/**
		* @desc Support for MAPEM reception
		* @see TODO
		*/
		modulepar boolean PICS_MAPEM_TRANSMISSION_RATE := false;

		/**
		* @desc Support for MAPEM reception
		* @see TODO
		*/
		modulepar boolean PICS_SPECIALIZED_CARS_MANOEUVRES := false;

		/**
		* @desc Support for SPATEM generation
		* @see ETSI TS 103 191-1 Table A.2
		@@ -44,4 +74,58 @@ module LibItsMapemSpatem_Pics {
		*/
		modulepar boolean PICS_SPATEM_RECEPTION := true;

		/**
		* @desc Support for SPATEM reception
		* @see TODO
		*/
		modulepar boolean PICS_SPATEM_PEDESTRIAN_MANOEUVRES := false;

		/**
		* @desc Support for SPATEM reception
		* @see TODO
		*/
		modulepar boolean PICS_SPATEM_SPECIALIZED_MANOEUVRES := false;

		/**
		* @desc Support for SPATEM reception
		* @see TODO
		*/
		modulepar boolean PICS_SPATEM_HAS_TIMING := false;

		/**
		* @desc Support for SPATEM reception
		* @see TODO
		*/
		modulepar boolean PICS_SPATEM_PRIORITIZATION := false;

		/**
		* @desc Support for SPATEM reception
		* @see TODO
		*/
		modulepar boolean PICS_SPATEM_PEDESTRIAN_MAOEUVRES := false;

		/**
		* @desc Support for SPATEM reception
		* @see TODO
		*/
		modulepar boolean PICS_SPATEM_HAS_OPTIMAL_SPEED := false;

		/**
		* @desc Support for SPATEM reception
		* @see TODO
		*/
		modulepar boolean PICS_SPATEM_HAS_SIGNAL_PROGRESSION_SPEED := false;

		/**
		* @desc Support for SPATEM reception
		* @see TODO
		*/
		modulepar boolean PICS_SPATEM_HAS_EGRESS_QUEUE := false;

		/**
		* @desc Support for SPATEM reception
		* @see TODO
		*/
		modulepar boolean PICS_SPATEM_TRANSMISSION_RATE := false;

		} // end LibItsSremSsem_Pics

ttcn/Rtcmem/LibItsRtcmem_EncdecDeclarations.ttcn

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		module LibItsRtcmem_EncdecDeclarations {

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

		// LibItsRtcmem
		import from LibItsRtcmem_TypesAndValues all;
		import from LibItsRtcmem_TestSystem all;

		external function fx_enc_RtcmemReq (RtcmemReq p) return bitstring
		with {extension "prototype(convert) encode(LibIts_Interface)"}

		external function fx_dec_RtcmemReq (inout bitstring b, out RtcmemReq p) return integer
		with {extension "prototype(sliding) decode(LibIts_Interface)"}

		external function fx_dec_RtcmemInd (inout bitstring b, out RtcmemInd p) return integer
		with {extension "prototype(sliding) decode(LibIts_Interface)"}

		external function fx_enc_RTCMEM (RTCMEM p) return bitstring
		with {extension "prototype(convert) encode(PER)"}

		external function fx_dec_RTCMEM (inout bitstring b, out RTCMEM p) return integer
		with {extension "prototype(sliding) decode(PER)"}

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

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

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

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

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

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

		} // End of module LibItsRtcmem_EncdecDeclarations

Admin message