- Update to 3GPP TS 25.413 V9.4.0 (2010-09).

- Fill the value_strings.

svn path=/trunk/; revision=34925

7 files changed, 59 insertions, 14 deletions

diff --git a/asn1/ranap/RANAP-CommonDataTypes.asn b/asn1/ranap/RANAP-CommonDataTypes.asn
index ffce4f9875..14271c52bf 100644
--- a/asn1/ranap/RANAP-CommonDataTypes.asn
+++ b/asn1/ranap/RANAP-CommonDataTypes.asn
@@ -1,6 +1,6 @@
 -- RANAP-CommonDataTypes.asn
 --
--- 3GPP TS 25.413 V9.2.0 (2010-03)
+-- 3GPP TS 25.413 V9.4.0 (2010-09)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.5	Common Definitions
@@ -42,3 +42,4 @@ TriggeringMessage	::= ENUMERATED { initiating-message, successful-outcome, unsuc
 END
 
 
+
diff --git a/asn1/ranap/RANAP-Constants.asn b/asn1/ranap/RANAP-Constants.asn
index fa38197319..882e15041a 100644
--- a/asn1/ranap/RANAP-Constants.asn
+++ b/asn1/ranap/RANAP-Constants.asn
@@ -1,6 +1,6 @@
 -- RANAP-Constants.asn
 --
--- 3GPP TS 25.413 V9.2.0 (2010-03)
+-- 3GPP TS 25.413 V9.4.0 (2010-09)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.6	Constant Definitions
@@ -35,6 +35,7 @@ id-RelocationCancel					INTEGER ::= 4
 id-SRNS-ContextTransfer				INTEGER ::= 5
 id-SecurityModeControl				INTEGER ::= 6
 id-DataVolumeReport					INTEGER ::= 7
+id-Not-Used-8						INTEGER ::= 8
 id-Reset							INTEGER ::= 9
 id-RAB-ReleaseRequest				INTEGER ::= 10
 id-Iu-ReleaseRequest				INTEGER ::= 11
@@ -127,6 +128,9 @@ maxNrOfCSGs							INTEGER ::= 256
 -- **************************************************************
 
 id-AreaIdentity 								INTEGER ::= 0
+-- Ws Extension
+id-Not-Used-1	 								INTEGER ::= 1
+id-Not-Used-2	 								INTEGER ::= 2
 id-CN-DomainIndicator 							INTEGER ::= 3
 id-Cause 										INTEGER ::= 4
 id-ChosenEncryptionAlgorithm 					INTEGER ::= 5
@@ -197,6 +201,9 @@ id-UE-ID 										INTEGER ::= 69
 id-UL-GTP-PDU-SequenceNumber 					INTEGER ::= 70
 id-RAB-FailedtoReportItem						INTEGER ::= 71
 id-RAB-FailedtoReportList 						INTEGER ::= 72
+-- Ws Extension
+id-Not-Used-73	 								INTEGER ::= 73
+id-Not-Used-74	 								INTEGER ::= 74
 id-KeyStatus									INTEGER ::= 75
 id-DRX-CycleLengthCoefficient 					INTEGER ::= 76
 id-IuSigConIdList								INTEGER ::= 77
@@ -223,6 +230,9 @@ id-LastKnownServiceArea							INTEGER ::= 97
 id-SRB-TrCH-Mapping								INTEGER ::= 98
 id-InterSystemInformation-TransparentContainer	INTEGER ::= 99
 id-NewBSS-To-OldBSS-Information 						INTEGER ::= 100
+-- Ws Extension
+id-Not-Used-101	 										INTEGER ::= 101
+id-Not-Used-102			 								INTEGER ::= 102
 id-SourceRNC-PDCP-context-info							INTEGER ::= 103
 id-InformationTransferID								INTEGER ::= 104
 id-SNA-Access-Information								INTEGER ::= 105
@@ -352,10 +362,14 @@ id-SRVCC-Operation-Possible								INTEGER ::= 228
 id-CSG-Id-List											INTEGER ::= 229
 id-PSRABtobeReplaced									INTEGER ::= 230
 id-E-UTRAN-Service-Handover								INTEGER ::= 231
+-- Ws Extension
+id-Not-Used-232	 										INTEGER ::= 232
 id-UE-AggregateMaximumBitRate							INTEGER ::= 233
 id-CSG-Membership-Status 								INTEGER ::= 234
 id-Cell-Access-Mode										INTEGER ::= 235
 id-IP-Source-Address									INTEGER ::= 236 
-id-CSFB-Information										INTEGER ::= 237
+id-CSFB-Information										INTEGER ::= 237 
+id-PDP-TypeInformation-extension						INTEGER ::= 238
+
 
 END
diff --git a/asn1/ranap/RANAP-Containers.asn b/asn1/ranap/RANAP-Containers.asn
index 2fb2b0b50c..68b47b606d 100644
--- a/asn1/ranap/RANAP-Containers.asn
+++ b/asn1/ranap/RANAP-Containers.asn
@@ -1,6 +1,6 @@
 -- RANAP-Containers.asn
 --
--- 3GPP TS 25.413 V9.2.0 (2010-03)
+-- 3GPP TS 25.413 V9.4.0 (2010-09)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.7	Container Definitions
diff --git a/asn1/ranap/RANAP-IEs.asn b/asn1/ranap/RANAP-IEs.asn
index 0087f78e9e..456e41ae93 100644
--- a/asn1/ranap/RANAP-IEs.asn
+++ b/asn1/ranap/RANAP-IEs.asn
@@ -1,6 +1,6 @@
 -- RANAP-IEs.asn
 --
--- 3GPP TS 25.413 V9.2.0 (2010-03)
+-- 3GPP TS 25.413 V9.4.0 (2010-09)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.4	Information Element Definitions
@@ -1187,6 +1187,13 @@ PDP-Type ::= ENUMERATED {
 	ipv6,
 	...
 }
+PDP-TypeInformation-extension ::= SEQUENCE (SIZE (1..maxNrOfPDPDirections)) OF
+	PDP-Type-extension
+
+PDP-Type-extension ::= ENUMERATED {
+	ipv4-and-ipv6,
+	...
+}
 
 PeriodicLocationInfo ::= SEQUENCE {
 	reportingAmount				INTEGER (1..8639999, ...),
@@ -2127,3 +2134,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 3a9bcd191d..3c9b1991af 100644
--- a/asn1/ranap/RANAP-PDU-Contents.asn
+++ b/asn1/ranap/RANAP-PDU-Contents.asn
@@ -1,6 +1,6 @@
 -- RANAP-PDU-Contents.asn
 --
--- 3GPP TS 25.413 V9.2.0 (2010-03)
+-- 3GPP TS 25.413 V9.4.0 (2010-09)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.3	PDU Definitions
@@ -102,7 +102,8 @@ IMPORTS
 	OldBSS-ToNewBSS-Information,
 	PagingAreaID,
 	PagingCause,
-	PDP-TypeInformation,
+	PDP-TypeInformation, 
+	PDP-TypeInformation-extension,
 	PermanentNAS-UE-ID,
 	PLMNidentity,
 	PositionData,
@@ -264,7 +265,8 @@ FROM RANAP-Containers
 	id-OldBSS-ToNewBSS-Information,
 	id-PagingAreaID,
 	id-PagingCause,
-	id-PDP-TypeInformation,
+	id-PDP-TypeInformation, 
+	id-PDP-TypeInformation-extension,
 	id-PermanentNAS-UE-ID,
 	id-PositionData,
 	id-PositionDataSpecificToGERANIuMode,
@@ -683,7 +685,9 @@ RAB-SetupItem-RelocReq-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 5 to enable GERAN support over Iu-cs --
 	{ ID id-GERAN-BSC-Container					CRITICALITY ignore	EXTENSION GERAN-BSC-Container			PRESENCE optional	}|
 -- Extension for Release 8 to enable handover restriction to E-UTRAN --
-	{ ID id-E-UTRAN-Service-Handover			CRITICALITY ignore	EXTENSION E-UTRAN-Service-Handover			PRESENCE optional	},
+	{ ID id-E-UTRAN-Service-Handover			CRITICALITY ignore	EXTENSION E-UTRAN-Service-Handover			PRESENCE optional	}|
+-- Extension for Release 9 to enable a new value --
+	{ ID id-PDP-TypeInformation-extension 		CRITICALITY ignore	EXTENSION PDP-TypeInformation-extension	PRESENCE optional	},
 	...
 }
 
@@ -2115,7 +2119,9 @@ RAB-SetupOrModifyItemSecond-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 --
-	{ ID id-GERAN-BSC-Container					CRITICALITY ignore	EXTENSION GERAN-BSC-Container			PRESENCE optional	} ,
+	{ ID id-GERAN-BSC-Container					CRITICALITY ignore	EXTENSION GERAN-BSC-Container			PRESENCE optional	} |
+-- Extension for Release Release 9 to enable a new value --
+	{ ID id-PDP-TypeInformation-extension		CRITICALITY ignore	EXTENSION PDP-TypeInformation-extension	PRESENCE optional	},
 	...
 }
 
