Update the ASN.1 files.

svn path=/trunk/; revision=25648

1 files changed, 145 insertions, 49 deletions

diff --git a/asn1/rrc/Internode-definitions.asn b/asn1/rrc/Internode-definitions.asn
index 3591dab1a9..cf0a92e812 100644
--- a/asn1/rrc/Internode-definitions.asn
+++ b/asn1/rrc/Internode-definitions.asn
@@ -1,7 +1,8 @@
+-- $Id$
 -- Internode-definitions.asn
 --
--- Taken from 3GPP TS 25.331 V7.4.0 (2007-03)
--- http://www.3gpp.org/ftp/Specs/archive/25_series/25.331/25331-740.zip/25331-740.doc
+-- Taken from 3GPP TS 25.331 V8.2.0 (2008-04-21)
+-- http://www.3gpp.org/ftp/Specs/archive/25_series/25.331/25331-820.zip
 --
 -- 11.5	RRC information between network nodes
 --
@@ -60,9 +61,7 @@ FROM PDU-definitions
 	MultiRAT-Capability,
 	NetworkAssistedGPS-Supported,
 	PhysicalChannelCapability-edch-r6,
-	PhysicalChannelCapability-r7,
 	RadioFrequencyBandTDDList,
-	RF-Capability-r7,
 	RLC-Capability,
 	RRC-MessageSequenceNumber,
 	SecurityCapability,
@@ -71,10 +70,12 @@ FROM PDU-definitions
 	STARTSingle,
 	START-Value,
 	SupportOfDedicatedPilotsForChEstimation,
+	T-305,
 	TransportChannelCapability,
 	TxRxFrequencySeparation,
 	U-RNTI,
 	UE-CapabilityContainer-IEs,
+	UE-GANSSPositioning-Capability,
 	UE-MultiModeRAT-Capability,
 	UE-PowerClassExt,
 	UE-RadioAccessCapabBandFDDList,
@@ -88,7 +89,6 @@ FROM PDU-definitions
 	UE-RadioAccessCapability-v4b0ext,
 	UE-RadioAccessCapability-v590ext,
 	UE-RadioAccessCapability-v5c0ext,
-	UE-RadioAccessCapability-v7xyext,
 	UL-PhysChCapabilityFDD,
 	UL-PhysChCapabilityFDD-r6,
 	UL-PhysChCapabilityTDD,
@@ -103,10 +103,14 @@ FROM PDU-definitions
 	RAB-InformationSetupList-r6,
 	RAB-InformationSetupList-v6b0ext,
 	RAB-InformationSetupList-r7,
+	RAB-InformationSetupList-r8,
+	RAB-InformationSetupList-v820ext,
 	RB-Identity,
 	SRB-InformationSetupList,
 	SRB-InformationSetupList-r5,
 	SRB-InformationSetupList-r6,
+	SRB-InformationSetupList-r7,
+	SRB-InformationSetupList-r8,
 -- Transport Channel IEs :
 	CPCH-SetID,
 	DL-CommonTransChInfo,
@@ -114,12 +118,14 @@ FROM PDU-definitions
 	DL-AddReconfTransChInfoList,
 	DL-AddReconfTransChInfoList-r4,
 	DL-AddReconfTransChInfoList-r5,
+	DL-AddReconfTransChInfoList-r7,
 	DRAC-StaticInformationList,
 	UL-CommonTransChInfo,
 	UL-CommonTransChInfo-r4,
 	UL-AddReconfTransChInfoList,
 	UL-AddReconfTransChInfoList-r6,
 	UL-AddReconfTransChInfoList-r7,
+	UL-AddReconfTransChInfoList-r8,
 -- Physical Channel IEs :
 	PrimaryCPICH-Info,
 	TPC-CombinationIndex,
@@ -141,6 +147,7 @@ FROM PDU-definitions
 	MeasurementType,
 	MeasurementType-r4,
 	MeasurementType-r6,
+	MeasurementType-r7,
 	AdditionalMeasurementID-List,
 	PositionEstimate,
 	ReportingCellStatus,
@@ -161,16 +168,15 @@ FROM PDU-definitions
 FROM InformationElements
 
 	maxCNdomains,
+	maxGANSS,
 	maxNoOfMeas,
-
 	maxRB,
 	maxRBallRABs,
 	maxRFC3095-CID,
 	maxSRBsetup,
 	maxRL,
 	maxTGPS
