titanization_libits.patch

     import from LibItsGeoNetworking_TypesAndValues all;
     import from LibItsGeoNetworking_Pixits all;
+    import from LibItsGeoNetworking_EncdecDeclarations all;
     
     group geoNwPrimitivesTemplates {
         
@@ -107,7 +109,7 @@
                 geoUnicast := {
                     gnAddress := p_destinationGnAddr,
                     lifetime := c_lifetime,
-                    trafficClass := m_trafficClass,
+                    trafficClass := valueof(m_trafficClass),
                     payload := { decodedPayload := omit, rawPayload := ''O} // do not use f_adaptPayload_m here
                 }
             }
@@ -184,7 +186,7 @@
                 geoBroadcast := {
                     shape := p_geoArea.shape,
                     lifetime := c_lifetime,
-                    trafficClass := m_trafficClass,
+                    trafficClass := valueof(m_trafficClass),
                     reserved := c_uInt24Zero,
                     area := p_geoArea.area,
                     payload := { decodedPayload := omit, rawPayload := ''O} // do not use f_adaptPayload_m here
@@ -244,7 +246,7 @@
                 geoAnycast := {
                     shape := p_geoArea.shape,
                     lifetime := c_lifetime,
-                    trafficClass := m_trafficClass,
+                    trafficClass := valueof(m_trafficClass),
                     reserved := c_uInt24Zero,
                     area := p_geoArea.area,
                     payload := { decodedPayload := omit, rawPayload := ''O} // do not use f_adaptPayload_m here
@@ -286,7 +288,7 @@
              */
             template (value) UtGnTrigger m_generateShbMessage := {
                 shb := {
-                    trafficClass := m_trafficClass,
+                    trafficClass := valueof(m_trafficClass),
                     payload := { decodedPayload := omit, rawPayload := ''O} // do not use f_adaptPayload_m here
                 }
             }
@@ -324,7 +326,7 @@
                 tsb := {
                     nbHops := 10,
                     lifetime := c_lifetime,
-                    trafficClass := m_trafficClass,
+                    trafficClass := valueof(m_trafficClass),
                     payload := { decodedPayload := omit, rawPayload := ''O} // do not use f_adaptPayload_m here
                 }
             }
@@ -374,7 +376,7 @@
                 template (value) BeaconHeader p_beaconHeader
             ) := {
                 startBeaconing := {
-                    beaconPacket := m_geoNwPdu(m_geoNwBeaconPacket(p_beaconHeader.srcPosVector), -, c_hopLimit1)
+                    beaconPacket := m_geoNwPdu(valueof(m_geoNwBeaconPacket(valueof(p_beaconHeader.srcPosVector))), -, c_hopLimit1)
                 }
             }
             
@@ -417,7 +419,7 @@
                 integer p_numberOfNeighbour
             ) := {
                 startBeaconingMultipleNeighbour := {
-                    beaconPacket := m_geoNwPdu(m_geoNwBeaconPacket(p_beaconHeader.srcPosVector), -, c_hopLimit1),
+                    beaconPacket := m_geoNwPdu(valueof(m_geoNwBeaconPacket(valueof(p_beaconHeader.srcPosVector))), -, c_hopLimit1),
                     numberOfNeighbour := p_numberOfNeighbour
                 }
             }
@@ -537,11 +539,11 @@
             in template (value) CommonHeader p_commonHeader,
             in template (value) ExtendedHeader p_extHeader
         ) := {
-            packet := {
+            packet := valueof({
                 commonHeader := p_commonHeader,
                 extendedHeader := p_extHeader,
                 payload := f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD"))
-            },
+            }),
             securedMsg := omit
         }
         
@@ -575,7 +577,7 @@
             in template (value) octetstring p_payload
         ) modifies m_geoNwPacket := {
             packet := {
-                payload := f_adaptPayload_m(p_payload)
+                payload := valueof(f_adaptPayload_m(p_payload))
             }
         }
         
@@ -621,7 +623,9 @@
          *
          * @see     mw_geoNwPacket
          */
