Update to the latest asn1 files and try to get rid of unused code warnings.

svn path=/trunk/; revision=26271

7 files changed, 655 insertions, 174 deletions

diff --git a/asn1/x2ap/X2AP-CommonDataTypes.asn b/asn1/x2ap/X2AP-CommonDataTypes.asn
index fef4d533d6..a5be5027e9 100644
--- a/asn1/x2ap/X2AP-CommonDataTypes.asn
+++ b/asn1/x2ap/X2AP-CommonDataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V8.0.0 (2007-12)
+-- 3GPP TS 36.423 V8.3.0 (2008-09)
 -- 9.3.6	Common Definitions
 -- **************************************************************
 --
@@ -49,3 +49,4 @@ ProtocolIE-ID		::= INTEGER (0..maxProtocolIEs)
 TriggeringMessage	::= ENUMERATED { initiating-message, successful-outcome, unsuccessful-outcome}
 
 END
+
diff --git a/asn1/x2ap/X2AP-Constants.asn b/asn1/x2ap/X2AP-Constants.asn
index 882f9ff6db..b2477c8dfb 100644
--- a/asn1/x2ap/X2AP-Constants.asn
+++ b/asn1/x2ap/X2AP-Constants.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V8.0.0 (2007-12)
+-- 3GPP TS 36.423 V8.3.0 (2008-09)
 -- 9.3.7	Constant Definitions
 -- **************************************************************
 --
@@ -31,9 +31,14 @@ id-handoverCancel												ProcedureCode ::= 1
 id-loadIndication												ProcedureCode ::= 2
 id-errorIndication												ProcedureCode ::= 3
 id-snStatusTransfer												ProcedureCode ::= 4
-id-releaseResource												ProcedureCode ::= 5
+id-uEContextRelease									ProcedureCode ::= 5
 id-x2Setup														ProcedureCode ::= 6
 id-reset														ProcedureCode ::= 7
+id-eNBConfigurationUpdate										ProcedureCode ::= 8
+id-resourceStatusUpdateInitiation								ProcedureCode ::= 9
+id-resourceStatusReporting										ProcedureCode ::= 10
+
+
 
 
 
@@ -43,17 +48,20 @@ id-reset														ProcedureCode ::= 7
 --
 -- **************************************************************
 
+maxEARFCN									INTEGER ::= 32767	-- FFS Value to be checked
 maxInterfaces								INTEGER ::= 16		-- FFS Value to be checked
-maxCellineNB								INTEGER ::= 256		-- FFS Value to be checked
+maxCellineNB								INTEGER ::= 256		
 maxnoofCells								INTEGER ::= 16		-- FFS Value to be checked
-maxnoofBearers								INTEGER ::= 16		-- FFS Value to be checked
+maxnoofBearers								INTEGER ::= 256		
 maxNrOfErrors								INTEGER ::= 256		-- FFS Value to be checked
 maxnoofPDCP-SN								INTEGER ::= 16		-- FFS Value to be checked
 maxnoofEPLMNs								INTEGER ::= 15		
 maxnoofEPLMNsPlusOne						INTEGER ::= 16		
-maxnoofForbLACs								INTEGER ::= 256		-- FFS Value to be checked
-maxnoofForbTAIs								INTEGER ::= 256		-- FFS Value to be checked
+maxnoofForbLACs								INTEGER ::= 4096		
+maxnoofForbTACs							    INTEGER ::= 4096	
 maxnoofBPLMNs								INTEGER ::= 6
+maxnoofPRBs									INTEGER ::= 110		-- FFS Value to be checked
+maxPools									INTEGER ::= 16		-- FFS Value to be checked
 
 
 
@@ -85,9 +93,21 @@ id-CriticalityDiagnostics													ProtocolIE-ID ::= 17
 id-Bearers-SubjectToStatusTransfer-List										ProtocolIE-ID ::= 18
 id-Bearers-SubjectToStatusTransfer-Item										ProtocolIE-ID ::= 19
 id-ServedCells																ProtocolIE-ID ::= 20
-id-ENB-Global-ID															ProtocolIE-ID ::= 21
+id-GlobalENB-ID																ProtocolIE-ID ::= 21
 id-TimeToWait																ProtocolIE-ID ::= 22
 id-GUMMEI-ID																ProtocolIE-ID ::= 23
+id-GUGroupIDList															ProtocolIE-ID ::= 24
+id-ServedCellsToAdd															ProtocolIE-ID ::= 25
+id-ServedCellsToModify														ProtocolIE-ID ::= 26
+id-ServedCellsToDelete														ProtocolIE-ID ::= 27
+id-Registration-Request														ProtocolIE-ID ::= 28
+id-CellToReport																ProtocolIE-ID ::= 29
+id-ReportingPeriodicity														ProtocolIE-ID ::= 30
+id-CellToReport-Item														ProtocolIE-ID ::= 31
+id-CellMeasurementResult													ProtocolIE-ID ::= 32
+id-CellMeasurementResult-Item												ProtocolIE-ID ::= 33
+id-GUGroupIDListToAdd														ProtocolIE-ID ::= 34
+id-GUGroupIDListToDelete													ProtocolIE-ID ::= 35
 
 
 END
diff --git a/asn1/x2ap/X2AP-Containers.asn b/asn1/x2ap/X2AP-Containers.asn
index 3a10f6eea9..e6b6661a9b 100644
--- a/asn1/x2ap/X2AP-Containers.asn
+++ b/asn1/x2ap/X2AP-Containers.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V1.0.1 (2007-10)
+-- 3GPP TS 36.423 V8.3.0 (2008-09)
 -- 9.3.8	Container Definitions
 -- **************************************************************
 --
