Update to the latest spec. V8.0.1 (2008-09)

svn path=/trunk/; revision=26712

7 files changed, 378 insertions, 21 deletions

diff --git a/asn1/ranap/RANAP-CommonDataTypes.asn b/asn1/ranap/RANAP-CommonDataTypes.asn
index 4f51f08f01..dee2715c55 100644
--- a/asn1/ranap/RANAP-CommonDataTypes.asn
+++ b/asn1/ranap/RANAP-CommonDataTypes.asn
@@ -1,7 +1,7 @@
 -- RANAP-CommonDataTypes.asn
 --
--- Taken from 3GPP TS 25.413 V7.8.0 (2008-01)
--- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-780.zip/25413-780.DOC
+-- Taken from 3GPP TS 25.413 V8.0.1 (2008-09)
+-- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-801.zip
 --
 -- 9.3.5	Common Definitions
 --
@@ -41,3 +41,4 @@ TriggeringMessage	::= ENUMERATED { initiating-message, successful-outcome, unsuc
 
 END
 
+
diff --git a/asn1/ranap/RANAP-Constants.asn b/asn1/ranap/RANAP-Constants.asn
index 501dbf13c1..34737022e3 100644
--- a/asn1/ranap/RANAP-Constants.asn
+++ b/asn1/ranap/RANAP-Constants.asn
@@ -1,7 +1,7 @@
 -- RANAP-Constants.asn
 --
--- Taken from 3GPP TS 25.413 V7.8.0 (2008-01)
--- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-780.zip/25413-780.DOC
+-- Taken from 3GPP TS 25.413 V8.0.1 (2008-09)
+-- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-801.zip
 --
 -- 9.3.6	Constant Definitions
 --
@@ -69,6 +69,9 @@ id-MBMSRegistration					INTEGER ::= 39
 id-MBMSCNDe-Registration-Procedure	INTEGER ::= 40
 id-MBMSRABEstablishmentIndication	INTEGER ::= 41
 id-MBMSRABRelease					INTEGER ::= 42
+id-enhancedRelocationComplete		INTEGER ::= 43
+id-enhancedRelocationCompleteConfirm		INTEGER ::= 44
+id-RANAPenhancedRelocation			INTEGER ::= 45
 
 
 
@@ -303,6 +306,18 @@ id-GANSS-PositioningDataSet								INTEGER ::= 184
 id-RequestedGANSSAssistanceData							INTEGER ::= 185
 id-BroadcastGANSSAssistanceDataDecipheringKeys			INTEGER ::= 186
 id-d-RNTI-for-NoIuCSUP									INTEGER ::= 187
+id-RAB-SetupList-EnhancedRelocCompleteReq				INTEGER ::= 188
+id-RAB-SetupItem-EnhancedRelocCompleteReq				INTEGER ::= 189
+id-RAB-SetupList-EnhancedRelocCompleteRes				INTEGER ::= 190
+id-RAB-SetupItem-EnhancedRelocCompleteRes				INTEGER ::= 191
+id-RAB-SetupList-EnhRelocInfoReq						INTEGER ::= 192
+id-RAB-SetupItem-EnhRelocInfoReq						INTEGER ::= 193
+id-RAB-SetupList-EnhRelocInfoRes						INTEGER ::= 194
+id-RAB-SetupItem-EnhRelocInfoRes						INTEGER ::= 195
+id-OldIuSigConId										INTEGER ::= 196
+id-RAB-FailedList-EnhRelocInfoRes						INTEGER ::= 197
+id-RAB-FailedItem-EnhRelocInfoRes						INTEGER ::= 198
 
 END
 
+
diff --git a/asn1/ranap/RANAP-Containers.asn b/asn1/ranap/RANAP-Containers.asn
index 7bc5444a2d..dcd109da71 100644
--- a/asn1/ranap/RANAP-Containers.asn
+++ b/asn1/ranap/RANAP-Containers.asn
@@ -1,7 +1,7 @@
 -- RANAP-Containers.asn
 --
--- Taken from 3GPP TS 25.413 V7.8.0 (2008-01)
--- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-780.zip/25413-780.DOC
+-- Taken from 3GPP TS 25.413 V8.0.1 (2008-09)
+-- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-801.zip
 --
 -- 9.3.7	Container Definitions
 --
@@ -202,3 +202,4 @@ PrivateIE-Field {RANAP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
 }
 
 END
+
diff --git a/asn1/ranap/RANAP-IEs.asn b/asn1/ranap/RANAP-IEs.asn
index 85cdb7a206..0f98e140d7 100644
--- a/asn1/ranap/RANAP-IEs.asn
+++ b/asn1/ranap/RANAP-IEs.asn
@@ -1,7 +1,7 @@
 -- RANAP-IEs.asn
 --
--- Taken from 3GPP TS 25.413 V7.8.0 (2008-01)
--- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-780.zip/25413-780.DOC
+-- Taken from 3GPP TS 25.413 V8.0.1 (2008-09)
+-- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-801.zip
 --
 -- 9.3.4	Information Element Definitions
 --
@@ -938,8 +938,8 @@ LoadValue	::= INTEGER (0..100)
 LocationRelatedDataRequestType	::= SEQUENCE {
 	requestedLocationRelatedDataType			RequestedLocationRelatedDataType,
 	requestedGPSAssistanceData					RequestedGPSAssistanceData	OPTIONAL,
-	-- This IE shall be present if the Requested Location Related Data Type IE is set to 'Dedicated Assistance Data for Assisted GPS' or
-	-- `Dedicated Assistance Data for Assisted GPS and GANSS'
+	-- This IE shall be present if the Requested Location Related Data Type IE is set to ‘Dedicated Assistance Data for Assisted GPS’ or
+	-- `Dedicated Assistance Data for Assisted GPS and GANSS’
 	...
 }
 
diff --git a/asn1/ranap/RANAP-PDU-Contents.asn b/asn1/ranap/RANAP-PDU-Contents.asn
index b7145b89a8..7bcadef14c 100644
--- a/asn1/ranap/RANAP-PDU-Contents.asn
+++ b/asn1/ranap/RANAP-PDU-Contents.asn
@@ -1,7 +1,7 @@
 -- RANAP-PDU-Contents.asn
 --
--- Taken from 3GPP TS 25.413 V7.8.0 (2008-01)
--- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-780.zip/25413-780.DOC
+-- Taken from 3GPP TS 25.413 V8.0.1 (2008-09)
+-- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-801.zip
 --
 -- 9.3.3	PDU Definitions
 --
@@ -209,6 +209,7 @@ FROM RANAP-Containers
 	id-InterSystemInformation-TransparentContainer,
 	id-IPMulticastAddress,
 	id-IuSigConId,
+	id-OldIuSigConId,
 	id-IuSigConIdItem,
 	id-IuSigConIdList,
 	id-IuTransportAssociation,
@@ -258,6 +259,8 @@ FROM RANAP-Containers
 	id-RAB-DataVolumeReportRequestList,
 	id-RAB-FailedItem,
 	id-RAB-FailedList,
+	id-RAB-FailedList-EnhRelocInfoRes,
+	id-RAB-FailedItem-EnhRelocInfoRes,
 	id-RAB-FailedtoReportItem,
 	id-RAB-FailedtoReportList,
 	id-RAB-ID, 
@@ -279,6 +282,14 @@ FROM RANAP-Containers
 	id-RAB-SetupItem-RelocReqAck,
 	id-RAB-SetupList-RelocReq,
 	id-RAB-SetupList-RelocReqAck,
+	id-RAB-SetupList-EnhRelocInfoReq,
+	id-RAB-SetupItem-EnhRelocInfoReq,
+	id-RAB-SetupList-EnhRelocInfoRes,
+	id-RAB-SetupItem-EnhRelocInfoRes,
+	id-RAB-SetupList-EnhancedRelocCompleteReq,
+	id-RAB-SetupItem-EnhancedRelocCompleteReq,
+	id-RAB-SetupList-EnhancedRelocCompleteRes,
+	id-RAB-SetupItem-EnhancedRelocCompleteRes,
 	id-RAB-SetupOrModifiedItem,
 	id-RAB-SetupOrModifiedList,
 	id-RAB-SetupOrModifyItem,
@@ -1366,6 +1377,144 @@ RelocationCompleteExtensions RANAP-PROTOCOL-EXTENSION ::= {
 
 -- **************************************************************
 --
+-- ENHANCED RELOCATION COMPLETE ELEMENTARY PROCEDURE
+--
+-- **************************************************************
+
+-- **************************************************************
+--
+-- Enhanced Relocation Complete Request
+--
+-- **************************************************************
+
+EnhancedRelocationCompleteRequest ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {EnhancedRelocationCompleteRequestIEs} },
+	protocolExtensions		ProtocolExtensionContainer { {EnhancedRelocationCompleteRequestExtensions} }				OPTIONAL,
+	...
+}
+
+EnhancedRelocationCompleteRequestIEs RANAP-PROTOCOL-IES ::= {
+	{ ID id-OldIuSigConId	CRITICALITY reject TYPE IuSignallingConnectionIdentifier  PRESENCE mandatory } |
+	{ ID id-IuSigConId	CRITICALITY ignore TYPE IuSignallingConnectionIdentifier  PRESENCE mandatory } |
+	{ ID id-SourceID				CRITICALITY ignore	TYPE SourceID	 				PRESENCE mandatory	} |
+	{ ID id-ExtendedRNC-ID			CRITICALITY ignore		TYPE ExtendedRNC-ID			PRESENCE optional	} |
+	{ ID id-RAB-SetupList-EnhancedRelocCompleteReq			CRITICALITY reject	TYPE RAB-SetupList-EnhancedRelocCompleteReq	PRESENCE optional	}| 
+	{ ID id-RAB-FailedList				CRITICALITY ignore	TYPE RAB-FailedList				PRESENCE optional },
+	...
+}
+
+RAB-SetupList-EnhancedRelocCompleteReq 				::= RAB-IE-ContainerList { { RAB-SetupItem-EnhancedRelocCompleteReq-IEs} }
+
+RAB-SetupItem-EnhancedRelocCompleteReq-IEs RANAP-PROTOCOL-IES ::= { 
+	{ ID id-RAB-SetupItem-EnhancedRelocCompleteReq		CRITICALITY reject	TYPE RAB-SetupItem-EnhancedRelocCompleteReq			PRESENCE mandatory 	},
+	...
+}
+
+RAB-SetupItem-EnhancedRelocCompleteReq ::= SEQUENCE {
+	rAB-ID						RAB-ID,
+	transportLayerAddressReq1				TransportLayerAddress	OPTIONAL,
+	iuTransportAssociationReq1				IuTransportAssociation	OPTIONAL,
+	ass-RAB-Parameters					Ass-RAB-Parameters OPTIONAL,
+	transportLayerAddressReq2				TransportLayerAddress	OPTIONAL,
+	iuTransportAssociationReq2				IuTransportAssociation	OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { { RAB-SetupItem-EnhancedRelocCompleteReq-ExtIEs} }			OPTIONAL,
+	...
+}
+
+RAB-SetupItem-EnhancedRelocCompleteReq-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+EnhancedRelocationCompleteRequestExtensions RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+-- **************************************************************
+--
+-- Enhanced Relocation Complete Response
+--
+-- **************************************************************
+
+EnhancedRelocationCompleteResponse ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {EnhancedRelocationCompleteResponseIEs} },
+	protocolExtensions		ProtocolExtensionContainer { {EnhancedRelocationCompleteResponseExtensions} }			OPTIONAL,
+	...
+}
+
+EnhancedRelocationCompleteResponseIEs RANAP-PROTOCOL-IES ::= {
+	{ ID id-RAB-SetupList-EnhancedRelocCompleteRes		CRITICALITY ignore	TYPE RAB-SetupList-EnhancedRelocCompleteRes	PRESENCE optional} |
+	{ ID id-CriticalityDiagnostics			CRITICALITY ignore	TYPE CriticalityDiagnostics 			PRESENCE optional	},
+	...
+}
+
+RAB-SetupList-EnhancedRelocCompleteRes ::= RAB-IE-ContainerList { {RAB-SetupItem-EnhancedRelocCompleteRes-IEs} }
+
+RAB-SetupItem-EnhancedRelocCompleteRes-IEs RANAP-PROTOCOL-IES ::= { 
+	{ ID id-RAB-SetupItem-EnhancedRelocCompleteRes		CRITICALITY reject	TYPE RAB-SetupItem-EnhancedRelocCompleteRes		PRESENCE mandatory 	},
+	...
+}
+
+RAB-SetupItem-EnhancedRelocCompleteRes ::= SEQUENCE {
+	rAB-ID						RAB-ID,
+	userPlaneInformation				UserPlaneInformation,
+
+	transportLayerAddressRes1				TransportLayerAddress	OPTIONAL,
+	iuTransportAssociationRes1				IuTransportAssociation	OPTIONAL,
+	transportLayerAddressRes2				TransportLayerAddress	OPTIONAL,
+	iuTransportAssociationRes2				IuTransportAssociation	OPTIONAL,
+	...
+}
+
+EnhancedRelocationCompleteResponseExtensions RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+-- **************************************************************
+--
+-- Enhanced Relocation Complete Failure
+--
+-- **************************************************************
+
+EnhancedRelocationCompleteFailure ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {EnhancedRelocationCompleteFailureIEs} },
+	protocolExtensions		ProtocolExtensionContainer { {EnhancedRelocationCompleteFailureExtensions} }				OPTIONAL,
+	...
+}
+
+EnhancedRelocationCompleteFailureIEs RANAP-PROTOCOL-IES ::= {
+	{ ID id-Cause					CRITICALITY ignore	TYPE Cause					PRESENCE mandatory	} |
+	{ ID id-CriticalityDiagnostics			CRITICALITY ignore	TYPE CriticalityDiagnostics 			PRESENCE optional	},
+	...
+}
+
+EnhancedRelocationCompleteFailureExtensions RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+-- **************************************************************
+--
+-- Enhanced Relocation Complete Confirm
+--
+-- **************************************************************
+
+EnhancedRelocationCompleteConfirm ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {EnhancedRelocationCompleteConfirmIEs} },
+	protocolExtensions		ProtocolExtensionContainer { {EnhancedRelocationCompleteConfirmExtensions} }				OPTIONAL,
+	...
+}
+
+EnhancedRelocationCompleteConfirmIEs RANAP-PROTOCOL-IES ::= {
+	{ ID id-RAB-FailedList				CRITICALITY ignore	TYPE RAB-FailedList				PRESENCE optional },
+	...
+}
+
+EnhancedRelocationCompleteConfirmExtensions RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+-- **************************************************************
+--
 -- PAGING ELEMENTARY PROCEDURE
 --
 -- **************************************************************
