Update to V9.2.0 (2010-03).

svn path=/trunk/; revision=32450

8 files changed, 191 insertions, 27 deletions

diff --git a/asn1/x2ap/X2AP-CommonDataTypes.asn b/asn1/x2ap/X2AP-CommonDataTypes.asn
index 451391fc1d..6feadf6829 100644
--- a/asn1/x2ap/X2AP-CommonDataTypes.asn
+++ b/asn1/x2ap/X2AP-CommonDataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V9.1.0 (2009-12)
+-- 3GPP TS 36.423 V9.2.0 (2010-03)
 
 -- 9.3.6	Common definitions
 -- **************************************************************
diff --git a/asn1/x2ap/X2AP-Constants.asn b/asn1/x2ap/X2AP-Constants.asn
index 1117c809aa..69fdd47a86 100644
--- a/asn1/x2ap/X2AP-Constants.asn
+++ b/asn1/x2ap/X2AP-Constants.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V9.1.0 (2009-12)
+-- 3GPP TS 36.423 V9.2.0 (2010-03)
 -- 9.3.7	Constant Definitions
 -- **************************************************************
 --
@@ -41,7 +41,7 @@ id-privateMessage												ProcedureCode ::= 11
 id-mobilitySettingsChange										ProcedureCode ::= 12 
 id-rLFIndication												ProcedureCode ::= 13 
 id-handoverReport												ProcedureCode ::= 14
-
+id-cellActivation												ProcedureCode ::= 15
 
 
 
@@ -65,7 +65,8 @@ maxnoofBPLMNs								INTEGER ::= 6
 maxnoofNeighbours							INTEGER ::= 512
 maxnoofPRBs									INTEGER ::= 110		
 maxPools									INTEGER ::= 16
-maxnoofCells								INTEGER ::= 16
+maxnoofCells								INTEGER ::= 16 
+maxnoofMBSFN								INTEGER ::= 8
 
 
 
@@ -131,5 +132,10 @@ id-SourceCellECGI															ProtocolIE-ID ::= 52
 id-FailureCellECGI															ProtocolIE-ID ::= 53
 id-HandoverReportType														ProtocolIE-ID ::= 54
 id-PRACH-Configuration														ProtocolIE-ID ::= 55
+id-MBSFN-Subframe-Info														ProtocolIE-ID ::= 56
+id-ServedCellsToActivate													ProtocolIE-ID ::= 57
+id-ActivatedCellList														ProtocolIE-ID ::= 58
+id-DeactivationIndication													ProtocolIE-ID ::= 59
+id-UE-RLF-Report-Container													ProtocolIE-ID ::= 60
 
 END
diff --git a/asn1/x2ap/X2AP-Containers.asn b/asn1/x2ap/X2AP-Containers.asn
index debbcf53cc..7e22bbb52d 100644
--- a/asn1/x2ap/X2AP-Containers.asn
+++ b/asn1/x2ap/X2AP-Containers.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V9.1.0 (2009-12)
+-- 3GPP TS 36.423 V9.2.0 (2010-03)
 -- 9.3.8	Container Definitions
 -- **************************************************************
 --
diff --git a/asn1/x2ap/X2AP-IEs.asn b/asn1/x2ap/X2AP-IEs.asn
index d56845a224..a440475008 100644
--- a/asn1/x2ap/X2AP-IEs.asn
+++ b/asn1/x2ap/X2AP-IEs.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V9.1.0 (2009-12)
+-- 3GPP TS 36.423 V9.2.0 (2010-03)
 -- 9.3.5	Information Element Definitions
 -- **************************************************************
 --
@@ -18,7 +18,8 @@ BEGIN
 IMPORTS
 	
 	id-E-RAB-Item,
-	id-Number-of-Antennaports,
+	id-Number-of-Antennaports, 
+	id-MBSFN-Subframe-Info,
 	id-PRACH-Configuration,
 
 	maxnoofBearers,	
@@ -35,7 +36,8 @@ IMPORTS
 	maxnoofNeighbours,
 	maxnoofPRBs,
 	maxNrOfErrors,
-	maxPools
+	maxPools,
+	maxnoofMBSFN
 
 FROM X2AP-Constants
 
@@ -146,7 +148,9 @@ CauseRadioNetwork ::= ENUMERATED {
 	...,
 	load-balancing,
 	handover-optimisation,
-	value-out-of-allowed-range
+	value-out-of-allowed-range,
+	multiple-E-RAB-ID-instances,
+	switch-off-ongoing
 
 }
 
