diff --git a/ttcn/CAM/LibItsCam_EncdecDeclarations.ttcn b/ttcn/CAM/LibItsCam_EncdecDeclarations.ttcn
index b6d6323d87b3c9ff48937aa4bdb2a8cf5b9f9680..c29869673cf5d81b7f5dfac36e58d220ed5f1e04 100644
--- a/ttcn/CAM/LibItsCam_EncdecDeclarations.ttcn
+++ b/ttcn/CAM/LibItsCam_EncdecDeclarations.ttcn
@@ -1,9 +1,7 @@
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
diff --git a/ttcn/CAM/LibItsCam_Functions.ttcn b/ttcn/CAM/LibItsCam_Functions.ttcn
index b1c443da038e3a30f1cbe1c75ae1a4ae285b74b5..aadbf34fd52967a170b1069772b3dc8dee02045d 100644
--- a/ttcn/CAM/LibItsCam_Functions.ttcn
+++ b/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 {
diff --git a/ttcn/CAM/LibItsCam_Templates.ttcn b/ttcn/CAM/LibItsCam_Templates.ttcn
index 018d52ed2118ba25d0ed249bac5817f5c899a5d4..7f8793b3537990674c1fce80847a53a60db838d6 100644
--- a/ttcn/CAM/LibItsCam_Templates.ttcn
+++ b/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;
diff --git a/ttcn/CAM/LibItsCam_TestSystem.ttcn b/ttcn/CAM/LibItsCam_TestSystem.ttcn
index 6752c4b5b6f1b31d9852a364e708a92179cff743..4d0bd3df0d0ab493fa9d5af7f79d740fcb0246f9 100644
--- a/ttcn/CAM/LibItsCam_TestSystem.ttcn
+++ b/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
}
diff --git a/ttcn/CAM/LibItsCam_TypesAndValues.ttcn b/ttcn/CAM/LibItsCam_TypesAndValues.ttcn
index f215e9739c03c6a9b4629b3c7f3c3bd0f3533cee..35fe1f0bd18abb8a05ebb4491dd90b94681f94ff 100644
--- a/ttcn/CAM/LibItsCam_TypesAndValues.ttcn
+++ b/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 {
diff --git a/ttcn/DENM/LibItsDenm_EncdecDeclarations.ttcn b/ttcn/DENM/LibItsDenm_EncdecDeclarations.ttcn
index c1910b55a2ec034272fd11836bf8ba42458fb688..b6c42160bab4b91b4ff03771cf830ecfc954c880 100644
--- a/ttcn/DENM/LibItsDenm_EncdecDeclarations.ttcn
+++ b/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
diff --git a/ttcn/DENM/LibItsDenm_TestSystem.ttcn b/ttcn/DENM/LibItsDenm_TestSystem.ttcn
index 4c26f5f069c74f47c7b2848d4a576cd8dc25f479..e6be9244b73041fb8160bb69d21af7a134cf5c49 100644
--- a/ttcn/DENM/LibItsDenm_TestSystem.ttcn
+++ b/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