@@ -2080,6 +2229,135 @@ RANAP-RelocationInformationExtensions RANAP-PROTOCOL-EXTENSION ::= {
 
 -- **************************************************************
 --
+-- RANAP ENHANCED RELOCATION INFORMATION REQUEST ELEMENTARY PROCEDURE
+--
+-- **************************************************************
+
+RANAP-EnhancedRelocationInformationRequest ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {RANAP-EnhancedRelocationInformationRequestIEs} },
+	protocolExtensions		ProtocolExtensionContainer { {RANAP-EnhancedRelocationInformationRequestExtensions} }			OPTIONAL,
+	...
+}
+
+RANAP-EnhancedRelocationInformationRequestIEs RANAP-PROTOCOL-IES ::= {
+	{ ID id-SourceRNC-ToTargetRNC-TransparentContainer		
+							CRITICALITY reject	TYPE SourceRNC-ToTargetRNC-TransparentContainer	PRESENCE mandatory	} |
+	{ ID id-OldIuSigConId	CRITICALITY ignore TYPE IuSignallingConnectionIdentifier  PRESENCE mandatory } |
+	{ ID id-GlobalCN-ID				CRITICALITY reject		TYPE GlobalCN-ID				PRESENCE optional} |
+	{ ID id-OldIuSigConId	CRITICALITY ignore TYPE IuSignallingConnectionIdentifier  PRESENCE mandatory } |
+	{ ID id-GlobalCN-ID				CRITICALITY reject		TYPE GlobalCN-ID				PRESENCE optional} |
+	{ ID id-RAB-SetupList-EnhRelocInfoReq			CRITICALITY reject	TYPE RAB-SetupList-EnhRelocInfoReq			PRESENCE optional	} |
+	{ ID id-SNA-Access-Information	CRITICALITY ignore		TYPE SNA-Access-Information	PRESENCE optional} |
+	{ ID id-UESBI-Iu	CRITICALITY ignore		TYPE UESBI-Iu	PRESENCE optional}|
+	{ ID id-SelectedPLMN-ID	 	CRITICALITY ignore	TYPE PLMNidentity		PRESENCE optional 	}|
+	{ ID id-CNMBMSLinkingInformation	CRITICALITY ignore		TYPE CNMBMSLinkingInformation	PRESENCE optional},
+	...
+}
+
+RAB-SetupList-EnhRelocInfoReq 					::= RAB-IE-ContainerList { { RAB-SetupItem-EnhRelocInfoReq-IEs} }
+
+RAB-SetupItem-EnhRelocInfoReq-IEs RANAP-PROTOCOL-IES ::= { 
+	{ ID id-RAB-SetupItem-EnhRelocInfoReq			CRITICALITY reject	TYPE RAB-SetupItem-EnhRelocInfoReq			PRESENCE mandatory 	},
+	...
+}
+
+RAB-SetupItem-EnhRelocInfoReq ::= SEQUENCE {
+	rAB-ID						RAB-ID,
+	rAB-Parameters					RAB-Parameters,
+	dataVolumeReportingIndication			DataVolumeReportingIndication 	OPTIONAL
+	-- This IE shall be present if the CN domain indicator IE is set to "PS domain" --,
+	pDP-TypeInformation				PDP-TypeInformation		OPTIONAL
+	-- This IE shall be present if the CN domain indicator IE is set to "PS domain" --,
+	userPlaneInformation				UserPlaneInformation,
+	transportLayerAddress				TransportLayerAddress,
+	iuTransportAssociation				IuTransportAssociation,
+	service-Handover				Service-Handover		OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { { RAB-SetupItem-EnhRelocInfoReq-ExtIEs} }			OPTIONAL,
+	...
+}
+
+RAB-SetupItem-EnhRelocInfoReq-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+-- Extension for Release 4 to enable RAB Quality of Service negotiation over Iu --
+	{ID id-Alt-RAB-Parameters	CRITICALITY ignore		EXTENSION Alt-RAB-Parameters		PRESENCE optional} ,
+-- Extension for Release 5 to enable GERAN support over Iu-cs --
+	...
+}
+
+RANAP-EnhancedRelocationInformationRequestExtensions RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+-- **************************************************************
+--
+-- RANAP ENHANCED RELOCATION INFORMATION RESPONSE ELEMENTARY PROCEDURE
+--
+-- **************************************************************
+
+RANAP-EnhancedRelocationInformationResponse ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {RANAP-EnhancedRelocationInformationResponseIEs} },
+	protocolExtensions		ProtocolExtensionContainer { {RANAP-EnhancedRelocationInformationResponseExtensions} }			OPTIONAL,
+	...
+}
+
+RANAP-EnhancedRelocationInformationResponseIEs RANAP-PROTOCOL-IES ::= {
+	{ ID id-TargetRNC-ToSourceRNC-TransparentContainer 
+							CRITICALITY ignore	TYPE TargetRNC-ToSourceRNC-TransparentContainer PRESENCE optional	} |
+	{ ID id-RAB-SetupList-EnhRelocInfoRes		CRITICALITY ignore	TYPE RAB-SetupList-EnhRelocInfoRes			PRESENCE optional} |
+	{ ID id-RAB-FailedList-EnhRelocInfoRes		CRITICALITY ignore	TYPE RAB-FailedList-EnhRelocInfoRes			PRESENCE optional }|
+	{ ID id-CriticalityDiagnostics			CRITICALITY ignore	TYPE CriticalityDiagnostics 			PRESENCE optional	},
+	...
+}
+
+RAB-SetupList-EnhRelocInfoRes 				::= RAB-IE-ContainerList { { RAB-SetupItem-EnhRelocInfoRes-IEs} }
+
+RAB-SetupItem-EnhRelocInfoRes-IEs RANAP-PROTOCOL-IES ::= { 
+	{ ID id-RAB-SetupItem-EnhRelocInfoRes		CRITICALITY reject	TYPE RAB-SetupItem-EnhRelocInfoRes			PRESENCE mandatory 	},
+	...
+}
+
+RAB-SetupItem-EnhRelocInfoRes ::= SEQUENCE {
+	cN-DomainIndicator			CN-DomainIndicator,
+	rAB-ID						RAB-ID,
+	transportLayerAddress				TransportLayerAddress	OPTIONAL,
+	iuTransportAssociation				IuTransportAssociation	OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { { RAB-SetupItem-EnhRelocInfoRes-ExtIEs} }			OPTIONAL,
+	...
+}
+
+RAB-SetupItem-EnhRelocInfoRes-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+-- Extension for Release 4 to enable RAB Quality of Service negotiation over Iu --
+	{ID id-Ass-RAB-Parameters	CRITICALITY ignore		EXTENSION Ass-RAB-Parameters		PRESENCE optional	} |
+-- Extension for Release 5 to allow transfer of a second pair of TLA and association --
+	{ID id-TransportLayerAddress	CRITICALITY ignore	EXTENSION TransportLayerAddress	PRESENCE optional} |
+	{ID id-IuTransportAssociation	CRITICALITY ignore	EXTENSION IuTransportAssociation	PRESENCE optional},
+	...
+}
+
+RAB-FailedList-EnhRelocInfoRes 				::= RAB-IE-ContainerList { { RAB-FailedItem-EnhRelocInfoRes-IEs} }
+
+RAB-FailedItem-EnhRelocInfoRes-IEs RANAP-PROTOCOL-IES ::= { 
+	{ ID id-RAB-FailedItem-EnhRelocInfoRes		CRITICALITY reject	TYPE RAB-FailedItem-EnhRelocInfoRes			PRESENCE mandatory 	},
+	...
+}
+
+RAB-FailedItem-EnhRelocInfoRes ::= SEQUENCE {
+	cN-DomainIndicator			CN-DomainIndicator,
+	rAB-ID						RAB-ID,
+	cause						Cause,
+	iE-Extensions					ProtocolExtensionContainer { { RAB-FailedItem-EnhRelocInfoRes-ExtIEs} }			OPTIONAL,
+	...
+}
+
+RAB-FailedItem-EnhRelocInfoRes-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+RANAP-EnhancedRelocationInformationResponseExtensions RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+-- **************************************************************
+--
 -- RAB MODIFICATION REQUEST ELEMENTARY PROCEDURE
 --
 -- **************************************************************
