Commit 0fe12cc8 authored by garciay's avatar garciay
Browse files

Add cfPort(mgtMnSapPort) into ItsCalm 

Align PIXIT with ETSI TS 102 985-3 v0.0.4
parent 467c3833

ttcn/CALM/FNTP/LibItsFntp_Functions.ttcn3

+3 −3
Original line number Original line Diff line number Diff line
@@ -64,7 +64,7 @@ module LibItsFntp_Functions { 
            // Map

            // Map

            map(self:acPort, system:acPort);

            map(self:acPort, system:acPort);

            map(self:utPort, system:utPort);

            map(self:utPort, system:utPort);

            map(self:mgtMnSapPort, system:mgtMnSapPort);

            map(self:cfPort, system:cfPort);

            map(self:fntpPort, system:fntpPort);

            map(self:fntpPort, system:fntpPort);

            

            

            // Connect

            // Connect
@@ -100,7 +100,7 @@ module LibItsFntp_Functions { 
            // Map

            // Map

            map(self:acPort, system:acPort);

            map(self:acPort, system:acPort);

            map(self:utPort, system:utPort);

            map(self:utPort, system:utPort);

            map(self:mgtMnSapPort, system:mgtMnSapPort);

            map(self:cfPort, system:cfPort);

            map(self:fntpPort, system:fntpPort);

            map(self:fntpPort, system:fntpPort);

            

            

            // Connect

            // Connect
@@ -127,7 +127,7 @@ module LibItsFntp_Functions { 
            // Unmap

            // Unmap

            unmap(self:acPort, system:acPort);

            unmap(self:acPort, system:acPort);

            unmap(self:utPort, system:utPort);

            unmap(self:utPort, system:utPort);

            unmap(self:mgtMnSapPort, system:mgtMnSapPort);

            unmap(self:cfPort, system:cfPort);

            unmap(self:fntpPort, system:fntpPort);

            unmap(self:fntpPort, system:fntpPort);

            

            

            // Disconnect

            // Disconnect

ttcn/CALM/FNTP/LibItsFntp_Pixits.ttcn3

+5 −4
Original line number Original line Diff line number Diff line
@@ -3,6 +3,7 @@ 
 *  @version    $URL:$

 *  @version    $URL:$

 *              $Id:$

 *              $Id:$

 *  @desc       FAST networking & transport layer protocol (ISO 29281-2) Pixits

 *  @desc       FAST networking & transport layer protocol (ISO 29281-2) Pixits

 *  @see        ETSI TS 102 985-3 v0.0.4

 */

 */

module LibItsFntp_Pixits {

module LibItsFntp_Pixits {
@@ -93,7 +94,7 @@ module LibItsFntp_Pixits { 
        /**

        /**

         * @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 := '030008FFFF01FFFF'O;

        modulepar EUI64 PX_WL_REMOTE_CIID_BC := '030008FFFFFF0000'O;

        

        

        /**

        /**

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

         * @desc Identifies the VCI for multicast on ITS-S router
@@ -126,15 +127,15 @@ module LibItsFntp_Pixits { 
        /**

        /**

         * @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 := '03000AFFFF01FFFF'O;

        modulepar EUI64 PX_LAN_REMOTE_CIID_BC := '03000AFFFFFF0000'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 := '03000AFFFF010001'O;

        modulepar EUI64 PX_LAN_REMOTE_CIID_UC := 'F3000AFFFF010001'O;

        

        

        /**

        /**

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

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

         * @see ISO 21218 - Clause 6.2 Link Identifier 

         * @see ISO 21218 - Clause 6.2 Link Identifier 

         */

         */

        modulepar EUI64 PX_LAN_DIFFERENT_LOCAL_CIID := '03000AFFFF020001'O; 

        modulepar EUI64 PX_LAN_DIFFERENT_LOCAL_CIID := '03000AFFFF020001'O;

ttcn/CALM/LibItsCalm_Interface.ttcn

+1 −0
Original line number Original line Diff line number Diff line
@@ -91,6 +91,7 @@ module LibItsCalm_Interface { 
            

            

            // NT3 ports

            // NT3 ports

            port FntpPort fntpPort;

            port FntpPort fntpPort;

            port MgtMnSapPort cfPort;

            

            

            // timers

            // timers