Commit 38325ab1 authored by tepelmann's avatar tepelmann
Browse files

Changed prefix of test adapter specific functions from "ta" to "ac" as specified in the framework.

parent 0a70c316
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -290,13 +290,13 @@ module LibItsGeoNetworking_Functions {
        function f_startBeingNeighbour() runs on ItsNt {
            
            activate(a_neighbourDefault());
            f_taTriggerEvent(m_startBeaconing(m_beaconHeader(f_getPosition(vc_componentName)).beaconHeader));
            f_acTriggerEvent(m_startBeaconing(m_beaconHeader(f_getPosition(vc_componentName)).beaconHeader));
            
        } // end f_startBeingNeighbour
        
        function f_stopBeingNeighbour() runs on ItsNt  {
            
            f_taTriggerEvent(m_stopBeaconing(vc_componentName));
            f_acTriggerEvent(m_stopBeaconing(vc_componentName));
            deactivate; // FIXME: probably too brutal
            activate(a_default());
            
@@ -893,7 +893,7 @@ module LibItsGeoNetworking_Functions {
         * @param p_event The event to trigger
         * @return
         */
        function f_taTriggerEvent(template (value) TaGNEvent p_event) runs on ItsFa return FncRetCode {
        function f_acTriggerEvent(template (value) AcGNEvent p_event) runs on ItsFa return FncRetCode {
            var FncRetCode v_ret := e_success;
            
            acPort.send(p_event);
+4 −4
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ module LibItsGeoNetworking_Templates {
             * @desc Testsystem will start beaconing for the given neighbor
             * @param p_beaconHeader The neighbor information
             */
            template (value) TaGNEvent m_startBeaconing(BeaconHeader p_beaconHeader) := {
            template (value) AcGNEvent m_startBeaconing(BeaconHeader p_beaconHeader) := {
                startBeaconing := {
                    beaconHeader := p_beaconHeader
                }
@@ -45,7 +45,7 @@ module LibItsGeoNetworking_Templates {
             * @desc Testsystem will stop beaconing for the given neighbor
             * @param p_compName The neighbor
             */
            template TaGNEvent m_stopBeaconing(charstring p_compName) := {
            template AcGNEvent m_stopBeaconing(charstring p_compName) := {
                stopBeaconing:= {
                    compName := p_compName
                }
@@ -55,7 +55,7 @@ module LibItsGeoNetworking_Templates {
             * @desc Testsystem will pass received to the TTCN-3
             * @param p_beaconHeader The neighbor information
             */
            template TaGNEvent m_startPassBeaconing(BeaconHeader p_beaconHeader) := {
            template AcGNEvent m_startPassBeaconing(BeaconHeader p_beaconHeader) := {
                startPassBeaconing := {
                    beaconHeader := p_beaconHeader
                }
@@ -64,7 +64,7 @@ module LibItsGeoNetworking_Templates {
            /**
             * @desc Testsystem will stop passing beacon information to the TTCN-3
             */
            template TaGNEvent m_stopPassBeaconing := {
            template AcGNEvent m_stopPassBeaconing := {
                stopPassBeaconing := {
                }
            }
+1 −1
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ module LibItsGeoNetworking_TypesAndValues {

    group taPrimitives {
        
        type union TaGNEvent {
        type union AcGNEvent {
            TaStartBeaconing startBeaconing,
            TaStopBeaconing stopBeaconing,
            TaStartPassBeaconing startPassBeaconing,
+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ module LibIts_Interface {
        	 * @desc Adapter control port
        	 */
        	type port AdapterControlPort message {
        	    out TaGNEvent;
        	    out AcGNEvent;
        	} // end AdapterControlPort
    
        	/**