@@ -2143,7 +2421,7 @@ LocationRelatedDataRequest ::= SEQUENCE {
 
 LocationRelatedDataRequestIEs RANAP-PROTOCOL-IES ::= {
 	{ ID id-LocationRelatedDataRequestType		CRITICALITY reject	TYPE LocationRelatedDataRequestType		PRESENCE optional	},
-	-- This IE is mandatory for UTRAN, optional for GERAN Iu Mode --
+	-- This IE is mandatory for UTRAN, optional for GERAN Iu Mode –-
 	...
 }
 
@@ -2152,7 +2430,7 @@ LocationRelatedDataRequestExtensions RANAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-LocationRelatedDataRequestTypeSpecificToGERANIuMode		CRITICALITY reject	EXTENSION LocationRelatedDataRequestTypeSpecificToGERANIuMode		PRESENCE optional	}|
 	-- The previous extension is optional for GERAN Iu Mode only, not applicable for UTRAN --
 	-- Extension for Release 7 to request GANSS Assistance Data. This IE shall be present if the Requested Location Related Data Type IE is set to
-	-- 'Dedicated Assistance Data for Assisted GANSS' or `Dedicated Assistance Data for Assisted GPS and GANSS'--
+	-- ‘Dedicated Assistance Data for Assisted GANSS’ or `Dedicated Assistance Data for Assisted GPS and GANSS’--
 	{ ID id-RequestedGANSSAssistanceData							CRITICALITY reject	EXTENSION RequestedGANSSAssistanceData							PRESENCE conditional	},
 	...
 }