@@ -248,6 +252,10 @@ CyclicPrefixUL ::= ENUMERATED {
 
 -- D
 
+DeactivationIndication::= ENUMERATED { 
+	deactivated,
+	...
+}
 
 DL-Forwarding ::= ENUMERATED {
 	dL-forwardingProposed,
@@ -393,7 +401,7 @@ ForbiddenLAs-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 
 ForbiddenLACs ::= SEQUENCE (SIZE(1..maxnoofForbLACs)) OF LAC
 
-
+Fourframes ::= BIT STRING (SIZE (24))
 
 -- G
 
@@ -451,7 +459,7 @@ GU-Group-ID-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 GUMMEI			::= SEQUENCE {
 	
 	gU-Group-ID		GU-Group-ID,
-	mMME-Code			MME-Code,
+	mME-Code			MME-Code,
 	iE-Extensions					ProtocolExtensionContainer { {GUMMEI-ExtIEs} } OPTIONAL,
 	...
 }
@@ -571,6 +579,20 @@ MME-Code		::= OCTET STRING (SIZE (1))
 
 Measurement-ID	::= INTEGER (1..4095, ...) 
 
+MBSFN-Subframe-Infolist::= SEQUENCE (SIZE(1.. maxnoofMBSFN)) OF MBSFN-Subframe-Info
+
+MBSFN-Subframe-Info	::= SEQUENCE {
+	radioframeAllocationPeriod		RadioframeAllocationPeriod,
+	radioframeAllocationOffset		RadioframeAllocationOffset,
+	subframeAllocation				SubframeAllocation,
+	iE-Extensions			ProtocolExtensionContainer { { MBSFN-Subframe-Info-ExtIEs } } 	OPTIONAL,
+	...
+}
+
+MBSFN-Subframe-Info-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 MobilityParametersModificationRange ::= SEQUENCE {
 	handoverTriggerChangeLowerLimit		INTEGER (-20..20),
 	handoverTriggerChangeUpperLimit		INTEGER (-20..20),
@@ -607,6 +629,9 @@ Number-of-Antennaports ::= ENUMERATED {
 }
 
 -- O
+
+Oneframe ::= BIT STRING (SIZE (6))
+
 -- P
 
 PDCP-SN ::= INTEGER (0..4095)  
@@ -729,6 +754,17 @@ DL-Total-PRB-usage::= INTEGER (0..100)
 
 UL-Total-PRB-usage::= INTEGER (0..100)
 
+RadioframeAllocationPeriod ::= ENUMERATED{
+	n1, 
+	n2, 
+	n4, 
+	n8, 
+	n16, 
+	n32,
+	...
+}
+
+RadioframeAllocationOffset ::= INTEGER (0..7, ...)
 
 -- S
 
@@ -768,8 +804,9 @@ ServedCell-Information ::= SEQUENCE {
 }
 
 ServedCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
-	{ ID id-Number-of-Antennaports			CRITICALITY ignore	EXTENSION Number-of-Antennaports				PRESENCE optional }|
-	{ ID id-PRACH-Configuration				CRITICALITY ignore	EXTENSION PRACH-Configuration				PRESENCE optional },
+	{ ID id-Number-of-Antennaports		CRITICALITY ignore	EXTENSION Number-of-Antennaports			PRESENCE optional }|
+	{ ID id-PRACH-Configuration			CRITICALITY ignore	EXTENSION PRACH-Configuration				PRESENCE optional },
+	{ ID id-MBSFN-Subframe-Info			CRITICALITY ignore	EXTENSION MBSFN-Subframe-Infolist			PRESENCE optional},
 	...
 }
 
@@ -819,6 +856,11 @@ SpecialSubframePatterns ::= ENUMERATED {
 
 SubscriberProfileIDforRFP ::= INTEGER (1..256) 
 
+SubframeAllocation ::= CHOICE {
+	oneframe						Oneframe,
+	fourframes						Fourframes,
+	...
+}
 
 -- T
 
@@ -940,9 +982,10 @@ UL-HighInterferenceIndicationInfo-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-
 UL-HighInterferenceIndication ::= BIT STRING (SIZE(1..110, ...))
 
+UE-RLF-Report-Container::= OCTET STRING
+-- This IE is a transparent container and shall be encoded as the rlfReport field contained in the UEInformationResponse message as defined in [9]
 
 -- V
 -- W
diff --git a/asn1/x2ap/X2AP-PDU-Contents.asn b/asn1/x2ap/X2AP-PDU-Contents.asn
index a39869083c..b3d285d26a 100644
--- a/asn1/x2ap/X2AP-PDU-Contents.asn
+++ b/asn1/x2ap/X2AP-PDU-Contents.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V9.1.0 (2009-12)
+-- 3GPP TS 36.423 V9.2.0 (2010-03)
 -- 9.3.4	PDU Definitions
 -- **************************************************************
 --
@@ -24,12 +24,12 @@ BEGIN
 IMPORTS
 	
 	AS-SecurityInformation,	
-	
 	Cause,
 	CompositeAvailableCapacityGroup,	
 	COUNTvalue,
 	CriticalityDiagnostics, 
 	CRNTI,
+	DeactivationIndication,	
 	DL-Forwarding,
 	ECGI,
 	E-RAB-ID,
@@ -50,7 +50,8 @@ IMPORTS
 	ReceiveStatusofULPDCPSDUs,
 	Registration-Request,
 	RelativeNarrowbandTxPower,
-	RadioResourceStatus,
+	RadioResourceStatus, 
+	UE-RLF-Report-Container,
 	RRC-Context,
 	ServedCell-Information,
 	ServedCells, 
@@ -96,6 +97,7 @@ FROM X2AP-IEs
 FROM X2AP-Containers
 
 	
+	id-ActivatedCellList,
 	id-Cause,
 	id-CellInformation,
 	id-CellInformation-Item,	
@@ -104,7 +106,8 @@ FROM X2AP-Containers
 	id-CellToReport,
 	id-CellToReport-Item, 
 	id-CompositeAvailableCapacityGroup,
-	id-CriticalityDiagnostics,
+	id-CriticalityDiagnostics, 
+	id-DeactivationIndication,
 	id-E-RABs-Admitted-Item,
 	id-E-RABs-Admitted-List,
 	id-E-RABs-NotAdmitted-List,
@@ -120,7 +123,8 @@ FROM X2AP-Containers
 	id-Old-eNB-UE-X2AP-ID,
 	id-Registration-Request,
 	id-ReportingPeriodicity,
-	id-ServedCells,
+	id-ServedCells, 
+	id-ServedCellsToActivate,
 	id-ServedCellsToAdd,
 	id-ServedCellsToModify,
 	id-ServedCellsToDelete,
@@ -148,7 +152,8 @@ FROM X2AP-Containers
 	id-SourceCellECGI,
 	id-FailureCellECGI,
 	id-Re-establishmentCellECGI,
-	id-HandoverReportType,
+	id-HandoverReportType, 
+ 	id-UE-RLF-Report-Container,
 
 
 	maxCellineNB,	
@@ -557,6 +562,7 @@ ServedCellsToModify-Item::= SEQUENCE {
 }
 
 ServedCellsToModify-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+{ ID id-DeactivationIndication			CRITICALITY ignore	EXTENSION DeactivationIndication				PRESENCE optional },
 	...
 }
 
@@ -714,7 +720,7 @@ CellMeasurementResult-Item ::= SEQUENCE {
 	cell-ID							ECGI,
 	hWOverLoadIndicator				HWLoadIndicator		OPTIONAL,
 	s1TNLOverLoadIndicator			S1TNLLoadIndicator	OPTIONAL,
-	radioresourceStatus				RadioResourceStatus	OPTIONAL,
+	radioResourceStatus				RadioResourceStatus	OPTIONAL,
 	iE-Extensions					ProtocolExtensionContainer { {CellMeasurementResult-Item-ExtIEs} }	OPTIONAL,
 	...
 }
@@ -772,6 +778,8 @@ MobilityChangeAcknowledge ::= SEQUENCE {
 }
 
 MobilityChangeAcknowledge-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-ENB1-Cell-ID			CRITICALITY reject	TYPE ECGI							PRESENCE mandatory	}|
+	{ ID id-ENB2-Cell-ID			CRITICALITY reject	TYPE ECGI							PRESENCE mandatory	}|
 	{ ID id-CriticalityDiagnostics	CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional },
 	...
 }