-        template GeoNetworkingPacket mw_geoNwPduAnyPayload(
+//FIXME RGY template restriction can be the same as its base template: template is not used currently
+//        template GeoNetworkingPacket mw_geoNwPduAnyPayload(
+        template(present) GeoNetworkingPacket mw_geoNwPduAnyPayload(
             in template (present) CommonHeader p_commonHeader,
             in template (present) ExtendedHeader p_extHeader
         ) modifies mw_geoNwPacket := {
@@ -638,7 +642,9 @@
          *
          * @see     mw_geoNwPacket
          */
-        template GeoNetworkingPacket mw_geoNwPduWithOctetstringPayload(
+//FIXME RGY template restriction can be the same as its base template: template is not used currently
+//        template GeoNetworkingPacket mw_geoNwPduWithOctetstringPayload(
+        template(present) GeoNetworkingPacket mw_geoNwPduWithOctetstringPayload(
             in template (present) CommonHeader p_commonHeader,
             in template (present) ExtendedHeader p_extHeader,
             in template (present) octetstring p_payload
@@ -656,7 +662,9 @@
          *
          * @see     mw_geoNwPacket
          */
-        template GeoNetworkingPacket mw_geoNwPduWithPayload(
+//FIXME RGY template restriction can be the same as its base template: used in TC_SEC_ITSS_SND_CAM_02_01_BV only, where is called with parameters
+//        template GeoNetworkingPacket mw_geoNwPduWithPayload(
+        template(present) GeoNetworkingPacket mw_geoNwPduWithPayload(
             in template (present) CommonHeader p_commonHeader,
             in template (present) ExtendedHeader p_extHeader,
             in template (present) Payload p_payload
@@ -714,18 +722,18 @@
                 in template (value) UInt8 p_hopLimit := c_defaultHopLimit,
                 in template (value) TrafficClass p_trafficClass := m_trafficClass
             ) := {
-                commonHeader := m_commonHeader(
+                commonHeader := valueof(m_commonHeader(
                     PX_GN_UPPER_LAYER,
                     m_geoUnicastHeaderType,
                     p_trafficClass,
                     p_hopLimit
-                ),
-                extendedHeader := m_geoUnicastHeader(
+                )),
+                extendedHeader := valueof(m_geoUnicastHeader(
                     p_sourceLongPosVec,
                     p_destinationShortPosVec,
                     p_seqNumber
-                ),
-                payload := f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD"))
+                )),
+                payload := valueof(f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD")))
             }
             
             /**
@@ -825,18 +833,18 @@
                 in template (value) UInt8 p_hopLimit := c_defaultHopLimit,
                 in template (value) TrafficClass p_trafficClass := m_trafficClass
             ) := {
-                commonHeader := m_commonHeader(
+                commonHeader := valueof(m_commonHeader(
                     PX_GN_UPPER_LAYER,
-                    m_geoAnycastHeaderType(p_anycastArea.geoAnycastSubType),
+                    m_geoAnycastHeaderType(valueof(p_anycastArea.geoAnycastSubType)),
                     p_trafficClass,
                     p_hopLimit
-                ),
-                extendedHeader := m_geoAnycastHeader(
+                )),
+                extendedHeader := valueof(m_geoAnycastHeader(
                     p_sourceLongPosVec,
                     p_seqNumber,
                     p_anycastArea
-                ),
-                payload := f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD"))
+                )),
+                payload := valueof(f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD")))
             }
             
             /**
@@ -939,18 +947,18 @@
                 in template (value) UInt8 p_hopLimit := c_defaultHopLimit,
                 in template (value) TrafficClass p_trafficClass := m_trafficClass
             ) := {
-                commonHeader := m_commonHeader(
+                commonHeader := valueof(m_commonHeader(
                     PX_GN_UPPER_LAYER,
-                    m_geoBroadcastHeaderType(p_broadcastArea.geoBroadcastSubType),
+                    m_geoBroadcastHeaderType(valueof(p_broadcastArea.geoBroadcastSubType)),
                     p_trafficClass,
                     p_hopLimit
-                ),
-                extendedHeader := m_geoBroadcastHeader(
+                )),
+                extendedHeader := valueof(m_geoBroadcastHeader(
                     p_sourceLongPosVec,
                     p_seqNumber,
                     p_broadcastArea
-                ),
-                payload := f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD"))
+                )),
+                payload := valueof(f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD")))
             }
             
             /**
@@ -1242,16 +1250,16 @@
             template (value) GnNonSecuredPacket m_geoNwShbPacket(
                 in template (value) LongPosVector p_sourceLongPosVec
             ) := {
-                commonHeader := m_commonHeader(
+                commonHeader := valueof(m_commonHeader(
                     PX_GN_UPPER_LAYER,
                     m_shbHeaderType,
                     m_trafficClass,
                     c_defaultHopLimit
-                ),
-                extendedHeader := m_shbHeader(
+                )),
+                extendedHeader := valueof(m_shbHeader(
                     p_sourceLongPosVec
-                ),
-                payload :=  f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD"))
+                )),
+                payload :=  valueof(f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD")))
             }
             
             /**
@@ -1288,17 +1296,17 @@
                 in template (value) UInt8 p_hopLimit := c_defaultHopLimit,
                 in template (value) TrafficClass p_trafficClass := m_trafficClass
             ) := {
-                commonHeader := m_commonHeader(
+                commonHeader := valueof(m_commonHeader(
                     PX_GN_UPPER_LAYER,
                     m_tsbHeaderType,
                     p_trafficClass,
                     p_hopLimit
-                ),
-                extendedHeader := m_tsbHeader(
+                )),
+                extendedHeader := valueof(m_tsbHeader(
                     p_seqNumber,
                     p_sourceLongPosVec
-                ),
-                payload :=  f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD"))
+                )),
+                payload :=  valueof(f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD")))
             }
             
             /**
@@ -1774,7 +1782,7 @@
                 in template (value) UInt16 p_seqNumber,
                 in template (value) GeoBroadcastArea p_broadcastArea
             ) := {
-                geoBroadcastHeader := {
+                geoBroadcastHeader := valueof({
                     seqNumber := p_seqNumber,
                     reserved := c_uInt8Zero,
                     srcPosVector := p_sourceLongPosVec,
@@ -1784,7 +1792,7 @@
                     distanceB := p_broadcastArea.geoBroadcastArea.distanceB,
                     angle := p_broadcastArea.geoBroadcastArea.angle,
                     reserved2 := c_uInt24Zero
-                }
+                })
             }
             
             /**
@@ -1883,7 +1891,7 @@
                 in template (value) UInt16 p_seqNumber,
                 in template (value) GeoAnycastArea p_anycastArea
             ) := {
-                geoAnycastHeader := {
+                geoAnycastHeader := valueof({
                     seqNumber := p_seqNumber,
                     reserved := c_uInt8Zero,
                     srcPosVector := p_sourceLongPosVec,
@@ -1893,7 +1901,7 @@
                     distanceB := p_anycastArea.geoAnycastArea.distanceB,
                     angle := p_anycastArea.geoAnycastArea.angle,
                     reserved2 := c_uInt24Zero
-                }
+                })
             }
             
             /**
Index: GeoNetworking/LibItsGeoNetworking_TestSystem.ttcn
===================================================================
--- GeoNetworking/LibItsGeoNetworking_TestSystem.ttcn	(revision 1312)
+++ GeoNetworking/LibItsGeoNetworking_TestSystem.ttcn	(working copy)
@@ -39,7 +39,10 @@
             out
                 AcGnPrimitive, AcGn6Primitive, AcGnssPrimitive, AcSecPrimitive;
             in
-                AcGnResponse, AcGn6Response, AcGnssResponse, AcGnssDistanceCovered, AcSecResponse;
+
+//FIXME RGY As discussed, boolean results are replaced by a top-level union of results
+//                AcGnResponse, AcGn6Response, AcGnssResponse, AcGnssDistanceCovered, AcSecResponse;
+                AcGnResponse, AcGn6Response, AdapterControlResults;
         } // end AdapterControlPort
         
         /**
@@ -49,7 +52,9 @@
             out
                 UtInitialize, UtChangePosition, UtGnTrigger;
             in
-                UtInitializeResult, UtChangePositionResult, UtGnTriggerResult, UtGnEventInd;
+//FIXME RGY As discussed, boolean results are replaced by a top-level union of results
+//                UtInitializeResult, UtChangePositionResult, UtGnTriggerResult, UtGnEventInd;
+                UtCommonResults, UtGnTriggerResult, UtGnEventInd;
         } // end UpperTesterPort
         
     } // end portDefinitions
@@ -79,13 +84,17 @@
         /**
          * @desc ITS Main Test Component
          */
-        type component ItsMtc extends ItsBaseMtc, ServerSyncComp, ItsSecurityBaseComponent { // TODO Extend ItsBaseMtc with ItsSecurityBaseComponent? {
-            
+//FIXME RGY ItsMtc can extend ItsBaseGeoNetworking instead of ItsSecurityBaseComponent, as it contains
+//          everything defined here but vc_componentTable and already extends ItsSecurityBaseComponent
+//          also, ItsBaseMtc already extends ServerSyncComp
+//        type component ItsMtc extends ItsBaseMtc, ServerSyncComp, ItsSecurityBaseComponent { // TODO Extend ItsBaseMtc with ItsSecurityBaseComponent? {
+        type component ItsMtc extends ItsBaseMtc, ItsBaseGeoNetworking { // TODO Extend ItsBaseMtc with ItsSecurityBaseComponent? {
+/*FIXME RGY all these objects are inherited from ItsBaseGeoNetworking, they shall not be defined again: see $6.2.10.2
             port UpperTesterPort utPort;
             port AdapterControlPort acPort;
-            
+*/            
             var ComponentTable vc_componentTable := {};
-            
+/*
             // UT indications
             var UtGnEventIndList vc_utInds := {};
             
@@ -92,7 +101,7 @@
             var boolean vc_utDefaultActive := true;
             var boolean vc_acDefaultActive := true;
             var boolean vc_gnDefaultActive := true;
-        
+*/        
         } // end ItsMtc
         
         /**
Index: GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn
===================================================================
--- GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn	(revision 1312)
+++ GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn	(working copy)
@@ -1008,7 +1008,9 @@
         
     } // end utPrimitives
     with {
-        encode "UpperTester"
+//FIXME RGY temporarily changed to RAW, until encoding functions are changed to UpperTester
+//        encode "UpperTester"
+        encode "RAW"; variant ""
     }
     
     group acPrimitives {
Index: Ipv6OverGeoNetworking/LibItsIpv6OverGeoNetworking_Functions.ttcn
===================================================================
--- Ipv6OverGeoNetworking/LibItsIpv6OverGeoNetworking_Functions.ttcn	(revision 1312)
+++ Ipv6OverGeoNetworking/LibItsIpv6OverGeoNetworking_Functions.ttcn	(working copy)
@@ -38,7 +38,8 @@
          *       - two ITS nodes (nodeA, nodeB)
          *       - three GVLs
          */
-        function f_cf01UpGn6() runs on ItsIpv6OverGeoNetworking system ItsIpv6OverGeoNetworkingSystem {
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+        function f_cf01UpGn6() runs on ItsIpv6OverGeoNetworking {
             
             // Variables
             var float v_distance;
@@ -73,7 +74,8 @@
         /**
          * @desc Deletes configuration cf01Gn6
          */
-        function f_cf01DownGn6() runs on ItsIpv6OverGeoNetworking system ItsIpv6OverGeoNetworkingSystem {
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+        function f_cf01DownGn6() runs on ItsIpv6OverGeoNetworking {
             
             // Map
             unmap(self:ipv6OverGeoNetworkingPort, system:ipv6OverGeoNetworkingPort);
@@ -296,12 +298,14 @@
             var LongPosVector v_nodeLongPosVector := f_getPosition(p_compName);
             
             f_sendGeoNetMessageWithPayload(
-                m_geoNwReq_linkLayerBroadcast(
-                    m_geoNwPdu(
-                        m_geoNwBroadcastPacket(
-                            v_nodeLongPosVector,
-                            vc_localSeqNumber,
-                            f_getGeoBroadcastArea(valueof(p_gvl.area))
+                valueof(
+                    m_geoNwReq_linkLayerBroadcast(
+                        m_geoNwPdu(
+                            m_geoNwBroadcastPacket(
+                                v_nodeLongPosVector,
+                                vc_localSeqNumber,
+                                f_getGeoBroadcastArea(valueof(p_gvl.area))
+                            )
                         )
                     )
                 ),
@@ -312,12 +316,12 @@
                         c_icmpHdr,
                         m_rtAdvWithOptions(
                             m_rtAdvOpt_prefixOpt(
-                                p_gvl.prefixLength,
+                                valueof(p_gvl.prefixLength),
                                 c_lFlag1,
                                 c_aFlag1,
                                 p_validLifetime,
                                 c_preferredLifetime30s,
-                                p_gvl.prefix
+                                valueof(p_gvl.prefix)
                             )
                         )
                     )
Index: Ipv6OverGeoNetworking/LibItsIpv6OverGeoNetworking_TypesAndValues.ttcn
===================================================================
--- Ipv6OverGeoNetworking/LibItsIpv6OverGeoNetworking_TypesAndValues.ttcn	(revision 1312)
+++ Ipv6OverGeoNetworking/LibItsIpv6OverGeoNetworking_TypesAndValues.ttcn	(working copy)
@@ -171,7 +171,7 @@
             
             //geographic
             const Bit7 c_itsGn6aslGeoAnycastID := '1111101'B; //TODO TDB by IANA
-        }//end group ipv6Address
+        } //end group ipv6Address
                
         /**
          * @desc PDU type derived from RFC2461 clause 4.2
@@ -189,7 +189,7 @@
             UInt32        reachableTime,
             UInt32        retransTimer,
             RtAdvOptions  rtAdvOptions optional
-        } with { variant (checksum) "MarkForIPv6ChecksumCalculation" }
+        } // FIXME CHECK while TITAN refuse it: with { variant (checksum) "MarkForIPv6ChecksumCalculation" }
         
         /**
          * @desc RouterAdvertisement option list
Index: IVIM/LibItsIvim_Functions.ttcn
===================================================================
--- IVIM/LibItsIvim_Functions.ttcn	(revision 1312)
+++ IVIM/LibItsIvim_Functions.ttcn	(working copy)
@@ -159,7 +159,9 @@
             utPort.send(p_event);
             tc_wait.start;
             alt {
-                [] utPort.receive(UtIvimTerminationResult:?) {
+//FIXME RGY As discussed, port in type is changed to a top-level union type 
+//                [] utPort.receive(UtIvimTerminationResult:?) {
+                [] utPort.receive(UtIvimResults:{utIvimTerminationResult:=?}) {
                     tc_wait.stop;
                 }
                 [] tc_wait.timeout {
@@ -243,7 +245,8 @@
          */
         function f_cfUp(
                         in charstring p_certificateId := PX_CERT_FOR_TS
-        ) runs on ItsIvim system ItsIvimSystem {
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+        ) runs on ItsIvim /*system ItsIvimSystem*/ {
             
             map(self:acPort, system:acPort);
             map(self:utPort, system:utPort);
@@ -258,7 +261,8 @@
         /**
          * @desc    Deletes default configuration 
          */
-        function f_cfDown() runs on ItsIvim system ItsIvimSystem {
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+        function f_cfDown() runs on ItsIvim /*system ItsIvimSystem*/ {
             
             // Initialise secured mode
             f_uninitialiseSecuredMode();
@@ -373,7 +377,7 @@
             var FncRetCode v_ret := e_success;
             
             if (valueof(p_trigger) == e_ets) {
-                f_sendIviMessage(m_ivimStructureCancellation(p_iviIdentificationNumber));
+                f_sendIviMessage(valueof(m_ivimStructureCancellation(p_iviIdentificationNumber)));
                 f_sleep(PX_TNOAC);
             }
             else {
Index: IVIM/LibItsIvim_Templates.ttcn
===================================================================
--- IVIM/LibItsIvim_Templates.ttcn	(revision 1312)
+++ IVIM/LibItsIvim_Templates.ttcn	(working copy)
@@ -26,11 +26,13 @@
     import from LibItsCommon_TypesAndValues all;
     import from LibItsCommon_Functions all;
     import from LibItsCommon_Pixits all;
+    import from LibItsCommon_ASN1_NamedNumbers all;
     
     // LibItsIvim
     import from LibItsIvim_TestSystem all;
     import from LibItsIvim_TypesAndValues all;
     import from LibItsIvim_Functions all;
+    import from LibItsIvim_ASN1_IVInamedNumbers all;
     
     group asn1Constants {
     } // End of group asn1Constants 
@@ -75,7 +77,9 @@
          * @param   p_gnLifetime        GN packet lifetime value (ms)
          * @param   p_gnTrafficClass    GN traffic class value
          */
-        template IvimInd mw_ivimIndWithGnParameters (
+//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
+//        template IvimInd mw_ivimIndWithGnParameters (
+        template(present) IvimInd mw_ivimIndWithGnParameters (
                                                      template (present) IVIM p_iviMsg,
                                                      in template UInt8 p_gnNextHeader := *,
                                                      in template UInt8 p_gnHeaderType := *,
@@ -96,7 +100,9 @@
          * @param   p_btpDestinationPort    BTP destination port value
          * @param   p_btpInfo               BTP destination port info value (if BTP-B) or BTP source port value (if BTP-A)
          */
-        template IvimInd mw_ivimIndWithBtpParameters (
+//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
+//        template IvimInd mw_ivimIndWithBtpParameters (
+        template(present) IvimInd mw_ivimIndWithBtpParameters (
                                                       template (present) IVIM p_iviMsg,
                                                       template UInt16 p_btpDestinationPort := *,
                                                       template UInt16 p_btpInfo := *
@@ -111,7 +117,8 @@
          * @param   p_ssp       SSP security parameter
          * @param   p_its_aid   ITS-AID value
          */
-        template IvimInd mw_ivimIndWithSecurityParameters (
+//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
+        template(present) IvimInd mw_ivimIndWithSecurityParameters (
                                                            template (present) IVIM p_iviMsg,
                                                            template Bit256 p_ssp := *,
                                                            template UInt32 p_its_aid := *
@@ -308,7 +315,7 @@
         template (value) IviStructure m_ivimStructureCancellation(
                                                                   in template (value) IviIdentificationNumber p_iviIdentificationNumber
         ) := {
-            mandatory   := m_iviManagementContainer(f_getProvider(), p_iviIdentificationNumber, IviStatus_cancellation_), 
+            mandatory   := valueof(m_iviManagementContainer(f_getProvider(), valueof(p_iviIdentificationNumber), IviStatus_cancellation_)), 
             optional_   := omit
         } // End of template m_ivimStructureCancellation
         
Index: IVIM/LibItsIvim_TestSystem.ttcn
===================================================================
--- IVIM/LibItsIvim_TestSystem.ttcn	(revision 1312)
+++ IVIM/LibItsIvim_TestSystem.ttcn	(working copy)
@@ -37,7 +37,10 @@
             out
                 AcGnssPrimitive, AcSecPrimitive;
             in
-                AcGnssResponse, AcGnssDistanceCovered, AcSecResponse;
+//FIXME RGY as discussed, list of boolean responses is replaced by a union
+//                AcGnssResponse, AcGnssDistanceCovered, AcSecResponse;
+                AdapterControlResults;
+
         } // end AdapterControlPort
         
         /**
@@ -47,8 +50,11 @@
             out 
                 UtInitialize, UtIvimTrigger, UtIvimUpdate, UtIvimTermination, UtChangePosition, UtChangePseudonym;
             in 
-                UtInitializeResult, UtIvimTriggerResult, UtIvimUpdateResult, UtIvimTerminationResult,
-                UtChangePositionResult, UtChangePseudonymResult, UtIvimEventInd;
+//FIXME RGY as discussed, list of boolean responses is replaced by a union
+//                UtInitializeResult, UtIvimTriggerResult, UtIvimUpdateResult, UtIvimTerminationResult,
+//                UtChangePositionResult, UtChangePseudonymResult, UtIvimEventInd;
+                UtInitializeResult, UtIvimTriggerResult, UtIvimUpdateResult, UtIvimEventInd, UtIvimResults, UtCommonResults;
+                
         } // end UpperTesterPort
         
     } // end portDefinitions
Index: IVIM/LibItsIvim_TypesAndValues.ttcn
===================================================================
--- IVIM/LibItsIvim_TypesAndValues.ttcn	(revision 1312)
+++ IVIM/LibItsIvim_TypesAndValues.ttcn	(working copy)
@@ -102,7 +102,12 @@
         /**
          * @desc Upper Tester result message of termination of an event on Ivim IUT 
          */
-        type boolean UtIvimTerminationResult;
+//FIXME RGY as discussed, simple boolean responses are replaced by a union of results;
+        type union UtIvimResults {
+          boolean utIvimTerminationResult
+        }
+//        type boolean UtIvimTerminationResult;
+        type UtIvimResults.utIvimTerminationResult UtIvimTerminationResult;
         
         /**
          * @desc Upper Tester message to check event/status on Ivim IUT 
Index: MapemSpatem/LibItsMapemSpatem_Functions.ttcn
===================================================================
--- MapemSpatem/LibItsMapemSpatem_Functions.ttcn	(revision 1312)
+++ MapemSpatem/LibItsMapemSpatem_Functions.ttcn	(working copy)
@@ -18,7 +18,7 @@
     
     // LibIts
     import from ITS_Container language "ASN.1:1997" all;
-    import from DSRC language "ASN.1:1997" all;
+    import from IS_DSRC language "ASN.1:1997" all;
     
     // LibItsCommon
     import from LibItsCommon_TypesAndValues all;
@@ -44,7 +44,9 @@
             utPort.send(p_init);
             tc_wait.start;
             alt {
-                [] utPort.receive(UtInitializeResult:true) {
+//FIXME RGY the simple boolean result has been changed to a union
+//                [] utPort.receive(UtInitializeResult:true) {
+                [] utPort.receive(UtCommonResults:{utInitializeResult:=true}) {
                     tc_wait.stop;
                     log("*** " & testcasename() & ": INFO: IUT initialized ***");
                 }
@@ -70,8 +72,14 @@
             
             utPort.send ( p_event );
             tc_wait.start;
+//FIXME RGY temporal variable to save the result-union value
+var UtMapemSpatemResuls v_UtMapemSpatemResuls;
             alt {
-                [] utPort.receive ( UtMapemSpatemTriggerResult:? ) -> value v_result {
+//FIXME RGY the simple boolean result has been changed to a union
+//                [] utPort.receive ( UtMapemSpatemTriggerResult:? ) -> value v_result {
+                [] utPort.receive (UtMapemSpatemResuls:{utMapemSpatemTriggerResult:=?} ) -> value v_UtMapemSpatemResuls {
+//FIXME RGY storing result from the temporal variable
+                    v_result:= v_UtMapemSpatemResuls.utMapemSpatemTriggerResult;
                     tc_wait.stop;
                     if ( not v_result ) {
                         f_selfOrClientSyncAndVerdict("MapSpat Trigger failed", e_error);
@@ -223,9 +231,10 @@
          * @desc    Setups default configuration   
          * @param   p_certificateId The certificate identifier the TA shall use in case of secured IUT
          */
+//FIXME RGY Titan doesn't support mtc and system clauses yet
         function f_cfUp(
                         in charstring p_certificateId := PX_CERT_FOR_TS
-        )  runs on ItsMapemSpatem system ItsMapemSpatemSystem {
+        )  runs on ItsMapemSpatem /*system ItsMapemSpatemSystem*/ {
             
             map(self:acPort, system:acPort);
             map(self:utPort, system:utPort);
@@ -243,7 +252,8 @@
         /**
          * @desc    Deletes default configuration 
          */
-        function f_cfDown() runs on ItsMapemSpatem system ItsMapemSpatemSystem {
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+        function f_cfDown() runs on ItsMapemSpatem {
             
             // Initialise secured mode
             f_uninitialiseSecuredMode();
@@ -332,6 +342,6 @@
             }
         }
         
-    } // End of receiveFunctions
+    } // End of group receiveFunctions
     
-} // End of module LibItsMapemSpatem_Functions
\ No newline at end of file
+} // End of module LibItsMapemSpatem_Functions
Index: MapemSpatem/LibItsMapemSpatem_Pixits.ttcn
===================================================================
--- MapemSpatem/LibItsMapemSpatem_Pixits.ttcn	(revision 1312)
+++ MapemSpatem/LibItsMapemSpatem_Pixits.ttcn	(working copy)
@@ -16,7 +16,8 @@
     import from LibCommon_BasicTypesAndValues all;
     
     // LibIts
-    import from DSRC language "ASN.1:1997" all;
+    import from IS_DSRC language "ASN.1:1997" all;
+    import from IS_DSRC_REGION_noCircular language "ASN.1:1997" all;
     
     // LibItsMapemSpatem
     import from LibItsMapemSpatem_TypesAndValues all;
@@ -34,7 +35,7 @@
     /**
      * @desc Status for IntersectionState DF sending
      */
-    modulepar IntersectionStatusObject PX_STATUS := IntersectionStatusObject_manualControlIsEnabled_;
+    modulepar IntersectionStatusObject PX_STATUS := '1000000000000000'B;
 
     /**
      * @desc Id for IntersectionReferenceID DF sending
Index: MapemSpatem/LibItsMapemSpatem_Templates.ttcn
===================================================================
--- MapemSpatem/LibItsMapemSpatem_Templates.ttcn	(revision 1312)
+++ MapemSpatem/LibItsMapemSpatem_Templates.ttcn	(working copy)
@@ -19,11 +19,14 @@
     import from ITS_Container language "ASN.1:1997" all;
     import from MAPEM_PDU_Descriptions language "ASN.1:1997" all;
     import from SPATEM_PDU_Descriptions language "ASN.1:1997" all;
-    import from DSRC language "ASN.1:1997" all;
+    import from IS_DSRC language "ASN.1:1997" all;
+    import from IS_DSRC_REGION_noCircular language "ASN.1:1997" all;
     
     // LibItsCommon
     import from LibItsCommon_Functions all;
     import from LibItsCommon_TypesAndValues all;
+    import from LibItsCommon_ASN1_NamedNumbers all;
+    import from LibItsCommon_ASN1_ISDSRC_NamedNumbers all;
     
     // LibItsMapemSpatem
     import from LibItsMapemSpatem_TestSystem all;
@@ -91,7 +94,9 @@
          * @param   p_btpDestinationPort    BTP destination port value
          * @param   p_btpInfo               BTP destination port info value (if BTP-B) or BTP source port value (if BTP-A)
          */
-        template MapemInd mw_mapemIndWithBtpParameters(
+//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
+//        template MapemInd mw_mapemIndWithBtpParameters(
+        template(present) MapemInd mw_mapemIndWithBtpParameters(
                                                        template (present) MAPEM p_mapemMsg,
                                                        in template UInt16 p_btpDestinationPort := *,
                                                        in template UInt16 p_btpInfo := *
@@ -174,7 +179,9 @@
          * @param   p_btpDestinationPort    BTP destination port value
          * @param   p_btpInfo               BTP destination port info value (if BTP-B) or BTP source port value (if BTP-A)
          */
-        template SpatemInd mw_spatemIndWithBtpParameters(
+//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
+//        template SpatemInd mw_spatemIndWithBtpParameters(
+        template(present) SpatemInd mw_spatemIndWithBtpParameters(
                                                          template (present) SPATEM p_spatemMsg,
                                                          template UInt16 p_btpDestinationPort := *,
                                                          template UInt16 p_btpInfo := *
@@ -385,7 +392,9 @@
                 /**
                  * @desc    Receive template for MAPEM Message
                  */
-                template (omit) MapData m_mapem(
+//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
+//                template (omit) MapData m_mapem(
+                template (value) MapData m_mapem(
                                                 in template (value) MsgCount p_msgIssueRevision,
                                                 in template (omit) IntersectionGeometryList p_intersectionGeometryList := omit,
                                                 in template (omit) RoadSegmentList p_roadSegments := omit
@@ -560,7 +569,9 @@
             /**
              * @desc    Send template for SPAT Message
              */
-            template (omit) SPAT m_spatem(
+//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
+//            template (omit) SPAT m_spatem(
+            template (value) SPAT m_spatem(
                                           in template (value) IntersectionStateList p_intersections,
                                           in template (omit) DescriptiveName p_name := omit
             ) modifies m_defaultSpatem:= {
@@ -588,7 +599,7 @@
                 
                 template (value) MovementList m_movements := { m_movement };
                 
-                template (value) MovementState m_movement := {
+                template (omit) MovementState m_movement := {
                     movementName           := omit,
                     signalGroup            := PX_SIGNAL_GROUP_ID,
                     state_time_speed       := m_movementEventList,
Index: MapemSpatem/LibItsMapemSpatem_TestSystem.ttcn
===================================================================
--- MapemSpatem/LibItsMapemSpatem_TestSystem.ttcn	(revision 1312)
+++ MapemSpatem/LibItsMapemSpatem_TestSystem.ttcn	(working copy)
@@ -39,7 +39,9 @@
             out
                 AcSecPrimitive;
             in
-                AcSecResponse;
+//FIXME RGY As discussed, boolean response types are replaced by union of boolean responses
+//                AcSecResponse;
+                AdapterControlResults
         } // end AdapterControlPort
         
         /**
@@ -49,7 +51,9 @@
             out 
                 UtInitialize, UtMapemSpatemTrigger;
             in 
-                UtInitializeResult, UtMapemSpatemTriggerResult, UtMapemEventInd , UtSpatemEventInd;
+//FIXME RGY as discussed, boolean results are replaced by union of booleans
+//                UtInitializeResult, UtMapemSpatemTriggerResult, UtMapemEventInd , UtSpatemEventInd;
+                UtCommonResults, UtMapemSpatemResuls, UtMapemEventInd , UtSpatemEventInd;
         } // end UpperTesterPort
 
     } // end portDefinitions
Index: MapemSpatem/LibItsMapemSpatem_TypesAndValues.ttcn
===================================================================
--- MapemSpatem/LibItsMapemSpatem_TypesAndValues.ttcn	(revision 1312)
+++ MapemSpatem/LibItsMapemSpatem_TypesAndValues.ttcn	(working copy)
@@ -48,7 +48,12 @@
         /**
          * @desc Upper Tester result message of request of triggering of an event at IUT 
          */
-        type boolean UtMapemSpatemTriggerResult;
+//FIXME RGY as discussed boolean results are replaced by union of booleans
+        type union  UtMapemSpatemResuls {
+          boolean utMapemSpatemTriggerResult
+        }
+//        type boolean UtMapemSpatemTriggerResult;
+        type UtMapemSpatemResuls.utMapemSpatemTriggerResult UtMapemSpatemTriggerResult;
         
         /**
          * @desc Upper Tester message to check event/status at IUT 
Index: Security/LibItsSecurity_Functions.ttcn3
===================================================================
--- Security/LibItsSecurity_Functions.ttcn3	(revision 1312)
+++ Security/LibItsSecurity_Functions.ttcn3	(working copy)
@@ -24,6 +24,7 @@
     import from LibItsSecurity_Templates all;
     import from LibItsSecurity_Pixits all;
     import from LibItsSecurity_TestSystem all;
+    import from LibItsSecurity_EncdecDeclarations all;
     
     group helpersFunctions {
         
@@ -262,7 +263,7 @@
                         return false;
                     }
                 } else {
-                    if(not f_readSigningKey(valueof(cc_taCert_A), v_privateKey)){
+                    if(not f_readSigningKey(cc_taCert_A, v_privateKey)){
                         return false;
                     }
                 }
@@ -272,7 +273,7 @@
                 );
                 
                 p_securedMessage := m_securedMessage(
-                    v_toBeSignedSecuredMessage.header_fields,
+                    valueof(v_toBeSignedSecuredMessage.header_fields),
                     p_payloadField,
                     {
                         m_trailer_field_signature(
@@ -417,7 +418,7 @@
 //                log("p_trailerStatus=", p_trailerStatus);
                 if (p_trailerStatus == 0) { // No signature
                     p_securedMessage := m_securedMessage(
-                        v_toBeSignedSecuredMessage.header_fields,
+                        valueof(v_toBeSignedSecuredMessage.header_fields),
                         p_payloadField,
                         { }
                     );
@@ -424,7 +425,7 @@
                     v_trailerSize := 0;
                 } else if (p_trailerStatus == 2) { // Duplicate signature
                     p_securedMessage := m_securedMessage(
-                        v_toBeSignedSecuredMessage.header_fields,
+                        valueof(v_toBeSignedSecuredMessage.header_fields),
                         p_payloadField,
                         {
                             m_trailer_field_signature(
@@ -452,7 +453,7 @@
                 } else if (p_trailerStatus == 3) { // Signature with reserved algorthm
                     p_securedMessage := m_securedMessage_wrong_protocol(
                         p_protocolVersion,
-                        v_toBeSignedSecuredMessage.header_fields,
+                        valueof(v_toBeSignedSecuredMessage.header_fields),
                         p_payloadField,
                         {
                             m_trailer_field_signature(
@@ -464,7 +465,7 @@
                     );
                 } else { // Invalid signature
                     p_securedMessage := m_securedMessage(
-                        v_toBeSignedSecuredMessage.header_fields,
+                        valueof(v_toBeSignedSecuredMessage.header_fields),
                         p_payloadField,
                         {
                             m_trailer_field_signature(
@@ -1020,7 +1021,7 @@
                     if (valueof(p_issuingCertificate.subject_attributes[v_counter].type_) == e_verification_key) {
                         return f_verifyCertificateSignatureWithPublicKey(
                             p_certificateToBeVerified,
-                            p_issuingCertificate.subject_attributes[v_counter].attribute.key);
+                            valueof(p_issuingCertificate.subject_attributes[v_counter].attribute.key));
                     }
                 } // End of 'for' statement
                 
@@ -1053,8 +1054,8 @@
                 
                 // Create SecuredMessage payload to be signed
                 v_toBeSignedSecuredMessage := m_toBeSignedSecuredMessage(
-                    p_securedMessage.header_fields,
-                    p_securedMessage.payload_field,
+                    valueof(p_securedMessage.header_fields),
+                    valueof(p_securedMessage.payload_field),
                     e_signature
                 );
                 log("f_verifyGnSecuredMessageSignatureWithPublicKey: v_toBeSignedSecuredMessage=", v_toBeSignedSecuredMessage);
@@ -1107,7 +1108,7 @@
                     if (v_subjectAttribute.type_ == e_verification_key) {
                         return f_verifyGnSecuredMessageSignatureWithPublicKey(
                             p_securedMessage,
-                            p_certificate.subject_attributes[v_counter].attribute.key);
+                            valueof(p_certificate.subject_attributes[v_counter].attribute.key));
                     }
                 } // End of 'for' statement
                 
@@ -1315,8 +1316,11 @@
             ) return boolean {
                 
                 for (var integer i := 0; i < lengthof(p_cert.validity_restrictions); i := i + 1) {
-                    if (valueof(p_cert).validity_restrictions[i].type_ == p_type) {
-                        p_return := valueof(p_cert).validity_restrictions[i];
+//FIXME RGY Titan doesn't support dot notation after valueof at the moment
+//                    if (valueof(p_cert).validity_restrictions[i].type_ == p_type) {
+//                        p_return := valueof(p_cert).validity_restrictions[i];
+                    if (valueof(p_cert.validity_restrictions[i].type_) == p_type) {
+                        p_return := valueof(p_cert.validity_restrictions[i]);
                         return true;
                     }
                 } // End of 'for' statement
@@ -1344,8 +1348,11 @@
                                                       out SubjectAttribute p_return
             ) return boolean {
                 for (var integer i := 0; i < lengthof(p_cert.subject_attributes); i := i + 1) {
-                    if (valueof(p_cert).subject_attributes[i].type_ == p_type) {
-                        p_return := valueof(p_cert).subject_attributes[i];
+//FIXME RGY Titan doesn't support dot notation after valueof at the moment
+//                    if (valueof(p_cert).subject_attributes[i].type_ == p_type) {
+//                        p_return := valueof(p_cert).subject_attributes[i];
+                    if (valueof(p_cert.subject_attributes[i].type_) == p_type) {
+                        p_return := valueof(p_cert.subject_attributes[i]);
                         return true;
                     }
                 }
@@ -1746,8 +1753,11 @@
                                        in template (value) TwoDLocation p_location
         ) return boolean {
             return
-                (valueof(p_location).longitude != c_maxLongitude + 1) and
-                (valueof(p_location).latitude != c_maxLatitude + 1);
+//FIXME RGY Titan doesn't support dot notation after valueof at the moment
+//                (valueof(p_location).longitude != c_maxLongitude + 1) and
+//                (valueof(p_location).latitude != c_maxLatitude + 1);
+                (valueof(p_location.longitude) != c_maxLongitude + 1) and
+                (valueof(p_location.latitude) != c_maxLatitude + 1);
         } // End of function f_isValidTwoDLocation
 
         /**
@@ -1763,10 +1773,15 @@
                                                    in template (value) RectangularRegion p_r2
         ) return boolean {
             return not (
-                valueof(p_r2).northwest.longitude > valueof(p_r1).southeast.longitude or 
-                valueof(p_r2).southeast.longitude < valueof(p_r1).northwest.longitude or 
-                valueof(p_r2).southeast.latitude  > valueof(p_r1).northwest.latitude or 
-                valueof(p_r2).northwest.latitude  < valueof(p_r1).southeast.latitude
+//FIXME RGY Titan doesn't support dot notation after valueof at the moment
+//                valueof(p_r2).northwest.longitude > valueof(p_r1).southeast.longitude or 
+//                valueof(p_r2).southeast.longitude < valueof(p_r1).northwest.longitude or 
+//                valueof(p_r2).southeast.latitude  > valueof(p_r1).northwest.latitude or 
+//                valueof(p_r2).northwest.latitude  < valueof(p_r1).southeast.latitude
+                valueof(p_r2.northwest.longitude) > valueof(p_r1.southeast.longitude) or 
+                valueof(p_r2.southeast.longitude) < valueof(p_r1.northwest.longitude) or 
+                valueof(p_r2.southeast.latitude)  > valueof(p_r1.northwest.latitude) or 
+                valueof(p_r2.northwest.latitude)  < valueof(p_r1.southeast.latitude)
             );
         } // End of function f_isRectangularRegionsIntersected
         
@@ -1778,12 +1793,12 @@
             
             for (v_i := 0; v_i < lengthof(p_region); v_i := v_i + 1) {
                 var PolygonalRegion v_region_base;
-                f_convertRectangularRegionIntoPolygonalRegion(p_region[v_i], v_region_base);
+                f_convertRectangularRegionIntoPolygonalRegion(valueof(p_region[v_i]), v_region_base);
                 v_found := false;
                 for (v_j := 0; v_j < lengthof(p_region); v_j := v_j + 1) {
                     if (v_j != v_i) {
                         var PolygonalRegion v_region;
-                        f_convertRectangularRegionIntoPolygonalRegion(p_region[v_j], v_region);
+                        f_convertRectangularRegionIntoPolygonalRegion(valueof(p_region[v_j]), v_region);
                         if (f_isPolygonalRegionInside(v_region, v_region_base) == true) {
                             v_found := true;
                         }
@@ -1812,9 +1827,9 @@
             
             for (v_i := 0; v_i < lengthof(p_parent); v_i := v_i + 1) {
                 var PolygonalRegion v_region_parent, v_region;
-                f_convertRectangularRegionIntoPolygonalRegion(p_parent[v_i], v_region_parent);
+                f_convertRectangularRegionIntoPolygonalRegion(valueof(p_parent[v_i]), v_region_parent);
                 for (v_j := 0; v_j < lengthof(p_parent); v_j := v_j + 1) {
-                    f_convertRectangularRegionIntoPolygonalRegion(p_region[v_j], v_region);
+                    f_convertRectangularRegionIntoPolygonalRegion(valueof(p_region[v_j]), v_region);
                     if (f_isPolygonalRegionInside(v_region, v_region_parent) == true) {
                         return true;
                     }
@@ -1911,24 +1926,26 @@
         ) return boolean {
             var boolean v_ret := false;
             
-            select (p_region.region_type) {
+//FIXME RGY valeuof is missing: argument of select case is Expression (see $19.3.1)
+//            select (p_region.region_type) {
+            select (valueof(p_region.region_type)) {
                 case (e_none) {
                     v_ret := true;
                 }
                 case (e_circle) {
-                    v_ret := f_isLocationInsideCircularRegion(p_region.region.circular_region, p_location);
+                    v_ret := f_isLocationInsideCircularRegion(valueof(p_region.region.circular_region), p_location);
                 }
                 case (e_rectangle) {
-                    v_ret := f_isLocationInsideRectangularRegion(p_region.region.rectangular_region, p_location);
+                    v_ret := f_isLocationInsideRectangularRegion(valueof(p_region.region.rectangular_region), p_location);