diff --git a/asn1/ranap/RANAP-PDU-Descriptions.asn b/asn1/ranap/RANAP-PDU-Descriptions.asn
index b05c93d36e..b4c5d0240e 100644
--- a/asn1/ranap/RANAP-PDU-Descriptions.asn
+++ b/asn1/ranap/RANAP-PDU-Descriptions.asn
@@ -1,7 +1,7 @@
 -- RANAP-PDU-Descriptions.asn
 --
--- Taken from 3GPP TS 25.413 V7.8.0 (2008-01)
--- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-780.zip/25413-780.DOC
+-- Taken from 3GPP TS 25.413 V8.0.1 (2008-09)
+-- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-801.zip
 --
 -- 9.3.2	Elementary Procedure Definitions
 --
@@ -43,6 +43,10 @@ FROM RANAP-CommonDataTypes
 	RelocationFailure,
 	RelocationCancel,
 	RelocationCancelAcknowledge,
+	EnhancedRelocationCompleteRequest,
+	EnhancedRelocationCompleteResponse,
+	EnhancedRelocationCompleteFailure,
+	EnhancedRelocationCompleteConfirm,
 	SRNS-ContextRequest,
 	SRNS-ContextResponse,
 	SecurityModeCommand,
@@ -75,6 +79,8 @@ FROM RANAP-CommonDataTypes
 	ResetResource,
 	ResetResourceAcknowledge,
 	RANAP-RelocationInformation,