@@ -789,6 +797,8 @@ MobilityChangeFailure ::= SEQUENCE {
 }
 
 MobilityChangeFailure-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-ENB1-Cell-ID									CRITICALITY ignore	TYPE ECGI								PRESENCE mandatory	}|
+	{ ID id-ENB2-Cell-ID									CRITICALITY ignore	TYPE ECGI								PRESENCE mandatory	}|
 	{ ID id-Cause											CRITICALITY ignore	TYPE Cause												PRESENCE mandatory	}|
 	{ ID id-ENB2-Mobility-Parameters-Modification-Range		CRITICALITY ignore	TYPE MobilityParametersModificationRange		PRESENCE optional	}|
 	{ ID id-CriticalityDiagnostics							CRITICALITY ignore	TYPE CriticalityDiagnostics						PRESENCE optional },
@@ -810,7 +820,83 @@ RLFIndication-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-FailureCellPCI				CRITICALITY ignore		TYPE PCI			PRESENCE mandatory}|
 	{ ID id-Re-establishmentCellECGI	CRITICALITY ignore		TYPE ECGI			PRESENCE mandatory}|
 	{ ID id-FailureCellCRNTI			CRITICALITY ignore		TYPE CRNTI			PRESENCE mandatory}|
-	{ ID id-ShortMAC-I					CRITICALITY ignore		TYPE ShortMAC-I		PRESENCE optional},
+	{ ID id-ShortMAC-I					CRITICALITY ignore		TYPE ShortMAC-I		PRESENCE optional}|
+	{ ID id-UE-RLF-Report-Container		CRITICALITY ignore		TYPE UE-RLF-Report-Container	PRESENCE optional},
+	...
+}
+
+
+-- **************************************************************
+--
+-- Cell Activation Request
+--
+-- **************************************************************
+
+CellActivationRequest ::= SEQUENCE {
+	protocolIEs                     ProtocolIE-Container       {{CellActivationRequest-IEs}},
+	...
+}
+
+CellActivationRequest-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-ServedCellsToActivate 	CRITICALITY reject	TYPE ServedCellsToActivate		PRESENCE mandatory },
+	...
+}
+
+ServedCellsToActivate::= SEQUENCE (SIZE (1..maxCellineNB)) OF ServedCellsToActivate-Item
+ 
+ServedCellsToActivate-Item::= SEQUENCE {
+	ecgi						ECGI,
+	iE-Extensions					ProtocolExtensionContainer { { ServedCellsToActivate-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+ServedCellsToActivate-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+-- **************************************************************
+--
+-- Cell Activation Response
+--
+-- **************************************************************
+
+CellActivationResponse ::= SEQUENCE {
+	protocolIEs                     ProtocolIE-Container       {{CellActivationResponse-IEs}},
+	...
+}
+
+CellActivationResponse-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-ActivatedCellList 	CRITICALITY ignore		TYPE ActivatedCellList		PRESENCE mandatory }|
+	{ ID id-CriticalityDiagnostics	CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional },
+	...
+}
+
+ActivatedCellList ::= SEQUENCE (SIZE (1..maxCellineNB)) OF ActivatedCellList-Item
+ 
+ActivatedCellList-Item::= SEQUENCE {
+	ecgi								ECGI,
+	iE-Extensions						ProtocolExtensionContainer { { ActivatedCellList-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+ActivatedCellList-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+--**************************************************************
+--
+-- CELL ACTIVATION FAILURE
+--
+-- **************************************************************
+
+CellActivationFailure ::= SEQUENCE {
+	protocolIEs                     ProtocolIE-Container       {{CellActivationFailure-IEs}},
+	...
+}
+
+CellActivationFailure-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory	}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics		PRESENCE optional },
 	...
 }
 
diff --git a/asn1/x2ap/X2AP-PDU-Descriptions.asn b/asn1/x2ap/X2AP-PDU-Descriptions.asn
index e9d2c2b8c2..4f535f6c5b 100644
--- a/asn1/x2ap/X2AP-PDU-Descriptions.asn
+++ b/asn1/x2ap/X2AP-PDU-Descriptions.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V9.1.0 (2009-12)
+-- 3GPP TS 36.423 V9.2.0 (2010-03)
 -- 9.3.3	Elementary Procedure Definitions
 -- **************************************************************
 --
@@ -27,6 +27,9 @@ IMPORTS
 FROM X2AP-CommonDataTypes
 
 
+	CellActivationRequest,
+	CellActivationResponse,
+	CellActivationFailure,
 	ENBConfigurationUpdate,
 	ENBConfigurationUpdateAcknowledge,
 	ENBConfigurationUpdateFailure,
@@ -57,6 +60,7 @@ FROM X2AP-CommonDataTypes
 
 FROM X2AP-PDU-Contents
 
+	id-cellActivation,
 	id-eNBConfigurationUpdate,
 	id-errorIndication,
 	id-handoverCancel, 
@@ -151,7 +155,8 @@ X2AP-ELEMENTARY-PROCEDURES-CLASS-1 X2AP-ELEMENTARY-PROCEDURE ::= {
 	x2Setup													|
 	resourceStatusReportingInitiation						|
 	eNBConfigurationUpdate									|
-	mobilitySettingsChange									,
+	mobilitySettingsChange									|
+	cellActivation											,
 	...
 }
 
@@ -278,5 +283,13 @@ mobilitySettingsChange	X2AP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY				reject
 }
 