@@ -2388,7 +2394,9 @@ RAB-SetupItem-EnhRelocInfoReq ::= SEQUENCE {
 
 RAB-SetupItem-EnhRelocInfoReq-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 8 to enable handover restriction to E-UTRAN --
-	{ ID id-E-UTRAN-Service-Handover			CRITICALITY ignore	EXTENSION E-UTRAN-Service-Handover			PRESENCE optional	},
+	{ ID id-E-UTRAN-Service-Handover			CRITICALITY ignore	EXTENSION E-UTRAN-Service-Handover			PRESENCE optional	}|
+-- Extension for Release Release 9 to enable a new value --
+	{ ID id-PDP-TypeInformation-extension		CRITICALITY ignore	EXTENSION PDP-TypeInformation-extension	PRESENCE optional	},
 	...
 }
 
@@ -2876,7 +2884,9 @@ MBMSSessionStartIEs RANAP-PROTOCOL-IES ::= {
 MBMSSessionStartExtensions RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 6 to enable MBMS counting in broadcast mode --
 	{ ID id-MBMSCountingInformation			CRITICALITY ignore		EXTENSION MBMSCountingInformation				PRESENCE optional	} |
-	{ ID id-MBMSSynchronisationInformation	CRITICALITY ignore		EXTENSION MBMSSynchronisationInformation		PRESENCE optional	},
+	{ ID id-MBMSSynchronisationInformation	CRITICALITY ignore		EXTENSION MBMSSynchronisationInformation		PRESENCE optional	} |
+-- Extension for Release Release 9 to enable a new value --
+	{ ID id-PDP-TypeInformation-extension 	CRITICALITY ignore		EXTENSION PDP-TypeInformation-extension		PRESENCE optional	},
 	...
 }
 