+	RANAP-EnhancedRelocationInformationRequest,
+	RANAP-EnhancedRelocationInformationResponse,
 	LocationRelatedDataRequest,
 	LocationRelatedDataResponse,
 	LocationRelatedDataFailure,
@@ -128,11 +134,14 @@ FROM RANAP-PDU-Contents
 	id-RAB-ReleaseRequest, 
 	id-RAB-ModifyRequest,
 	id-RANAP-Relocation,
+	id-RANAPenhancedRelocation,
 	id-RelocationCancel,
 	id-RelocationComplete,
 	id-RelocationDetect,
 	id-RelocationPreparation,
 	id-RelocationResourceAllocation,
+	id-enhancedRelocationComplete,
+	id-enhancedRelocationCompleteConfirm,
 	id-Reset,
 	id-SRNS-ContextTransfer,
 	id-SRNS-DataForward,
@@ -247,7 +256,9 @@ RANAP-ELEMENTARY-PROCEDURES-CLASS-1 RANAP-ELEMENTARY-PROCEDURE ::= {
 	mBMSUELinking				|
 	mBMSRegistration			|
 	mBMSCNDe-Registration		|
-	mBMSRABRelease
+	mBMSRABRelease				|
+	enhancedRelocationComplete	|
+	rANAP-enhancedRelocation
 }
 
 RANAP-ELEMENTARY-PROCEDURES-CLASS-2 RANAP-ELEMENTARY-PROCEDURE ::= {
@@ -273,7 +284,8 @@ RANAP-ELEMENTARY-PROCEDURES-CLASS-2 RANAP-ELEMENTARY-PROCEDURE ::= {
 	rAB-ModifyRequest		|
 	uESpecificInformation	|
 	directInformationTransfer	|
-	mBMSRABEstablishmentIndication
+	mBMSRABEstablishmentIndication	|
+	enhancedRelocationCompleteConfirm
 }
 
 RANAP-ELEMENTARY-PROCEDURES-CLASS-3 RANAP-ELEMENTARY-PROCEDURE ::= {
@@ -570,6 +582,27 @@ mBMSRABRelease RANAP-ELEMENTARY-PROCEDURE ::= {
 	PROCEDURE CODE		id-MBMSRABRelease
 	CRITICALITY		reject
 }
+enhancedRelocationComplete RANAP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE	EnhancedRelocationCompleteRequest
+	SUCCESSFUL OUTCOME		EnhancedRelocationCompleteResponse
+	UNSUCCESSFUL OUTCOME	EnhancedRelocationCompleteFailure
+	PROCEDURE CODE		id-enhancedRelocationComplete
+	CRITICALITY		reject
+}
+
+enhancedRelocationCompleteConfirm RANAP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE	EnhancedRelocationCompleteConfirm
+	PROCEDURE CODE		id-enhancedRelocationCompleteConfirm
+	CRITICALITY		ignore
+}
+
+rANAP-enhancedRelocation RANAP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE	RANAP-EnhancedRelocationInformationRequest
+	SUCCESSFUL OUTCOME	RANAP-EnhancedRelocationInformationResponse
+	PROCEDURE CODE			id-RANAPenhancedRelocation
+	CRITICALITY		reject
+}
 
 END
 