+cellActivation	X2AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		CellActivationRequest
+	SUCCESSFUL OUTCOME		CellActivationResponse
+	UNSUCCESSFUL OUTCOME	CellActivationFailure
+	PROCEDURE CODE			id-cellActivation
+	CRITICALITY				reject
+}
+
 
 END
diff --git a/asn1/x2ap/packet-x2ap-template.c b/asn1/x2ap/packet-x2ap-template.c
index d86dd8c2b0..7fc87483df 100644
--- a/asn1/x2ap/packet-x2ap-template.c
+++ b/asn1/x2ap/packet-x2ap-template.c
@@ -2,7 +2,7 @@
  * Routines for dissecting Evolved Universal Terrestrial Radio Access Network (EUTRAN);
  * X2 Application Protocol (X2AP);
  * 3GPP TS 36.423 packet dissection
- * Copyright 2007-2008, Anders Broman <anders.broman@ericsson.com>
+ * Copyright 2007-2010, Anders Broman <anders.broman@ericsson.com>
  *
  * $Id$
  *
@@ -25,7 +25,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  * Ref: 
- * 3GPP TS 36.423 V8.0.0 (2007-12)
+ * 3GPP TS 36.423 V9.2.0 (2010-03)
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/asn1/x2ap/x2ap.cnf b/asn1/x2ap/x2ap.cnf
index e904b23398..797dca886c 100644
--- a/asn1/x2ap/x2ap.cnf
+++ b/asn1/x2ap/x2ap.cnf
@@ -161,6 +161,7 @@ id-privateMessage						ProcedureCode
 id-mobilitySettingsChange				ProcedureCode
 id-rLFIndication						ProcedureCode
 id-handoverReport						ProcedureCode
