Commit 382d54ca authored by Yann Garcia's avatar Yann Garcia
Browse files

Merging Titan/TTwb branches

parent b9f7e1c8
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -39,7 +39,7 @@ module LibItsCam_Templates {
            in template (present) CAM p_camMsg
            in template (present) CAM p_camMsg
        ) := { 
        ) := { 
            msgIn               := p_camMsg,
            msgIn               := p_camMsg,
            recvTime            := *,
            recvTime            := ?,
            gnNextHeader        := *,
            gnNextHeader        := *,
            gnHeaderType        := *,
            gnHeaderType        := *,
            gnHeaderSubtype     := *,
            gnHeaderSubtype     := *,
+1 −1
Original line number Original line Diff line number Diff line
@@ -126,7 +126,7 @@ module LibItsCam_TestSystem language "TTCN-3:2010 Real Time and Performance Test
             */
             */
            type record CamInd {
            type record CamInd {
                CAM         msgIn,
                CAM         msgIn,
                UInt64      recvTime optional,
                UInt64      recvTime,
                UInt8       gnNextHeader optional,
                UInt8       gnNextHeader optional,
                UInt8       gnHeaderType optional,
                UInt8       gnHeaderType optional,
                UInt8       gnHeaderSubtype optional,
                UInt8       gnHeaderSubtype optional,
+1 −1
Original line number Original line Diff line number Diff line
@@ -64,7 +64,7 @@ module LibItsDenm_Templates {
            template (present) DENM p_denMsg
            template (present) DENM p_denMsg
        ) := {
        ) := {
            msgIn               := p_denMsg,
            msgIn               := p_denMsg,
            recvTime            := *,
            recvTime            := ?,
            gnNextHeader        := *,
            gnNextHeader        := *,
            gnHeaderType        := *,
            gnHeaderType        := *,
            gnHeaderSubtype     := *,
            gnHeaderSubtype     := *,
+1 −1
Original line number Original line Diff line number Diff line
@@ -130,7 +130,7 @@ module LibItsDenm_TestSystem {
             */
             */
            type record DenmInd {
            type record DenmInd {
                DENM        msgIn,
                DENM        msgIn,
                UInt64      recvTime optional,
                UInt64      recvTime,
                UInt8       gnNextHeader optional,
                UInt8       gnNextHeader optional,
                UInt8       gnHeaderType optional,
                UInt8       gnHeaderType optional,
                UInt8       gnHeaderSubtype optional,
                UInt8       gnHeaderSubtype optional,
+0 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,6 @@ module LibItsDenm_TypesAndValues {
    
    
  //LibCommon
  //LibCommon
  import from LibCommon_BasicTypesAndValues all;
  import from LibCommon_BasicTypesAndValues all;
  import from LibCommon_DataStrings all;
    
    
  // LibIts
  // LibIts
  import from DENM_PDU_Descriptions language "ASN.1:1997" all;
  import from DENM_PDU_Descriptions language "ASN.1:1997" all;
Loading