Remove unneeded imports

ttcn/BTP/LibItsBtp_EncdecDeclarations.ttcn

@@ -2,12 +2,32 @@ module LibItsBtp_EncdecDeclarations {
     
     // LibItsBtp
     import from LibItsBtp_TypesAndValues all;
+    import from LibItsBtp_TestSystem all;
     
     external function fx_enc_BtpPayload (BtpPayload p) return bitstring
-        with {extension "prototype(convert) encode(LibItsBtp)"}
+        with {extension "prototype(convert) encode(LibItsBtp_BtpPayload)"}
     
     /*  TODO RGy function not implemented! (decvalue() not used by test suite @29-06-2016)    
     external function fx_dec_BtpPayload (inout bitstring b, out BtpPayload p) return integer
         with {extension "prototype(sliding) decode(LibItsBtp)"}
     */
+
+    external function fx_enc_BtpReq (BtpReq p) return bitstring
+        with {extension "prototype(convert) encode(LibIts_Interface)"}
+
+    external function fx_enc_BtpInd (BtpInd p) return bitstring
+        with {extension "prototype(convert) encode(LibIts_Interface)"}
+
+    external function fx_dec_BtpInd (inout bitstring b, out BtpInd p) return integer
+        with {extension "prototype(sliding) decode(LibIts_Interface)"}
+
+    external function fx_dec_BtpReq (inout bitstring b, out BtpReq p) return integer
+        with {extension "prototype(sliding) decode(LibIts_Interface)"}
+
+    external function fx_enc_BtpPacket (BtpPacket p) return bitstring
+        with {extension "prototype(convert) encode(LibIts_Interface)"}
+
+    external function fx_dec_BtpPacket (inout bitstring b, out BtpPacket p) return integer
+        with {extension "prototype(sliding) decode(LibIts_Interface)"}
+        
 } // End of module LibItsBtp_EncdecDeclarations 

ttcn/BTP/LibItsBtp_Functions.ttcn

@@ -14,11 +14,11 @@
      
     // LibCommon
     import from LibCommon_Sync all;
-    import from LibCommon_Time all;
-    import from LibCommon_VerdictControl all;
+//    import from LibCommon_Time all;
+//    import from LibCommon_VerdictControl all;
     
     // LibItsCommon
-    import from LibItsCommon_Functions all;
+//    import from LibItsCommon_Functions all;
     import from LibItsCommon_TypesAndValues all;
     
     // LibItsBtp

ttcn/BTP/LibItsBtp_TestSystem.ttcn

@@ -12,8 +12,8 @@
 module LibItsBtp_TestSystem {
     
     // LibCommon
-    import from LibCommon_Time {modulepar all};
-    import from LibCommon_Sync all;
+//    import from LibCommon_Time {modulepar all};
+//    import from LibCommon_Sync all;
     
     // LibIts
     import from LibItsCommon_TestSystem all;
@@ -112,8 +112,8 @@ module LibItsBtp_TestSystem {
         } // end nt1Primitives
         
     } // End of group networkAndTransportPrimitives    
-    with {
-        encode "LibIts_Interface"
+        with {
+           encode "LibIts_Interface"
     } // end interfacePrimitives    
      
 } // End of module LibItsBtp_TestSystem

ttcn/BTP/LibItsBtp_TypesAndValues.ttcn

@@ -35,6 +35,9 @@ module LibItsBtp_TypesAndValues {
             BtpHeader      header,
             BtpPayload     payload optional
         }
+        with {
+            encode "LibIts_Interface"
+        }
         
     } // end btpPdus
     
@@ -100,6 +103,9 @@ module LibItsBtp_TypesAndValues {
             DecodedBtpPayload decodedPayload optional,
             BtpRawPayload rawPayload
         }
