changes in order to make it compile on TTwb (b87cabb5) · Commits · DMR / dPMR

ttcn/dPMR_Functions.ttcn

+45 −42

Original line number	Diff line number	Diff line
		@@ -177,52 +177,55 @@
		*/
		function f_getChannelNrFromColourCode( ColourCode p_cc )
		return ChannelNumber {
		var IsfChannelNr ret_isfChannelNr;
		var CsfChannelNr ret_csfChannelNr;

		var IsfChannelNr v_ret_isfChannelNr;
		var CsfChannelNr v_ret_csfChannelNr;
		var IsfColourCode v_isf_cc;
		var CsfColourCode v_csf_cc;

		if (ischosen(p_cc.isfColourCode)){
		v_isf_cc := p_cc.isfColourCode;
		if (c_grpAcf1 == v_isf_cc) {ret_isfChannelNr := e_isfChannelNr_1}
		if (c_grpAcf2 == v_isf_cc) {ret_isfChannelNr := e_isfChannelNr_2}
		if (c_grpAcf3 == v_isf_cc) {ret_isfChannelNr := e_isfChannelNr_3}
		if (c_grpAcf4 == v_isf_cc) {ret_isfChannelNr := e_isfChannelNr_4}
		if (c_grpAcf5 == v_isf_cc) {ret_isfChannelNr := e_isfChannelNr_5}
		if (c_grpAcf6 == v_isf_cc) {ret_isfChannelNr := e_isfChannelNr_6}
		if (c_grpAcf7 == v_isf_cc) {ret_isfChannelNr := e_isfChannelNr_7}
		if (c_grpAcf8 == v_isf_cc) {ret_isfChannelNr := e_isfChannelNr_8}
		if (c_grpAcf9 == v_isf_cc) {ret_isfChannelNr := e_isfChannelNr_9}
		if (c_grpAcf10 == v_isf_cc) {ret_isfChannelNr := e_isfChannelNr_10}
		if (c_grpAcf11 == v_isf_cc) {ret_isfChannelNr := e_isfChannelNr_11}
		if (c_grpAcf12 == v_isf_cc) {ret_isfChannelNr := e_isfChannelNr_12}
		if (c_grpAcf13 == v_isf_cc) {ret_isfChannelNr := e_isfChannelNr_13}
		if (c_grpAcf14 == v_isf_cc) {ret_isfChannelNr := e_isfChannelNr_14}
		if (c_grpAcf15 == v_isf_cc) {ret_isfChannelNr := e_isfChannelNr_15}
		if (c_grpAcf16 == v_isf_cc) {ret_isfChannelNr := e_isfChannelNr_16}
		return { isfChannelNr := ret_isfChannelNr };
		if (c_grpAcf1 == v_isf_cc) {v_ret_isfChannelNr := e_isfChannelNr_1;}
		if (c_grpAcf2 == v_isf_cc) {v_ret_isfChannelNr := e_isfChannelNr_2;}
		if (c_grpAcf3 == v_isf_cc) {v_ret_isfChannelNr := e_isfChannelNr_3;}
		if (c_grpAcf4 == v_isf_cc) {v_ret_isfChannelNr := e_isfChannelNr_4;}
		if (c_grpAcf5 == v_isf_cc) {v_ret_isfChannelNr := e_isfChannelNr_5;}
		if (c_grpAcf6 == v_isf_cc) {v_ret_isfChannelNr := e_isfChannelNr_6;}
		if (c_grpAcf7 == v_isf_cc) {v_ret_isfChannelNr := e_isfChannelNr_7;}
		if (c_grpAcf8 == v_isf_cc) {v_ret_isfChannelNr := e_isfChannelNr_8;}
		if (c_grpAcf9 == v_isf_cc) {v_ret_isfChannelNr := e_isfChannelNr_9;}
		if (c_grpAcf10 == v_isf_cc) {v_ret_isfChannelNr := e_isfChannelNr_10;}
		if (c_grpAcf11 == v_isf_cc) {v_ret_isfChannelNr := e_isfChannelNr_11;}
		if (c_grpAcf12 == v_isf_cc) {v_ret_isfChannelNr := e_isfChannelNr_12;}
		if (c_grpAcf13 == v_isf_cc) {v_ret_isfChannelNr := e_isfChannelNr_13;}
		if (c_grpAcf14 == v_isf_cc) {v_ret_isfChannelNr := e_isfChannelNr_14;}
		if (c_grpAcf15 == v_isf_cc) {v_ret_isfChannelNr := e_isfChannelNr_15;}
		if (c_grpAcf16 == v_isf_cc) {v_ret_isfChannelNr := e_isfChannelNr_16;}

		return valueof(m_isfChannelNumber(v_ret_isfChannelNr));
		} else { // its e_csf
		v_csf_cc := p_cc.isfColourCode;
		if (c_grpBcf1 == v_csf_cc) {ret_csfChannelNr := e_csfChannelNr_1}
		if (c_grpBcf2 == v_csf_cc) {ret_csfChannelNr := e_csfChannelNr_2}
		if (c_grpBcf3 == v_csf_cc) {ret_csfChannelNr := e_csfChannelNr_3}
		if (c_grpBcf4 == v_csf_cc) {ret_csfChannelNr := e_csfChannelNr_4}
		if (c_grpBcf5 == v_csf_cc) {ret_csfChannelNr := e_csfChannelNr_5}
		if (c_grpBcf6 == v_csf_cc) {ret_csfChannelNr := e_csfChannelNr_6}
		if (c_grpBcf7 == v_csf_cc) {ret_csfChannelNr := e_csfChannelNr_7}
		if (c_grpBcf8 == v_csf_cc) {ret_csfChannelNr := e_csfChannelNr_8}
		if (c_grpBcf9 == v_csf_cc) {ret_csfChannelNr := e_csfChannelNr_9}
		if (c_grpBcf10 == v_csf_cc) {ret_csfChannelNr := e_csfChannelNr_10}
		if (c_grpBcf11 == v_csf_cc) {ret_csfChannelNr := e_csfChannelNr_11}
		if (c_grpBcf12 == v_csf_cc) {ret_csfChannelNr := e_csfChannelNr_12}
		if (c_grpBcf13 == v_csf_cc) {ret_csfChannelNr := e_csfChannelNr_13}
		if (c_grpBcf14 == v_csf_cc) {ret_csfChannelNr := e_csfChannelNr_14}
		if (c_grpBcf15 == v_csf_cc) {ret_csfChannelNr := e_csfChannelNr_15}
		if (c_grpBcf16 == v_csf_cc) {ret_csfChannelNr := e_csfChannelNr_16}
		return { csfChannelNr := ret_csfChannelNr };
		v_csf_cc := p_cc.csfColourCode;
		if (c_grpBcf1 == v_csf_cc) {v_ret_csfChannelNr := e_csfChannelNr_1;}
		if (c_grpBcf2 == v_csf_cc) {v_ret_csfChannelNr := e_csfChannelNr_2;}
		if (c_grpBcf3 == v_csf_cc) {v_ret_csfChannelNr := e_csfChannelNr_3;}
		if (c_grpBcf4 == v_csf_cc) {v_ret_csfChannelNr := e_csfChannelNr_4;}
		if (c_grpBcf5 == v_csf_cc) {v_ret_csfChannelNr := e_csfChannelNr_5;}
		if (c_grpBcf6 == v_csf_cc) {v_ret_csfChannelNr := e_csfChannelNr_6;}
		if (c_grpBcf7 == v_csf_cc) {v_ret_csfChannelNr := e_csfChannelNr_7;}
		if (c_grpBcf8 == v_csf_cc) {v_ret_csfChannelNr := e_csfChannelNr_8;}
		if (c_grpBcf9 == v_csf_cc) {v_ret_csfChannelNr := e_csfChannelNr_9;}
		if (c_grpBcf10 == v_csf_cc) {v_ret_csfChannelNr := e_csfChannelNr_10;}
		if (c_grpBcf11 == v_csf_cc) {v_ret_csfChannelNr := e_csfChannelNr_11;}
		if (c_grpBcf12 == v_csf_cc) {v_ret_csfChannelNr := e_csfChannelNr_12;}
		if (c_grpBcf13 == v_csf_cc) {v_ret_csfChannelNr := e_csfChannelNr_13;}
		if (c_grpBcf14 == v_csf_cc) {v_ret_csfChannelNr := e_csfChannelNr_14;}
		if (c_grpBcf15 == v_csf_cc) {v_ret_csfChannelNr := e_csfChannelNr_15;}
		if (c_grpBcf16 == v_csf_cc) {v_ret_csfChannelNr := e_csfChannelNr_16;}

		return valueof(m_csfChannelNumber(v_ret_csfChannelNr));
		}
		} // end f_getChannelNrFromColourCode


		} // end f_getChannelNrFromColourCode

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

