Update to latest spec.

svn path=/trunk/; revision=24851

5 files changed, 79 insertions, 23 deletions

diff --git a/asn1/x2ap/X2AP-Constants.asn b/asn1/x2ap/X2AP-Constants.asn
index 2460ace6db..882f9ff6db 100644
--- a/asn1/x2ap/X2AP-Constants.asn
+++ b/asn1/x2ap/X2AP-Constants.asn
@@ -85,8 +85,9 @@ 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-ID																	ProtocolIE-ID ::= 21
+id-ENB-Global-ID															ProtocolIE-ID ::= 21
 id-TimeToWait																ProtocolIE-ID ::= 22
+id-GUMMEI-ID																ProtocolIE-ID ::= 23
 
 
 END
diff --git a/asn1/x2ap/X2AP-Containers.asn b/asn1/x2ap/X2AP-Containers.asn
index ccc00b0ee4..3a10f6eea9 100644
--- a/asn1/x2ap/X2AP-Containers.asn
+++ b/asn1/x2ap/X2AP-Containers.asn
@@ -195,3 +195,4 @@ PrivateIE-Field {X2AP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
 }
 
 END
+
diff --git a/asn1/x2ap/X2AP-IEs.asn b/asn1/x2ap/X2AP-IEs.asn
index 8f7e455fb4..27b1118cef 100644
--- a/asn1/x2ap/X2AP-IEs.asn
+++ b/asn1/x2ap/X2AP-IEs.asn
@@ -49,6 +49,9 @@ AggregateMaximumBitRate ::= SEQUENCE {
 	...
 }
 
+AllocationAndRetentionPriority ::= OCTET STRING
+
+
 -- B
 
 Bearer-ID ::= BIT STRING (SIZE (8))  -- To be checked, FFS
