Update to V9.2.1 (2010-04)

svn path=/trunk/; revision=32784

asn1/rrc/Class-definitions.asn

@@ -1,12 +1,11 @@
 -- $Id$
 -- Class-definitions.asn
 --
--- 3GPP TS 25.331 V9.1.0 (2009-12)
+-- 3GPP TS 25.331 V9.2.1 (2010-04)
 -- http://www.3gpp.org/ftp/Specs/html-info/25331.htm
 --
 -- 11.1 General message structure
 --
-
 Class-definitions DEFINITIONS AUTOMATIC TAGS ::=
 
 BEGIN

asn1/rrc/Constant-definitions.asn

@@ -1,7 +1,7 @@
 -- $Id$
 -- Constant-definitions.asn
 --
--- 3GPP TS 25.331 V9.1.0 (2009-12)
+-- 3GPP TS 25.331 V9.2.1 (2010-04)
 -- http://www.3gpp.org/ftp/Specs/html-info/25331.htm
 --
 -- 11.4	Constant definitions
@@ -23,6 +23,7 @@ maxCCTrCH					INTEGER ::= 8
 maxCellMeas 				INTEGER ::= 32
 maxCellMeasOnSecULFreq 		INTEGER ::= 32
 maxCellMeas-1				INTEGER ::= 31
+maxCellMeasOnSecULFreq-1	INTEGER ::= 31
 maxCNdomains				INTEGER ::= 4
 maxCommonHRNTI				INTEGER ::= 4
 maxCommonQueueID			INTEGER ::= 2
@@ -86,6 +87,8 @@ maxMeasCSGRange				INTEGER ::= 4
 maxMeasEvent				INTEGER ::= 8
 maxMeasEventOnSecULFreq		INTEGER ::= 8
 maxMeasIntervals			INTEGER ::= 3
+maxMeasOccasionPattern		INTEGER ::= 5
+maxMeasOccasionPattern-1	INTEGER ::= 4
 maxMeasParEvent				INTEGER ::= 2
 maxNumCDMA2000Freqs			INTEGER ::=  8
 maxNumE-AGCH				INTEGER ::= 4
@@ -113,7 +116,6 @@ maxPRACH-FPACH				INTEGER ::= 8
 maxPredefConfig				INTEGER ::= 16
 maxPrio						INTEGER ::= 8
 maxPrio-1					INTEGER ::= 7
-maxCSGProximityIndications	INTEGER ::= 4
 maxPUSCH					INTEGER ::= 8
 maxQueueIDs					INTEGER ::= 8
 maxRABsetup					INTEGER ::= 16

asn1/rrc/Internode-definitions.asn

@@ -1,7 +1,7 @@
 -- $Id$
 -- Internode-definitions.asn
 --
--- 3GPP TS 25.331 V9.1.0 (2009-12)
+-- 3GPP TS 25.331 V9.2.1 (2010-04)
 -- http://www.3gpp.org/ftp/Specs/html-info/25331.htm
 --
 -- 11.5	RRC information between network nodes
@@ -164,7 +164,6 @@ FROM PDU-definitions
 	MBMS-JoinedInformation-r6,
 	MBMS-SelectedServiceInfo,
 -- Other IEs :
-	CSGProximityIndication,
 	GERANIu-RadioAccessCapability,
 	GSM-MS-RadioAccessCapability,
 	InterRAT-UE-RadioAccessCapabilityList,
@@ -173,12 +172,11 @@ FROM PDU-definitions
 	InterRAT-UE-RadioAccessCapability-v860ext,
 	UE-HistoryInformation,
 	UESpecificBehaviourInformation1idle,
-	-- WS fix
-	CSGProximityIndicationList,
 	UESpecificBehaviourInformation1interRAT
 
 FROM InformationElements
 
+
 	maxCNdomains,
 	maxEDCHRL,
 	maxGANSS,
