Commit 467c3833 authored by garciay's avatar garciay
Browse files

Align code with ETSI TS 102 985-3 v0.0.3

parent f4f61a85

ttcn/CALM/FNTP/LibItsFntp_Pixits.ttcn3

+13 −13
Original line number Original line Diff line number Diff line
@@ -88,27 +88,27 @@ module LibItsFntp_Pixits { 
         * @desc Identifies the CI on ITS-S router 

         * @desc Identifies the CI on ITS-S router 

         * @see ISO 21218 - Clause 6.2 Link Identifier 

         * @see ISO 21218 - Clause 6.2 Link Identifier 

         */

         */

        modulepar EUI64 PX_WL_LOCAL_CIID := '0000000000000000'O; 

        modulepar EUI64 PX_WL_LOCAL_CIID := '030008FFFF010000'O; 

        

        

        /**

        /**

         * @desc Identifies the VCI for broadcast on ITS-S router 

         * @desc Identifies the VCI for broadcast on ITS-S router 

         */

         */

        modulepar EUI64 PX_WL_REMOTE_CIID_BC := '0000000000000000'O;

        modulepar EUI64 PX_WL_REMOTE_CIID_BC := '030008FFFF01FFFF'O;

        

        

        /**

        /**

         * @desc Identifies the VCI for multicast on ITS-S router 

         * @desc Identifies the VCI for multicast on ITS-S router 

         */

         */

        modulepar EUI64 PX_WL_REMOTE_CIID_MC := '0000000000000000'O;

        modulepar EUI64 PX_WL_REMOTE_CIID_MC := '030008FFFF010001'O;

        

        

        /**

        /**

         * @desc Identifies the VCI for unicast on ITS-S router (peer station)

         * @desc Identifies the VCI for unicast on ITS-S router (peer station)

         */

         */

        modulepar EUI64 PX_WL_REMOTE_CIID_UC := '0000000000000000'O;

        modulepar EUI64 PX_WL_REMOTE_CIID_UC := '030008FFFF010001'O;

        

        

        /**

        /**

         * @desc Identifies an unknown CI on ITS-S router 

         * @desc Identifies an unknown CI on ITS-S router 

         */

         */

        modulepar EUI64 PX_WL_LOCAL_CIID_UNKNOWN := 'DEADBEEFDEADBABE'O;

        modulepar EUI64 PX_WL_LOCAL_CIID_UNKNOWN := '030008FFFF000000'O;

        

        

    } // End of group routerWlanVcisMac

    } // End of group routerWlanVcisMac
@@ -121,23 +121,23 @@ module LibItsFntp_Pixits { 
         * @desc Identifies the CI on ITS-S host 

         * @desc Identifies the CI on ITS-S host 

         * @see ISO 21218 - Clause 6.2 Link Identifier 

         * @see ISO 21218 - Clause 6.2 Link Identifier 

         */

         */

        modulepar EUI64 PX_LAN_LOCAL_CIID := '0000000000000000'O; 

        modulepar EUI64 PX_LAN_LOCAL_CIID := '03000AFFFF010000'O; 

        

        

        /**

        /**

         * @desc Identifies the VCI for broadcast on ITS-S host 

         * @desc Identifies the VCI for broadcast on ITS-S host 

         */

         */

        modulepar EUI64 PX_LAN_REMOTE_CIID_BC := '0000000000000000'O;

        modulepar EUI64 PX_LAN_REMOTE_CIID_BC := '03000AFFFF01FFFF'O;

        

        

        /**

        /**

         * @desc Identifies the VCI for unicast on ITS-S host 

         * @desc Identifies the VCI for unicast on ITS-S host 

         */

         */

        modulepar EUI64 PX_LAN_REMOTE_CIID_UC := '0000000000000000'O;

        modulepar EUI64 PX_LAN_REMOTE_CIID_UC := '03000AFFFF010001'O;

        

        

        /**

        /**

         * @desc Identifies a different VCI on ITS-S router 

         * @desc Identifies a different VCI on ITS-S router 

         * @see ISO 21218 - Clause 6.2 Link Identifier 

         * @see ISO 21218 - Clause 6.2 Link Identifier 

         */

         */

        modulepar EUI64 PX_LAN_DIFFERENT_LOCAL_CIID := '0000000000000001'O; 

        modulepar EUI64 PX_LAN_DIFFERENT_LOCAL_CIID := '03000AFFFF020001'O; 

        

        

    } // End of routerLanVcisMac

    } // End of routerLanVcisMac
