Changed prefix of test adapter specific functions from "ta" to "ac" as specified in the framework. (38325ab1) · Commits · TTCN-3 Libraries / LibIts

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+3 −3

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -35,7 +35,7 @@ module LibItsGeoNetworking_Templates {
	* @desc Testsystem will start beaconing for the given neighbor		* @desc Testsystem will start beaconing for the given neighbor
	* @param p_beaconHeader The neighbor information		* @param p_beaconHeader The neighbor information
	*/		*/
	template (value) TaGNEvent m_startBeaconing(BeaconHeader p_beaconHeader) := {		template (value) AcGNEvent m_startBeaconing(BeaconHeader p_beaconHeader) := {
	startBeaconing := {		startBeaconing := {
	beaconHeader := p_beaconHeader		beaconHeader := p_beaconHeader
	}		}
	@@ -45,7 +45,7 @@ module LibItsGeoNetworking_Templates {
	* @desc Testsystem will stop beaconing for the given neighbor		* @desc Testsystem will stop beaconing for the given neighbor
	* @param p_compName The neighbor		* @param p_compName The neighbor
	*/		*/
	template TaGNEvent m_stopBeaconing(charstring p_compName) := {		template AcGNEvent m_stopBeaconing(charstring p_compName) := {
	stopBeaconing:= {		stopBeaconing:= {
	compName := p_compName		compName := p_compName
	}		}
	@@ -55,7 +55,7 @@ module LibItsGeoNetworking_Templates {
	* @desc Testsystem will pass received to the TTCN-3		* @desc Testsystem will pass received to the TTCN-3
	* @param p_beaconHeader The neighbor information		* @param p_beaconHeader The neighbor information
	*/		*/
	template TaGNEvent m_startPassBeaconing(BeaconHeader p_beaconHeader) := {		template AcGNEvent m_startPassBeaconing(BeaconHeader p_beaconHeader) := {
	startPassBeaconing := {		startPassBeaconing := {
	beaconHeader := p_beaconHeader		beaconHeader := p_beaconHeader
	}		}
	@@ -64,7 +64,7 @@ module LibItsGeoNetworking_Templates {
	/**		/**
	* @desc Testsystem will stop passing beacon information to the TTCN-3		* @desc Testsystem will stop passing beacon information to the TTCN-3
	*/		*/
	template TaGNEvent m_stopPassBeaconing := {		template AcGNEvent m_stopPassBeaconing := {
	stopPassBeaconing := {		stopPassBeaconing := {
	}		}
	}		}

ttcn/GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -845,7 +845,7 @@ module LibItsGeoNetworking_TypesAndValues {

	group taPrimitives {		group taPrimitives {

	type union TaGNEvent {		type union AcGNEvent {
	TaStartBeaconing startBeaconing,		TaStartBeaconing startBeaconing,
	TaStopBeaconing stopBeaconing,		TaStopBeaconing stopBeaconing,
	TaStartPassBeaconing startPassBeaconing,		TaStartPassBeaconing startPassBeaconing,

ttcn/LibIts_Interface.ttcn

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,7 @@ module LibIts_Interface {
	* @desc Adapter control port		* @desc Adapter control port
	*/		*/
	type port AdapterControlPort message {		type port AdapterControlPort message {
	out TaGNEvent;		out AcGNEvent;
	} // end AdapterControlPort		} // end AdapterControlPort

	/**		/**

Original line number	Original line	Diff line number	Diff line
	@@ -290,13 +290,13 @@ module LibItsGeoNetworking_Functions {
	function f_startBeingNeighbour() runs on ItsNt {		function f_startBeingNeighbour() runs on ItsNt {

	activate(a_neighbourDefault());		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		} // end f_startBeingNeighbour

	function f_stopBeingNeighbour() runs on ItsNt {		function f_stopBeingNeighbour() runs on ItsNt {

	f_taTriggerEvent(m_stopBeaconing(vc_componentName));		f_acTriggerEvent(m_stopBeaconing(vc_componentName));
	deactivate; // FIXME: probably too brutal		deactivate; // FIXME: probably too brutal
	activate(a_default());		activate(a_default());

	@@ -893,7 +893,7 @@ module LibItsGeoNetworking_Functions {
	* @param p_event The event to trigger		* @param p_event The event to trigger
	* @return		* @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;		var FncRetCode v_ret := e_success;

	acPort.send(p_event);		acPort.send(p_event);

Admin message