@@ -196,3 +196,4 @@ PrivateIE-Field {X2AP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
 
 END
 
+
diff --git a/asn1/x2ap/X2AP-IEs.asn b/asn1/x2ap/X2AP-IEs.asn
index 27b1118cef..e03bfe1338 100644
--- a/asn1/x2ap/X2AP-IEs.asn
+++ b/asn1/x2ap/X2AP-IEs.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V8.0.0 (2007-12)
+-- 3GPP TS 36.423 V8.3.0 (2008-09
 -- 9.3.5	Information Element Definitions
 -- **************************************************************
 --
@@ -17,15 +17,21 @@ BEGIN
 
 IMPORTS
 	id-InterfacesToTrace-Item,
+
+	maxCellineNB,
+	maxEARFCN,
 	maxInterfaces,
-	maxNrOfErrors,
+	
 	maxnoofCells,
+	maxnoofBPLMNs,
 	maxnoofEPLMNs,
 	maxnoofEPLMNsPlusOne,
 	maxnoofForbLACs,
-	maxnoofForbTAIs,
-	maxCellineNB,
-	maxnoofBPLMNs
+	maxnoofForbTACs,
+	
+	maxnoofPRBs,
+	maxNrOfErrors,
+	maxPools
 
 FROM X2AP-Constants
 
@@ -35,27 +41,24 @@ FROM X2AP-Constants
 	TriggeringMessage
 FROM X2AP-CommonDataTypes
 
-	ProtocolIE-Single-Container{},
 	ProtocolExtensionContainer{},
-	X2AP-PROTOCOL-IES,
-	X2AP-PROTOCOL-EXTENSION
+	ProtocolIE-Single-Container{},
+	
+	X2AP-PROTOCOL-EXTENSION,
+	X2AP-PROTOCOL-IES
 FROM X2AP-Containers;
 
 -- A
 
-AggregateMaximumBitRate ::= SEQUENCE {
-	aggregateMaximumBitRateDownlink		SAE-Bearer-BitRate,
-	aggregateMaximumBitRateUplink		SAE-Bearer-BitRate,
-	...
-}
 
-AllocationAndRetentionPriority ::= OCTET STRING
+AllocationAndRetentionPriority ::= INTEGER (0..15)
 
 
 -- B
 
-Bearer-ID ::= BIT STRING (SIZE (8))  -- To be checked, FFS
+Bearer-ID ::= INTEGER (0..15, ...)  
 
+BitRate ::= INTEGER (0..10000000000)
 BroadcastPLMNs-Item ::= SEQUENCE (SIZE(1..maxnoofBPLMNs)) OF PLMN-Identity
 
 
@@ -90,10 +93,21 @@ CauseProtocol ::= ENUMERATED {
 }
 
 CauseRadioNetwork ::= ENUMERATED {
-	normal-ho,
-	emergency-ho,
-	load-balancing,
-	overload,
+	handover-desirable-for-radio-reasons,
+	time-critical-handover,
+	resource-optimisation-handover,
+	reduce-load-in-serving-cell,
+	partial-handover,
+	unknown-new-eNB-UE-X2AP-ID, 
+	unknown-old-eNB-UE-X2AP-ID, 
+	unknown-pair-of-UE-X2AP-ID,
+	ho-target-not-allowed,
+	tx2relocoverall-expiry,
+	trelocprep-expiry,
+	cell-not-available,
+	no-radio-resources-available-in-target-cell,
+	invalid-MME-GroupID,
+	unknown-MME-Code,
 	unspecified,
 	...
 
@@ -113,22 +127,30 @@ CellType ::= ENUMERATED{
 	...
 }
 
-CellId ::= OCTET STRING
 
+Cell-Transmission-Bandwidth ::= ENUMERATED {
+		bw6,
+	 	bw15,
+		bw25,
+	 	bw50,
+		bw75,
+		bw100,
+		...
+}
 
 
-CGI ::= SEQUENCE {
-	pLMN-Identity			PLMN-Identity,
-	lAC						LAC,
-	cI						CI,
-	iE-Extensions			ProtocolExtensionContainer { {CGI-ExtIEs} } OPTIONAL
+
+COUNTvalue ::= SEQUENCE {
+	pDCP-SN					PDCP-SN,
+	hFN						HFN,
+	iE-Extensions			ProtocolExtensionContainer { { COUNTvalue-ExtIEs} } OPTIONAL,
+	...
 }
 
-CGI-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+COUNTvalue-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-CI					::= OCTET STRING (SIZE (2))
 
 CriticalityDiagnostics ::= SEQUENCE {
 	procedureCode					ProcedureCode					OPTIONAL,
@@ -139,11 +161,6 @@ CriticalityDiagnostics ::= SEQUENCE {
 	...
 }
 
-COUNTvalue ::= SEQUENCE {
-	pDCP-SN			PDCP-SN,
-	hFN				HFN,
-	...
-}
 
 CriticalityDiagnostics-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
@@ -156,7 +173,7 @@ CriticalityDiagnostics-IE-List ::= SEQUENCE (SIZE (1..maxNrOfErrors)) OF
 		typeOfError				TypeOfError,
 		iE-Extensions			ProtocolExtensionContainer { {CriticalityDiagnostics-IE-List-ExtIEs} } OPTIONAL,
 		...
-	}
+}
 
 CriticalityDiagnostics-IE-List-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
@@ -166,7 +183,6 @@ CriticalityDiagnostics-IE-List-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 
 -- D
 
-DL-data-received ::= INTEGER
 
 DL-Forwarding ::= ENUMERATED {
 	dL-forwardingProposed,
@@ -175,10 +191,33 @@ DL-Forwarding ::= ENUMERATED {
 
 -- E
 
-ENB-Global-ID		::= INTEGER (0..65535)  -- Value to be checked FFS
+EARFCN ::= INTEGER (0..maxEARFCN)
+
+ECGI ::= SEQUENCE {
+	pLMN-Identity				PLMN-Identity,
+	eUTRANcellIdentifier		EUTRANCellIdentifier,
+	iE-Extensions				ProtocolExtensionContainer { {ECGI-ExtIEs} } OPTIONAL,
+	...
+}
+
+ECGI-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+ENB-ID ::= CHOICE {
+	macro-eNB-ID	BIT STRING (SIZE (20)),
+	home-eNB-ID		BIT STRING (SIZE (28)),
+	...
+}
 
 EPLMNs ::= SEQUENCE (SIZE(1..maxnoofEPLMNs)) OF PLMN-Identity
 
+EventType ::= ENUMERATED{
+	change-of-serving-cell,
+	...
+}
+
+EUTRANCellIdentifier ::= BIT STRING (SIZE (28))
 
 -- F
 
@@ -193,10 +232,10 @@ ForbiddenTAs ::= SEQUENCE (SIZE(1.. maxnoofEPLMNsPlusOne)) OF ForbiddenTAs-Item
 
 ForbiddenTAs-Item ::= SEQUENCE {
 	pLMN-Identity		PLMN-Identity,
-	forbiddenTAIs		ForbiddenTAIs
+	forbiddenTACs		ForbiddenTACs
 }
 
-ForbiddenTAIs ::= SEQUENCE (SIZE(1..maxnoofForbTAIs)) OF TAI
+ForbiddenTACs ::= SEQUENCE (SIZE(1..maxnoofForbTACs)) OF TAC
 
 ForbiddenLAs ::= SEQUENCE (SIZE(1..maxnoofEPLMNsPlusOne)) OF ForbiddenLAs-Item
 
@@ -207,12 +246,33 @@ ForbiddenLAs-Item ::= SEQUENCE {
 
 ForbiddenLACs ::= SEQUENCE (SIZE(1..maxnoofForbLACs)) OF LAC
 
-Frequency ::= OCTET STRING
 
 
 -- G
 
+GBR-QosInformation ::= SEQUENCE {
+	sAE-Bearer-MaximumBitrateDL			BitRate,
+	sAE-Bearer-MaximumBitrateUL			BitRate,
+	sAE-Bearer-GuaranteedBitrateDL		BitRate,
+	sAE-Bearer-GuaranteedBitrateUL		BitRate,
+	iE-Extensions						ProtocolExtensionContainer { { GBR-QosInformation-ExtIEs} } OPTIONAL,
+	...
+}
+
+GBR-QosInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+GlobalENB-ID ::= SEQUENCE {
+	pLMN-Identity			PLMN-Identity,
+	eNB-ID					ENB-ID,
+	iE-Extensions			ProtocolExtensionContainer { {GlobalENB-ID-ExtIEs} } OPTIONAL,
+	...
+}
 
+GlobalENB-ID-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 GTPtunnelEndpoint ::= SEQUENCE {
 	transportLayerAddress			TransportLayerAddress,
 	gTP-TEID						GTP-TEI,
@@ -226,9 +286,24 @@ GTPtunnelEndpoint-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 
 GTP-TEI					::= OCTET STRING (SIZE (4))
 
-GUMMEI			::= SEQUENCE {
+GUGroupIDList		::= SEQUENCE (SIZE (1..maxPools)) OF GU-Group-ID
+
+
+GU-Group-ID			::= SEQUENCE {
 	pLMN-Identity		PLMN-Identity,
 	mME-Group-ID		MME-Group-ID,
+	iE-Extensions		ProtocolExtensionContainer { {GU-Group-ID-ExtIEs} } OPTIONAL,
+	...
+}
+
+GU-Group-ID-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+GUMMEI			::= SEQUENCE {
+	
+	gU-Group-ID		GU-Group-ID,
 	mMME-Code			MME-Code,
 	iE-Extensions					ProtocolExtensionContainer { {GUMMEI-ExtIEs} } OPTIONAL,
 	...
@@ -243,6 +318,7 @@ GUMMEI-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 -- H
 
 HandoverRestrictionList ::= SEQUENCE {
+	servingPLMN					PLMN-Identity,
 	equivalentPLMNs				EPLMNs					OPTIONAL,
 	forbiddenTAs				ForbiddenTAs			OPTIONAL,
 	forbiddenLAs				ForbiddenLAs			OPTIONAL,
@@ -262,7 +338,7 @@ HFN ::= INTEGER (0..1048575)
 -- I
 
 
-InterfacesToTrace ::= SEQUENCE (SIZE(0..maxInterfaces)) OF ProtocolIE-Single-Container {{InterfacesToTrace-ItemIEs} }
+InterfacesToTrace ::= SEQUENCE (SIZE(1..maxInterfaces)) OF ProtocolIE-Single-Container {{InterfacesToTrace-ItemIEs} }
 
 InterfacesToTrace-ItemIEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-InterfacesToTrace-Item	CRITICALITY ignore	TYPE InterfacesToTrace-Item 	PRESENCE mandatory	}
@@ -279,18 +355,16 @@ InterfacesToTrace-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-InterferenceOverloadIndication ::= OCTET STRING  -- FFS
 
 -- J
 -- K
 -- L
 
-Label ::= INTEGER (1..256)
 
 LAC					::= OCTET STRING (SIZE (2)) --(EXCEPT ('0000'H|'FFFE'H))
 
 LastVisitedCell-Item ::= SEQUENCE {
-	global-Cell-ID					CGI,
+	global-Cell-ID					ECGI,
 	cellType						CellType,
 	time-UE-StayedInCell			Time-UE-StayedInCell	OPTIONAL,
 	iE-Extensions					ProtocolExtensionContainer { {LastVisitedCell-Item-ExtIEs} } OPTIONAL,
@@ -301,9 +375,20 @@ LastVisitedCell-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+LocationReportingInformation ::= SEQUENCE {
+	eventType		EventType,
+	reportArea		ReportArea,
+	iE-Extensions		ProtocolExtensionContainer { {LocationReportingInformation-ExtIEs} } OPTIONAL,
+	...
+}
+
+LocationReportingInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::={
+	...
+}
 
 -- M
 
+
 MME-Group-ID	::= OCTET STRING (SIZE (2))
 
 MME-Code		::= OCTET STRING (SIZE (1))
@@ -316,78 +401,102 @@ MME-Code		::= OCTET STRING (SIZE (1))
 
 PDCP-SN ::= INTEGER (0..4095)  
 
-PhyCID ::= OCTET STRING
+PhyCID ::= INTEGER (1..504, ...)
 
 
 PLMN-Identity ::= OCTET STRING (SIZE(3))
 
 -- Q
--- R
 
-RB-type ::= INTEGER
--- Editors note: FFS To be replaced by other QCI definition, ENUMERATED??
+QCI ::= INTEGER (1..256)
 
-ReceiveStatusofULPDCPSDUs ::= BIT STRING (SIZE(256)) 
-
-RRC-Context ::= OCTET STRING
+-- R
 
--- S
 
-SAE-Bearer-BitRate ::= INTEGER (0..210000000000)
+ReceiveStatusofULPDCPSDUs ::= BIT STRING (SIZE(4096))
 
-SAE-BearerLevel-QoS-Parameters ::= SEQUENCE {
-	label				Label,
-	allocationAndRetentionPriority	AllocationAndRetentionPriority,  --FFS
-	sAE-BearerType			SAE-BearerType,
+Registration-Request	::= ENUMERATED {
+	start,
+	stop,
 	...
 }
+ 
+RelativeNarrowbandTxPower ::= SEQUENCE {
 
-
-SAE-BearerType ::= CHOICE {
-	sAE-GBR-bearer		SAE-GBR-Bearer,
-	sAE-non-GBR-bearer		SAE-Non-GBR-Bearer,
+	rNTP-PerPRB							BIT STRING (SIZE(6..110, ...)),
+	rNTP-Threshold						RNTP-Threshold,
+	numberOfCellSpecificAntennaPorts	ENUMERATED {one, two, four, ...},
+	p-B									INTEGER (0..3,...),
+	pDCCH-InterferenceImpact			INTEGER (0..4,...),
+	iE-Extensions						ProtocolExtensionContainer { { RelativeNarrowbandTxPower-ExtIEs} } OPTIONAL,
 	...
 }
 
-SAE-GBR-Bearer ::= SEQUENCE {
-	sAE-Bearer-MaximumBitrateDL			SAE-Bearer-BitRate,
-	sAE-Bearer-MaximumBitrateUL			SAE-Bearer-BitRate,
-	sAE-Bearer-GuaranteedBitrateDL		SAE-Bearer-BitRate,
-	sAE-Bearer-GuaranteedBitrateUL		SAE-Bearer-BitRate,
-	iE-Extensions						ProtocolExtensionContainer { {SAE-GBR-Bearer-Parameters-ExtIEs} } OPTIONAL,
+RelativeNarrowbandTxPower-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-SAE-GBR-Bearer-Parameters-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ReportArea ::= ENUMERATED{
+	ecgi,
 	...
 }
 
-
-SAE-Non-GBR-Bearer ::= SEQUENCE {
-	sAE-non-GBR-Bearer-Type			SAE-Non-GBR-Bearer-Type,
-	iE-Extensions						ProtocolExtensionContainer { {SAE-non-GBR-Bearer-Parameters-ExtIEs} } OPTIONAL,
+RNTP-Threshold ::= ENUMERATED {
+	minusInfinity,
+	minusEleven,
+	minusTen,
+	minusNine,
+	minusEight,
+	minusSeven,
+	minusSix,
+	minusFive,
+	minusFour,
+	minusThree,
+	minusTwo,
+	minusOne,
+	zero,
+	one,
+	two,
+	three,
 	...
 }
 
-SAE-non-GBR-Bearer-Parameters-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+RRC-Context ::= OCTET STRING
+
+ResourceStatus			::= INTEGER
+
+
+-- S
+
+
+SAE-BearerLevel-QoS-Parameters ::= SEQUENCE {
+	qCI				QCI,
+	allocationAndRetentionPriority	AllocationAndRetentionPriority,
+	
+	gbrQosInformation				GBR-QosInformation			OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { { SAE-BearerLevel-QoS-Parameters-ExtIEs} } OPTIONAL,
 	...
 }
 
-SAE-Non-GBR-Bearer-Type ::= ENUMERATED {
-	non-GBR-Bearer,
+SAE-BearerLevel-QoS-Parameters-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
 
+
+
+
 ServedCells		::= SEQUENCE (SIZE (1..maxCellineNB)) OF ServedCell-Information
 
 
 ServedCell-Information ::= SEQUENCE {
 	phyCID				PhyCID,
-	cellId				CellId,
-	tAI					TAI,
+	cellId				ECGI,
+	tAC					TAC,
 	broadcastPLMNs		BroadcastPLMNs-Item,
-	frequency			Frequency,
+	uL-EARFCN			EARFCN,
+	dL-EARFCN			EARFCN,
+	cell-Transmission-Bandwidth		Cell-Transmission-Bandwidth,
 	iE-Extensions		ProtocolExtensionContainer { {ServedCell-Information-ExtIEs} } OPTIONAL,
 	...
 }
@@ -396,10 +505,12 @@ ServedCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+SubscriberProfileIDforRFP ::= INTEGER (1..256) 
+
 
 -- T
 
-TAI ::= OCTET STRING 	-- FFS
+TAC ::= OCTET STRING 	-- FFS
 
 TargeteNBtoSource-eNBTransparentContainer	::= OCTET STRING
 
@@ -438,7 +549,7 @@ TraceInterface		::= ENUMERATED {
 	...
 }
 
-TraceReference					::= OCTET STRING (SIZE (3))
+TraceReference					::= OCTET STRING (SIZE (8))
 
 
 TransportLayerAddress			::= BIT STRING (SIZE(1..160, ...))
@@ -455,11 +566,45 @@ TypeOfError ::= ENUMERATED {
 UE-HistoryInformation ::= SEQUENCE (SIZE(1..maxnoofCells)) OF LastVisitedCell-Item
 
 
-UE-S1AP-ID					::= INTEGER (0..4095) -- Value FFS
+UE-S1AP-ID					::= INTEGER (0.. 4294967295)
 
 UE-X2AP-ID					::= INTEGER (0..4095) -- Value FFS
 
+UEAggregateMaximumBitRate ::= SEQUENCE {
+	uEaggregateMaximumBitRateDownlink	BitRate,
+	uEaggregateMaximumBitRateUplink		BitRate,
+	iE-Extensions						ProtocolExtensionContainer { {UEAggregate-MaximumBitrate-ExtIEs} } OPTIONAL,
+	...
+}
+
+UEAggregate-MaximumBitrate-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+UL-InterferenceOverloadIndication ::= SEQUENCE (SIZE(1..maxnoofPRBs)) OF UL-InterferenceOverloadIndication-Item
+
+UL-InterferenceOverloadIndication-Item ::= ENUMERATED {
+	high-interference,
+	medium-interference,
+	low-interference,
+	...
+}
+
+UL-HighInterferenceIndicationInfo ::= SEQUENCE (SIZE(1..maxCellineNB)) OF UL-HighInterferenceIndicationInfo-Item
+
+UL-HighInterferenceIndicationInfo-Item ::= SEQUENCE {
+	ul-interferenceindication		UL-HighInterferenceIndication,
+	target-Cell-ID					ECGI,
+	iE-Extensions					ProtocolExtensionContainer { { UL-HighInterferenceIndicationInfo-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+UL-HighInterferenceIndicationInfo-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 
+UL-HighInterferenceIndication ::= BIT STRING (SIZE(1..110, ...))
 
 
 -- V
diff --git a/asn1/x2ap/X2AP-PDU-Contents.asn b/asn1/x2ap/X2AP-PDU-Contents.asn
index a2f00c7286..7fde73aaf7 100644
--- a/asn1/x2ap/X2AP-PDU-Contents.asn
+++ b/asn1/x2ap/X2AP-PDU-Contents.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V8.0.0 (2007-12)
+-- 3GPP TS 36.423 V8.3.0 (2008-09
 -- 9.3.4	PDU Definitions
 -- **************************************************************
 --
@@ -22,42 +22,60 @@ BEGIN
 -- **************************************************************
 
 IMPORTS
-	AggregateMaximumBitRate,
+	
 	Bearer-ID,
 	Cause,
-	CGI,
+	
 	COUNTvalue,
 	CriticalityDiagnostics,
 	DL-Forwarding,
-	ENB-Global-ID,
+	ECGI,
+	GlobalENB-ID,
+	GTPtunnelEndpoint,
+	GUGroupIDList,
 	GUMMEI,
 	HandoverRestrictionList,
-	InterferenceOverloadIndication,
+	
+	
+	LocationReportingInformation,
 	PDCP-SN,
 	PLMN-Identity,
-	UE-S1AP-ID,
-	RB-type,
+	
 	ReceiveStatusofULPDCPSDUs,
+	Registration-Request,
+	RelativeNarrowbandTxPower,
+	ResourceStatus,
 	RRC-Context,
 	SAE-BearerLevel-QoS-Parameters,
+	ServedCell-Information,
 	ServedCells,
+	SubscriberProfileIDforRFP,
+	TargeteNBtoSource-eNBTransparentContainer,
 	TimeToWait,
 	TraceActivation,
-	TargeteNBtoSource-eNBTransparentContainer,
+	
 	TraceDepth,
 	TraceReference,
 	TransportLayerAddress,
+	UEAggregateMaximumBitRate,
 	UE-HistoryInformation,
-	GTPtunnelEndpoint,
-	UE-X2AP-ID
+	UE-S1AP-ID,
+	UE-X2AP-ID,
+	
+	UL-HighInterferenceIndicationInfo,
+	UL-InterferenceOverloadIndication
+	
+	
+	
 FROM X2AP-IEs
 
 	PrivateIE-Container{},
 	ProtocolExtensionContainer{},
+	ProtocolIE-Container{},
 	ProtocolIE-ContainerList{},
 	ProtocolIE-ContainerPair{},
 	ProtocolIE-ContainerPairList{},
-	ProtocolIE-Container{},
+	
 	ProtocolIE-Single-Container{},
 	X2AP-PRIVATE-IES,
 	X2AP-PROTOCOL-EXTENSION,
@@ -71,27 +89,42 @@ FROM X2AP-Containers
 	id-Bearers-NotAdmitted-List,
 	id-Bearers-SubjectToStatusTransfer-List,
 	id-Bearers-SubjectToStatusTransfer-Item,
-	id-Cause,
+	id-Bearers-ToBeSetup-Item,	id-Cause,
 	id-CellInformation,
-	id-CellInformation-Item,
+	id-CellInformation-Item,	
+	id-CellMeasurementResult,
+	id-CellMeasurementResult-Item,
+	id-CellToReport,
+	id-CellToReport-Item,
+	
 	id-CriticalityDiagnostics,
-	id-ENB-Global-ID,
+	id-GlobalENB-ID,
+	id-GUGroupIDList,
+	id-GUGroupIDListToAdd,
+	id-GUGroupIDListToDelete,
 	id-GUMMEI-ID,
-	id-UE-ContextInformation,
-	id-Bearers-ToBeSetup-Item,
-	id-New-eNB-UE-X2AP-ID,
+			id-New-eNB-UE-X2AP-ID,
 	id-Old-eNB-UE-X2AP-ID,
+	id-Registration-Request,
+	id-ReportingPeriodicity,
 	id-ServedCells,
+	id-ServedCellsToAdd,
+	id-ServedCellsToModify,
+	id-ServedCellsToDelete,
 	id-TargetCell-ID,
 	id-TargeteNBtoSource-eNBTransparentContainer,
 	id-TimeToWait,
 	id-TraceActivation,
+	id-UE-ContextInformation,
 	id-UE-HistoryInformation,
 	id-UE-X2AP-ID,
+	
 
+
+	maxCellineNB,	
 	maxnoofBearers,
-	maxnoofPDCP-SN,
-	maxCellineNB
+	maxnoofPDCP-SN
+	
 FROM X2AP-Constants;
 
 -- **************************************************************
@@ -108,7 +141,7 @@ HandoverRequest ::= SEQUENCE {
 HandoverRequest-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-Old-eNB-UE-X2AP-ID				CRITICALITY reject	TYPE UE-X2AP-ID 				PRESENCE mandatory } |
 	{ ID id-Cause							CRITICALITY ignore	TYPE Cause 						PRESENCE mandatory } |
-	{ ID id-TargetCell-ID					CRITICALITY reject	TYPE CGI 						PRESENCE mandatory } |
+	{ ID id-TargetCell-ID					CRITICALITY reject	TYPE ECGI 						PRESENCE mandatory } |
 	{ ID id-GUMMEI-ID						CRITICALITY reject	TYPE GUMMEI  					PRESENCE mandatory } |
 	{ ID id-UE-ContextInformation			CRITICALITY reject	TYPE UE-ContextInformation 		PRESENCE mandatory } |
 	{ ID id-UE-HistoryInformation			CRITICALITY ignore	TYPE UE-HistoryInformation 		PRESENCE optional } |
@@ -118,11 +151,12 @@ HandoverRequest-IEs X2AP-PROTOCOL-IES ::= {
 
 UE-ContextInformation ::= SEQUENCE {
 	mME-UE-S1AP-ID						UE-S1AP-ID,
-	aggregateMaximumBitRate				AggregateMaximumBitRate,
-	bearers-ToBeSetup-List				Bearers-ToBeSetup-List,
+	uEaggregateMaximumBitRate			UEAggregateMaximumBitRate,
+	subscriberProfileIDforRFP			SubscriberProfileIDforRFP		OPTIONAL,
+bearers-ToBeSetup-List				Bearers-ToBeSetup-List,
 	rRC-Context							RRC-Context, 
-	servingPLMN							PLMN-Identity				OPTIONAL,
-	handoverRestrictionList				HandoverRestrictionList		OPTIONAL,
+		handoverRestrictionList				HandoverRestrictionList		OPTIONAL,
+	locationReportingInformation		LocationReportingInformation	OPTIONAL,
 	iE-Extensions						ProtocolExtensionContainer { {UE-ContextInformation-ExtIEs} } OPTIONAL,
 	...
 }
@@ -131,7 +165,7 @@ UE-ContextInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-Bearers-ToBeSetup-List ::= SEQUENCE (SIZE(0..maxnoofBearers)) OF ProtocolIE-Single-Container { {Bearers-ToBeSetup-ItemIEs} }
+Bearers-ToBeSetup-List ::= SEQUENCE (SIZE(1..maxnoofBearers)) OF ProtocolIE-Single-Container { {Bearers-ToBeSetup-ItemIEs} }
 
 Bearers-ToBeSetup-ItemIEs 	X2AP-PROTOCOL-IES ::= {
 	{ ID id-Bearers-ToBeSetup-Item	 CRITICALITY ignore 	TYPE Bearers-ToBeSetup-Item 	PRESENCE mandatory },
@@ -141,9 +175,8 @@ Bearers-ToBeSetup-ItemIEs 	X2AP-PROTOCOL-IES ::= {
 Bearers-ToBeSetup-Item ::= SEQUENCE {
 	sAE-Bearer-ID					Bearer-ID,
 	sAE-BearerLevel-QoS-Parameters		SAE-BearerLevel-QoS-Parameters,
-	dL-Forwarding					DL-Forwarding,
+	dL-Forwarding					DL-Forwarding													OPTIONAL,
 	uL-GTPtunnelEndpoint			GTPtunnelEndpoint,
-	rB-type 						RB-type,
 	iE-Extensions					ProtocolExtensionContainer { {Bearers-ToBeSetup-ItemExtIEs} } OPTIONAL,
 	...
 }
@@ -166,11 +199,13 @@ HandoverRequestAcknowledge ::= SEQUENCE {
 }
 
 HandoverRequestAcknowledge-IEs X2AP-PROTOCOL-IES ::= {
-	{ ID id-Old-eNB-UE-X2AP-ID							CRITICALITY reject	TYPE UE-X2AP-ID							PRESENCE mandatory} |
-	{ ID id-New-eNB-UE-X2AP-ID							CRITICALITY reject	TYPE UE-X2AP-ID							PRESENCE mandatory} |
-	{ ID id-Bearers-Admitted-List						CRITICALITY ignore	TYPE Bearers-Admitted-List			PRESENCE optional	} |
-	{ ID id-Bearers-NotAdmitted-List					CRITICALITY ignore	TYPE Bearers-NotAdmitted-List		PRESENCE optional	} |
-	{ ID id-TargeteNBtoSource-eNBTransparentContainer	CRITICALITY ignore	TYPE TargeteNBtoSource-eNBTransparentContainer			PRESENCE mandatory },
+	{ ID id-Old-eNB-UE-X2AP-ID							CRITICALITY reject	TYPE UE-X2AP-ID													PRESENCE mandatory} |
+	{ ID id-New-eNB-UE-X2AP-ID							CRITICALITY reject	TYPE UE-X2AP-ID													PRESENCE mandatory} |
+	{ ID id-Bearers-Admitted-List						CRITICALITY ignore	TYPE Bearers-Admitted-List									PRESENCE optional	} |
+	{ ID id-Bearers-NotAdmitted-List					CRITICALITY ignore	TYPE Bearers-NotAdmitted-List								PRESENCE optional	} |
+	{ ID id-TargeteNBtoSource-eNBTransparentContainer	CRITICALITY ignore	TYPE TargeteNBtoSource-eNBTransparentContainer		PRESENCE mandatory }|
+	{ ID id-CriticalityDiagnostics						CRITICALITY ignore	TYPE CriticalityDiagnostics									PRESENCE optional },
+
 	...
 }
 
@@ -223,7 +258,9 @@ HandoverPreparationFailure ::= SEQUENCE {
 
 HandoverPreparationFailure-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-Old-eNB-UE-X2AP-ID			CRITICALITY reject	TYPE UE-X2AP-ID				PRESENCE mandatory} |
-	{ ID id-Cause						CRITICALITY ignore	TYPE Cause					PRESENCE mandatory} ,
+	{ ID id-Cause						CRITICALITY ignore	TYPE Cause					PRESENCE mandatory} |
+	{ ID id-CriticalityDiagnostics	    CRITICALITY ignore	TYPE CriticalityDiagnostics	PRESENCE optional },
+
 	...
 }
 
@@ -271,16 +308,16 @@ Bearers-SubjectToStatusTransfer-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 
 -- **************************************************************
 --
--- Release Resource
+-- UE Context Release 
 --
 -- **************************************************************
 
-ReleaseResource ::= SEQUENCE {
-	protocolIEs                     ProtocolIE-Container       {{ReleaseResource-IEs}},
+UEContextRelease ::= SEQUENCE {
+	protocolIEs                     ProtocolIE-Container       {{UEContextRelease-IEs}},
 	...
 }
 
-ReleaseResource-IEs X2AP-PROTOCOL-IES ::= {
+UEContextRelease-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-Old-eNB-UE-X2AP-ID			CRITICALITY reject	TYPE UE-X2AP-ID				PRESENCE mandatory} |
 	{ ID id-New-eNB-UE-X2AP-ID			CRITICALITY reject	TYPE UE-X2AP-ID				PRESENCE mandatory} ,
 	...
@@ -336,6 +373,7 @@ ResetRequest ::= SEQUENCE {
 }
 
 ResetRequest-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory	},
 	...
 }
 
@@ -351,6 +389,7 @@ ResetResponse ::= SEQUENCE {
 }
 
 ResetResponse-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-CriticalityDiagnostics	CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional },
 	...
 }
 
@@ -366,9 +405,10 @@ X2SetupRequest ::= SEQUENCE {
 }
 
 X2SetupRequest-IEs X2AP-PROTOCOL-IES ::= {
-	{ ID id-ENB-Global-ID				CRITICALITY reject	TYPE ENB-Global-ID				PRESENCE mandatory} |
-	{ ID id-ServedCells			CRITICALITY reject	TYPE ServedCells		PRESENCE mandatory} ,
-	...
+	{ ID id-GlobalENB-ID				CRITICALITY reject	TYPE GlobalENB-ID				PRESENCE mandatory} |
+	{ ID id-ServedCells						CRITICALITY reject	TYPE ServedCells						PRESENCE mandatory} |
+	{ ID id-GUGroupIDList					CRITICALITY reject  TYPE GUGroupIDList						PRESENCE optional},
+...
 }
 
 
@@ -385,8 +425,11 @@ X2SetupResponse ::= SEQUENCE {
 }
 
 X2SetupResponse-IEs X2AP-PROTOCOL-IES ::= {
-	{ ID id-ENB-Global-ID				CRITICALITY reject	TYPE ENB-Global-ID				PRESENCE mandatory} |
-	{ ID id-ServedCells			CRITICALITY reject	TYPE ServedCells		PRESENCE mandatory} ,
+	{ ID id-GlobalENB-ID				CRITICALITY reject	TYPE GlobalENB-ID				 PRESENCE mandatory} |
+	{ ID id-ServedCells						CRITICALITY reject	TYPE ServedCells				   	PRESENCE mandatory} |
+	{ ID id-GUGroupIDList					CRITICALITY reject  TYPE GUGroupIDList				    	PRESENCE optional}|
+	{ ID id-CriticalityDiagnostics	    	CRITICALITY ignore	TYPE CriticalityDiagnostics				PRESENCE optional },
+
 	...
 }
 
@@ -404,8 +447,10 @@ X2SetupFailure ::= SEQUENCE {
 }
 
 X2SetupFailure-IEs X2AP-PROTOCOL-IES ::= {
-	{ ID id-Cause				CRITICALITY ignore	TYPE Cause			PRESENCE mandatory} |
-	{ ID id-TimeToWait			CRITICALITY ignore	TYPE TimeToWait		PRESENCE optional} ,
+	{ ID id-Cause					CRITICALITY ignore		TYPE Cause								PRESENCE mandatory} |
+	{ ID id-TimeToWait				CRITICALITY ignore		TYPE TimeToWait							PRESENCE optional} |
+	{ ID id-CriticalityDiagnostics	CRITICALITY ignore		TYPE CriticalityDiagnostics				PRESENCE optional },
+
 	...
 }
 
@@ -434,8 +479,10 @@ CellInformation-ItemIEs X2AP-PROTOCOL-IES ::= {
 }
 
 CellInformation-Item ::= SEQUENCE {
-	global-Cell-ID							CGI,
-	interferenceOverloadIndication			InterferenceOverloadIndication		OPTIONAL,
+	cell-ID							ECGI,
+	ul-InterferenceOverloadIndication		UL-InterferenceOverloadIndication		OPTIONAL,
+	ul-HighInterferenceIndicationInfo		UL-HighInterferenceIndicationInfo		OPTIONAL,
+	relativeNarrowbandTxPower				RelativeNarrowbandTxPower				OPTIONAL,
 	iE-Extensions							ProtocolExtensionContainer { {CellInformation-Item-ExtIEs} } OPTIONAL,
 	...
 }
@@ -443,6 +490,189 @@ CellInformation-Item ::= SEQUENCE {
 CellInformation-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
+
+-- **************************************************************
+--
+-- ENB CONFIGURATION UPDATE
+--
+-- **************************************************************
+
+ENBConfigurationUpdate ::= SEQUENCE {
+	protocolIEs                     ProtocolIE-Container       {{ENBConfigurationUpdate-IEs}},
+	...
+}
+
+ENBConfigurationUpdate-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-ServedCellsToAdd    	CRITICALITY reject	TYPE ServedCells				PRESENCE optional} |
+	{ ID id-ServedCellsToModify 	CRITICALITY reject	TYPE ServedCellsToModify		PRESENCE optional} |
+	{ ID id-ServedCellsToDelete 	CRITICALITY reject	TYPE Old-ECGIs					PRESENCE optional} |
+	{ ID id-GUGroupIDListToAdd 		CRITICALITY reject	TYPE GUGroupIDList			    PRESENCE optional} |
+	{ ID id-GUGroupIDListToDelete 	CRITICALITY reject	TYPE GUGroupIDList		        PRESENCE optional},
+	...
+}
+
+ServedCellsToModify::= SEQUENCE (SIZE (1..maxCellineNB)) OF ServedCellsToModify-Item
+ 
+ServedCellsToModify-Item::= SEQUENCE {
+	old-ecgi						ECGI,
+	served-cells                    ServedCell-Information,
+	iE-Extensions					ProtocolExtensionContainer { { ServedCellsToModify-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+ServedCellsToModify-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+Old-ECGIs::= SEQUENCE (SIZE (1..maxCellineNB)) OF ECGI
+
+-- **************************************************************
+--
+-- ENB CONFIGURATION UPDATE ACKNOWLEDGE
+--
+-- **************************************************************
+
+ENBConfigurationUpdateAcknowledge ::= SEQUENCE {
+	protocolIEs                     ProtocolIE-Container       {{ENBConfigurationUpdateAcknowledge-IEs}},
+	...
+}
+
+ENBConfigurationUpdateAcknowledge-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
+...
+}
+
+-- **************************************************************
+--
+-- ENB CONFIGURATION UPDATE FAIURE
+--
+-- **************************************************************
+
+ENBConfigurationUpdateFailure ::= SEQUENCE {
+	protocolIEs                     ProtocolIE-Container       {{ENBConfigurationUpdateFailure-IEs}},
+	...
+}
+
+ENBConfigurationUpdateFailure-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory	}|
+	{ ID id-TimeToWait					CRITICALITY ignore	TYPE TimeToWait					PRESENCE optional	}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics		PRESENCE optional },
+	...
+}
+
+
+
+-- **************************************************************
+--
+-- Resource Status Request
+--
+-- **************************************************************
+
+ResourceStatusRequest ::= SEQUENCE {
+	protocolIEs                     ProtocolIE-Container       {{ResourceStatusRequest-IEs}},
+	...
+}
+
+ResourceStatusRequest-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-Registration-Request	CRITICALITY reject	TYPE Registration-Request			PRESENCE mandatory} |
+	{ ID id-CellToReport			CRITICALITY ignore	TYPE CellToReport-List				PRESENCE optional} |
+	{ ID id-ReportingPeriodicity	CRITICALITY ignore	TYPE ReportingPeriod				PRESENCE optional} ,
+	...
+}
+
+
+CellToReport-List 		::= SEQUENCE (SIZE (1..maxCellineNB)) OF ProtocolIE-Single-Container { {CellToReport-ItemIEs} }
+
+CellToReport-ItemIEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-CellToReport-Item	CRITICALITY ignore	TYPE CellToReport-Item 	PRESENCE mandatory	}
+}
+
+CellToReport-Item ::= SEQUENCE {
+	cell-ID									ECGI,
+	iE-Extensions							ProtocolExtensionContainer { {CellToReport-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+CellToReport-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+ReportingPeriod ::= ENUMERATED {ffs,...}
+-- The Report Period gives the reporting periodicity in number of ffs ms periods.
+-- E.g. value ffs means ffs ms 
+-- Unit ms, Step ffs ms
+
+-- **************************************************************
+--
+-- Resource Status Response
+--
+-- **************************************************************
+
+ResourceStatusResponse ::= SEQUENCE {
+	protocolIEs                     ProtocolIE-Container       {{ResourceStatusResponse-IEs}},
+	...
+}
+
+ResourceStatusResponse-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-CriticalityDiagnostics	CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional },
+	...
+}
+
+
+-- **************************************************************
+--
+-- Resource Status Failure
+--
+-- **************************************************************
+
+ResourceStatusFailure ::= SEQUENCE {
+	protocolIEs                     ProtocolIE-Container       {{ResourceStatusFailure-IEs}},
+	...
+}
+
+ResourceStatusFailure-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-Cause				CRITICALITY ignore	TYPE Cause			PRESENCE mandatory} |
+	{ ID id-CriticalityDiagnostics	CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional },
+	...
+}
+
+
+-- **************************************************************
+--
+-- Resource Status Update
+--
+-- **************************************************************
+
+ResourceStatusUpdate ::= SEQUENCE {
+	protocolIEs                     ProtocolIE-Container       {{ResourceStatusUpdate-IEs}},
+	...
+}
+
+ResourceStatusUpdate-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-CellMeasurementResult	CRITICALITY ignore	TYPE CellMeasurementResult-List		PRESENCE mandatory},
+	...
+}
+
+CellMeasurementResult-List 		::= SEQUENCE (SIZE (1..maxCellineNB)) OF ProtocolIE-Single-Container { {CellMeasurementResult-ItemIEs} }
+
+CellMeasurementResult-ItemIEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-CellMeasurementResult-Item	CRITICALITY ignore	TYPE CellMeasurementResult-Item 	PRESENCE mandatory	}
+}
+
+CellMeasurementResult-Item ::= SEQUENCE {
+	cell-ID							ECGI,
+	resoureStatus					ResourceStatus			OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { {CellMeasurementResult-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+CellMeasurementResult-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
 -- **************************************************************
 --
 -- PRIVATE MESSAGE
diff --git a/asn1/x2ap/X2AP-PDU-Descriptions.asn b/asn1/x2ap/X2AP-PDU-Descriptions.asn
index 2f1879aa1a..5a461320c2 100644
--- a/asn1/x2ap/X2AP-PDU-Descriptions.asn
+++ b/asn1/x2ap/X2AP-PDU-Descriptions.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V8.0.0 (2007-12)
+-- 3GPP TS 36.423 V8.3.0 (2008-09)
 -- 9.3.3	Elementary Procedure Definitions
 -- **************************************************************
 --
@@ -27,32 +27,49 @@ IMPORTS
 FROM X2AP-CommonDataTypes
 
 
+	ENBConfigurationUpdate,
+	ENBConfigurationUpdateAcknowledge,
+	ENBConfigurationUpdateFailure,
 	ErrorIndication,
-	HandoverRequest,
-	HandoverRequestAcknowledge,
-	HandoverPreparationFailure,
-	SNStatusTransfer,
-	ReleaseResource,
 	HandoverCancel,
-	LoadInformation,
+	HandoverPreparationFailure,	HandoverRequest,
+	HandoverRequestAcknowledge,
+	
+	
+		LoadInformation,
 	ResetRequest,
 	ResetResponse,
-	X2SetupRequest,
-	X2SetupResponse,
-	X2SetupFailure
+	ResourceStatusFailure,
+	ResourceStatusRequest,
+	ResourceStatusResponse,
+	ResourceStatusUpdate,
+	SNStatusTransfer,
+	UEContextRelease,
+	X2SetupFailure,	X2SetupRequest,
+	X2SetupResponse
+	
+
+
 
 FROM X2AP-PDU-Contents
 
+	id-eNBConfigurationUpdate,
 	id-errorIndication,
-	id-handoverPreparation,
-	id-snStatusTransfer,
-	id-releaseResource,
 	id-handoverCancel,
+	id-handoverPreparation,
+	
 	id-loadIndication,
 	id-reset,
+	
+	id-resourceStatusReporting,
+	id-resourceStatusUpdateInitiation,
+	id-snStatusTransfer,
+	id-uEContextRelease,
 	id-x2Setup
 
 
+
+
 FROM X2AP-Constants;
 
 -- **************************************************************
@@ -91,20 +108,20 @@ X2AP-PDU ::= CHOICE {
 
 InitiatingMessage ::= SEQUENCE {
 	procedureCode	X2AP-ELEMENTARY-PROCEDURE.&procedureCode		({X2AP-ELEMENTARY-PROCEDURES}),
-	criticality	X2AP-ELEMENTARY-PROCEDURE.&criticality		({X2AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
-	value		X2AP-ELEMENTARY-PROCEDURE.&InitiatingMessage	({X2AP-ELEMENTARY-PROCEDURES}{@procedureCode})
+	criticality		X2AP-ELEMENTARY-PROCEDURE.&criticality			({X2AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
+	value			X2AP-ELEMENTARY-PROCEDURE.&InitiatingMessage	({X2AP-ELEMENTARY-PROCEDURES}{@procedureCode})
 }
 
 SuccessfulOutcome ::= SEQUENCE {
 	procedureCode	X2AP-ELEMENTARY-PROCEDURE.&procedureCode		({X2AP-ELEMENTARY-PROCEDURES}),
-	criticality	X2AP-ELEMENTARY-PROCEDURE.&criticality		({X2AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
-	value		X2AP-ELEMENTARY-PROCEDURE.&SuccessfulOutcome	({X2AP-ELEMENTARY-PROCEDURES}{@procedureCode})
+	criticality		X2AP-ELEMENTARY-PROCEDURE.&criticality			({X2AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
+	value			X2AP-ELEMENTARY-PROCEDURE.&SuccessfulOutcome	({X2AP-ELEMENTARY-PROCEDURES}{@procedureCode})
 }
 
 UnsuccessfulOutcome ::= SEQUENCE {
 	procedureCode	X2AP-ELEMENTARY-PROCEDURE.&procedureCode		({X2AP-ELEMENTARY-PROCEDURES}),
-	criticality	X2AP-ELEMENTARY-PROCEDURE.&criticality		({X2AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
-	value		X2AP-ELEMENTARY-PROCEDURE.&UnsuccessfulOutcome	({X2AP-ELEMENTARY-PROCEDURES}{@procedureCode})
+	criticality		X2AP-ELEMENTARY-PROCEDURE.&criticality			({X2AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
+	value			X2AP-ELEMENTARY-PROCEDURE.&UnsuccessfulOutcome	({X2AP-ELEMENTARY-PROCEDURES}{@procedureCode})
 }
 
 
@@ -123,15 +140,18 @@ X2AP-ELEMENTARY-PROCEDURES X2AP-ELEMENTARY-PROCEDURE ::= {
 X2AP-ELEMENTARY-PROCEDURES-CLASS-1 X2AP-ELEMENTARY-PROCEDURE ::= {
 	handoverPreparation										|
 	reset													|
-	x2Setup													,
+	x2Setup													|
+	resourceStatusUpdateInitiation							|
+	eNBConfigurationUpdate								    ,
 	...
 }
 
 X2AP-ELEMENTARY-PROCEDURES-CLASS-2 X2AP-ELEMENTARY-PROCEDURE ::= {
 	snStatusTransfer						|
-	releaseResource							|
+	uEContextRelease						|
 	handoverCancel							|
 	errorIndication							|
+	resourceStatusReporting					|	
 	loadIndication							,
 	...
 
@@ -158,9 +178,9 @@ snStatusTransfer X2AP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY				ignore
 }
 
-releaseResource X2AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		ReleaseResource
-	PROCEDURE CODE			id-releaseResource
+uEContextRelease X2AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		UEContextRelease
+	PROCEDURE CODE			id-uEContextRelease
 	CRITICALITY				ignore
 }
 
@@ -187,7 +207,7 @@ reset	X2AP-ELEMENTARY-PROCEDURE ::= {
 x2Setup	X2AP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE		X2SetupRequest
 	SUCCESSFUL OUTCOME		X2SetupResponse
-	UNSUCCESSFUL OUTCOME		X2SetupFailure
+	UNSUCCESSFUL OUTCOME	X2SetupFailure
 	PROCEDURE CODE			id-x2Setup
 	CRITICALITY				reject
 }
@@ -199,5 +219,26 @@ loadIndication X2AP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY				ignore
 }
 
+eNBConfigurationUpdate		X2AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		ENBConfigurationUpdate
+	SUCCESSFUL OUTCOME		ENBConfigurationUpdateAcknowledge
+	UNSUCCESSFUL OUTCOME	ENBConfigurationUpdateFailure
+	PROCEDURE CODE			id-eNBConfigurationUpdate
+	CRITICALITY				reject
+}
+
+resourceStatusUpdateInitiation	X2AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		ResourceStatusRequest
+	SUCCESSFUL OUTCOME		ResourceStatusResponse
+	UNSUCCESSFUL OUTCOME	ResourceStatusFailure
+	PROCEDURE CODE			id-resourceStatusUpdateInitiation
+	CRITICALITY				reject
+}
+
+resourceStatusReporting X2AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		ResourceStatusUpdate
+	PROCEDURE CODE			id-resourceStatusReporting
+	CRITICALITY				ignore
+}
 
 END
diff --git a/asn1/x2ap/x2ap.cnf b/asn1/x2ap/x2ap.cnf
index 9b8c1189f4..fbadf87cf1 100644
--- a/asn1/x2ap/x2ap.cnf
+++ b/asn1/x2ap/x2ap.cnf
@@ -8,6 +8,11 @@ PER
 ALIGNED
 #.END
 
+#.OMIT_ASSIGNMENT
+# Get rid of unused code warnings
+PrivateMessage
+#.END
+
 #.PDU
 X2AP-PDU
 
@@ -74,19 +79,23 @@ ProtocolIE-ContainerPairList
 #.END
 
 # Handle 64 bit constraint
-#.FN_PARS SAE-Bearer-BitRate FN_VARIANT = _64b
+#.FN_PARS BitRate FN_VARIANT = _64b
 
 #.ASSIGN_VALUE_TO_TYPE  # X2AP does not have constants assigned to types, they are pure INTEGER
 # ProcedureCode
 
-id-handoverPreparation		ProcedureCode
-id-handoverCancel			ProcedureCode
-id-loadIndication			ProcedureCode
-id-errorIndication			ProcedureCode
-id-snStatusTransfer			ProcedureCode
-id-releaseResource			ProcedureCode
-id-x2Setup					ProcedureCode
-id-reset					ProcedureCode
+id-handoverPreparation				ProcedureCode
+id-handoverCancel					ProcedureCode
+id-loadIndication					ProcedureCode
+id-errorIndication					ProcedureCode
+id-snStatusTransfer					ProcedureCode
+id-uEContextRelease					ProcedureCode
+id-x2Setup							ProcedureCode
+id-reset							ProcedureCode
+id-eNBConfigurationUpdate			ProcedureCode
+id-resourceStatusUpdateInitiation	ProcedureCode
+id-resourceStatusReporting			ProcedureCode
+
 
 # ProtocolIE-ID
 
@@ -111,9 +120,21 @@ id-CriticalityDiagnostics													ProtocolIE-ID
 id-Bearers-SubjectToStatusTransfer-List										ProtocolIE-ID
 id-Bearers-SubjectToStatusTransfer-Item										ProtocolIE-ID
 id-ServedCells																ProtocolIE-ID
+id-GlobalENB-ID																ProtocolIE-ID
 id-TimeToWait																ProtocolIE-ID
 id-GUMMEI-ID																ProtocolIE-ID
-
+id-GUGroupIDList															ProtocolIE-ID
+id-ServedCellsToAdd															ProtocolIE-ID
+id-ServedCellsToModify														ProtocolIE-ID
+id-ServedCellsToDelete														ProtocolIE-ID
+id-Registration-Request														ProtocolIE-ID
+id-CellToReport																ProtocolIE-ID
+id-ReportingPeriodicity														ProtocolIE-ID
+id-CellToReport-Item														ProtocolIE-ID
+id-CellMeasurementResult													ProtocolIE-ID
+id-CellMeasurementResult-Item												ProtocolIE-ID
+id-GUGroupIDListToAdd														ProtocolIE-ID
+id-GUGroupIDListToDelete													ProtocolIE-ID
 
 #.REGISTER_NEW
 
@@ -129,7 +150,7 @@ CellInformation-Item						N x2ap.ies id-CellInformation-Item
 InterfacesToTrace-Item						N x2ap.ies id-InterfacesToTrace-Item
 UE-X2AP-ID									N x2ap.ies id-New-eNB-UE-X2AP-ID
 UE-X2AP-ID									N x2ap.ies id-Old-eNB-UE-X2AP-ID
-CGI											N x2ap.ies id-TargetCell-ID
+ECGI										N x2ap.ies id-TargetCell-ID
 TargeteNBtoSource-eNBTransparentContainer	N x2ap.ies id-TargeteNBtoSource-eNBTransparentContainer
 TraceActivation								N x2ap.ies id-TraceActivation
 UE-ContextInformation						N x2ap.ies id-UE-ContextInformation
@@ -139,9 +160,21 @@ CriticalityDiagnostics						N x2ap.ies id-CriticalityDiagnostics
 Bearers-SubjectToStatusTransfer-List		N x2ap.ies id-Bearers-SubjectToStatusTransfer-List
 Bearers-SubjectToStatusTransfer-Item		N x2ap.ies id-Bearers-SubjectToStatusTransfer-Item
 ServedCells									N x2ap.ies id-ServedCells
+GlobalENB-ID								N x2ap.ies id-GlobalENB-ID
 TimeToWait									N x2ap.ies id-TimeToWait
 GUMMEI										N x2ap.ies id-GUMMEI-ID
-
+GUGroupIDList								N x2ap.ies id-GUGroupIDList
+ServedCells									N x2ap.ies id-ServedCellsToAdd
+ServedCellsToModify							N x2ap.ies id-ServedCellsToModify
+Old-ECGIs									N x2ap.ies id-ServedCellsToDelete
+Registration-Request						N x2ap.ies id-Registration-Request
+CellToReport-List							N x2ap.ies id-CellToReport
+ReportingPeriod								N x2ap.ies id-ReportingPeriodicity
+CellToReport-Item							N x2ap.ies id-CellToReport-Item
+CellMeasurementResult-List					N x2ap.ies id-CellMeasurementResult
+CellMeasurementResult-Item					N x2ap.ies id-CellMeasurementResult-Item
+GUGroupIDList								N x2ap.ies id-GUGroupIDListToAdd
+GUGroupIDList								N x2ap.ies id-GUGroupIDListToDelete
 
 #X2AP-PROTOCOL-EXTENSION
 # this is from rnsap MessageStructure                   N x2ap.extension id-MessageStructure
@@ -154,7 +187,7 @@ HandoverPreparationFailure			S x2ap.proc.uout "id-handoverPreparation"
 
 SNStatusTransfer					S x2ap.proc.imsg "id-snStatusTransfer"
 
-ReleaseResource						S x2ap.proc.imsg "id-releaseResource"
+UEContextRelease					S x2ap.proc.imsg "id-uEContextRelease"
 
 HandoverCancel						S x2ap.proc.imsg "id-handoverCancel"
 
@@ -167,5 +200,15 @@ X2SetupRequest						S x2ap.proc.imsg "id-x2Setup"
 X2SetupResponse						S x2ap.proc.sout "id-x2Setup"
 X2SetupFailure						S x2ap.proc.uout "id-x2Setup"
 
-LoadInformation						S x2ap.proc.imsg "LoadInformation"
+LoadInformation						S x2ap.proc.imsg "id-loadIndication"
+
+ENBConfigurationUpdate				S x2ap.proc.imsg "id-eNBConfigurationUpdate"
+ENBConfigurationUpdateAcknowledge	S x2ap.proc.sout "id-eNBConfigurationUpdate"
+ENBConfigurationUpdateFailure		S x2ap.proc.uout "id-eNBConfigurationUpdate"
+
+ResourceStatusRequest				S x2ap.proc.imsg "id-resourceStatusUpdateInitiation"
+ResourceStatusResponse				S x2ap.proc.sout "id-resourceStatusUpdateInitiation"
+ResourceStatusFailure				S x2ap.proc.uout "id-resourceStatusUpdateInitiation"
+
+ResourceStatusUpdate				S x2ap.proc.imsg "id-resourceStatusReporting"
 #.END