Commit 8cfd977e authored by Yann Garcia's avatar Yann Garcia
Browse files

Compile AtsIS with TITAN: file name shall be identical to ASN.1 module name

parent d3447a65
Loading
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ WITH SUCCESSORS

Reg-AdvisorySpeed, Reg-ConnectionManeuverAssist, Reg-GenericLane,
Reg-IntersectionGeometry, Reg-IntersectionState, Reg-LaneAttributes, Reg-MapData,
Reg-LaneDataAttribute, Reg-MovementEvent, Reg-MovementState,
Reg-NodeAttributeSetXY, Reg-Position3D, Reg-RequestorDescription, Reg-RequestorType, Reg-RestrictionUserType, Reg-RoadSegment,
Reg-MovementEvent, Reg-MovementState,
Reg-Position3D, Reg-RequestorDescription, Reg-RequestorType, Reg-RestrictionUserType, Reg-RoadSegment,
Reg-RTCMcorrections, Reg-SignalControlZone, Reg-SignalRequestPackage, Reg-SignalRequest, Reg-SignalStatus, Reg-SignalStatusPackage, Reg-SignalRequestMessage,
Reg-SignalStatusMessage, Reg-SPAT
FROM ETSI-ITS-DSRC-REGION {
@@ -30,7 +30,7 @@ FROM ETSI-ITS-DSRC-REGION {
}
WITH SUCCESSORS

REG-EXT-ID-AND-TYPE, RegionId, Reg-ComputedLane,
REG-EXT-ID-AND-TYPE, RegionId, Reg-NodeAttributeSetXY, Reg-LaneDataAttribute, Reg-ComputedLane,
Offset-B09, Offset-B10, Offset-B11, Offset-B12, Offset-B13, Offset-B14, Offset-B16,
NodeListXY, NodeSetXY, NodeXY, Node-XY-20b, Node-XY-22b, Node-XY-24b, Node-XY-26b, Node-XY-28b, Node-XY-32b, Node-LLmD-64b, RegionalExtension, 
NodeAttributeXY, NodeAttributeSetXY, SegmentAttributeXYList, SegmentAttributeXY,
+0 −0

File moved.

+6 −5
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ DEFINITIONS AUTOMATIC TAGS::= BEGIN

IMPORTS

addGrpC, REG-EXT-ID-AND-TYPE, Reg-ComputedLane
addGrpC, REG-EXT-ID-AND-TYPE, Reg-ComputedLane, NodeAttributeSet-addGrpC
FROM DSRC-noCircular {
  itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts103301 (103301) dsrc-nocircular (666) major-version-2 (2) minor-version-1 (1)
}
@@ -22,7 +22,7 @@ WITH SUCCESSORS

ConnectionManeuverAssist-addGrpC, ConnectionTrajectory-addGrpC,
IntersectionState-addGrpC, LaneAttributes-addGrpC, MapData-addGrpC,
MovementEvent-addGrpC, NodeAttributeSet-addGrpC, Position3D-addGrpC, RequestorDescription-addGrpC, RestrictionUserType-addGrpC, SignalStatusPackage-addGrpC
MovementEvent-addGrpC, Position3D-addGrpC, RequestorDescription-addGrpC, RestrictionUserType-addGrpC, SignalStatusPackage-addGrpC
FROM ETSI-ITS-DSRC-AddGrpC {
  itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts103301 (103301) dsrc (6) addgrpc (0) major-version-2 (2) minor-version-1 (1)
}
@@ -58,8 +58,9 @@ Reg-LaneAttributes REG-EXT-ID-AND-TYPE ::= {
   {LaneAttributes-addGrpC IDENTIFIED BY addGrpC} ,
   ...
}
/*
Reg-LaneDataAttribute           REG-EXT-ID-AND-TYPE ::= { ... }

*/

Reg-MapData	                    REG-EXT-ID-AND-TYPE ::= {
	{MapData-addGrpC  IDENTIFIED BY addGrpC},
@@ -73,10 +74,10 @@ Reg-MovementEvent REG-EXT-ID-AND-TYPE ::= {
Reg-MovementState               REG-EXT-ID-AND-TYPE ::= { ... }


Reg-NodeAttributeSetXY          REG-EXT-ID-AND-TYPE ::= {
/*Reg-NodeAttributeSetXY          REG-EXT-ID-AND-TYPE ::= {
	{NodeAttributeSet-addGrpC   IDENTIFIED BY addGrpC},
	...
}
}*/

/*
Reg-NodeOffsetPointXY	        REG-EXT-ID-AND-TYPE ::= { ... }
+10 −7
Original line number Diff line number Diff line
@@ -8,13 +8,6 @@ DEFINITIONS AUTOMATIC TAGS::= BEGIN
IMPORTS


Reg-NodeAttributeSetXY, Reg-LaneDataAttribute
FROM ETSI-ITS-DSRC-REGION {
  itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts103301 (103301) dsrc (6) region (1) major-version-2 (2) minor-version-1 (1)
}
WITH SUCCESSORS


Longitude, Latitude FROM ETSI-ITS-CDD { itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) 102894 cdd (2) major-version-4 (4) minor-version-1 (1) }
;

@@ -457,6 +450,9 @@ LaneDataAttribute ::= CHOICE {
   ...
}

Reg-LaneDataAttribute           REG-EXT-ID-AND-TYPE ::= { ... }


/**
* This DF consists of a list of LaneDataAttribute entries.
*
@@ -971,6 +967,13 @@ NodeAttributeSet-addGrpC ::= SEQUENCE {
}


Reg-NodeAttributeSetXY          REG-EXT-ID-AND-TYPE ::= {
	{NodeAttributeSet-addGrpC   IDENTIFIED BY addGrpC},
	...
}



/**
* This DE defines a list of activation requests used for C-ITS migration of legacy public 
* transport prioritization systems. 
+5 −5
Original line number Diff line number Diff line
sources := \
sources := \
      IVIM_PDU_Descriptions.asn   \
      MAPEM_PDU_Descriptions.asn  \
      RTCMEM_PDU_Descriptions.asn \
      SPATEM_PDU_Descriptions.asn \
      SREM_PDU_Descriptions.asn   \
      SSEM_PDU_Descriptions.asn   \
      DSRC.asn                    \
      DSRC_addgrp_C.asn           \
      DSRC_region.asn             \
      ETSI_ITS_DSRC.asn                    \
      ETSI_ITS_DSRC_AddGrpC.asn           \
      ETSI_ITS_DSRC_REGION.asn             \
      IVI.asn                     \
      iso-patched/EfcDataDictionary.asn \
      iso-patched/GddVersion1.asn \
      iso-patched/EfcDsrcGeneric.asn \
      iso-patched/EfcDsrcApplication.asn \
      iso-patched/DSRC_NoCircular.asn \
      iso-patched/DSRC_noCircular.asn \
      /build/asn1/ISO_TS_14816/AVIAEINumberingAndDataStructures.asn \
      /build/asn1/ISO_TS_17419/CITSapplMgmtIDs.asn