+
diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf
index d071fe191b..1a8cda71dc 100644
--- a/asn1/ranap/ranap.cnf
+++ b/asn1/ranap/ranap.cnf
@@ -262,6 +262,9 @@ id-MBMSRegistration					ProcedureCode
 id-MBMSCNDe-Registration-Procedure	ProcedureCode
 id-MBMSRABEstablishmentIndication	ProcedureCode
 id-MBMSRABRelease					ProcedureCode
+id-enhancedRelocationComplete		ProcedureCode
+id-enhancedRelocationCompleteConfirm	ProcedureCode
+id-RANAPenhancedRelocation				ProcedureCode
 
 # ProtocolIE-ID
 id-AreaIdentity 								ProtocolIE-ID 
@@ -444,7 +447,17 @@ id-GANSS-PositioningDataSet								ProtocolIE-ID
 id-RequestedGANSSAssistanceData							ProtocolIE-ID 
 id-BroadcastGANSSAssistanceDataDecipheringKeys			ProtocolIE-ID
 id-d-RNTI-for-NoIuCSUP									ProtocolIE-ID
-
+id-RAB-SetupList-EnhancedRelocCompleteReq				ProtocolIE-ID
+id-RAB-SetupItem-EnhancedRelocCompleteReq				ProtocolIE-ID
+id-RAB-SetupList-EnhancedRelocCompleteRes				ProtocolIE-ID
+id-RAB-SetupItem-EnhancedRelocCompleteRes				ProtocolIE-ID
+id-RAB-SetupList-EnhRelocInfoReq						ProtocolIE-ID
+id-RAB-SetupItem-EnhRelocInfoReq						ProtocolIE-ID
+id-RAB-SetupList-EnhRelocInfoRes						ProtocolIE-ID
+id-RAB-SetupItem-EnhRelocInfoRes						ProtocolIE-ID
+id-OldIuSigConId										ProtocolIE-ID
+id-RAB-FailedList-EnhRelocInfoRes						ProtocolIE-ID
+id-RAB-FailedItem-EnhRelocInfoRes						ProtocolIE-ID
 #.END
 
 #.REGISTER_NEW
