Commit eb7b78d3 authored by petersenj's avatar petersenj
Browse files

Updated template, implemented f_ConvertDialStringToAddress

parent 878ab533

ttcn/AtsDpmr_Defaults.ttcn

+3 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 *	@desc		Alternative default behaviour steps are defined here.

 *

 */

module dPMR_Defaults {

module AtsDpmr_Defaults {





	//LibCommon
@@ -56,6 +56,7 @@ module dPMR_Defaults { 
		[]	dp1Port.receive(m_callSetUpOrServiceRequest(

								m_headerFrame(

									mw_headerInformationTx(

										e_connReqHeader,

										vc_mse.testerId, 

										vc_mse.iutId, 

										p_commsMode,
@@ -79,4 +80,4 @@ module dPMR_Defaults { 
		}  

	}



 } // end module dPMR_Defaults
 
 } // end module AtsDpmr_Defaults

ttcn/AtsDpmr_ExtFunctions.ttcn

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 */

 



module dPMR_ExtFunctions {

module AtsDpmr_ExtFunctions {



	//LibCommon

	import from LibCommon_Sync all;
@@ -14,7 +14,7 @@ module dPMR_ExtFunctions { 
	import from LibCommon_BasicTypesAndValues all;

	import from LibCommon_DataStrings all;

	//Ats

	import from dPMR_Types all;

	import from AtsDpmr_Types all;

	

	/**

	 * @desc	xf_calcDialString calculates and returns the dialstring
@@ -67,4 +67,4 @@ module dPMR_ExtFunctions { 


	} // end group ChannelAccessExternalFunctions



}  // end module dPMR_ExtFunctions
 
}  // end module AtsDpmr_ExtFunctions

ttcn/AtsDpmr_Functions.ttcn

+34 −13
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *

 */

 

 module dPMR_Functions {

 module AtsDpmr_Functions {



	//LibCommon

	import from LibCommon_Sync all;
@@ -13,15 +13,15 @@ 
	import from LibCommon_BasicTypesAndValues all;

	import from LibCommon_DataStrings all;

	//Ats

	import from dPMR_Templates all;

	import from dPMR_Messages all;

	import from dPMR_TestConfiguration all;

	import from dPMR_Values all;

	import from dPMR_Types all;

	import from dPMR_TestSystem all;

	import from dPMR_ExtFunctions all;

	import from dPMR_Pics all;

	import from dPMR_Pixits all;

	import from AtsDpmr_Templates all;

	import from AtsDpmr_Messages all;

	import from AtsDpmr_TestConfiguration all;

	import from AtsDpmr_Values all;

	import from AtsDpmr_Types all;

	import from AtsDpmr_TestSystem all;

	import from AtsDpmr_ExtFunctions all;

	import from AtsDpmr_Pics all;

	import from AtsDpmr_Pixits all;



	group initFunctions {
@@ -393,10 +393,12 @@ group UtilityFunctions { 
		function f_getWrongColourCode(ColourCode p_cc) return ColourCode {

			var ColourCode v_retcc;

			if (PIC_ISF_OR_CSF == e_isf) {

				v_retcc.isfColourCode :=p_cc.isfColourCode;

				if (p_cc.isfColourCode != c_grpAcf1) {

					v_retcc.isfColourCode :=c_grpAcf1;

				}

			} else {

				v_retcc.csfColourCode :=p_cc.csfColourCode;

				if (p_cc.csfColourCode != c_grpBcf1) { 

					v_retcc.csfColourCode :=c_grpBcf1;

				}
@@ -407,11 +409,14 @@ group UtilityFunctions { 
		function f_ConvertDialStringToAddress(DialString p_inDialString)

		return MsAddress {

			var CSFAddress v_csfAddress;

			var octetstring v_octAdrString;

			var octetstring v_octAdrString2;

			var MsAddress v_retAdr;

			var charstring myprint;

			var integer tempAdr;

			var integer i;

			var integer v_tmpArr[8];

			for (i:=0;i>0;i:=i-1) {

			for (i:=7;i>0;i:=i-1) {

				if (p_inDialString[i-1] == "*") {  v_tmpArr[i] :=10;}

				if (p_inDialString[i-1] == "0") {  v_tmpArr[i] :=0;}

				if (p_inDialString[i-1] == "1") {  v_tmpArr[i] :=1;}
@@ -425,8 +430,24 @@ group UtilityFunctions { 
				if (p_inDialString[i-1] == "9") {  v_tmpArr[i] :=9;}

			}

			tempAdr := v_tmpArr[1]*1464100 + v_tmpArr[2]*146410+v_tmpArr[3]*14641+v_tmpArr[4]*1331+v_tmpArr[5]*121+v_tmpArr[6]*11+v_tmpArr[7];

			v_csfAddress := int2bit(tempAdr,24);

//			log(tempAdr);

			v_csfAddress := oct2bit(int2oct(tempAdr,3));

			v_retAdr := {csfAddress := v_csfAddress};

//			log(p_inDialString);

//			log(int2str(tempAdr));

//			log(v_csfAddress);

//			 TODO It might be neccessary to shift the bytes around according to where the bits are going!!!

//			v_octAdrString := int2oct(tempAdr,3);

//			v_octAdrString2 := int2oct(tempAdr,3);

//			v_octAdrString2[0] := v_octAdrString[2];

//			v_octAdrString2[2] := v_octAdrString[0];

//			log(v_octAdrString);

//			log(oct2bit(v_octAdrString));

//			log(v_octAdrString2);

//			log(oct2bit(v_octAdrString2));

//    i := 1806845;

//    log (bit2str(int2bit(i,24)));

//      log(bit2str(oct2bit(int2oct(i,3))));

			return v_retAdr

		}
@@ -516,4 +537,4 @@ group UtilityFunctions { 
		

	}//end taFunctions



} // end module dPMR_Functions
 
} // end module AtsDpmr_Functions

ttcn/AtsDpmr_Messages.ttcn

+6 −6
Original line number Diff line number Diff line
@@ -3,14 +3,14 @@ 
 *  @version  	$Id$

 *  @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 dPMR_types module.

 *  @see      dPMR_types

              information elements are defined in the AtsDpmr_types module.

 *  @see      AtsDpmr_types

 */



module dPMR_Messages {

module AtsDpmr_Messages {



  import from dPMR_Values all;

  import from dPMR_Types all;

  import from AtsDpmr_Values all;

  import from AtsDpmr_Types all;

  import from LibCommon_DataStrings all;



	group Frames {
@@ -186,4 +186,4 @@ module dPMR_Messages { 
	} // end group TransmissionSequences





} // end module dPMR_messages
 
} // end module AtsDpmr_messages

ttcn/AtsDpmr_Pics.ttcn

+4 −4
Original line number Diff line number Diff line
@@ -6,14 +6,14 @@ 
 *  

 */

 

module dPMR_Pics {

module AtsDpmr_Pics {



	//LibCommon

	import from LibCommon_DataStrings all;

	import from LibCommon_BasicTypesAndValues all;

	//Ats

	import from dPMR_Types all;

	import from dPMR_Values all;

	import from AtsDpmr_Types all;

	import from AtsDpmr_Values all;



	group Entitygroup { // PICS Clause A.5
@@ -642,4 +642,4 @@ module dPMR_Pics { 
	}





} // end module dPMR_PICS
 
} // end module AtsDpmr_PICS