Some doc updates (@param etc), (fee2e27b) · Commits · DMR / dPMR

ttcn/AtsDpmr_ExtFunctions.ttcn

+3 −3

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ module AtsDpmr_ExtFunctions {
		* @desc xf_transmitVoice transmit voice
		* @param p_chNr Channel to transmit on
		* @param p_cc Colour Code
		* @param p_chNr Signal Level
		* @param p_dbM Signal Level
		*/
		external function xf_transmitVoice(ChannelNumber p_chNr, ColourCode p_cc, Int8 p_dbM);

		@@ -45,7 +45,7 @@ module AtsDpmr_ExtFunctions {
		* @desc xf_transmitVoice transmit voice
		* @param p_chNr Channel to transmit on
		* @param p_cc Colour Code
		* @param p_chNr Signal Level
		* @param p_dbM Signal Level
		* @param p_id ISF id
		*/
		external function xf_transmitVoiceToIsfId(ChannelNumber p_chNr, ColourCode p_cc, Int8 p_dbM, Common_ID p_id);
		@@ -54,7 +54,7 @@ module AtsDpmr_ExtFunctions {
		* @desc xf_transmitVoice transmit voice
		* @param p_chNr Channel to transmit on
		* @param p_cc Colour Code
		* @param p_chNr Signal Level
		* @param p_dbM Signal Level
		* @param p_groupDialString The group dialstring
		*/
		external function xf_transmitVoiceToCsfGroup(ChannelNumber p_chNr, ColourCode p_cc, Int8 p_dbM, DialString p_groupDialString);

ttcn/AtsDpmr_Functions.ttcn

+15 −12

Original line number	Diff line number	Diff line
		@@ -104,8 +104,7 @@

		/**
		* @desc Configure Upper Tester
		* @param p_msCfgParams MS config parameters
		* @param p_ret the return code
		* @param p_utRequest Ut request
		*/
		function f_handshake_Ut( template UtRequest p_utRequest)
		runs on Ut return FncRetCode{
		@@ -136,8 +135,7 @@

		/**
		* @desc Configure Tester
		* @param p_msCfgParams MS config parameters
		* @param p_ret the return code
		* @param p_taRequest ta Request
		*/
		function f_handshake_Ta( template TaRequest p_taRequest)
		runs on Mse return FncRetCode{
		@@ -292,7 +290,7 @@
		/**
		* @desc f_createMsAddressIUT returns an MsAddress.
		*
		* @param a booloan if the unit is IUT
		* @param p_useAllCall a booloan if the unit is IUT
		* @remark This function should perhaps be rewritten (split) , and the enumerated type UseAllCallCommonId removed
		*/
		function f_createMsAddressIUT(boolean p_useAllCall)
		@@ -319,7 +317,7 @@
		/**
		* @desc f_createMsAddressTester returns an MsAddress.
		*
		* @param a booloan if it should be a AllCall
		* @param p_useAllCall a booloan if it should be a AllCall
		*/
		function f_createMsAddressTester(boolean p_useAllCall)
		return MsAddress {
		@@ -349,7 +347,7 @@ group UtilityFunctions {
		/**
		* @desc f_msAddress2Upper returns upper part of the MsAddress.
		*
		* @param MsAddress
		* @param p_msAddress MsAddress
		*/
		function f_msAddress2Upper(MsAddress p_msAddress) return Bit12 {
		var Bit12 v_retval;
		@@ -371,7 +369,7 @@ group UtilityFunctions {
		/**
		* @desc f_msAddress2Lower returns lower part of the MsAddress.
		*
		* @param MsAddress
		* @param p_msAddress MsAddress
		*/
		function f_msAddress2Lower(MsAddress p_msAddress) return Bit12 {
		if (ischosen(p_msAddress.isfAddress)) {
		@@ -388,7 +386,7 @@ group UtilityFunctions {
		/*
		* @desc f_getWrongColourCode returns wrong colourcode i.e. != inparam
		*
		* @param ColourCode
		* @param p_cc ColourCode
		*/
		function f_getWrongColourCode(ColourCode p_cc) return ColourCode {
		var ColourCode v_retcc;
		@@ -406,6 +404,11 @@ group UtilityFunctions {
		return v_retcc;
		} // end f_getWrongColourCode

		/*
		* @desc f_ConvertDialStringToAddress Converts a DialString to an MSAddress
		*
		* @param p_inDialString DialString
		*/
		function f_ConvertDialStringToAddress(DialString p_inDialString)
		return MsAddress {
		var CSFAddress v_csfAddress;
		@@ -444,7 +447,7 @@ group UtilityFunctions {
		/**
		* @desc f_msToStandby_UT 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)
		* @param p_utActParam the action to be taken
		*/
		function f_msToStandby_UT(UtActParams p_utActParam)
		runs on Ut
		@@ -471,7 +474,8 @@ group UtilityFunctions {
		/**
		* @desc f_msToStandbyPoliteLevel_UT 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), The polite level
		* @param p_utActParam the action to be taken
		* @param p_politeLevel The polite level
		*/
		function f_msToStandbyPoliteLevel_UT(UtActParams p_utActParam, PoliteLvl p_politeLevel )
		runs on Ut
		@@ -502,7 +506,6 @@ group UtilityFunctions {
		/**
		* @desc f_taToStandby function will put the Test Adapter 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_taToStandby()
		runs on Mse

ttcn/AtsDpmr_Messages.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		* @desc This module defines message types for digfital Public Mobile
		Radio (dPMR) upper Dynamic Link Layer (DLL) message. Message
		information elements are defined in the AtsDpmr_types module.
		* @see AtsDpmr_types
		* @see AtsDpmr_Types
		*/

		module AtsDpmr_Messages {

ttcn/AtsDpmr_TestCases.ttcn

+87 −8

Original line number	Diff line number	Diff line
		@@ -1196,7 +1196,7 @@ module AtsDpmr_TestCases {
		f_startValidation( "TC_PMR_0406_01",v_mse_val,v_ut_val);

		// synchronize both PTCs
		f_serverSync2ClientsAndStop({c_prDone});
		f_serverSync2ClientsAndStop({c_prDone, c_tbDone});

		// Configuration Down
		f_cfMseDown(v_mse, v_ut);
		@@ -5916,7 +5916,7 @@ module AtsDpmr_TestCases {
		setverdict(fail);
		}
		} // end alt

		f_clientSyncAndVerdict(c_tbDone, v_ret);
		//no Postamble

		deactivate;
		@@ -8829,18 +8829,97 @@ module AtsDpmr_TestCases {
		return;
		}
		if (p_testCaseName == "TC_PMR_0405_02") {
		log("VALIDATION: ** please implement **");setverdict(fail);
		dp1Port.receive(mw_plt_val(?,?,?));
		// wait a few millisecs
		validationTimer.start(0.5);
		alt {
		[] validationTimer.timeout {
		}
		}
		dp1Port.send(m_callSetUpOrServiceRequest(
		m_headerFrame(
		m_headerInformation(e_connReqHeader, vc_mse.testerId, vc_mse.iutId, e_voice, e_p2p),
		vc_mse.colourCode),
		m_endFrame(m_endInformationAck))
		);
		setverdict(pass);
		return;
		}
		if (p_testCaseName == "TC_PMR_0406_01") {
		log("VALIDATION: ** please implement **");setverdict(fail);
		dp1Port.receive(mw_plt_val(?,?,?));
		// wait a few millisecs
		validationTimer.start(0.5);
		alt {
		[] validationTimer.timeout {
		}
		}
		validationTimer.start;

		alt {
		[] dp1Port.receive(m_callSetUpOrServiceRequest(
		m_headerFrame(?,vc_mse.colourCode),
		m_endFrame(?)))
		{
		validationTimer.stop;
		dp1Port.send(m_acknowledgement(
		m_headerInformation(e_ackHeader, vc_mse.testerId, vc_mse.iutId, e_voice, e_p2p),
		vc_mse.colourCode)); // normal ack
		setverdict(pass);
		}
		[] validationTimer.timeout {
		log("* f_TC_VAL: never received any match ! *");
		setverdict(fail);
		}
		} // end alt
		return;
		}
		if (p_testCaseName == "TC_PMR_0406_02") {
		log("VALIDATION: ** please implement **");setverdict(fail);
		dp1Port.receive(mw_plt_val(?,?,?));
		// wait a few millisecs
		validationTimer.start(0.5);
		alt {
		[] validationTimer.timeout {
		}
		}
		validationTimer.start;
		alt {
		[] dp1Port.receive( m_voiceorT1orT2PayloadTransmission(
		m_headerFrame(
		mw_headerInformationTx(
		e_commStartHeader,
		vc_mse.testerId,
		vc_mse.iutId,
		e_dataT1,
		e_p2p),
		vc_mse.colourCode),
		mw_superFrameList_OneOrManyElem(
		m_superFrame(
		mw_frame1dataT1orT2(
		vc_mse.testerIdUP,
		e_dataT1,
		mw_slowData(?,?,?,?)),
		mw_frame2dataT1orT2(
		vc_mse.colourCode,
		vc_mse.testerIdLP,
		e_dataT1,
		mw_slowData(?,?,?,?)),
		mw_frame3dataT1orT2(
		vc_mse.iutIdUP,
		e_dataT1,
		mw_slowData(?,?,?,?)),
		mw_frame4dataT1orT2(
		vc_mse.colourCode,
		vc_mse.iutIdLP,
		e_dataT1,
		mw_slowData(?,?,?,?)))),
		m_endFrame(mw_endInformation(e_AckReq))))
		{
		dp1Port.send(m_acknowledgement(
		m_headerInformation(e_ackHeader, vc_mse.testerId, vc_mse.iutId, e_dataT1, e_p2p),
		vc_mse.colourCode)); // normal ack
		}
		[] validationTimer.timeout {
		log("* f_TC_VAL: never received any match ! *");
		setverdict(fail);
		}
		} // end alt
		return;
		}
		if (p_testCaseName == "TC_PMR_0406_03") {

ttcn/AtsDpmr_TestConfiguration.ttcn

+0 −1

Original line number	Diff line number	Diff line
		@@ -116,7 +116,6 @@ group mapFns {

		/**
		* @desc This function maps all ports
		* @param void
		*
		*/
		function f_mapMse()