Commit 8a3f9666 authored by berge's avatar berge
Browse files

Moved f_cfUp() to avoid cyclic imports

parent d55f20b0

ePassport/ttcn/ePassport_Functions.ttcn

+0 −15
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
	import from ePassport_Values all;

	import from ePassport_Templates all;

	import from ePassport_Pixits all;

	import from ePassport_Altsteps {altstep a_default, a_fileDefault};



	group externalFunctions {
@@ -49,20 +48,6 @@ 


	} // end externalFunctions



	group configurationFunctions {

	

		function f_cfUp() runs on MRTD {

			

			// map ports

			map(self:mgmt, system: system_mgmt);

			map(self:mrtdport, system: system_mrtdPort);

			

			// activate default

			activate(a_default());

			activate(a_fileDefault());

		}	

	}



	group classFunctions {

		

		function f_getLogicalChannel(in Class p_class)

ePassport/ttcn/ePassport_TestSystem.ttcn

+14 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ module ePassport_TestSystem { 
	//Ats

	import from ePassport_Types all;

	import from ePassport_Pixits all;

	import from ePassport_Altsteps {altstep a_default, a_fileDefault};

		

	type component MRTD_System

	{
@@ -80,7 +81,19 @@ group portDefs { 
	//type port TaPort message {in Command, out Response};

}



group configurationFunctions {

	

	function f_cfUp() runs on MRTD {

			

    	// map ports

    	map(self:mgmt, system: system_mgmt);

    	map(self:mrtdport, system: system_mrtdPort);

    			

    	// activate default

    	activate(a_default());

    	activate(a_fileDefault());

    }	

}



/*

group primitives {