ttcn/dPMR_Pixits.ttcn

+5 −0

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

		/**
		* @desc T1 data for frame 1, 2, 3 and 4, must be chosen
		*
		* @remark TODO
		*/
		modulepar {Payload PXT_DATA_T1_F1}//modulepar {T1Payload PXT_DATA_T1_F1}
		modulepar {Payload PXT_DATA_T1_F2}
		modulepar {Payload PXT_DATA_T1_F3}

ttcn/dPMR_Templates.ttcn

+8 −0

Original line number	Diff line number	Diff line
		@@ -719,6 +719,14 @@
		csfAddress := p_cadr
		} // end m_msAddressFromCsfAddr

		template ChannelNumber m_isfChannelNumber (IsfChannelNr p_isfChannelNr) := {
		isfChannelNr := p_isfChannelNr
		}

		template ChannelNumber m_csfChannelNumber (CsfChannelNr p_csfChannelNr) := {
		csfChannelNr := p_csfChannelNr
		}

		} //end group InformationElementTemplates

		group Powersave {

ttcn/dPMR_TestCases.ttcn

+8 −7

Original line number	Diff line number	Diff line
		@@ -6024,7 +6024,7 @@ module dPMR_TestCases {
		log("** f_TC_T3Tx1400Bytes_MS01: wrong number of frames **");
		setverdict(fail);
		} else {
		v_eightFrame := v_packetDataTransmission.packetDataFrameList[v_NrOfFrames-1]
		v_eightFrame := v_packetDataTransmission.packetDataFrameList[v_NrOfFrames-1];
		if (v_eightFrame.validDataLength != 140) {
		tc_ac.stop ;
		log("** f_TC_T3Tx1400Bytes_MS01: wrong size of Frame 8 **");
		@@ -6660,6 +6660,7 @@ module dPMR_TestCases {
		deactivate;

		} // end function f_TC_VoiceHeaderFixedPartLowerTx_MS01

		/**
		* @desc Check that a data on T2 transmission from the MS (IUT) consists of
		* a Header Frame containing the Communication Mode set to '010b'

ttcn/dPMR_Types.ttcn

+2 −2

Original line number	Diff line number	Diff line
		@@ -232,7 +232,7 @@ module dPMR_Types {
		e_terminate (1)
		}

		type Bit16 CrcD // CRC for data field.
		type Bit16 CrcD ; // CRC for data field.

		type Bit24 CSFAddress;

		@@ -414,7 +414,7 @@ module dPMR_Types {
		type Bit2 Reserved2bit;
		type Bit4 Reserved4bit;
		type Bit5 Reserved5bit;
		type Bit14 Reserved14Bit
		type Bit14 Reserved14Bit;

		// 5.9 SLD format

Admin message