diff --git a/asn1/ranap/RANAP-PDU-Descriptions.asn b/asn1/ranap/RANAP-PDU-Descriptions.asn
index 242c794b6a..a064aa8e6e 100644
--- a/asn1/ranap/RANAP-PDU-Descriptions.asn
+++ b/asn1/ranap/RANAP-PDU-Descriptions.asn
@@ -1,6 +1,6 @@
 -- RANAP-PDU-Descriptions.asn
 --
--- 3GPP TS 25.413 V9.2.0 (2010-03)
+-- 3GPP TS 25.413 V9.4.0 (2010-09)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.2	Elementary Procedure Definitions
diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf
index 8f836537c2..ff9d5b698d 100644
--- a/asn1/ranap/ranap.cnf
+++ b/asn1/ranap/ranap.cnf
@@ -364,6 +364,7 @@ id-RelocationCancel					ProcedureCode
 id-SRNS-ContextTransfer				ProcedureCode
 id-SecurityModeControl				ProcedureCode
 id-DataVolumeReport					ProcedureCode
+id-Not-Used-8						ProcedureCode
 id-Reset							ProcedureCode
 id-RAB-ReleaseRequest				ProcedureCode
 id-Iu-ReleaseRequest				ProcedureCode
@@ -405,6 +406,8 @@ id-SRVCCPreparation						ProcedureCode
 
 # ProtocolIE-ID
 id-AreaIdentity 								ProtocolIE-ID 
+id-Not-Used-1									ProtocolIE-ID
+id-Not-Used-2									ProtocolIE-ID
 id-CN-DomainIndicator 							ProtocolIE-ID 
 id-Cause 										ProtocolIE-ID 
 id-ChosenEncryptionAlgorithm 					ProtocolIE-ID 
