Update asn1 files to GPP TS 25.413 V7.8.0 (2008-01).

svn path=/trunk/; revision=24250

7 files changed, 42 insertions, 24 deletions

diff --git a/asn1/ranap/RANAP-CommonDataTypes.asn b/asn1/ranap/RANAP-CommonDataTypes.asn
index 1284c2cb7d..4f51f08f01 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.6.0 (2007-06)
--- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-760.zip/25413-760.DOC
+-- 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
 --
 -- 9.3.5	Common Definitions
 --
@@ -40,3 +40,4 @@ ProtocolIE-ID		::= INTEGER (0..65535)
 TriggeringMessage	::= ENUMERATED { initiating-message, successful-outcome, unsuccessfull-outcome, outcome }
 
 END
+
diff --git a/asn1/ranap/RANAP-Constants.asn b/asn1/ranap/RANAP-Constants.asn
index 0575077435..501dbf13c1 100644
--- a/asn1/ranap/RANAP-Constants.asn
+++ b/asn1/ranap/RANAP-Constants.asn
@@ -1,13 +1,12 @@
 -- RANAP-Constants.asn
 --
--- Taken from 3GPP TS 25.413 V7.6.0 (2007-06)
--- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-760.zip/25413-760.DOC
+-- 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
 --
 -- 9.3.6	Constant Definitions
 --
 -- $Id$
 --
-
 -- **************************************************************
 --
 -- Constant definitions
@@ -114,7 +113,7 @@ maxnoofMulticastServicesPerRNC		INTEGER ::= 512
 maxMBMSSA							INTEGER ::= 256
 maxMBMSRA							INTEGER ::= 65536
 maxNrOfEDCHMACdFlows-1				INTEGER ::= 7
-maxGANSSSet							INTEGER ::= 32
+maxGANSSSet							INTEGER ::= 9
 
 -- **************************************************************
 --
@@ -286,6 +285,7 @@ id-RedirectAttemptFlag									INTEGER ::= 166
 id-RAT-Type												INTEGER ::= 167
 id-PeriodicLocationInfo									INTEGER ::= 168
 id-MBMSCountingInformation								INTEGER ::= 169
+id-170-not-to-be-used-for-IE-ids						INTEGER ::= 170
 id-ExtendedRNC-ID										INTEGER ::= 171
 id-Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf		INTEGER ::= 172
 id-Alt-RAB-Parameter-ExtendedMaxBitrateInf				INTEGER ::= 173
@@ -298,7 +298,11 @@ id-Requested-RAB-Parameter-ExtendedGuaranteedBitrateList	INTEGER ::= 179
 id-LAofIdleModeUEs										INTEGER ::= 180
 id-newLAListofIdleModeUEs								INTEGER ::= 181
 id-LAListwithNoIdleModeUEsAnyMore						INTEGER ::= 182
+id-183-not-to-be-used-for-IE-ids						INTEGER ::= 183
 id-GANSS-PositioningDataSet								INTEGER ::= 184
 id-RequestedGANSSAssistanceData							INTEGER ::= 185
+id-BroadcastGANSSAssistanceDataDecipheringKeys			INTEGER ::= 186
+id-d-RNTI-for-NoIuCSUP									INTEGER ::= 187
 
 END
+
diff --git a/asn1/ranap/RANAP-Containers.asn b/asn1/ranap/RANAP-Containers.asn
index 853675e6e7..7bc5444a2d 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.6.0 (2007-06)
--- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-760.zip/25413-760.DOC
+-- 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
 --
 -- 9.3.7	Container Definitions
 --
diff --git a/asn1/ranap/RANAP-IEs.asn b/asn1/ranap/RANAP-IEs.asn
index e168fee30b..85cdb7a206 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.6.0 (2007-06)
--- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-760.zip/25413-760.DOC
+-- 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
 --
 -- 9.3.4	Information Element Definitions
 --
@@ -73,7 +73,8 @@ IMPORTS
 	id-newLAListofIdleModeUEs,
 	id-LAListwithNoIdleModeUEsAnyMore,
 	id-ExtendedRNC-ID,
-	id-GANSS-PositioningDataSet
+	id-GANSS-PositioningDataSet,
+	id-d-RNTI-for-NoIuCSUP
 
 
 FROM RANAP-Constants
@@ -368,7 +369,9 @@ CauseRadioNetworkExtension ::= INTEGER {
 	periodicLocationInformationNotAvailable(262),
 	gTP-Resources-Unavailable(263),
 	tMGI-inUse-overlapping-MBMS-service-area(264),
-	mBMS-no-cell-in-MBMS-service-area(265)
+	mBMS-no-cell-in-MBMS-service-area(265),
+	no-Iu-CS-UP-relocation(266)
+
 } (257..512)
 
 CauseNon-Standard ::= INTEGER (129..256)
@@ -935,7 +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' --
+	-- 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'
 	...
 }
 
@@ -1325,7 +1329,9 @@ RequestedLocationRelatedDataType ::= ENUMERATED {
 	..., 
 -- Release 7 extension elements --
 	decipheringKeysAssistedGANSS,
-	dedicatedAssistanceDataAssistedGANSS
+	dedicatedAssistanceDataAssistedGANSS,
+	decipheringKeysAssistedGPSandGANSS,
+	dedicatedAssistanceDataAssistedGPSandGANSS
 }
 
 RequestedMBMSIPMulticastAddressandAPNRequest ::= SEQUENCE (SIZE (1..maxnoofMulticastServicesPerRNC)) OF