@@ -150,22 +150,22 @@ module LibItsFntp_Pixits { 
         * @desc Identifies uniquely a specific CI in a specific "ITS-S Communication Unit"

         * @desc Identifies uniquely a specific CI in a specific "ITS-S Communication Unit"

         * @see ISO 21218 - Clause 6.2 Link Identifier

         * @see ISO 21218 - Clause 6.2 Link Identifier

         */

         */

        modulepar EUI64 PX_DEST_LOCAL_CIID := '0000000000000000'O;

        modulepar EUI64 PX_DEST_LOCAL_CIID := '030009FFFF010000'O;

        

        

        /**

        /**

         * @desc Identifies uniquely a specific CI in a specific "ITS-S Communication Unit" for broadcast

         * @desc Identifies uniquely a specific CI in a specific "ITS-S Communication Unit" for broadcast

         */

         */

        modulepar EUI64 PX_DEST_REMOTE_CIID_BC := '0000000000000000'O;

        modulepar EUI64 PX_DEST_REMOTE_CIID_BC := '030009FFFF01FFFF'O;

        

        

        /**

        /**

         * @desc Identifies uniquely a specific CI in a specific "ITS-S Communication Unit" for multicast

         * @desc Identifies uniquely a specific CI in a specific "ITS-S Communication Unit" for multicast

         */

         */

        modulepar EUI64 PX_DEST_REMOTE_CIID_MC := '0000000000000000'O;

        modulepar EUI64 PX_DEST_REMOTE_CIID_MC := '030009FFFF010001'O;

        

        

        /**

        /**

         * @desc Identifies uniquely a specific CI in a specific "ITS-S Communication Unit" for unicast (peer to peer)

         * @desc Identifies uniquely a specific CI in a specific "ITS-S Communication Unit" for unicast (peer to peer)

         */

         */

        modulepar EUI64 PX_DEST_REMOTE_CIID_UC := '0000000000000000'O;

        modulepar EUI64 PX_DEST_REMOTE_CIID_UC := '030009FFFF010001'O;

        

        

        /**

        /**

         * @desc Identifies a second VCI for unicast (peer to peer) on ITS-S host 

         * @desc Identifies a second VCI for unicast (peer to peer) on ITS-S host

ttcn/CALM/IICP/LibItsIicp_Functions.ttcn3

+2 −2
Original line number Original line Diff line number Diff line
@@ -67,7 +67,7 @@ module LibItsIicp_Functions { 
            map(self:utPort, system:utPort);

            map(self:utPort, system:utPort);

            map(self:iicpPort, system:iicpPort);

            map(self:iicpPort, system:iicpPort);

            map(self:iicpPort, system:iicpPort);

            map(self:iicpPort, system:iicpPort);

            map(self:mgtMFSapPort, system:mgtMFSapPort);

            map(self:mgtMfSapPort, system:mgtMfSapPort);

            

            

            // Connect

            // Connect

            f_connect4SelfOrClientSync();

            f_connect4SelfOrClientSync();
@@ -94,7 +94,7 @@ module LibItsIicp_Functions { 
            unmap(self:acPort, system:acPort);

            unmap(self:acPort, system:acPort);

            unmap(self:utPort, system:utPort);

            unmap(self:utPort, system:utPort);

            unmap(self:iicpPort, system:iicpPort);

            unmap(self:iicpPort, system:iicpPort);

            unmap(self:mgtMFSapPort, system:mgtMFSapPort);

            unmap(self:mgtMfSapPort, system:mgtMfSapPort);

            

            

            // Disconnect

            // Disconnect

            f_disconnect4SelfOrClientSync();

            f_disconnect4SelfOrClientSync();

ttcn/CALM/IICP/LibItsIicp_Templates.ttcn3

+2 −2
Original line number Original line Diff line number Diff line
@@ -616,7 +616,7 @@ module LibItsIicp_Templates { 
                    in template (value) CIclass p_ciClass, 

                    in template (value) CIclass p_ciClass, 

                    in template (value) CIstatus p_status

                    in template (value) CIstatus p_status

                ) := {

                ) := {

                    linkID := p_linkId, 

                    linkId := p_linkId, 

                    medType := p_medType, 

                    medType := p_medType, 

                    ciaClass := p_iciaClass, 

                    ciaClass := p_iciaClass, 

                    ciClass := p_ciClass, 

                    ciClass := p_ciClass,
@@ -657,7 +657,7 @@ module LibItsIicp_Templates { 
                    in template (present) CIclass p_ciClass, 

                    in template (present) CIclass p_ciClass, 

                    in template (present) CIstatus p_status

                    in template (present) CIstatus p_status

                ) := {

                ) := {

                    linkID := p_linkId, 

                    linkId := p_linkId, 

                    medType := p_medType, 

                    medType := p_medType, 

                    ciaClass := p_iciaClass, 

                    ciaClass := p_iciaClass, 

                    ciClass := p_ciClass, 

                    ciClass := p_ciClass,