Commit a0ecf281 authored by petersenj's avatar petersenj
Browse files

lot of changes to adopt to the real environments, changing functions, and... 

lot of changes to adopt to the real environments, changing functions, and parameters. Gave section references in the pixit and commented out many PIXITs, some will be moved to a "default" area.
Most TODO fixed.
parent 9fd0c895

ttcn/dPMR_Defaults.ttcn

+1 −1
Changes for ttcn/dPMR_Defaults.ttcn: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
/*

/**

 *	@author 	STF 340

 *  @version    $vx.x.x$

 *	@desc		Alternative default behaviour steps are defined here.

ttcn/dPMR_ExtFunctions.ttcn

+2 −5
Changes for ttcn/dPMR_ExtFunctions.ttcn: 2 added lines, 5 removed lines.
Original line number Diff line number Diff line 
/*

/**

 *	@author 	STF 340

 *  @version    $vx.x.x$

 *	@desc		External functions used in dPMR.
@@ -16,7 +16,7 @@ module dPMR_ExtFunctions { 
	//Ats

	import from dPMR_Types all;

	

	/*

	/**

	 * @desc	fx_calcDialString calculates and returns the dialstring

	 *			that corresponds to the specified address.

	 * @param	p_addr Used to calculate the actual dial string used
@@ -28,6 +28,3 @@ module dPMR_ExtFunctions { 




}  // end module dPMR_ExtFunctions

ttcn/dPMR_Functions.ttcn

+198 −114
Changes for ttcn/dPMR_Functions.ttcn: 198 added lines, 114 removed lines.
Original line number Diff line number Diff line 
/*

/**

 *	@author 	STF 340

 *  @version    $vx.x.x$

 *	@desc		Functions used in dPMR.
@@ -25,15 +25,15 @@ 


	group initFunctions {





		/*

		/**

		 * @desc	Init the Mse

        */

		function f_initMse()

		runs on Mse{

			vc_mse.useAllCallCommonId := e_noAllCall;

			vc_mse.iutId := f_createMsAddress(true /* its IUT */);//TODO JPcleanup

			vc_mse.testerId := f_createMsAddress(false /* its not IUT (its Tester) */);

			vc_mse.iut_useAllCallCommonId := false;

			vc_mse.tester_useAllCallCommonId := false;

			vc_mse.iutId 		:= f_createMsAddressIUT(vc_mse.iut_useAllCallCommonId);

			vc_mse.testerId 	:= f_createMsAddressTester(vc_mse.iut_useAllCallCommonId);

			vc_mse.iutIdUP 		:= f_msAddress2Upper(vc_mse.iutId);

			vc_mse.iutIdLP 		:= f_msAddress2Lower(vc_mse.iutId);

			vc_mse.testerIdUP 	:= f_msAddress2Upper(vc_mse.testerId);
@@ -41,14 +41,18 @@ 
			

		}//end f_initMse



		//TODO JP desc

		//TODO JP do nto forget the parameter itself p_useAllCallCommonId

		function f_initMse_isfAllCall(UseAllCallCommonId p_useAllCallCommonId)

		/**

		 * @desc	Init the Mse

		 * @param	p_iutUseAllCall boolean parameter if the iut should use All Call

		 * @param	p_testerUseAllCall boolean parameter if the tester should use All Call

        */

		function f_initMse_isfAllCall(boolean p_iutUseAllCall, boolean p_testerUseAllCall)

		runs on Mse{



			vc_mse.useAllCallCommonId := p_useAllCallCommonId;

			vc_mse.iutId := f_createMsAddress(true /* its IUT */);

			vc_mse.testerId := f_createMsAddress(false /* its not IUT (its Tester) */);

			vc_mse.iut_useAllCallCommonId := p_iutUseAllCall;

			vc_mse.tester_useAllCallCommonId := p_testerUseAllCall;

			vc_mse.iutId := f_createMsAddressIUT(p_iutUseAllCall);

			vc_mse.testerId := f_createMsAddressTester(p_testerUseAllCall);

			vc_mse.iutIdUP := f_msAddress2Upper(vc_mse.iutId);

			vc_mse.iutIdLP := f_msAddress2Lower(vc_mse.iutId);

			vc_mse.testerIdUP := f_msAddress2Upper(vc_mse.testerId);
@@ -56,14 +60,15 @@ 


		}//end f_initMse_isfAllCall



		/*

		/**

		 * @desc	Init the Upper Tester

        */

		function f_initUt()

		runs on Ut{

			vc_ut.useAllCallCommonId := e_noAllCall;

			vc_ut.iutId := f_createMsAddress(true /* its IUT */);//TODO JPcleanup

			vc_ut.testerId := f_createMsAddress(false /* its not IUT (its Tester) */);

			vc_ut.iut_useAllCallCommonId := false;

			vc_ut.tester_useAllCallCommonId := false;

			vc_ut.iutId := f_createMsAddressIUT(vc_ut.iut_useAllCallCommonId);

			vc_ut.testerId := f_createMsAddressTester(vc_ut.tester_useAllCallCommonId); 

			vc_ut.iutIdUP := f_msAddress2Upper(vc_ut.iutId);

			vc_ut.iutIdLP := f_msAddress2Lower(vc_ut.iutId);

			vc_ut.testerIdUP := f_msAddress2Upper(vc_ut.testerId);
@@ -71,14 +76,18 @@ 
			

		}//end f_initUt



		//TODO JP desc

		//TODO JP do nto forget the parameter itself p_useAllCallCommonId

		function f_initUt_isfAllCall(UseAllCallCommonId p_useAllCallCommonId)

		/**

		 * @desc	Init the Upper Tester

		 * @param	p_iutUseAllCall boolean parameter if the iut should use All Call

		 * @param	p_testerUseAllCall boolean parameter if the tester should use All Call

        */

		function f_initUt_isfAllCall(boolean p_iutUseAllCall, boolean p_testerUseAllCall)

		runs on Ut{



			vc_ut.useAllCallCommonId := p_useAllCallCommonId;

			vc_ut.iutId := f_createMsAddress(true /* its IUT */);

			vc_ut.testerId := f_createMsAddress(false /* its not IUT (its Tester) */);

			vc_ut.iut_useAllCallCommonId := p_iutUseAllCall;

			vc_ut.tester_useAllCallCommonId := p_testerUseAllCall;

			vc_ut.iutId := f_createMsAddressIUT(vc_ut.iut_useAllCallCommonId);

			vc_ut.testerId := f_createMsAddressTester(vc_ut.tester_useAllCallCommonId); 

			vc_ut.iutIdUP := f_msAddress2Upper(vc_ut.iutId);

			vc_ut.iutIdLP := f_msAddress2Lower(vc_ut.iutId);

			vc_ut.testerIdUP := f_msAddress2Upper(vc_ut.testerId);
@@ -90,45 +99,27 @@ 


	group configFunctions {



		/*

		 * @desc 	The ISF MSUT is configured to use PXT_APPLICABLE_COMMON_ID.

		 *			An CSF MSUT does not need to be configured. It will receive

		 *			in the Header frame the CalledId and OwnId.

		 * @param	p_cc is the CoulourCode used

		*/

//		function f_msConfigureRx(ColourCode p_cc)

//		/**

//		 * @desc 	The ISF MSUT is configured to use PXT_APPLICABLE_COMMON_ID.

//		 *			An CSF MSUT does not need to be configured. It will receive

//		 *			in the Header frame the CalledId and OwnId.

//		 * @param	p_cc is the CoulourCode used

//		 * @param	p_politeLvl is the Polite level used

//		 * @param	p_callType is the CallType used

//		*/

//		function f_msConfigureTx(ColourCode p_cc, PoliteLvl p_politeLvl, CallType p_callType)

//		runs on Mse

//		return FncRetCode {

//			var FncRetCode v_ret := e_success;

//			if (PIC_ISF_OR_CSF == e_isf) { 

//				//TODO JP wrong , CSF needs to be configured as well

//				// get rid of f_msConfigureRx/Tx and just use f_utsHandshake_Ut

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

//				v_ret := f_handshake_Ut(m_msCfgParamsIsfPoliteTx(f_getChannelNrFromColourCode(p_cc), p_politeLvl, p_callType, int2bit(PXT_APPLICABLE_COMMON_ID,8))); }

//			else { 

//				v_ret := f_handshake_Ut(m_msCfgParamsCsfPoliteTx(f_getChannelNrFromColourCode(p_cc), p_politeLvl, p_callType, fx_calcDialString(PXT_CSF_ADDRESS_TESTER)));

//			}

//			return v_ret;

//		}//end f_msConfigureRx



		/*

		 * @desc 	The ISF MSUT is configured to use PXT_APPLICABLE_COMMON_ID.

		 *			An CSF MSUT does not need to be configured. It will receive

		 *			in the Header frame the CalledId and OwnId.

		 * @param	p_cc is the CoulourCode used

		 * @param	p_politeLvl is the Polite level used

		 * @param	p_callType is the CallType used

		*/

		function f_msConfigureTx(ColourCode p_cc, PoliteLvl p_politeLvl, CallType p_callType)

		runs on Mse

		return FncRetCode {

			var FncRetCode v_ret := e_success;

			if (PIC_ISF_OR_CSF == e_isf) { 

				v_ret := f_handshake_Ut(m_msCfgParamsIsfPoliteTx(p_cc, p_politeLvl, p_callType, int2bit(PXT_APPLICABLE_COMMON_ID,8))); }

			else { 

				v_ret := f_handshake_Ut(m_msCfgParamsCsfPoliteTx(p_cc, p_politeLvl, p_callType, fx_calcDialString(PXT_CSF_ADDRESS_TESTER)));

			}

			return v_ret;

		}//end f_msConfigureTx

//		}//end f_msConfigureTx



		/*

		/**

		 * @desc 	Configure Upper Tester

		 * @param	p_msCfgParams MS config parameters

		 * @param   p_ret the return code
@@ -165,15 +156,106 @@ 


	group converterFunctions {



		/*

		/**

	 	 * @desc f_getChannelNrFromColourCode returns the Channel used

		 *

		 * @param   p_cc the colour code

		*/

		function f_getChannelNrFromColourCode( ColourCode p_cc ) 

		return ChannelNumber {

			var IsfChannelNr ret_isfChannelNr;

			var CsfChannelNr ret_csfChannelNr;

			if (PIC_ISF_OR_CSF == e_isf) {

				select (p_cc) {

					case (c_grpAcf1)

						{ ret_isfChannelNr := e_isfChannelNr_1; }

					case (c_grpAcf2)

						{ ret_isfChannelNr := e_isfChannelNr_2; }

					case (c_grpAcf3)

						{ ret_isfChannelNr := e_isfChannelNr_3; }

					case (c_grpAcf4)

						{ ret_isfChannelNr := e_isfChannelNr_4; }

					case (c_grpAcf5)

						{ ret_isfChannelNr := e_isfChannelNr_5; }

					case (c_grpAcf6)

						{ ret_isfChannelNr := e_isfChannelNr_6; }

					case (c_grpAcf7)

						{ ret_isfChannelNr := e_isfChannelNr_7; }

					case (c_grpAcf8)

						{ ret_isfChannelNr := e_isfChannelNr_8; }

					case (c_grpAcf9)

						{ ret_isfChannelNr := e_isfChannelNr_9; }

					case (c_grpAcf10)

						{ ret_isfChannelNr := e_isfChannelNr_10; }

					case (c_grpAcf11)

						{ ret_isfChannelNr := e_isfChannelNr_11; }

					case (c_grpAcf12)

						{ ret_isfChannelNr := e_isfChannelNr_12; }

					case (c_grpAcf13)

						{ ret_isfChannelNr := e_isfChannelNr_13; }

					case (c_grpAcf14)

						{ ret_isfChannelNr := e_isfChannelNr_14; }

					case (c_grpAcf15)

						{ ret_isfChannelNr := e_isfChannelNr_15; }

					case (c_grpAcf16)

						{ ret_isfChannelNr := e_isfChannelNr_16; }

					case else {

						// TODO fix it! if we come here then we are in error

					}

				}

				return { isfChannelNr := ret_isfChannelNr };

			} else { // its e_csf

				select (p_cc) {

					case (c_grpBcf1)

						{ ret_csfChannelNr := e_csfChannelNr_1; }

					case (c_grpBcf2)

						{ ret_csfChannelNr := e_csfChannelNr_2; }

					case (c_grpBcf3)

						{ ret_csfChannelNr := e_csfChannelNr_3; }

					case (c_grpBcf4)

						{ ret_csfChannelNr := e_csfChannelNr_4; }

					case (c_grpBcf5)

						{ ret_csfChannelNr := e_csfChannelNr_5; }

					case (c_grpBcf6)

						{ ret_csfChannelNr := e_csfChannelNr_6; }

					case (c_grpBcf7)

						{ ret_csfChannelNr := e_csfChannelNr_7; }

					case (c_grpBcf8)

						{ ret_csfChannelNr := e_csfChannelNr_8; }

					case (c_grpBcf9)

						{ ret_csfChannelNr := e_csfChannelNr_9; }

					case (c_grpBcf10)

						{ ret_csfChannelNr := e_csfChannelNr_10; }

					case (c_grpBcf11)

						{ ret_csfChannelNr := e_csfChannelNr_11; }

					case (c_grpBcf12)

						{ ret_csfChannelNr := e_csfChannelNr_12; }

					case (c_grpBcf13)

						{ ret_csfChannelNr := e_csfChannelNr_13; }

					case (c_grpBcf14)

						{ ret_csfChannelNr := e_csfChannelNr_14; }

					case (c_grpBcf15)

						{ ret_csfChannelNr := e_csfChannelNr_15; }

					case (c_grpBcf16)

						{ ret_csfChannelNr := e_csfChannelNr_16; }

					case else {

						// TODO fix it! if we come here then we are in error

					}

				}

			return { csfChannelNr := ret_csfChannelNr};

			}

		}







		/**

	 	 * @desc f_getCommonId returns the Common ID from an ISF address.

		 *		 This function shall be called only with a ISF address, if called with

		 *       an CSF address it will return the reserved Common ID value 0.

		 * @param   p_msAddress where to get the Common Id

		*/



		function f_getCommonId( MsAddress p_msAddress )

		runs on Ut return Common_ID {

		return Common_ID {

			if (ischosen(p_msAddress.isfAddress)) {

				return p_msAddress.isfAddress.common_ID; }

			else {
@@ -181,71 +263,65 @@ 
			}

		} // end f_getCommonId

		

		/*

		/**

	 	 * @desc f_getColourCode returns the Colour Code for ISF or CSF

		*/

		function f_getColourCode ()

		runs on Mse

		return ColourCode {

		

			var ColourCode v_cc;

			if (PIC_ISF_OR_CSF == e_isf) {

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_0) { v_cc := { isfColourCode := c_grpAcf1 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_1) { v_cc := { isfColourCode := c_grpAcf2 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_2) { v_cc := { isfColourCode := c_grpAcf3 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_3) { v_cc := { isfColourCode := c_grpAcf4 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_4) { v_cc := { isfColourCode := c_grpAcf5 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_5) { v_cc := { isfColourCode := c_grpAcf6 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_6) { v_cc := { isfColourCode := c_grpAcf7 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_7) { v_cc := { isfColourCode := c_grpAcf8 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_8) { v_cc := { isfColourCode := c_grpAcf9 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_9) { v_cc := { isfColourCode := c_grpAcf10 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_10) { v_cc := { isfColourCode := c_grpAcf11 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_11) { v_cc := { isfColourCode := c_grpAcf12 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_12) { v_cc := { isfColourCode := c_grpAcf13 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_13) { v_cc := { isfColourCode := c_grpAcf14 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_14) { v_cc := { isfColourCode := c_grpAcf15 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_15) { v_cc := { isfColourCode := c_grpAcf16 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_1) { v_cc := { isfColourCode := c_grpAcf1 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_2) { v_cc := { isfColourCode := c_grpAcf2 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_3) { v_cc := { isfColourCode := c_grpAcf3 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_4) { v_cc := { isfColourCode := c_grpAcf4 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_5) { v_cc := { isfColourCode := c_grpAcf5 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_6) { v_cc := { isfColourCode := c_grpAcf6 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_7) { v_cc := { isfColourCode := c_grpAcf7 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_8) { v_cc := { isfColourCode := c_grpAcf8 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_9) { v_cc := { isfColourCode := c_grpAcf9 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_10) { v_cc := { isfColourCode := c_grpAcf10 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_11) { v_cc := { isfColourCode := c_grpAcf11 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_12) { v_cc := { isfColourCode := c_grpAcf12 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_13) { v_cc := { isfColourCode := c_grpAcf13 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_14) { v_cc := { isfColourCode := c_grpAcf14 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_15) { v_cc := { isfColourCode := c_grpAcf15 };}

				if (PXT_ISF_CHANNEL_NR == e_isfChannelNr_16) { v_cc := { isfColourCode := c_grpAcf16 };}

			} 

			else { // e_csf

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_0) { v_cc := { csfColourCode := c_grpBcf1 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_1) { v_cc := { csfColourCode := c_grpBcf2 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_2) { v_cc := { csfColourCode := c_grpBcf3 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_3) { v_cc := { csfColourCode := c_grpBcf4 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_4) { v_cc := { csfColourCode := c_grpBcf5 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_5) { v_cc := { csfColourCode := c_grpBcf6 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_6) { v_cc := { csfColourCode := c_grpBcf7 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_7) { v_cc := { csfColourCode := c_grpBcf8 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_8) { v_cc := { csfColourCode := c_grpBcf9 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_9) { v_cc := { csfColourCode := c_grpBcf10 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_10) { v_cc := { csfColourCode := c_grpBcf11 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_11) { v_cc := { csfColourCode := c_grpBcf12 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_12) { v_cc := { csfColourCode := c_grpBcf13 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_13) { v_cc := { csfColourCode := c_grpBcf14 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_14) { v_cc := { csfColourCode := c_grpBcf15 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_15) { v_cc := { csfColourCode := c_grpBcf16 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_1) { v_cc := { csfColourCode := c_grpBcf1 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_2) { v_cc := { csfColourCode := c_grpBcf2 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_3) { v_cc := { csfColourCode := c_grpBcf3 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_4) { v_cc := { csfColourCode := c_grpBcf4 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_5) { v_cc := { csfColourCode := c_grpBcf5 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_6) { v_cc := { csfColourCode := c_grpBcf6 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_7) { v_cc := { csfColourCode := c_grpBcf7 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_8) { v_cc := { csfColourCode := c_grpBcf8 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_9) { v_cc := { csfColourCode := c_grpBcf9 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_10) { v_cc := { csfColourCode := c_grpBcf10 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_11) { v_cc := { csfColourCode := c_grpBcf11 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_12) { v_cc := { csfColourCode := c_grpBcf12 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_13) { v_cc := { csfColourCode := c_grpBcf13 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_14) { v_cc := { csfColourCode := c_grpBcf14 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_15) { v_cc := { csfColourCode := c_grpBcf15 };}

				if (PXT_CSF_CHANNEL_NR == e_csfChannelNr_16) { v_cc := { csfColourCode := c_grpBcf16 };}

			}

				

			return v_cc;

		

		} //end f_getColourCode	

	

		/*

		/**

	 	 * @desc f_createMsAddress returns an MsAddress.

		 *

		 * @param   a booloan if the unit is IUT

		 * @remark	This function should perhaps be rewritten (split) , and the enumerated type UseAllCallCommonId removed

		*/

		function f_createMsAddress(	boolean p_testingEntityIsIUT)

		runs on Mse

		function f_createMsAddressIUT(boolean p_useAllCall)

		return MsAddress {

			var MsAddress v_retAdr;

			if (PIC_ISF_OR_CSF == e_isf) {

				var ISFAddress v_retIsfAdr;

				if ((p_testingEntityIsIUT and ((vc_mse.useAllCallCommonId == e_iutUsesAllCallCommonId) or 

												(vc_mse.useAllCallCommonId == e_testerAndIutUseAllCallCommonId))) or

					((not p_testingEntityIsIUT) and ((vc_mse.useAllCallCommonId == e_testerUsesAllCallCommonId) or

													 (vc_mse.useAllCallCommonId == e_testerAndIutUseAllCallCommonId))))

				if (p_useAllCall)

				{

					v_retIsfAdr.common_ID := c_allCall;

				}
@@ -256,34 +332,42 @@ 
				v_retAdr := { isfAddress := v_retIsfAdr}

			}

			else { // e_csf

				v_retAdr := { csfAddress := f_getCsfAddress(p_testingEntityIsIUT) };

				v_retAdr := { csfAddress := PXT_CSF_ADDRESS_IUT };

			}

			return v_retAdr;

		}//end f_createMsAddress



		/*

	 	 * @desc f_getCsfAddress returns an CSFAddress.

		/**

	 	 * @desc f_createMsAddressTester returns an MsAddress.

		 *

		 * @param   a booloan if the unit is IUT

		 * @remark	This function should perhaps be rewritten (split) , and the enumerated type UseAllCallCommonId removed

		 * @param   a booloan if it should be a AllCall

		*/

		function f_getCsfAddress (boolean p_testingEntityIsIUT) 

		return CSFAddress {

			var CSFAddress v_ret;

			if (p_testingEntityIsIUT) {

				v_ret :=PXT_CSF_ADDRESS_IUT;

		function f_createMsAddressTester(boolean p_useAllCall)

		return MsAddress {

			var MsAddress v_retAdr;

			if (PIC_ISF_OR_CSF == e_isf) {

				var ISFAddress v_retIsfAdr;

				if (p_useAllCall)

				{

					v_retIsfAdr.common_ID := c_allCall;

				}

				else {

					v_retIsfAdr.common_ID := int2bit(PXT_APPLICABLE_COMMON_ID,c_commonIdLength);

				}

		    else { // its for tester

				v_ret :=PXT_CSF_ADDRESS_TESTER;

				v_retIsfAdr.fixedPart := c_isfFixedPart;

				v_retAdr := { isfAddress := v_retIsfAdr}

			}

			return v_ret;

			else { // e_csf

				v_retAdr := { csfAddress := PXT_CSF_ADDRESS_TESTER };

			}

			return v_retAdr;

		}//end f_createMsAddress



	}//end converterFunctions



group UtilityFunctions {



		/*

		/**

	 	 * @desc f_msAddress2Upper returns upper part of the MsAddress.

		 *

		 * @param   MsAddress
@@ -300,7 +384,7 @@ group UtilityFunctions { 
			}

		}



		/*

		/**

	 	 * @desc f_msAddress2Upper returns lower part of the MsAddress.

		 *

		 * @param   MsAddress

ttcn/dPMR_Messages.ttcn

+1 −6
Changes for ttcn/dPMR_Messages.ttcn: 1 added line, 6 removed lines.
Original line number Diff line number Diff line 
/*

/**

 *  @author   STF 340

 *  @version  $vx.x.x$

 *  @desc     This module defines message types for digfital Public Mobile
@@ -170,8 +170,6 @@ type record PacketDataTransmission { 
		type set length (1 .. c_maxNmbPDF) of PacketFrame PacketDataFrameList;









		// 11.1 A common Extended Header List for Voice, Data T1 and T2, Call Setup, and Service 

		//      Request transmissions and a specific extended header list for Type 3 packet data 

		//      header transmission.
@@ -180,9 +178,6 @@ type set length (1 .. c_maxNmbExtHdr) of HeaderFrame ExtendedHdrFrameList; 


		type set length (1 .. c_maxNmbExtHdr) of PacketDataHeader ExtendedPacketDataHdrList; 









	} // end group TransmissionSequences

ttcn/dPMR_Pics.ttcn

+2 −3
Changes for ttcn/dPMR_Pics.ttcn: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line 
/*

/**

 *	@author 	STF 340

 *  @version 	$vx.x.x$

 *	@desc		All Functions are defined here and grouped into functions for
@@ -17,11 +17,10 @@ module dPMR_Pics { 
	import from dPMR_TestConfiguration all;





	/*

	/**

	* @desc  	Is the IUT an ISF or CSF entity?

	* @remark	see PICS, Table A.1/1.

	*/ 

	modulepar {Entity PIC_ISF_OR_CSF := e_isf}





} // end module dPMR_PICS