Commit 55f6521c authored by YannGarcia's avatar YannGarcia
Browse files

Separate typing and test system

parent e5c6b540

lib/LibItsGeoNetworking_EncdecDeclarations.ttcn

+0 −1
Original line number Diff line number Diff line 
module LibItsGeoNetworking_EncdecDeclarations {

    

    import from LibItsGeoNetworking_TypesAndValues all;

    import from LibItsGeoNetworking_TestSystem all;

    

    external function fx_enc_GeoNetworkingReq (GeoNetworkingReq p) return bitstring

        with {extension "prototype(convert) encode(LibIts_Interface)"}

lib/LibItsGeoNetworking_Templates.ttcn

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ module LibItsGeoNetworking_Templates { 
    //import from LibItsIpv6OverGeoNetworking_Templates all;

    

    // AtsGeoNetworking

    import from LibItsGeoNetworking_TestSystem all;

    import from LibItsGeoNetworking_TypesAndValues all;

    import from LibItsGeoNetworking_Pixits all;

//    import from LibItsGeoNetworking_EncdecDeclarations all;

lib/LibItsGeoNetworking_TypesAndValues.ttcn

+43 −1
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ module LibItsGeoNetworking_TypesAndValues { 
  import from LibCommon_BasicTypesAndValues all;

  import from LibCommon_DataStrings all;

    

  // LibItsCommon

  import from LibItsCommon_TypesAndValues all;

  import from LibItsExternal_TypesAndValues all;



  // LibIts

  import from EtsiTs103097Module language "ASN.1:1997" all;
@@ -1175,6 +1179,44 @@ module LibItsGeoNetworking_TypesAndValues { 
    variant ""

    encode "AdapterControl"

    }



    group networkAndTransportPrimitives {



        group nt2Primitives {



            /**

             * @desc NT2 GeoNetworking Indication Primitive

             */

            type record GeoNetworkingInd {

                GeoNetworkingPdu    msgIn,

                MacAddress          macDestinationAddress,

                Bit256              ssp optional,

                UInt32              its_aid optional

            } with {

                //encode "RAW"; 

                variant "FIELDORDER(msb)" 

            }



            /**

             * @desc NT2 GeoNetworking Request Primitive

             */

            type record GeoNetworkingReq {

                GeoNetworkingPdu    msgOut,

                MacAddress          macDestinationAddress,

                UInt32              its_aid

            } with {

                //encode "RAW"; 

                 variant "FIELDORDER(msb)" 

            }



        } // end nt2Primitives



    } // End of group networkAndTransportPrimitives

    with {

        variant ""

        encode "LibIts_Interface"

    } // end interfacePrimitives



}

with {

  variant ""

lib/module.mk

+0 −2
Original line number Diff line number Diff line 
sources := \

  LibItsGeoNetworking_EncdecDeclarations.ttcn \

  LibItsGeoNetworking_Functions.ttcn                   \

  LibItsGeoNetworking_Pics.ttcn                        \

  LibItsGeoNetworking_Pixits.ttcn                      \

  LibItsGeoNetworking_Templates.ttcn                   \

  LibItsGeoNetworking_TestSystem.ttcn                  \

  LibItsGeoNetworking_TypesAndValues.ttcn              \