Commit 927b844e authored by filatov's avatar filatov
Browse files

PERization of CAM/DENM

parent 10fbceff

ttcn/CAM/LibItsCam_EncdecDeclarations.ttcn

+13 −7
Original line number Diff line number Diff line 
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

+4 −4
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+7 −5
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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 {