-FROM Constant-definitions
-;
+FROM Constant-definitions;
 
 -- Part 1: Class definitions similar to what has been defined in 11.1 for RRC messages
 -- Information that is tranferred in the same direction and across the same path is grouped
@@ -326,9 +332,9 @@ SRNC-RelocationInfo-r3 ::= CHOICE {
 															v6b0NonCriticalExtensions		SEQUENCE {
 																sRNC-RelocationInfo-v6b0ext
 																			SRNC-RelocationInfo-v6b0ext-IEs,
-																v7xyNonCriticalExtensions	SEQUENCE {
-																	sRNC-RelocationInfo-v7xyext
-																			SRNC-RelocationInfo-v7xyext-IEs,
+																v770NonCriticalExtensions	SEQUENCE {
+																	sRNC-RelocationInfo-v770ext
+																			SRNC-RelocationInfo-v770ext-IEs,
 																	-- Reserved for future non critical
 																	-- extension
 																	nonCriticalExtensions
@@ -369,9 +375,9 @@ SRNC-RelocationInfo-r3 ::= CHOICE {
 									v6b0NonCriticalExtensions			SEQUENCE {
 										sRNC-RelocationInfo-v6b0ext
 																	SRNC-RelocationInfo-v6b0ext-IEs,
-										v7xyNonCriticalExtensions			SEQUENCE {
-											sRNC-RelocationInfo-v7xyext
-																	SRNC-RelocationInfo-v7xyext-IEs,
+										v770NonCriticalExtensions			SEQUENCE {
+											sRNC-RelocationInfo-v770ext
+																	SRNC-RelocationInfo-v770ext-IEs,
 												nonCriticalExtensions			SEQUENCE {}	OPTIONAL
 										}	OPTIONAL
 									}	OPTIONAL
@@ -396,9 +402,9 @@ SRNC-RelocationInfo-r3 ::= CHOICE {
 								sRNC-RelocationInfo-v690ext			SRNC-RelocationInfo-v690ext-IEs,
 								v6b0NonCriticalExtensions			SEQUENCE {
 									sRNC-RelocationInfo-v6b0ext		SRNC-RelocationInfo-v6b0ext-IEs,
-										v7xyNonCriticalExtensions		SEQUENCE {
-											sRNC-RelocationInfo-v7xyext
-																	SRNC-RelocationInfo-v7xyext-IEs,
+										v770NonCriticalExtensions		SEQUENCE {
+											sRNC-RelocationInfo-v770ext
+																	SRNC-RelocationInfo-v770ext-IEs,
 											nonCriticalExtensions			SEQUENCE {}		OPTIONAL
 									}	OPTIONAL
 								}	OPTIONAL
@@ -413,9 +419,12 @@ SRNC-RelocationInfo-r3 ::= CHOICE {
 					sRNC-RelocationInfo-r6-add-ext	BIT STRING		OPTIONAL,
 					v6b0NonCriticalExtensions		SEQUENCE {
 						sRNC-RelocationInfo-v6b0ext		SRNC-RelocationInfo-v6b0ext-IEs,
-						v7xyNonCriticalExtensions		SEQUENCE {
-							sRNC-RelocationInfo-v7xyext		SRNC-RelocationInfo-v7xyext-IEs,
-							nonCriticalExtensions			SEQUENCE {}		OPTIONAL
+						v770NonCriticalExtensions		SEQUENCE {
+							sRNC-RelocationInfo-v770ext		SRNC-RelocationInfo-v770ext-IEs,
+							v820NonCriticalExtensions		SEQUENCE {
+								srnc-RelocationInfo-v820ext		SRNC-RelocationInfo-v820ext-IEs,
+								nonCriticalExtensions			SEQUENCE {}		OPTIONAL
+							}	OPTIONAL
 						}	OPTIONAL
 					}	OPTIONAL
 				},
@@ -423,9 +432,19 @@ SRNC-RelocationInfo-r3 ::= CHOICE {
 					r7								SEQUENCE {
 						sRNC-RelocationInfo-r7			SRNC-RelocationInfo-r7-IEs,
 						sRNC-RelocationInfo-r7-add-ext	BIT STRING		OPTIONAL,
-						nonCriticalExtensions			SEQUENCE {}	OPTIONAL
+						v820NonCriticalExtensions		SEQUENCE {
+							srnc-RelocationInfo-v820ext		SRNC-RelocationInfo-v820ext-IEs,
+							nonCriticalExtensions			SEQUENCE {}	OPTIONAL
+						}
 					},
+					criticalExtensions				CHOICE {
+						r8								SEQUENCE {
+							sRNC-RelocationInfo-r8			SRNC-RelocationInfo-r8-IEs,
+							sRNC-RelocationInfo-r8-add-ext	BIT STRING		OPTIONAL,
+							nonCriticalExtensions			SEQUENCE {}	OPTIONAL
+						},
 					criticalExtensions				SEQUENCE {}
+					}
 				}
 			}
 		}
@@ -530,7 +549,7 @@ SRNC-RelocationInfo-v3c0ext-IEs ::= SEQUENCE {
 		-- IE rb-IdentityForHOMessage includes the identity of the RB used by the source SRNC
 		-- to send the message contained in the IE "TargetRNC-ToSourceRNC-Container".
 		-- Only included if type is "UE involved"
-		rb-IdentityForHOMessage				RB-Identity  		OPTIONAL
+		rb-IdentityForHOMessage				RB-Identity		OPTIONAL
 }
 
 SRNC-RelocationInfo-v3d0ext-IEs ::= SEQUENCE {
@@ -872,6 +891,8 @@ SRNC-RelocationInfo-r7-IEs ::=			SEQUENCE {
 	-- User equipment IEs
 		u-RNTI							U-RNTI,
 		c-RNTI							C-RNTI								OPTIONAL,
+		-- IE 'UE-RadioAccessCapability-r6' includes the Rel-5 radio access capability extensions
+		-- and earlier. Rel-6 and later extensions are included in IE 'UE-CapabilityContainer-IEs'.
 		ue-RadioAccessCapability		UE-RadioAccessCapability-r6,
 		ue-RadioAccessCapability-ext	UE-RadioAccessCapabBandFDDList		OPTIONAL,
 		ue-Positioning-LastKnownPos		UE-Positioning-LastKnownPos			OPTIONAL,
@@ -899,6 +920,7 @@ SRNC-RelocationInfo-r7-IEs ::=			SEQUENCE {
 		ue-RATSpecificCapability		InterRAT-UE-RadioAccessCapabilityList-r5	OPTIONAL,
 	-- UTRAN mobility IEs
 		ura-Identity					URA-Identity						OPTIONAL,
+		srns-t-305						T-305								OPTIONAL,
 	-- Core network IEs
 		cn-CommonGSM-MAP-NAS-SysInfo	NAS-SystemInformationGSM-MAP,
 		cn-DomainInformationList		CN-DomainInformationListFull		OPTIONAL,
@@ -907,27 +929,113 @@ SRNC-RelocationInfo-r7-IEs ::=			SEQUENCE {
 		interRATCellInfoIndication		InterRATCellInfoIndication			OPTIONAL,
 	-- Radio bearer IEs
 		predefinedConfigStatusList		PredefinedConfigStatusList,
-		srb-InformationList				SRB-InformationSetupList-r6,
-		rab-InformationList				RAB-InformationSetupList-r6			OPTIONAL,
+		srb-InformationList				SRB-InformationSetupList-r7,
+		rab-InformationList				RAB-InformationSetupList-r7			OPTIONAL,
 	-- Transport channel IEs
 		ul-CommonTransChInfo			UL-CommonTransChInfo-r4				OPTIONAL,
 		ul-TransChInfoList				UL-AddReconfTransChInfoList-r7		OPTIONAL,
 		dl-CommonTransChInfo			DL-CommonTransChInfo-r4				OPTIONAL,
-		dl-TransChInfoList				DL-AddReconfTransChInfoList-r5		OPTIONAL,
+		dl-TransChInfoList				DL-AddReconfTransChInfoList-r7		OPTIONAL,
 	-- PhyCH IEs
 		tpc-CombinationInfoList			TPC-CombinationInfoList				OPTIONAL,
 		storedCompressedModeInfo		StoredCompressedModeInfo			OPTIONAL,
 	-- Measurement report
-		measurementReport				MeasurementReport					OPTIONAL,
+		measurementReport				BIT STRING
+							(CONTAINING MeasurementReport)					OPTIONAL,
 	-- Other IEs
 		failureCause					FailureCauseWithProtErr				OPTIONAL,
 	-- MBMS IEs
-		mbms-JoinedInformation			MBMS-JoinedInformation-r6			OPTIONAL
+		mbms-JoinedInformation			MBMS-JoinedInformation-r6			OPTIONAL,
+		mbmsSelectedServiceInfo			MBMS-SelectedServiceInfo			OPTIONAL
 }
 
-SRNC-RelocationInfo-v7xyext-IEs ::= SEQUENCE {
-		ue-RadioAccessCapability-v7xyext	UE-RadioAccessCapability-v7xyext		OPTIONAL,
-		thresholdSFN-GPS-TOW-us				ThresholdSFN-GPS-TOW-us					OPTIONAL
+SRNC-RelocationInfo-v770ext-IEs ::= SEQUENCE {
+		thresholdSFN-GPS-TOW-us				ThresholdSFN-GPS-TOW-us					OPTIONAL,
+		srns-t-305							T-305									OPTIONAL
+}
+
+SRNC-RelocationInfo-r8-IEs ::=			SEQUENCE {
+	-- Non-RRC IEs
+		-- IE rb-IdentityForHOMessage includes the identity of the RB used by the source SRNC
+		-- to send the message contained in the IE "TargetRNC-ToSourceRNC-Container".
+		-- Only included if type is "UE involved"
+		rb-IdentityForHOMessage			RB-Identity							OPTIONAL,
+		stateOfRRC						StateOfRRC,
+		stateOfRRC-Procedure			StateOfRRC-Procedure,
+	-- Ciphering related information IEs
+		cipheringStatusList				CipheringStatusList-r4,
+		latestConfiguredCN-Domain		CN-DomainIdentity,
+		calculationTimeForCiphering		CalculationTimeForCiphering			OPTIONAL,
+		count-C-List					COUNT-C-List						OPTIONAL,
+		cipheringInfoPerRB-List			CipheringInfoPerRB-List-r4			OPTIONAL,
+	-- Integrity protection related information IEs
+		integrityProtectionStatus		IntegrityProtectionStatus,
+		srb-SpecificIntegrityProtInfo	SRB-SpecificIntegrityProtInfoList	OPTIONAL,
+		implementationSpecificParams	ImplementationSpecificParams		OPTIONAL,
+	-- User equipment IEs
+		u-RNTI							U-RNTI,
+		c-RNTI							C-RNTI								OPTIONAL,
+		-- IE 'UE-RadioAccessCapability-r6' includes the Rel-5 radio access capability extensions
+		-- and earlier. Rel-6 and later extensions are included in IE 'UE-CapabilityContainer-IEs'.
+		ue-RadioAccessCapability		UE-RadioAccessCapability-r6,
+		ue-RadioAccessCapability-ext	UE-RadioAccessCapabBandFDDList		OPTIONAL,
+		ue-Positioning-LastKnownPos		UE-Positioning-LastKnownPos			OPTIONAL,
+		uESpecificBehaviourInformation1idle
+										UESpecificBehaviourInformation1idle		OPTIONAL,
+		uESpecificBehaviourInformation1interRAT
+										UESpecificBehaviourInformation1interRAT		OPTIONAL,
+		-- IE ueCapabilityContainer is used for the transparent transfer of capability information
+		-- received from the UE
+		ueCapabilityContainer			BIT STRING
+											(CONTAINING UE-CapabilityContainer-IEs)	OPTIONAL,
+		-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the 
+		-- transparent transfer of capability information received from the UE that was introduced 
+		-- in a release independent manner, i.e., transferred within a VLEC. These UE capabilities 
+		-- are included both in the RRC CONNECTION SETUP COMPLETE and the UE CAPABILITY INFORMATION 
+		-- messages. Only the VLEC of one message needs to be included i.e. the one from these
+		-- messages that was last received.
+		-- Case 1: If the last received message was a RRC CONNECTION SETUP COMPLETE (RSC)
+		ueCapabilityContainer-RSC		BIT STRING
+							(CONTAINING RRCConnectionSetupComplete-r3-add-ext-IEs)	OPTIONAL,
+		-- Case 2: If the last received message was a UE CAPABILITY INFORMATION (UCI)
+		ueCapabilityContainer-UCI		BIT STRING
+							(CONTAINING UECapabilityInformation-r3-add-ext-IEs)		OPTIONAL,
+	-- Other IEs
+		ue-RATSpecificCapability		InterRAT-UE-RadioAccessCapabilityList-r5	OPTIONAL,
+	-- UTRAN mobility IEs
+		ura-Identity					URA-Identity						OPTIONAL,
+		srns-t-305						T-305								OPTIONAL,
+	-- Core network IEs
+		cn-CommonGSM-MAP-NAS-SysInfo	NAS-SystemInformationGSM-MAP,
+		cn-DomainInformationList		CN-DomainInformationListFull		OPTIONAL,
+	-- Measurement IEs
+		ongoingMeasRepList				OngoingMeasRepList-r7				OPTIONAL,
+		interRATCellInfoIndication		InterRATCellInfoIndication			OPTIONAL,
+	-- Radio bearer IEs
+		predefinedConfigStatusList		PredefinedConfigStatusList,
+		srb-InformationList				SRB-InformationSetupList-r8,
+		rab-InformationList				RAB-InformationSetupList-r8			OPTIONAL,
+	-- Transport channel IEs
+		ul-CommonTransChInfo			UL-CommonTransChInfo-r4				OPTIONAL,
+		ul-TransChInfoList				UL-AddReconfTransChInfoList-r7		OPTIONAL,
+		dl-CommonTransChInfo			DL-CommonTransChInfo-r4				OPTIONAL,
+		dl-TransChInfoList				DL-AddReconfTransChInfoList-r7		OPTIONAL,
+	-- PhyCH IEs
+		tpc-CombinationInfoList			TPC-CombinationInfoList				OPTIONAL,
+		storedCompressedModeInfo		StoredCompressedModeInfo			OPTIONAL,
+	-- Measurement report
+		measurementReport				BIT STRING
+							(CONTAINING MeasurementReport)					OPTIONAL,
+	-- Other IEs
+		failureCause					FailureCauseWithProtErr				OPTIONAL,
+	-- MBMS IEs
+		mbms-JoinedInformation			MBMS-JoinedInformation-r6			OPTIONAL,
+		mbmsSelectedServiceInfo			MBMS-SelectedServiceInfo			OPTIONAL
+}
+
+SRNC-RelocationInfo-v820ext-IEs ::=	SEQUENCE {
+	-- Radio bearer IEs
+		rab-InformationList				RAB-InformationSetupList-v820ext	OPTIONAL
 }
 
 -- IE definitions
@@ -1115,6 +1223,12 @@ MeasurementCommandWithType-r6 ::=	CHOICE {
 	release								NULL
 }
 
+MeasurementCommandWithType-r7 ::=	CHOICE {
+	setup								MeasurementType-r7,
+	modify								NULL,
+	release								NULL
+}
+
 OngoingMeasRep ::=					SEQUENCE {
 	measurementIdentity					MeasurementIdentity,
 	-- TABULAR: The CHOICE Measurement in the tabular description is included
@@ -1159,10 +1273,7 @@ OngoingMeasRep-r6 ::=				SEQUENCE {
 
 OngoingMeasRep-r7 ::=				SEQUENCE {
 	measurementIdentity					MeasurementIdentity,
-	measurementCommandWithType			SEQUENCE {
-		measurementCommandWithType			MeasurementCommandWithType-r6,
-		thresholdSFN-GPS-TOW-us				ThresholdSFN-GPS-TOW-us			OPTIONAL
-	},
+	measurementCommandWithType			MeasurementCommandWithType-r7,
 	measurementReportingMode			MeasurementReportingMode			OPTIONAL,
 	additionalMeasurementID-List		AdditionalMeasurementID-List		OPTIONAL
 }
@@ -1400,21 +1511,6 @@ UE-RadioAccessCapability-r6 ::=		SEQUENCE {
 	measurementCapability				MeasurementCapability-r4		OPTIONAL
 }
 
-UE-RadioAccessCapability-r7 ::=		SEQUENCE {
-	accessStratumReleaseIndicator		AccessStratumReleaseIndicator,
-	dl-CapabilityWithSimultaneousHS-DSCHConfig
-										DL-CapabilityWithSimultaneousHS-DSCHConfig	OPTIONAL,
-	pdcp-Capability						PDCP-Capability-r6,
-	rlc-Capability						RLC-Capability-r5,
-	transportChannelCapability			TransportChannelCapability,
-	rf-Capability						RF-Capability-r7,
-	physicalChannelCapability			PhysicalChannelCapability-r7,
-	ue-MultiModeRAT-Capability			UE-MultiModeRAT-Capability-r5,
-	securityCapability					SecurityCapability,
-	ue-positioning-Capability			UE-Positioning-Capability-r4,
-	measurementCapability				MeasurementCapability-r4		OPTIONAL
-}
-
 UL-RFC3095-Context ::=				SEQUENCE {
 	rfc3095-Context-Identity			INTEGER (0..16383),
 	ul-mode								ENUMERATED {u, o, r},