@@ -568,12 +581,23 @@ UnsuccessfulLinking-IEs            N ranap.ies id-UnsuccessfulLinkingList
 MBMSRegistrationRequestType        N ranap.ies id-MBMSRegistrationRequestType
 IPMulticastAddress                 N ranap.ies id-IPMulticastAddress
 APN                                N ranap.ies id-APN
+RAB-SetupList-EnhancedRelocCompleteReq	N ranap.ies id-RAB-SetupList-EnhancedRelocCompleteReq
+RAB-SetupItem-EnhancedRelocCompleteReq	N ranap.ies id-RAB-SetupItem-EnhancedRelocCompleteReq
+RAB-SetupList-EnhancedRelocCompleteRes	N ranap.ies id-RAB-SetupList-EnhancedRelocCompleteRes
+RAB-SetupItem-EnhancedRelocCompleteRes	N ranap.ies id-RAB-SetupItem-EnhancedRelocCompleteRes
+RAB-SetupList-EnhRelocInfoReq			N ranap.ies id-RAB-SetupList-EnhRelocInfoReq
+RAB-SetupItem-EnhRelocInfoReq			N ranap.ies id-RAB-SetupItem-EnhRelocInfoReq
+RAB-SetupList-EnhRelocInfoRes			N ranap.ies id-RAB-SetupList-EnhRelocInfoRes
+RAB-SetupItem-EnhRelocInfoRes			N ranap.ies id-RAB-SetupItem-EnhRelocInfoRes
+IuSignallingConnectionIdentifier		N ranap.ies id-OldIuSigConId
+RAB-FailedList-EnhRelocInfoRes			N ranap.ies id-RAB-FailedList-EnhRelocInfoRes
+RAB-FailedItem-EnhRelocInfoRes			N ranap.ies id-RAB-FailedItem-EnhRelocInfoRes 
 
 #RANAP-PROTOCOL-IES-PAIR
 RAB-SetupOrModifyItemFirst         N ranap.ies.pair.first id-RAB-SetupOrModifyItem
 RAB-SetupOrModifyItemSecond        N ranap.ies.pair.second id-RAB-SetupOrModifyItem
 