+        with {
+	        encode "LibItsBtp_BtpPayload"
+        }
         
         /**
          * @desc The decoded payload of the BTP packet
@@ -120,13 +126,13 @@ module LibItsBtp_TypesAndValues {
             SREM    sremPacket, 
             SSEM    ssemPacket  
         } with { 
-            encode (camPacket) "LibItsCam_asn1"; 
-            encode (denmPacket) "LibItsDenm_asn1"; 
-            encode (mapemPacket) "LibItsMapemSpatem_asn1"; 
-            encode (spatemPacket) "LibItsMapemSpatem_asn1"; 
-            encode (ivimPacket) "LibItsIvim_asn1"; 
-            encode (sremPacket) "LibItsSremSsem_asn1"; 
-            encode (ssemPacket) "LibItsSremSsem_asn1" 
+            encode (camPacket) "PER"; 
+            encode (denmPacket) "PER"; 
+            encode (mapemPacket) "PER"; 
+            encode (spatemPacket) "PER"; 
+            encode (ivimPacket) "PER"; 
+            encode (sremPacket) "PER"; 
+            encode (ssemPacket) "PER" 
         }
         
     } //end btpPayload
@@ -189,6 +195,3 @@ module LibItsBtp_TypesAndValues {
     }
     
 }
-with {
-    encode "LibItsBtp"
-}

ttcn/Common/LibItsCommon_Functions.ttcn

@@ -13,8 +13,8 @@
 module LibItsCommon_Functions {
 
     // LibCommon
-    import from LibCommon_Sync all;
-    import from LibCommon_VerdictControl all;
+//    import from LibCommon_Sync all;
+//    import from LibCommon_VerdictControl all;
     import from LibCommon_BasicTypesAndValues all;
     
     // LibIts

ttcn/DENM/LibItsDenm_Functions.ttcn

@@ -30,7 +30,7 @@ module LibItsDenm_Functions {
     import from LibItsDenm_TestSystem all;
     import from LibItsDenm_TypesAndValues all; 
     import from LibItsDenm_Templates all; 
-    import from LibItsDenm_Pixits all; 
+//    import from LibItsDenm_Pixits all; 
     import from LibItsDenm_Pics all; 
     
     group utFuntions { 

ttcn/DENM/LibItsDenm_TypesAndValues.ttcn

@@ -8,7 +8,7 @@
 module LibItsDenm_TypesAndValues {
     
     //LibCommon
-    import from LibCommon_BasicTypesAndValues all;
+//    import from LibCommon_BasicTypesAndValues all;
     
     // LibIts
     import from DENM_PDU_Descriptions language "ASN.1:1997" all;

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

@@ -24,7 +24,7 @@ module LibItsGeoNetworking_Functions {
     import from LibItsCommon_Templates all;
     import from LibItsCommon_Functions all;
     import from LibItsCommon_Pixits all;
-    import from LibItsCommon_TestSystem all;
+//    import from LibItsCommon_TestSystem all;
     
     // LibItsSecurity
     import from LibItsSecurity_TypesAndValues all;
@@ -38,7 +38,7 @@ module LibItsGeoNetworking_Functions {
     import from LibItsGeoNetworking_Templates all;
     import from LibItsGeoNetworking_Pixits all;
     import from LibItsGeoNetworking_Pics all;
-    import from LibItsGeoNetworking_EncdecDeclarations all;
+//    import from LibItsGeoNetworking_EncdecDeclarations all;
     
     group utFuntions {
         

ttcn/GeoNetworking/LibItsGeoNetworking_Pixits.ttcn

@@ -12,7 +12,7 @@
 module LibItsGeoNetworking_Pixits {
     
     // LibCommon
-    import from LibCommon_DataStrings all;
+//    import from LibCommon_DataStrings all;
     import from LibCommon_BasicTypesAndValues all;
     
     // LibIts

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

@@ -21,11 +21,11 @@ module LibItsGeoNetworking_Templates {
     
     // LibItsBtp
     import from LibItsBtp_Templates all;
-    import from LibItsBtp_EncdecDeclarations all;
+//    import from LibItsBtp_EncdecDeclarations all;
     
     // LibItsSecurity
     import from LibItsSecurity_TypesAndValues all;
-    import from LibItsSecurity_Pixits all;
+//    import from LibItsSecurity_Pixits all;
     
     // LibItsIpv6OverGeoNetworking
     import from LibItsIpv6OverGeoNetworking_TypesAndValues all;
@@ -35,7 +35,7 @@ module LibItsGeoNetworking_Templates {
     import from LibItsGeoNetworking_TestSystem all;
     import from LibItsGeoNetworking_TypesAndValues all;
     import from LibItsGeoNetworking_Pixits all;
-    import from LibItsGeoNetworking_EncdecDeclarations all;
+//    import from LibItsGeoNetworking_EncdecDeclarations all;
     
     group geoNwPrimitivesTemplates {
         

ttcn/GeoNetworking/LibItsGeoNetworking_TestSystem.ttcn

@@ -12,8 +12,8 @@
 module LibItsGeoNetworking_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;
     

ttcn/GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn

@@ -16,7 +16,7 @@ module LibItsGeoNetworking_TypesAndValues {
     import from LibCommon_DataStrings all;
     
     // LibIts
-    import from LibItsCommon_TypesAndValues all;
+//    import from LibItsCommon_TypesAndValues all;
     import from LibItsBtp_TypesAndValues {type BtpPacket;}
     import from LibItsIpv6OverGeoNetworking_TypesAndValues {type Ipv6Packet;}