Commit cf85e2ae authored by kristofferse's avatar kristofferse
Browse files

Finn introduced extHdrList

parent 70018025

ttcn/dPMR_Messages.ttcn

+23 −7
Original line number Diff line number Diff line
@@ -121,7 +121,8 @@ type record AckFrame { 


group TransmissionSequences {



type record PayloadContTransmission {

type record PayloadTransmission {

  ExtendedHdrFrameList  extHdrFrameList optional,

  HeaderFrame           headerFrame,

  SuperFrameList        sfList,

  EndFrame              endFrame
@@ -134,6 +135,7 @@ type set length( 1.. c_maxNbrOfSfs ) of SuperFrame SuperFrameList; 




type record CallOrSrvReq {

  ExtendedHdrFrameList  extHdrFrameList optional,

  HeaderFrame  headerFrame,

  EndFrame     endFrame

}
@@ -155,6 +157,7 @@ type record Disconnect { 




type record PacketDataTransmission {

  ExtendedPacketDataHdrList extPacketDataHdrList optional, 

  PacketDataHeader          packetDataHeader,

  PacketDataFrameList       packetDataFrameList,

  EndFrame                  endFrame
@@ -167,6 +170,19 @@ 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.



type set length (1 .. c_maxNmbExtHdr) of HeaderFrame ExtendedHdrFrameList;



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









} // end group TransmissionSequences

ttcn/dPMR_Templates.ttcn

+14 −12
Original line number Diff line number Diff line
@@ -24,13 +24,14 @@ 


	group MessageTemplates {



		template PayloadContTransmission m_payloadContTransmission ( template HeaderFrame p_headerFrame ,

	template PayloadTransmission m_payloadTransmission ( template HeaderFrame p_headerFrame ,

																 template SuperFrameList p_superFrameList ,

																 template EndFrame p_endFrame ) := {

			extHdrFrameList := omit ,

			headerFrame := p_headerFrame ,

			sfList := p_superFrameList ,

			endFrame := p_endFrame 

		} // end template m_payloadContTransmission

	} // end template m_payloadTransmission





		template SuperFrameList m_superFrameListWith4SuperFrames ( template SuperFrame p_superFrame) := {
@@ -151,6 +152,7 @@ 
		

	template CallOrSrvReq m_callOrSrvReq( template HeaderFrame p_headerFrame ,

										  template EndFrame p_endFrame ) := {

			extHdrFrameList := omit ,

			headerFrame := p_headerFrame ,

			endFrame := p_endFrame 

	} // end template m_callOrSrvReq

ttcn/dPMR_TestCases.ttcn

+21 −21
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ module dPMR_TestCases { 
			f_clientSyncAndVerdict(c_prDone, v_ret); 

	

		//Test Body

			dp1Port.send(	m_payloadContTransmission(

		dp1Port.send(	m_payloadTransmission(

							m_headerFrame(									

								m_headerInformation(e_commStartHeader,

													vc_mse.iutId,

ttcn/dPMR_TestSystem.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ group portDefs { 
		in  EndFrame ;

		in  PacketDataHeader ;

		in  AckFrame ;

		out PayloadContTransmission ;

		out PayloadTransmission ;

		out CallOrSrvReq ;

		out Acknowledgement ;

		out StatusReqAck ;
@@ -111,7 +111,7 @@ group portDefs { 
		out EndFrame ;

		out	PacketDataHeader ;

		out	AckFrame ;

		in	PayloadContTransmission ;

		in	PayloadTransmission ;

		in 	CallOrSrvReq ;

		in 	Acknowledgement ;

		in 	StatusReqAck ;

ttcn/dPMR_Values.ttcn

+6 −0
Original line number Diff line number Diff line
@@ -118,4 +118,10 @@ const bitstring c_lowerPartSelector := '111111111111'B; // 12 bits 
const DialString c_nonUsedDialStr := "0000000"; 





// 11.1 Maximum number of extended headers preceding an extended header transmission.



const UInt4 c_maxNmbExtHdr := 15; 







} // end module dPMR_Values
 
 No newline at end of file