Commit c7f08aa4 authored by mullers's avatar mullers
Browse files

new addressing scheme introduced

parent d4a5d3ce

ttcn/dPMR_Functions.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ 






 	//@Desc: f_getDialString returns the Dial string from an CSF address as an out parameter.

 	//@Desc: f_getDialString returns the Dial string from an CSF address.

	//       The return result is successful only if the function is called with an

	//       CSF address. If called with an ISF address the functions returns an

	//       error and non-dialable address "0000000",

ttcn/dPMR_Pics.ttcn

+1 −2
Original line number Diff line number Diff line
@@ -24,8 +24,7 @@ module dPMR_Pics { 
	modulepar {RadioKind PIC_ISF_OR_CSF := e_isf}





	// @desc: Colour Code used by the IUT

	modulepar {ColourCode PIC_COLOUR_CODE := { isfColourCode := '577577'O }}







} // end module dPMR_PICS
 
 No newline at end of file

ttcn/dPMR_Pixits.ttcn

+12 −2
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ module dPMR_Pixits { 
	import from dPMR_Values all;



	

	// @desc: Colour Code used by the IUT

	modulepar {ColourCode PXT_COLOUR_CODE := { isfColourCode := '577577'O }}





	// @desc: Colour Code (Channel) to be used in test case, must be chosen 

	// in the correct range (Group A or B) dependent on if IUT is an ISF or CSF radio.

	modulepar {ISFColourcode PXT_SELECTED_ISF_COLOURCODE  }
@@ -32,8 +36,14 @@ module dPMR_Pixits { 
	// @desc: Type of call 

	modulepar { CallType PXT_CALL_TYPE := e_voiceGrp }



	// @desc: Address value of TE

	modulepar {MSAddress PXT_TE_ADDRESS := { csfAddress := '111111110000000000000000'B }}  // Note this value shall be overwritten. Only valid for CSF

	// @desc: Applicable Common Id used for ISF only

	modulepar {UInt8 PXT_APPLICABLE_COMMON_ID := 1}



	// @desc: Applicable Common Id used for ISF only

	modulepar {CSFAddress PXT_TE_CSF_ADDRESS := '111111110000000000000001'B }



		// @desc: Address value of IUT

	modulepar {MSAddress PXT_TE_ADDRESS := { csfAddress := '111111110000000000000001'B }} // Note this value shall be overwritten. Only valid for CSF



	// @desc: Address value of IUT

	modulepar {MSAddress PXT_IUT_ADDRESS := { csfAddress := '111111110000000000000001'B }} // Note this value shall be overwritten. Only valid for CSF

ttcn/dPMR_TestCases.ttcn

+4 −4
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ group IsfCsfCommon { 


			//Test body

			v_simu.start(f_msVoiceTransmissionCommon_ID_set_to_255(p_cc));

			v_ut.start(f_TC_IutWaitVoiceReceived_Ut(p_cc,f_getCommonId(PXT_IUT_ADDRESS) ));  // Use the IUT ISF address to define the Common ID

			v_ut.start(f_TC_IutWaitVoiceReceived_Ut(p_cc));



			// synchronize both PTCs

			f_serverSync2ClientsAndStop({c_prDone,c_tbDone});
@@ -104,14 +104,14 @@ group IsfCsfCommon { 
		*		

		*/

		

		function f_TC_IutWaitVoiceReceived_Ut( ColourCode p_cc, Common_ID p_commId)

		function f_TC_IutWaitVoiceReceived_Ut( ColourCode p_cc)

		runs on Ut{

			//Variables

			var FncRetCode v_ret := e_success;

			//Default

			activate(a_dftUt());

			//Preamble

			v_ret := f_msConfig_Ut(m_msCfgParamsIsfRx(p_cc,f_getCommonId(PXT_TE_ADDRESS)), v_ret);			

			v_ret := f_msConfig_Ut(m_msCfgParamsIsfRx(p_cc, int2bit(PXT_APPLICABLE_COMMON_ID,8)), v_ret);			

			

			f_clientSyncAndVerdict(c_prDone, v_ret); 

			//Test body
@@ -212,7 +212,7 @@ group Framing { 
		activate(a_dftUt());

		//Preamble

		if (PIC_ISF_OR_CSF == e_isf) {

			v_ret := f_msConfig_Ut(  m_msCfgParamsIsfRx( p_cc, f_getCommonId(PXT_TE_ADDRESS)), v_ret); }

			v_ret := f_msConfig_Ut(  m_msCfgParamsIsfRx( p_cc, int2bit(PXT_APPLICABLE_COMMON_ID,8)), v_ret); }

		else {  

			v_ret := f_msConfig_Ut( m_msCfgParamsCsfRx( p_cc, f_getDialString(PXT_TE_ADDRESS)), v_ret);

		}

ttcn/dPMR_TestExecution.ttcn

+3 −3
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ module dPMR_TestExecution { 


 control{



		execute(TC_PMR_0824_01( PIC_COLOUR_CODE ) );

		execute(TC_PMR_0824_01( PXT_COLOUR_CODE ) );





		execute( TC_PMR_0406_01(PIC_COLOUR_CODE) );

		if (PIC_ISF_OR_CSF == e_csf) {execute( TC_PMR_0406_01(PXT_COLOUR_CODE) );}





		execute(TC_PMR_0801_01( PIC_COLOUR_CODE ) ); 

		execute(TC_PMR_0801_01( PXT_COLOUR_CODE ) ); 





// TO BE DONE