PERization of CAM/DENM

ttcn/CAM/LibItsCam_EncdecDeclarations.ttcn

 module LibItsCam_EncdecDeclarations {
 
     // LibIts
-    import from ITS_Container language "ASN.1:1997" all;
     import from CAM_PDU_Descriptions language "ASN.1:1997" all;
-    import from DENM_PDU_Descriptions language "ASN.1:1997" all;
     
     // LibItsCam
     import from LibItsCam_TestSystem all; 
@@ -11,11 +9,19 @@ module LibItsCam_EncdecDeclarations {
     external function fx_enc_CamReq (CamReq p) return bitstring
         with {extension "prototype(convert) encode(LibIts_Interface)"}
     
-    external function fx_enc_CAM (CAM p) return bitstring
-        with {extension "prototype(convert) encode(PER)"}//LibItsCam_asn1
-    
-    /*  TODO RGy function not implemented! (decvalue() not used by test suite @29-06-2016) */
     external function fx_dec_CamReq (inout bitstring b, out CamReq p) return integer
         with {extension "prototype(sliding) decode(LibIts_Interface)"}
-   
+
+    external function fx_dec_CamInd (inout bitstring b, out CamInd p) return integer
+        with {extension "prototype(sliding) decode(LibIts_Interface)"}
+        
+    external function fx_enc_CAM (CAM p) return bitstring
+        with {extension "prototype(convert) encode(PER)"}
+
+    external function fx_dec_CAM (inout bitstring b, out CAM p) return integer
+        with {extension "prototype(sliding) decode(PER)"}
+/*
+    external function fx_enc_CAM (CAM p) return octetstring
+        with {extension "prototype(convert) encode(BER:BER_ENCODE_CER)"}
+*/    
 } // End of module LibItsCam_EncdecDeclarations 

ttcn/CAM/LibItsCam_Functions.ttcn

@@ -18,8 +18,8 @@ module LibItsCam_Functions {
     
     // LibIts
     import from ITS_Container language "ASN.1:1997" all;
-    import from CAM_PDU_Descriptions language "ASN.1:1997" all;
-    import from DENM_PDU_Descriptions language "ASN.1:1997" all;    
+//    import from CAM_PDU_Descriptions language "ASN.1:1997" all;
+//    import from DENM_PDU_Descriptions language "ASN.1:1997" all;    
     
     // LibItsCommon
     import from LibItsCommon_Pixits all;
@@ -32,8 +32,8 @@ module LibItsCam_Functions {
     import from LibItsCam_Templates all;
     import from LibItsCam_TypesAndValues all;
     import from LibItsCam_Pics all;
-    import from LibItsCam_Pixits all;
-    import from LibItsCam_EncdecDeclarations all;
+//    import from LibItsCam_Pixits all;
+//    import from LibItsCam_EncdecDeclarations all;
     
     group utFuntions { 
             

ttcn/CAM/LibItsCam_Templates.ttcn

@@ -18,7 +18,7 @@ module LibItsCam_Templates {
     // LibIts
     import from ITS_Container language "ASN.1:1997" all;
     import from CAM_PDU_Descriptions language "ASN.1:1997" all;
-    import from DENM_PDU_Descriptions language "ASN.1:1997" all;
+//    import from DENM_PDU_Descriptions language "ASN.1:1997" all;
     
     // LibItsCommon
     import from LibItsCommon_Functions all;

ttcn/CAM/LibItsCam_TestSystem.ttcn

@@ -12,14 +12,14 @@
 module LibItsCam_TestSystem {
     
     // LibCommon
-    import from LibCommon_Time {modulepar all};
-    import from LibCommon_Sync all;
+//    import from LibCommon_Time {modulepar all};
+//    import from LibCommon_Sync all;
     import from LibCommon_BasicTypesAndValues all;
     import from LibCommon_DataStrings all;
     
     // LibIts
     import from CAM_PDU_Descriptions language "ASN.1:1997" all;
-    import from DENM_PDU_Descriptions language "ASN.1:1997" all;
+//    import from DENM_PDU_Descriptions language "ASN.1:1997" all;
     
     // LibItsCommon
     import from LibItsCommon_TestSystem all;
@@ -141,8 +141,9 @@ module LibItsCam_TestSystem {
                 UInt32      its_aid optional
             }
             with {
-                 variant ""
+//                 variant ""
                  encode (msgIn) "PER"//LibItsCam_asn1
+/*
                  encode (gnNextHeader) "RAW"
                  encode (gnHeaderType) "RAW"
                  encode (gnHeaderSubtype) "RAW"
@@ -152,6 +153,7 @@ module LibItsCam_TestSystem {
                  encode (btpInfo) "RAW"
                  encode (ssp) "RAW"
                  encode (its_aid) "RAW"
+*/
             }
                 
             /**
@@ -161,7 +163,7 @@ module LibItsCam_TestSystem {
                 CAM msgOut
             }
             with {
-                 variant ""
+//                 variant ""
                  encode (msgOut) "PER"//LibItsCam_asn1
             }
             

ttcn/CAM/LibItsCam_TypesAndValues.ttcn

@@ -13,12 +13,12 @@ module LibItsCam_TypesAndValues {
 
     // LibCommon
     import from LibCommon_BasicTypesAndValues all;
-    import from LibCommon_DataStrings all;
+//    import from LibCommon_DataStrings all;
 
     // LibIts
     import from ITS_Container language "ASN.1:1997" all;
     import from CAM_PDU_Descriptions language "ASN.1:1997" all;
-    import from DENM_PDU_Descriptions language "ASN.1:1997" all;
+//    import from DENM_PDU_Descriptions language "ASN.1:1997" all;
 
     group camValues {
         

ttcn/DENM/LibItsDenm_EncdecDeclarations.ttcn

@@ -6,11 +6,16 @@ module LibItsDenm_EncdecDeclarations {
     external function fx_enc_DenmReq (DenmReq p) return bitstring
         with {extension "prototype(convert) encode(LibIts_Interface)"}
     
-    external function fx_enc_DENM (DENM p) return octetstring
+    external function fx_dec_DenmInd (inout bitstring b, out DenmInd p) return integer
+        with {extension "prototype(sliding) decode(LibIts_Interface)"}
+    
+    external function fx_enc_DENM (DENM p) return bitstring
         with {extension "prototype(convert) encode(BER:BER_ENCODE_CER)"}
+//        with {extension "prototype(convert) encode(PER)"}
     
-    /* not needed yet, no decvalue is used in TTCN-3 code
-    external function fx_dec_DenmReq (inout bitstring b, out DenmReq p) return integer
-        with {extension "prototype(sliding) decode(LibIts_Interface)"}
-    */
+    external function fx_dec_DENM (inout bitstring b, out DENM p) return integer
+        with {extension "prototype(sliding) decode(BER:BER_ENCODE_CER)"}
+//        with {extension "prototype(sliding) encode(PER)"}
+    
+
 } // End of module LibItsDenm_EncdecDeclarations 

ttcn/DENM/LibItsDenm_TestSystem.ttcn

@@ -12,8 +12,8 @@
 module LibItsDenm_TestSystem {
     
     // LibCommon
-    import from LibCommon_Time {modulepar all};
-    import from LibCommon_Sync all;
+//    import from LibCommon_Time {modulepar all};
+//    import from LibCommon_Sync all;
     import from LibCommon_BasicTypesAndValues all;
     import from LibCommon_DataStrings all;
 
@@ -147,7 +147,7 @@ module LibItsDenm_TestSystem {
                 UInt32      its_aid optional
             }
             with {
-                encode (msgIn) "LibItsDenm_asn1"
+                encode (msgIn) "PER"
             }
             
             /**
@@ -159,7 +159,7 @@ module LibItsDenm_TestSystem {
                 DENM msgOut
             }
             with {
-                encode (msgOut) "LibItsDenm_asn1"
+                encode (msgOut) "PER"
             }
             
         } // End of group fa1Primitives