@@ -1584,7 +1590,8 @@ SourceRNC-ToTargetRNC-TransparentContainer-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 6 to provide Trace Recording Session Information to the Target RNC --
 	{ID id-TraceRecordingSessionInformation		CRITICALITY ignore		EXTENSION TraceRecordingSessionInformation		PRESENCE optional}|
 -- Extension for Release 6 to indicate to the Target RNC that the UE has activated Multicast Service --
-	{ID id-MBMSLinkingInformation		CRITICALITY ignore		EXTENSION MBMSLinkingInformation	PRESENCE optional},
+	{ID id-MBMSLinkingInformation		CRITICALITY ignore		EXTENSION MBMSLinkingInformation	PRESENCE optional}|
+	{ID id-d-RNTI-for-NoIuCSUP			CRITICALITY reject		EXTENSION D-RNTI					PRESENCE optional},
 	...
 }
 
@@ -1884,3 +1891,4 @@ VerticalSpeedDirection ::= ENUMERATED {
 VerticalAccuracyCode			::= INTEGER (0..127)
 
 END
+
diff --git a/asn1/ranap/RANAP-PDU-Contents.asn b/asn1/ranap/RANAP-PDU-Contents.asn
index dc6956cdbf..86a30cdf2d 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.6.0 (2007-06)

--- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-760.zip/25413-760.DOC

+-- 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

 --

 -- 9.3.3	PDU Definitions

 --

@@ -321,7 +321,8 @@ FROM RANAP-Containers
 	id-UnsuccessfulLinkingList,

 	id-VelocityEstimate,

 	id-VerticalAccuracyCode,

-	id-PeriodicLocationInfo

+	id-PeriodicLocationInfo,

+	id-BroadcastGANSSAssistanceDataDecipheringKeys

 FROM RANAP-Constants;

 

 -- **************************************************************

@@ -1603,7 +1604,6 @@ InitialUE-MessageIEs RANAP-PROTOCOL-IES ::= {
 	{ ID id-NAS-PDU					CRITICALITY ignore	TYPE NAS-PDU					PRESENCE mandatory	} |

 	{ ID id-IuSigConId				CRITICALITY ignore 	TYPE IuSignallingConnectionIdentifier  		PRESENCE mandatory 	} |

 	{ ID id-GlobalRNC-ID				CRITICALITY ignore	TYPE GlobalRNC-ID				PRESENCE mandatory 	},

-

 	...

 }

 

@@ -2151,7 +2151,8 @@ LocationRelatedDataRequestExtensions RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 5 to enable LCS support for GERAN Iu mode --

 	{ 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' --

+	-- 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'--

 	{ ID id-RequestedGANSSAssistanceData							CRITICALITY reject	EXTENSION RequestedGANSSAssistanceData							PRESENCE conditional	},

 	...

 }

@@ -2175,7 +2176,8 @@ LocationRelatedDataResponseIEs RANAP-PROTOCOL-IES ::= {
 

 LocationRelatedDataResponseExtensions RANAP-PROTOCOL-EXTENSION ::= {

 -- Extension for error handling

-	{ ID id-CriticalityDiagnostics			CRITICALITY ignore	EXTENSION CriticalityDiagnostics			PRESENCE optional	},

+	{ ID id-CriticalityDiagnostics						CRITICALITY ignore	EXTENSION CriticalityDiagnostics							PRESENCE optional	}|

+	{ ID id-BroadcastGANSSAssistanceDataDecipheringKeys	CRITICALITY ignore	EXTENSION BroadcastAssistanceDataDecipheringKeys		PRESENCE optional},

 	...

 }

 

@@ -2950,3 +2952,4 @@ MBMSRABReleaseFailureExtensions RANAP-PROTOCOL-EXTENSION ::= {
 

 

 END

+

diff --git a/asn1/ranap/RANAP-PDU-Descriptions.asn b/asn1/ranap/RANAP-PDU-Descriptions.asn
index cc1e952302..b05c93d36e 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.6.0 (2007-06)
--- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-760.zip/25413-760.DOC
+-- 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
 --
 -- 9.3.2	Elementary Procedure Definitions
 --
@@ -572,3 +572,4 @@ mBMSRABRelease RANAP-ELEMENTARY-PROCEDURE ::= {
 }
 
 END
+
diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf
index a8b5530d1d..c3060f96cc 100644
--- a/asn1/ranap/ranap.cnf
+++ b/asn1/ranap/ranap.cnf
@@ -425,7 +425,8 @@ id-newLAListofIdleModeUEs								ProtocolIE-ID
 id-LAListwithNoIdleModeUEsAnyMore						ProtocolIE-ID 
 id-GANSS-PositioningDataSet								ProtocolIE-ID 
 id-RequestedGANSSAssistanceData							ProtocolIE-ID 
-
+id-BroadcastGANSSAssistanceDataDecipheringKeys			ProtocolIE-ID
+id-d-RNTI-for-NoIuCSUP									ProtocolIE-ID
 
 #.END