-#NBAP-PROTOCOL-EXTENSION
+#RANAP-PROTOCOL-EXTENSION
 RAB-Parameters                     N ranap.extension id-AlternativeRABConfiguration
 Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf N ranap.extension id-Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf
 Alt-RAB-Parameter-ExtendedMaxBitrateInf N ranap.extension id-Alt-RAB-Parameter-ExtendedMaxBitrateInf
@@ -713,5 +737,10 @@ MBMSRABEstablishmentIndication         N ranap.proc.imsg id-MBMSRABEstablishment
 MBMSRABReleaseRequest                  N ranap.proc.imsg id-MBMSRABRelease
 MBMSRABRelease                         N ranap.proc.sout id-MBMSRABRelease
 MBMSRABReleaseFailure                  N ranap.proc.uout id-MBMSRABRelease
-
+EnhancedRelocationCompleteRequest			N ranap.proc.imsg id-enhancedRelocationComplete
+EnhancedRelocationCompleteResponse			N ranap.proc.sout id-enhancedRelocationComplete
+EnhancedRelocationCompleteFailure			N ranap.proc.uout id-enhancedRelocationComplete
+EnhancedRelocationCompleteConfirm			N ranap.proc.imsg id-enhancedRelocationCompleteConfirm
+RANAP-EnhancedRelocationInformationRequest	N ranap.proc.imsg id-RANAPenhancedRelocation
+RANAP-EnhancedRelocationInformationResponse	N ranap.proc.sout id-RANAPenhancedRelocation
 #.END
\ No newline at end of file