@@ -474,7 +477,9 @@ id-TriggerID 									ProtocolIE-ID
 id-UE-ID 										ProtocolIE-ID 
 id-UL-GTP-PDU-SequenceNumber 					ProtocolIE-ID 
 id-RAB-FailedtoReportItem						ProtocolIE-ID 
-id-RAB-FailedtoReportList 						ProtocolIE-ID 
+id-RAB-FailedtoReportList 						ProtocolIE-ID
+id-Not-Used-73 									ProtocolIE-ID
+id-Not-Used-74									ProtocolIE-ID
 id-KeyStatus									ProtocolIE-ID 
 id-DRX-CycleLengthCoefficient 					ProtocolIE-ID 
 id-IuSigConIdList								ProtocolIE-ID 
@@ -501,6 +506,8 @@ id-LastKnownServiceArea							ProtocolIE-ID
 id-SRB-TrCH-Mapping								ProtocolIE-ID 
 id-InterSystemInformation-TransparentContainer	ProtocolIE-ID 
 id-NewBSS-To-OldBSS-Information 						ProtocolIE-ID 
+id-Not-Used-101	 										ProtocolIE-ID
+id-Not-Used-102			 								ProtocolIE-ID
 id-SourceRNC-PDCP-context-info							ProtocolIE-ID 
 id-InformationTransferID								ProtocolIE-ID 
 id-SNA-Access-Information								ProtocolIE-ID 
@@ -569,6 +576,7 @@ id-RAT-Type												ProtocolIE-ID
 id-PeriodicLocationInfo									ProtocolIE-ID 
 id-MBMSCountingInformation								ProtocolIE-ID 
 id-ExtendedRNC-ID										ProtocolIE-ID 
+id-170-not-to-be-used-for-IE-ids						ProtocolIE-ID
 id-Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf		ProtocolIE-ID 
 id-Alt-RAB-Parameter-ExtendedMaxBitrateInf				ProtocolIE-ID 
 id-Ass-RAB-Parameter-ExtendedGuaranteedBitrateList		ProtocolIE-ID 
@@ -580,6 +588,7 @@ id-Requested-RAB-Parameter-ExtendedGuaranteedBitrateList	ProtocolIE-ID
 id-LAofIdleModeUEs										ProtocolIE-ID 
 id-newLAListofIdleModeUEs								ProtocolIE-ID 
 id-LAListwithNoIdleModeUEsAnyMore						ProtocolIE-ID 
+id-183-not-to-be-used-for-IE-ids						ProtocolIE-ID
 id-GANSS-PositioningDataSet								ProtocolIE-ID 
 id-RequestedGANSSAssistanceData							ProtocolIE-ID 
 id-BroadcastGANSSAssistanceDataDecipheringKeys			ProtocolIE-ID
@@ -629,11 +638,13 @@ id-SRVCC-Operation-Possible									ProtocolIE-ID
 id-CSG-Id-List												ProtocolIE-ID
 id-PSRABtobeReplaced										ProtocolIE-ID
 id-E-UTRAN-Service-Handover									ProtocolIE-ID
+id-Not-Used-232	 											ProtocolIE-ID
 id-UE-AggregateMaximumBitRate								ProtocolIE-ID
 id-CSG-Membership-Status 									ProtocolIE-ID
 id-Cell-Access-Mode											ProtocolIE-ID
 id-IP-Source-Address										ProtocolIE-ID 
 id-CSFB-Information											ProtocolIE-ID
+id-PDP-TypeInformation-extension							ProtocolIE-ID
 #.END
 
 #.REGISTER_NEW
@@ -880,6 +891,7 @@ CSG-Membership-Status									N ranap.extension id-CSG-Membership-Status
 Cell-Access-Mode										N ranap.extension id-Cell-Access-Mode
 IPMulticastAddress										N ranap.extension id-IP-Source-Address
 CSFB-Information										N ranap.extension id-CSFB-Information
+PDP-TypeInformation-extension							N ranap.extension id-PDP-TypeInformation-extension
 
 #RANAP-ELEMENTARY-PROCEDURE
 Iu-ReleaseCommand							N ranap.proc.imsg id-Iu-Release