Initial

.gitmodules

+[submodule "asn1/cdd"]
+	path = asn1/cdd
+	url = https://forge.etsi.org/rep/ITS/asn1/cdd_ts102894_2.git
+	branch = testing

cdd @ cabf82ff

+Subproject commit cabf82ff5275e77dd427f5de86316bc3c198a32c

module.mk

-modules := ttcn/Common \
-           asn1/ITS-Container \
-
-#           asn1/IS \
-#           asn1/Security \
-#           asn1/DENM \
-#           asn1/CAM \
-#           ttcn/DENM \
-#           ttcn/IVIM \
-#           ttcn/MapemSpatem \
-#           ttcn/Pki         \
-#           ttcn/SremSsem    \
-#           ttcn/Http \
+modules := ttcn/Common

ttcn/Common/LibItsCommon_ASN1_NamedNumbers.ttcn

@@ -4,9 +4,9 @@ module LibItsCommon_ASN1_NamedNumbers {
     
     import from ITS_Container language "ASN.1:2008" all;
     
-    import from IVI language "ASN.1:1997" {
-      type IviStatus
-    }
+//    import from IVI language "ASN.1:1997" {
+//      type IviStatus
+//    }
     
       group commonConstants {
            

ttcn/Common/LibItsCommon_Functions.ttcn

@@ -20,7 +20,7 @@ module LibItsCommon_Functions {
     // LibIts
     import from LibItsCommon_Pixits all;
     import from ITS_Container language "ASN.1:1997" all;
-    import from DSRC language "ASN.1:1997" all;
+//    import from DSRC language "ASN.1:1997" all;
     
     group generalFunctions {
         
@@ -134,8 +134,8 @@ module LibItsCommon_Functions {
          * @desc    Gets the current time since 01/01/2004
          * @return  TimeMark - tenths of a second in the current or next hour in units of 1/10th second from UTC time
          */
-        function f_getCurrentTimeMark() return TimeMark {
-            var TimeMark v_timeMark := 0;
+        function f_getCurrentTimeMark() return UInt32 {
+            var UInt32 v_timeMark := 0;
             
 //            log("*** f_getCurrentTimeMark: INFO: calling fx_getCurrentTimeMark() ***");
             v_timeMark := fx_getCurrentTimeMark();
@@ -147,8 +147,8 @@ module LibItsCommon_Functions {
          * @desc    Gets the Minute of current UTC year
          * @return  MinuteOfTheYear - tenths of a second in the current or next hour in units of 1/10th second from UTC time
          */
-        function f_getMinuteOfTheYear() return MinuteOfTheYear {
-            var MinuteOfTheYear v_minuteOfTheYear := 0;
+        function f_getMinuteOfTheYear() return UInt16 {
+            var UInt16 v_minuteOfTheYear := 0;
             
 //            log("*** f_getMinuteOfTheYear: INFO: calling fx_getMinuteOfTheYear() ***");
             v_minuteOfTheYear := fx_getMinuteOfTheYear();
@@ -160,8 +160,8 @@ module LibItsCommon_Functions {
          * @desc    Gets the milliseconds point in the current UTC minute
          * @return  DSecond - The milliseconds point in the current UTC minute (0..60000)
          */
-        function f_getDSecond() return DSecond {
-            var DSecond v_dSecond := 0;
+        function f_getDSecond() return UInt16 {
+            var UInt16 v_dSecond := 0;
             
 //            log("*** f_getDSecond: INFO: calling fx_getDSecond() ***");
             v_dSecond := fx_getDSecond();

ttcn/Common/module.mk

-sources := LibItsCommon_ASN1_ISDSRC_NamedNumbers.ttcn \
+sources := \
   LibItsCommon_ASN1_NamedNumbers.ttcn \
   LibItsCommon_Functions.ttcn         \
   LibItsCommon_Pixits.ttcn            \
   LibItsCommon_Templates.ttcn         \
   LibItsCommon_TestSystem.ttcn        \
   LibItsCommon_TypesAndValues.ttcn    \
-  LibItsExternal_TypesAndValues.ttcn
\ No newline at end of file
+  LibItsExternal_TypesAndValues.ttcn  \
+#  LibItsCommon_ASN1_ISDSRC_NamedNumbers.ttcn \
+
+ifeq (,$(ITS_CONTAINER))
+   ITS_CONTAINER := defined
+   sources += ../../asn1/cdd/ITS_Container.asn
+endif

ttcn/Http/LibItsHttp_BinaryMessageBodyTypes.ttcn

@@ -16,8 +16,8 @@ module LibItsHttp_BinaryMessageBodyTypes {
    */
   // TODO Add here your custom binary import
   // LibIts
-  import from IEEE1609dot2BaseTypes language "ASN.1:1997" all;
-  import from IEEE1609dot2 language "ASN.1:1997" all;
+  import from Ieee1609Dot2BaseTypes language "ASN.1:1997" all;
+  import from Ieee1609Dot2 language "ASN.1:1997" all;
   import from EtsiTs102941BaseTypes language "ASN.1:1997" all;
   import from EtsiTs102941TypesEnrolment language "ASN.1:1997" all;
   import from EtsiTs102941MessagesCa language "ASN.1:1997" all;

ttcn/Http/LibItsHttp_BinaryTemplates.ttcn

@@ -15,8 +15,8 @@ module LibItsHttp_BinaryTemplates {
     
   // TODO Add here your custom binary import 
   // LibIts
-  import from IEEE1609dot2BaseTypes language "ASN.1:1997" all;
-  import from IEEE1609dot2 language "ASN.1:1997" all;
+  import from Ieee1609Dot2BaseTypes language "ASN.1:1997" all;
+  import from Ieee1609Dot2 language "ASN.1:1997" all;
   import from EtsiTs102941BaseTypes language "ASN.1:1997" all;
   import from EtsiTs102941TypesEnrolment language "ASN.1:1997" all;
   import from EtsiTs102941MessagesCa language "ASN.1:1997" all;