@@ -87,6 +90,10 @@ CauseProtocol ::= ENUMERATED {
 }
 
 CauseRadioNetwork ::= ENUMERATED {
+	normal-ho,
+	emergency-ho,
+	load-balancing,
+	overload,
 	unspecified,
 	...
 
@@ -132,6 +139,12 @@ CriticalityDiagnostics ::= SEQUENCE {
 	...
 }
 
+COUNTvalue ::= SEQUENCE {
+	pDCP-SN			PDCP-SN,
+	hFN				HFN,
+	...
+}
+
 CriticalityDiagnostics-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
@@ -162,7 +175,7 @@ DL-Forwarding ::= ENUMERATED {
 
 -- E
 
-ENB-ID							::= INTEGER (0..65535)  -- Value to be checked FFS
+ENB-Global-ID		::= INTEGER (0..65535)  -- Value to be checked FFS
 
 EPLMNs ::= SEQUENCE (SIZE(1..maxnoofEPLMNs)) OF PLMN-Identity
 
@@ -171,8 +184,8 @@ EPLMNs ::= SEQUENCE (SIZE(1..maxnoofEPLMNs)) OF PLMN-Identity
 
 ForbiddenInterRATs ::= ENUMERATED {
 	all,
-	gsm,
-	wcdma,
+	geran,
+	utran,
 	...
 }
 
@@ -213,6 +226,20 @@ GTPtunnelEndpoint-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 
 GTP-TEI					::= OCTET STRING (SIZE (4))
 
+GUMMEI			::= SEQUENCE {
+	pLMN-Identity		PLMN-Identity,
+	mME-Group-ID		MME-Group-ID,
+	mMME-Code			MME-Code,
+	iE-Extensions					ProtocolExtensionContainer { {GUMMEI-ExtIEs} } OPTIONAL,
+	...
+}
+
+GUMMEI-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+
 -- H
 
 HandoverRestrictionList ::= SEQUENCE {
@@ -228,6 +255,9 @@ HandoverRestrictionList-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+HFN ::= INTEGER (0..1048575)
+
+
 
 -- I
 
@@ -255,6 +285,8 @@ InterferenceOverloadIndication ::= OCTET STRING  -- FFS
 -- K
 -- L
 
+Label ::= INTEGER (1..256)
+
 LAC					::= OCTET STRING (SIZE (2)) --(EXCEPT ('0000'H|'FFFE'H))
 
 LastVisitedCell-Item ::= SEQUENCE {
@@ -271,13 +303,18 @@ LastVisitedCell-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 
 
 -- M
+
+MME-Group-ID	::= OCTET STRING (SIZE (2))
+
+MME-Code		::= OCTET STRING (SIZE (1))
+
 -- N
 
 
 -- O
 -- P
 
-PDCP-SN ::= INTEGER  -- FFS
+PDCP-SN ::= INTEGER (0..4095)  
 
 PhyCID ::= OCTET STRING
 
@@ -290,6 +327,8 @@ PLMN-Identity ::= OCTET STRING (SIZE(3))
 RB-type ::= INTEGER
 -- Editors note: FFS To be replaced by other QCI definition, ENUMERATED??
 
+ReceiveStatusofULPDCPSDUs ::= BIT STRING (SIZE(256)) 
+
 RRC-Context ::= OCTET STRING
 
 -- S
@@ -297,8 +336,8 @@ RRC-Context ::= OCTET STRING
 SAE-Bearer-BitRate ::= INTEGER (0..210000000000)
 
 SAE-BearerLevel-QoS-Parameters ::= SEQUENCE {
-	label				INTEGER (1..256),
-	allocationAndRetentionPriority	OCTET STRING,  --FFS
+	label				Label,
+	allocationAndRetentionPriority	AllocationAndRetentionPriority,  --FFS
 	sAE-BearerType			SAE-BearerType,
 	...
 }
@@ -319,18 +358,23 @@ SAE-GBR-Bearer ::= SEQUENCE {
 	...
 }
 
-SAE-GBR-Bearer-Parameters-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+SAE-GBR-Bearer-Parameters-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
 
 SAE-Non-GBR-Bearer ::= SEQUENCE {
-	sAE-non-GBR-Bearer-Type			ENUMERATED {non-GBR-Bearer,...},
+	sAE-non-GBR-Bearer-Type			SAE-Non-GBR-Bearer-Type,
 	iE-Extensions						ProtocolExtensionContainer { {SAE-non-GBR-Bearer-Parameters-ExtIEs} } OPTIONAL,
 	...
 }
 
-SAE-non-GBR-Bearer-Parameters-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+SAE-non-GBR-Bearer-Parameters-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+SAE-Non-GBR-Bearer-Type ::= ENUMERATED {
+	non-GBR-Bearer,
 	...
 }
 
@@ -381,6 +425,9 @@ TraceDepth 		::= ENUMERATED {
 	minimum,
 	medium,
 	maximum,
+	vendorMinimum,
+	vendorMedium,
+	vendorMaximum,
 	...
 }
 
diff --git a/asn1/x2ap/X2AP-PDU-Contents.asn b/asn1/x2ap/X2AP-PDU-Contents.asn
index 23f84b84a4..a2f00c7286 100644
--- a/asn1/x2ap/X2AP-PDU-Contents.asn
+++ b/asn1/x2ap/X2AP-PDU-Contents.asn
@@ -26,15 +26,18 @@ IMPORTS
 	Bearer-ID,
 	Cause,
 	CGI,
+	COUNTvalue,
 	CriticalityDiagnostics,
 	DL-Forwarding,
-	ENB-ID,
+	ENB-Global-ID,
+	GUMMEI,
 	HandoverRestrictionList,
 	InterferenceOverloadIndication,
 	PDCP-SN,
 	PLMN-Identity,
 	UE-S1AP-ID,
 	RB-type,
+	ReceiveStatusofULPDCPSDUs,
 	RRC-Context,
 	SAE-BearerLevel-QoS-Parameters,
 	ServedCells,
@@ -72,7 +75,8 @@ FROM X2AP-Containers
 	id-CellInformation,
 	id-CellInformation-Item,
 	id-CriticalityDiagnostics,
-	id-ENB-ID,
+	id-ENB-Global-ID,
+	id-GUMMEI-ID,
 	id-UE-ContextInformation,
 	id-Bearers-ToBeSetup-Item,
 	id-New-eNB-UE-X2AP-ID,
@@ -103,9 +107,11 @@ 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-GUMMEI-ID						CRITICALITY reject	TYPE GUMMEI  					PRESENCE mandatory } |
 	{ ID id-UE-ContextInformation			CRITICALITY reject	TYPE UE-ContextInformation 		PRESENCE mandatory } |
-	{ ID id-UE-HistoryInformation			CRITICALITY reject	TYPE UE-HistoryInformation 		PRESENCE optional } |
+	{ ID id-UE-HistoryInformation			CRITICALITY ignore	TYPE UE-HistoryInformation 		PRESENCE optional } |
 	{ ID id-TraceActivation					CRITICALITY ignore	TYPE TraceActivation 			PRESENCE optional } ,
 	...
 }
@@ -164,7 +170,7 @@ HandoverRequestAcknowledge-IEs X2AP-PROTOCOL-IES ::= {
 	{ 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 },
+	{ ID id-TargeteNBtoSource-eNBTransparentContainer	CRITICALITY ignore	TYPE TargeteNBtoSource-eNBTransparentContainer			PRESENCE mandatory },
 	...
 }
 
@@ -247,9 +253,10 @@ Bearers-SubjectToStatusTransfer-ItemIEs X2AP-PROTOCOL-IES ::= {
 
 Bearers-SubjectToStatusTransfer-Item ::= SEQUENCE {
 	bearer-ID								Bearer-ID,
-	pDCP-SNofULSDUsNotToBeRetransmitted-List	PDCP-SNofULSDUsNotToBeRetransmitted-List	OPTIONAL,
-	uL-PDCP-SN-NextInSequenceExpected					PDCP-SN,
-	dL-PDCP-SN-NextToAssign					PDCP-SN,
+	
+	receiveStatusofULPDCPSDUs				ReceiveStatusofULPDCPSDUs			OPTIONAL,
+	uL-COUNTvalue					COUNTvalue,
+	dL-COUNTvalue					COUNTvalue,
 	iE-Extensions							ProtocolExtensionContainer { {Bearers-SubjectToStatusTransfer-ItemExtIEs} } OPTIONAL,
 	...
 }
@@ -258,7 +265,6 @@ Bearers-SubjectToStatusTransfer-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-PDCP-SNofULSDUsNotToBeRetransmitted-List ::= SEQUENCE (SIZE (1..maxnoofPDCP-SN)) OF PDCP-SN
 
 
 
@@ -360,7 +366,7 @@ X2SetupRequest ::= SEQUENCE {
 }
 
 X2SetupRequest-IEs X2AP-PROTOCOL-IES ::= {
-	{ ID id-ENB-ID				CRITICALITY reject	TYPE ENB-ID				PRESENCE mandatory} |
+	{ ID id-ENB-Global-ID				CRITICALITY reject	TYPE ENB-Global-ID				PRESENCE mandatory} |
 	{ ID id-ServedCells			CRITICALITY reject	TYPE ServedCells		PRESENCE mandatory} ,
 	...
 }
@@ -379,7 +385,7 @@ X2SetupResponse ::= SEQUENCE {
 }
 
 X2SetupResponse-IEs X2AP-PROTOCOL-IES ::= {
-	{ ID id-ENB-ID				CRITICALITY reject	TYPE ENB-ID				PRESENCE mandatory} |
+	{ ID id-ENB-Global-ID				CRITICALITY reject	TYPE ENB-Global-ID				PRESENCE mandatory} |
 	{ ID id-ServedCells			CRITICALITY reject	TYPE ServedCells		PRESENCE mandatory} ,
 	...
 }
diff --git a/asn1/x2ap/x2ap.cnf b/asn1/x2ap/x2ap.cnf
index 3140831ab7..9b8c1189f4 100644
--- a/asn1/x2ap/x2ap.cnf
+++ b/asn1/x2ap/x2ap.cnf
@@ -111,8 +111,8 @@ id-CriticalityDiagnostics													ProtocolIE-ID
 id-Bearers-SubjectToStatusTransfer-List										ProtocolIE-ID
 id-Bearers-SubjectToStatusTransfer-Item										ProtocolIE-ID
 id-ServedCells																ProtocolIE-ID
-id-ENB-ID																	ProtocolIE-ID
 id-TimeToWait																ProtocolIE-ID
+id-GUMMEI-ID																ProtocolIE-ID
 
 
 #.REGISTER_NEW
@@ -139,8 +139,8 @@ 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
-ENB-ID										N x2ap.ies id-ENB-ID
 TimeToWait									N x2ap.ies id-TimeToWait
+GUMMEI										N x2ap.ies id-GUMMEI-ID
 
 
 #X2AP-PROTOCOL-EXTENSION
@@ -160,7 +160,8 @@ HandoverCancel						S x2ap.proc.imsg "id-handoverCancel"
 
 ErrorIndication						S x2ap.proc.imsg "id-errorIndication"
 
-ResetResponse						S x2ap.proc.imsg "id-reset"
+ResetRequest						S x2ap.proc.imsg "id-reset"
+ResetResponse						S x2ap.proc.sout "id-reset"
 
 X2SetupRequest						S x2ap.proc.imsg "id-x2Setup"
 X2SetupResponse						S x2ap.proc.sout "id-x2Setup"