@@ -252,9 +250,9 @@ InterRATHandoverInfoWithInterRATCapabilities-r3 ::= CHOICE {
 				v860NonCriticalExtensions		SEQUENCE {
 					interRATHandoverInfoWithInterRATCapabilities-v860ext
 										InterRATHandoverInfoWithInterRATCapabilities-v860ext-IEs,
-					v9xyNonCriticalExtensions		SEQUENCE {
-						interRATHandoverInfoWithInterRATCapabilities-v9xyext
-										InterRATHandoverInfoWithInterRATCapabilities-v9xyext-IEs,
+					v920NonCriticalExtensions		SEQUENCE {
+						interRATHandoverInfoWithInterRATCapabilities-v920ext
+										InterRATHandoverInfoWithInterRATCapabilities-v920ext-IEs,
 						nonCriticalExtensions			SEQUENCE {}	OPTIONAL
 					}		OPTIONAL
 				}		OPTIONAL
@@ -292,7 +290,7 @@ InterRATHandoverInfoWithInterRATCapabilities-v860ext-IEs ::= SEQUENCE {
 		ue-RATSpecificCapability			InterRAT-UE-RadioAccessCapability-v860ext	OPTIONAL
 }
 
-InterRATHandoverInfoWithInterRATCapabilities-v9xyext-IEs ::= SEQUENCE {
+InterRATHandoverInfoWithInterRATCapabilities-v920ext-IEs ::= SEQUENCE {
 	-- Other IEs
 		ue-Inactivity-Period				INTEGER (1..120)	OPTIONAL
 }
@@ -1244,7 +1242,6 @@ SRNC-RelocationInfo-r9-IEs ::=			SEQUENCE {
 		measurementReport				BIT STRING
 							(CONTAINING MeasurementReport)					OPTIONAL,
 	-- Other IEs
-		cSGproximityIndicationList		CSGProximityIndicationList			OPTIONAL,
 		failureCause					FailureCauseWithProtErr				OPTIONAL,
 		ue-HistoryInformation			UE-HistoryInformation				OPTIONAL,
 	-- MBMS IEs
@@ -1553,9 +1550,6 @@ OngoingMeasRepList-r8 ::=			SEQUENCE (SIZE (1..maxNoOfMeas)) OF
 
 OngoingMeasRepList-r9 ::=			SEQUENCE (SIZE (1..maxNoOfMeas)) OF
 										OngoingMeasRep-r9
--- WS fix: Imported from InformationElements
---CSGProximityIndicationList ::=		SEQUENCE (SIZE (1..maxNoOfMeas)) OF
---										CSGProximityIndication
 
 PDCP-Capability-r4 ::=				SEQUENCE {
 	losslessSRNS-RelocationSupport		BOOLEAN,

asn1/rrc/packet-rrc-template.c

@@ -1,7 +1,7 @@
 /* packet-rrc.c
  * Routines for Universal Mobile Telecommunications System (UMTS);
  * Radio Resource Control (RRC) protocol specification
- * (3GPP TS 25.331 version 6.7.0 Release 6) packet dissection
+ * (3GPP TS 25.331  packet dissection
  * Copyright 2006-2010, Anders Broman <anders.broman@ericsson.com>
  *
  * $Id$

asn1/rrc/rrc.cnf

@@ -14,16 +14,19 @@ InterRATHandoverInfo_PDU
 ToTargetRNC-Container_PDU
 TargetRNC-ToSourceRNC-Container_PDU
 HandoverToUTRANCommand_PDU
+
 #.OMIT_ASSIGNMENT
+# Omit System-Information-Container for now it messes up the
+# MasterInformationBlock       @si.mib
+# :
+# for some reason
+System-Information-Container
 UE-RadioAccessCapability-v890ext
 UL-PhysChCapabilityFDD-r6
 GSMCellGroupingList
-MeasuredResultOnSecULFreq
-TriggeringCondition3
 UE-Positioning-GANSS-Data
 GANSSDecipheringKeys
 GSM-CellID
-IntraFrequencyMeasuredResultsListOnSecULFreq
 CellMeasuredResultsListOnSecULFreq
 #.END