Commit 6715e595 authored by garciay's avatar garciay
Browse files

Rebuild project with TITAN/Eclipse

parent b74cf6ce
Loading
Loading
Loading
Loading
+10 −10
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ module ItsAutoInterop_TestCases {
                                ?,
                                e_btpB, 
                                mw_denm_stationId(
                                    complement(PX_EUT_DESC[p_eut_id].stationId)
                                    ? // FIXME complement(PX_EUT_DESC[p_eut_id].stationId)
                         ))),
                         ?
                )) { 
@@ -624,7 +624,7 @@ module ItsAutoInterop_TestCases {
                                ?,
                                e_btpB, 
                                mw_denm_stationId(
                                    complement(PX_EUT_DESC[p_eut_id].stationId)
                                    ? // FIXME complement(PX_EUT_DESC[p_eut_id].stationId)
                         ))),
                         ?
                )) { 
@@ -1057,7 +1057,7 @@ module ItsAutoInterop_TestCases {
                                ?,
                                e_btpB, 
                                mw_denm_stationId(
                                    complement(PX_EUT_DESC[p_eut_id].stationId)
                                    ? // FIXME complement(PX_EUT_DESC[p_eut_id].stationId)
                         ))),
                         c_llBroadcast
                )) { 
@@ -1189,7 +1189,7 @@ module ItsAutoInterop_TestCases {
                                ?,
                                e_btpB, 
                                mw_denm_stationId(
                                    complement(PX_EUT_DESC[p_eut_id].stationId)
                                    ? // FIXME complement(PX_EUT_DESC[p_eut_id].stationId)
                         ))),
                         c_llBroadcast
                )) { 
@@ -2293,7 +2293,7 @@ module ItsAutoInterop_TestCases {
                                ?,
                                e_btpB, 
                                mw_denm_stationId(
                                    complement(PX_EUT_DESC[p_eut_id].stationId)
                                    ? // FIXME complement(PX_EUT_DESC[p_eut_id].stationId)
                         ))),
                         ?
                )) -> value v_gnInd { 
@@ -2582,7 +2582,7 @@ module ItsAutoInterop_TestCases {
                                e_btpB, 
                                mw_cam_stationId(
                                    -,
                                    complement(PX_EUT_DESC[p_eut_id].stationId)
                                    ? // FIXME complement(PX_EUT_DESC[p_eut_id].stationId)
                         ))),
                         c_llBroadcast
                )) -> value v_gnInd { //  Receives a broadcast MAC address
@@ -2599,8 +2599,8 @@ module ItsAutoInterop_TestCases {
                            mw_geoNwShbPacket(
                                mw_longPosVectorAny(
                                    mw_gnAddressMid(
                                        complement(PX_EUT_DESC[p_eut_id].mid
                         ))))),
                                        ? // FIXME complement(PX_EUT_DESC[p_eut_id].mid)
                         )))),
                         c_llBroadcast
                )) -> value v_gnInd { //  Receives a broadcast MAC address
                    // Broadcast Beacon message to the other EUTs
@@ -3131,9 +3131,9 @@ module ItsAutoInterop_TestCases {
                        mw_geoNwPdu(
                            mw_geoNwShbPacketWithNextHeader_cam(
                                mw_longPosVectorAny(
                                    complement(
                                    ? /* FIXME complement(
                                        v_gnAddr
                                )),
                                )*/),
                                ?,
                                e_btpB,
                                mw_cam_stationId(
+2 −2
Original line number Diff line number Diff line
@@ -674,12 +674,12 @@ module ItsRSUsSimulator_Functions {
        }
        
        if(p_nextHeader == e_btpA) {
            v_payload := int2oct(valueof(p_destPort), 2) & int2oct(valueof(p_srcPort), 2) & p_finalPayload;
            v_payload := int2oct(valueof(p_destPort), 2) & int2oct(valueof(p_srcPort), 2) & valueof(p_finalPayload);
            return v_payload;
        }
        
        if(p_nextHeader == e_btpB) {
            v_payload := int2oct(valueof(p_destPort), 2) & int2oct(valueof(p_srcPort), 2) & p_finalPayload;
            v_payload := int2oct(valueof(p_destPort), 2) & int2oct(valueof(p_srcPort), 2) & valueof(p_finalPayload);
            return v_payload;
        }
        
+2 −2
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ module ItsRSUsSimulator_TestCases {
     */
    testcase TC_RSUSIMU_BV_02() runs on ItsRSUsSimulator system ItsRSUsSimulatorSystem {
        // Local variables
        const SequenceOfRectangularRegion c_detectionArea := { PICS_UC6_CAM_DETECTION_AREA_Z2 }; // PICS_UC6_CAM_DETECTION_AREA_Z1
        const SequenceOfRectangularRegion c_detectionArea := { valueof(PICS_UC6_CAM_DETECTION_AREA_Z2) }; // PICS_UC6_CAM_DETECTION_AREA_Z1
        var VehiclesSimulator v_vehicles := {};
        var integer v_stationID;
        var boolean v_isInDetectionZone;
@@ -353,7 +353,7 @@ module ItsRSUsSimulator_TestCases {
        ) runs on ItsRSUsSimulator {
            
            // Local variables
            const SequenceOfRectangularRegion c_detectionArea := { PICS_UC6_CAM_DETECTION_AREA_Z2 }; // PICS_UC6_CAM_DETECTION_AREA_Z1
            const SequenceOfRectangularRegion c_detectionArea := { valueof(PICS_UC6_CAM_DETECTION_AREA_Z2) }; // PICS_UC6_CAM_DETECTION_AREA_Z1
            var GeoNetworkingInd v_gnInd;
            var template (value) CAM v_camSimu;
            var ThreeDLocation v_location;
+3 −3
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ module TestCodec_ChainOfCertificates {
   */
  function f_create_ca_certificate_sha256_1(
                                            out sec_info p_ca_sec_info
  ) runs on TCType system TCType return EtsiTs103097Certificate {
  ) runs on TCType return EtsiTs103097Certificate {
    var template (value) EtsiTs103097Certificate v_cert; // ETSI TS 103 097 V1.3.1 Clause 6 Bullet 1
    var charstring v_certId := "STF538 Root Certificate";
    var HashAlgorithm v_self := sha256; // ETSI TS 103 097 V1.3.1 Clause 7.2.3 Root CA certificates Bullet 1
@@ -170,7 +170,7 @@ module TestCodec_ChainOfCertificates {
  function f_create_ea_certificate_sha256_1(
                                            in sec_info p_ca_sec_info,
                                            out sec_info p_ea_sec_info
  ) runs on TCType system TCType return EtsiTs103097Certificate {
  ) runs on TCType return EtsiTs103097Certificate {
    var template (value) EtsiTs103097Certificate v_cert; // ETSI TS 103 097 V1.3.1 Clause 6 Bullet 1
    var charstring v_certId := "STF538 EA Certificate"; // ETSI TS 103 097 V1.3.1 Clause 7.2.2 Enrolment credential #5
    var SequenceOfPsidSsp v_appPermissions := { // ETSI TS 102 965 Table A.1: ETSI ITS standardized ITS-AIDs
@@ -232,7 +232,7 @@ module TestCodec_ChainOfCertificates {
  function f_create_at_certificate_sha256_1(
                                            in sec_info p_ea_sec_info,
                                            out sec_info p_at_sec_info
  ) runs on TCType system TCType return EtsiTs103097Certificate {
  ) runs on TCType return EtsiTs103097Certificate {
    var template (value) EtsiTs103097Certificate v_cert; // ETSI TS 103 097 V1.3.1 Clause 6 Bullet 1
    var charstring v_certId := "STF538 AT Certificate"; // ETSI TS 103 097 V1.3.1 Clause 7.2.1 Authorization tickets #2
    var SequenceOfPsidSsp v_appPermissions := { // ETSI TS 102 965 Table A.1: ETSI ITS standardized ITS-AIDs