+id-cellActivation						ProcedureCode
 
 # ProtocolIE-ID
 
@@ -219,7 +220,12 @@ id-SourceCellECGI															ProtocolIE-ID
 id-FailureCellECGI															ProtocolIE-ID
 id-HandoverReportType														ProtocolIE-ID
 id-PRACH-Configuration														ProtocolIE-ID
-
+id-MBSFN-Subframe-Info														ProtocolIE-ID
+id-ServedCellsToActivate													ProtocolIE-ID
+id-ActivatedCellList														ProtocolIE-ID
+id-DeactivationIndication													ProtocolIE-ID
+id-UE-RLF-Report-Container													ProtocolIE-ID
+ 
 #.REGISTER_NEW
 
 #X2AP-PROTOCOL-IES
@@ -275,11 +281,16 @@ ShortMAC-I									N x2ap.ies id-ShortMAC-I
 ECGI										N x2ap.ies id-SourceCellECGI
 ECGI										N x2ap.ies id-FailureCellECGI
 HandoverReportType							N x2ap.ies id-HandoverReportType
+UE-RLF-Report-Container						N x2ap.ies id-UE-RLF-Report-Container
+ServedCellsToActivate						N x2ap.ies id-ServedCellsToActivate
+ActivatedCellList							N x2ap.ies id-ActivatedCellList
 
 #X2AP-PROTOCOL-EXTENSION
 Number-of-Antennaports						N x2ap.extension id-Number-of-Antennaports
 CompositeAvailableCapacityGroup				N x2ap.extension id-CompositeAvailableCapacityGroup
 PRACH-Configuration							N x2ap.extension id-PRACH-Configuration
+MBSFN-Subframe-Infolist						N x2ap.extension id-MBSFN-Subframe-Info
+DeactivationIndication						N x2ap.extension id-DeactivationIndication
 
 # X2AP-PDU-Descriptions.asn  Interface Elementary Procedures
 #X2AP-ELEMENTARY-PROCEDURE
@@ -324,6 +335,11 @@ MobilityChangeRequest				N x2ap.proc.imsg id-mobilitySettingsChange
 MobilityChangeAcknowledge			N x2ap.proc.sout id-mobilitySettingsChange
 MobilityChangeFailure				N x2ap.proc.uout id-mobilitySettingsChange
 
+CellActivationRequest				N x2ap.proc.imsg id-cellActivation
+CellActivationResponse				N x2ap.proc.sout id-cellActivation
+CellActivationFailure				N x2ap.proc.uout id-cellActivation
+
+
 #.TYPE_ATTR
 BitRate TYPE = FT_UINT64 DISPLAY = BASE_DEC STRINGS = NULL
 #.END