TC review (6a54cfe1) · Commits · DMR / dPMR

ttcn/dPMR_Defaults.ttcn

+18 −7

Original line number	Diff line number	Diff line
		@@ -48,14 +48,25 @@ module dPMR_Defaults {
		altstep a_dftMse()
		runs on Mse{
		[] syncPort.receive(m_syncServerStop){
		log("a_dftSimu: Test component received STOP signal from MTC - going to IDLE state");
		log("a_dftSimu: TEST COMPONENT NOW STOPPING ITSELF!");
		log("** a_dftSimu: Test component received STOP signal from MTC - going to IDLE state. ** ");
		log("** a_dftSimu: TEST COMPONENT NOW STOPPING ITSELF! ** ");
		stop;
		}
		// receive connection request and send an ack
		//TODO use CoonectionReq template
		/* [] dp1Port.receive(m_headerFrame(mw_headerInformationTx(
		vc_mse.testerId, vc_mse.iutId, p_commMode, e_p2p),
		p_cc)) {

		dp1Port.send( m_sendAck(m_headerInformation(e_ack,
		vc_mse.testerId,
		vc_mse.iutId,
		p_commMode,
		e_p2p), p_cc));
		} */
		[] dp1Port.receive{
		setverdict(inconc);
		log("* a_dftSimu: Unexpected message received on dp1Port *");
		log("* a_dftSimu: Unexpected message received on dp1Port. *");
		repeat;
		}
		}

ttcn/dPMR_Functions.ttcn

+31 −0

Original line number	Diff line number	Diff line
		@@ -346,4 +346,35 @@ group UtilityFunctions {

		} //end UtilityFunctions

		group UtFunctions {

		/**
		* @desc This function will put the MS in an idle mode listening to a
		* certain channel using the Pixit id or address
		* @param p_cc the colour code (the channel)
		*/
		function f_msToStandby_UT( ColourCode p_cc )
		runs on Ut
		return FncRetCode {
		//Variables
		var FncRetCode v_ret := e_success;

		//Preamble // TODO JP check if we can configure the ConnReqMode here
		if (PIC_ISF_OR_CSF == e_isf) {
		v_ret := f_handshake_Ut(m_msToStandBy_utRequest(f_getChannelNrFromColourCode(p_cc),
		omit,
		f_getCommonId(vc_ut.iutId)));
		} else { // its e_csf
		v_ret := f_handshake_Ut(m_msToStandBy_utRequest(f_getChannelNrFromColourCode(p_cc),
		fx_calcDialString(PXT_CSF_ADDRESS_IUT),
		omit));
		}

		return v_ret;

		} // end f_msToStandby_UT


		}//end UtFunctions

		} // end module dPMR_Functions

ttcn/dPMR_Pics.ttcn

+14 −4

Original line number	Diff line number	Diff line
		@@ -22,8 +22,18 @@ module dPMR_Pics {
		* @remark see PICS, Table A.1/1.
		*/
		modulepar {Entity PIC_ISF_OR_CSF := e_isf}
		modulepar {ConnectionRequestConfigurability PIC_CONNECTION_REQUEST_CONFIGURABILITY := e_ConnectionRequestNotConfigurable}
		modulepar {VoiceConnectionRequestStatus PIC_VOICE_CONNECTION_REQUEST_CONFIG := e_voiceNonConnectionRequest}
		modulepar {DataConnectionRequestStatus PIC_DATA_CONNECTION_REQUEST_CONFIG := e_dataNonConnectionRequest}





		/**
		* @desc Is OACSU option preconfiguerd or can it be configured by user?
		* @remark see PICS, Table A.10/2, A.11/2
		*/
		modulepar {OacsuMode PIC_OACSU_MODE := e_oacsuPreconfigured}




		} // end module dPMR_PICS

ttcn/dPMR_Pixits.ttcn

+11 −7

Original line number	Diff line number	Diff line
		@@ -42,11 +42,18 @@ module dPMR_Pixits {
		modulepar {Payload PXT_VOICE_TEST_TONE_F3}
		modulepar {Payload PXT_VOICE_TEST_TONE_F4}

		modulepar {Payload PXT_DATA_T1_F1}
		modulepar {Payload PXT_DATA_T1_F1}//modulepar {T1Payload PXT_DATA_T1_F1}
		modulepar {Payload PXT_DATA_T1_F2}
		modulepar {Payload PXT_DATA_T1_F3}
		modulepar {Payload PXT_DATA_T1_F4}

		/**
		* @desc Data Length in Slow Data Field.
		* Every super frame must carry 4x72 bits = 36 bytes of which not all may be used. To align to the 36 byte border, padding bits are used.
		* This pixit indicates the useful data length.
		*
		* @remark see clause clause 5.9.2
		*/
		modulepar {DataLength PXT_DATA_T1_F1_length}
		modulepar {DataLength PXT_DATA_T1_F2_length}
		modulepar {DataLength PXT_DATA_T1_F3_length}
		@@ -61,13 +68,13 @@ module dPMR_Pixits {
		modulepar {ApplicableCommonId PXT_APPLICABLE_COMMON_ID := 1}

		/**
		* @desc Address of the Tester in CSF
		* @desc Primary Individual Address of the Tester in CSF
		* @remark see clause 8.2.2 and A.2
		*/
		modulepar {CSFAddress PXT_CSF_ADDRESS_TESTER := '111111110000000000000001'B }

		/**
		* @desc Address of the IUT in CSF
		* @desc Primary Individual Address of the IUT in CSF
		* @remark see clause 8.2.2 and A.2
		*/
		modulepar {CSFAddress PXT_CSF_ADDRESS_IUT := '111111110000000000000001'B }
		@@ -106,8 +113,5 @@ module dPMR_Pixits {
		*/
		modulepar {float PXT_MAX_CASE_EXEC_PERIOD := 5000E-3}
		} // end dPMR_Timers
		group dPMR_ConnectionRequestSettings {
		modulepar {VoiceConnectionRequestStatus PXT_VOICE_CONNECTION_REQUEST_CONFIG := e_voiceNonConnectionRequest}
		modulepar {DataConnectionRequestStatus PXT_DATA_CONNECTION_REQUEST_CONFIG := e_dataNonConnectionRequest}
		}

		} // end module dPMR_Pixits

ttcn/dPMR_Templates.ttcn

+9 −3

Original line number	Diff line number	Diff line
		@@ -21,6 +21,8 @@
		import from dPMR_Types all;
		import from dPMR_Values all;

		//TODO group templates in Acknowledegment / ConnectionReq / Disconnect / SuperFrame


		group MessageTemplates {

		@@ -34,9 +36,13 @@
		} // end template m_payloadTransmission


		template SuperFrameList m_superFrameListWith4SuperFrames ( template SuperFrame p_superFrame) := {
		p_superFrame,p_superFrame,p_superFrame,p_superFrame //,m_superFrame,m_superFrame,m_superFrame
		} // end template m_superFrameListWith4Frames
		template SuperFrameList m_superFrameList_1Elem ( template SuperFrame p_superFrame) := {
		p_superFrame
		}

		template SuperFrameList m_superFrameList_4Elem ( template SuperFrame p_superFrame) := {
		p_superFrame,p_superFrame,p_superFrame,p_superFrame
		}


		template SuperFrame m_superFrame ( template Frame1 m_frame1,