Update to V9.1.0 (2010-03).

svn path=/trunk/; revision=32509

26 files changed, 221 insertions, 66 deletions

diff --git a/asn1/gsm_map/MAP-ApplicationContexts.asn b/asn1/gsm_map/MAP-ApplicationContexts.asn
index dc0aa8d772..b5ffe2ce01 100644
--- a/asn1/gsm_map/MAP-ApplicationContexts.asn
+++ b/asn1/gsm_map/MAP-ApplicationContexts.asn
@@ -1,7 +1,7 @@
 -- $Id$
 --17.3.3	ASN.1 Module for application-context-names
 --The following ASN.1 module summarises the application-context-name assigned to MAP application-contexts.
--- 3GPP TS 29.002 V9.0.0 (2009-12)
+-- 3GPP TS 29.002 V9.1.0 (2010-03)
 MAP-ApplicationContexts {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-ApplicationContexts (2) version11 (11)}
@@ -194,5 +194,3 @@ resourceManagementContext-v3  OBJECT IDENTIFIER ::=
 
 
 END
-
-
diff --git a/asn1/gsm_map/MAP-BS-Code.asn b/asn1/gsm_map/MAP-BS-Code.asn
index e589c4e344..edaa910126 100644
--- a/asn1/gsm_map/MAP-BS-Code.asn
+++ b/asn1/gsm_map/MAP-BS-Code.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12) 
+-- 3GPP TS 29.002 V9.1.0 (2010-03) 
 -- 17.7.10	Bearer Service Codes
  
 MAP-BS-Code {
@@ -128,4 +128,3 @@ plmn-specificBS-E	BearerServiceCode ::= '11011110'B
 plmn-specificBS-F	BearerServiceCode ::= '11011111'B
 
 END
-
diff --git a/asn1/gsm_map/MAP-CH-DataTypes.asn b/asn1/gsm_map/MAP-CH-DataTypes.asn
index e5e0db426c..1c39c6c5f3 100644
--- a/asn1/gsm_map/MAP-CH-DataTypes.asn
+++ b/asn1/gsm_map/MAP-CH-DataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12)
+-- 3GPP TS 29.002 V9.1.0 (2010-03)
 -- 17.7.3	Call handling data types
  
 MAP-CH-DataTypes {
@@ -191,7 +191,8 @@ SendRoutingInfoRes ::= [3] SEQUENCE {
 	allowedServices	[20] AllowedServices	OPTIONAL,
 	unavailabilityCause	[21] UnavailabilityCause	OPTIONAL,
 	releaseResourcesSupported	[22] NULL		OPTIONAL,
-	gsm-BearerCapability	[23] ExternalSignalInfo	OPTIONAL
+	gsm-BearerCapability	[23] ExternalSignalInfo	OPTIONAL,
+	mtRoamingRetryIndicator	[24] NULL		OPTIONAL
 	}
 
 AllowedServices ::= BIT STRING {
diff --git a/asn1/gsm_map/MAP-CallHandlingOperations.asn b/asn1/gsm_map/MAP-CallHandlingOperations.asn
index 91c982af0a..b09459b983 100644
--- a/asn1/gsm_map/MAP-CallHandlingOperations.asn
+++ b/asn1/gsm_map/MAP-CallHandlingOperations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12) 
+-- 3GPP TS 29.002 V9.1.0 (2010-03) 
 --17.6.3	Call Handling Operations
 MAP-CallHandlingOperations {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
diff --git a/asn1/gsm_map/MAP-CommonDataTypes.asn b/asn1/gsm_map/MAP-CommonDataTypes.asn
index a964c9c30a..4e98254e19 100644
--- a/asn1/gsm_map/MAP-CommonDataTypes.asn
+++ b/asn1/gsm_map/MAP-CommonDataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12)
+-- 3GPP TS 29.002 V9.1.0 (2010-03)
 -- 17.7.8	Common data types
 
 MAP-CommonDataTypes {
@@ -67,11 +67,11 @@ AccessNetworkSignalInfo,
 	LCSClientExternalID,
 	LCSClientInternalID,
 	LCSServiceTypeID,
--- WS added exports needed by gsm_map.asn (extra asn1 file to handle older prot. ver.)
+
+	-- WS added exports needed by gsm_map.asn (extra asn1 file to handle older prot. ver.)
 	ProtocolId,
 	-- gprs location registration types
 	GSN-Address
-
 ;
 
 IMPORTS
diff --git a/asn1/gsm_map/MAP-DialogueInformation.asn b/asn1/gsm_map/MAP-DialogueInformation.asn
index 2c6ff94948..28b2afcd2d 100644
--- a/asn1/gsm_map/MAP-DialogueInformation.asn
+++ b/asn1/gsm_map/MAP-DialogueInformation.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12) 
+-- 3GPP TS 29.002 V9.1.0 (2010-03) 
 -- 17.4	MAP Dialogue Information
 
 MAP-DialogueInformation {
diff --git a/asn1/gsm_map/MAP-Errors.asn b/asn1/gsm_map/MAP-Errors.asn
index d9daace1b9..3c04d1996b 100644
--- a/asn1/gsm_map/MAP-Errors.asn
+++ b/asn1/gsm_map/MAP-Errors.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12)  
+-- 3GPP TS 29.002 V9.1.0 (2010-03)  
 -- 17.6.6	Errors
  
 MAP-Errors {
diff --git a/asn1/gsm_map/MAP-ExtensionDataTypes.asn b/asn1/gsm_map/MAP-ExtensionDataTypes.asn
index 0b86325956..56ac0dcab1 100644
--- a/asn1/gsm_map/MAP-ExtensionDataTypes.asn
+++ b/asn1/gsm_map/MAP-ExtensionDataTypes.asn
@@ -1,7 +1,7 @@
 -- $Id$
 -- MAP-ExtensionDataTypes.asn
 --
--- Taken from 3GPP TS 29.002 V9.0.0 (2009-12)
+-- Taken from 3GPP TS 29.002 V9.1.0 (2010-03)
 --
 -- 17.7.11 Extension data types
 --
diff --git a/asn1/gsm_map/MAP-GR-DataTypes.asn b/asn1/gsm_map/MAP-GR-DataTypes.asn
index a3fa6ac596..d0fae42551 100644
--- a/asn1/gsm_map/MAP-GR-DataTypes.asn
+++ b/asn1/gsm_map/MAP-GR-DataTypes.asn
@@ -1,6 +1,6 @@
 -- $Id$
 --
--- Taken from 3GPP TS 29.002 V9.0.0 (2009-12)
+-- Taken from 3GPP TS 29.002 V9.1.0 (2010-03)
 --
 --17.7.12	Group Call data types
  
@@ -76,7 +76,8 @@ PrepareGroupCallArg ::= SEQUENCE {
 	...,
 	vstk			[5] VSTK		OPTIONAL,
 	vstk-rand		[6] VSTK-RAND	OPTIONAL,
-	talkerChannelParameter	[7] NULL		OPTIONAL }
+	talkerChannelParameter	[7] NULL		OPTIONAL,
+	uplinkReplyIndicator	[8] NULL		OPTIONAL}
 
 VSTK ::= OCTET STRING (SIZE (16))
 
diff --git a/asn1/gsm_map/MAP-Group-Call-Operations.asn b/asn1/gsm_map/MAP-Group-Call-Operations.asn
index bad0217512..ccd6622d0c 100644
--- a/asn1/gsm_map/MAP-Group-Call-Operations.asn
+++ b/asn1/gsm_map/MAP-Group-Call-Operations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12)  
+-- 3GPP TS 29.002 V9.1.0 (2010-03)  
 -- 17.6.7	Group Call operations
  
 MAP-Group-Call-Operations {
diff --git a/asn1/gsm_map/MAP-LCS-DataTypes.asn b/asn1/gsm_map/MAP-LCS-DataTypes.asn
index f4cee8b25f..d44b855901 100644
--- a/asn1/gsm_map/MAP-LCS-DataTypes.asn
+++ b/asn1/gsm_map/MAP-LCS-DataTypes.asn
@@ -1,7 +1,7 @@
 -- $Id$
 -- MAP-LCS-DataTypes.asn
 --
--- Taken from 3GPP TS 29.002  V9.0.0 (2009-12)
+-- Taken from 3GPP TS 29.002  V9.1.0 (2010-03)
 --
 -- 17.7.13 Location service data types
 --
@@ -102,7 +102,7 @@ RoutingInfoForLCS-Res ::= SEQUENCE {
 
 LCSLocationInfo ::= SEQUENCE {
 	networkNode-Number	ISDN-AddressString,
-	-- NetworkNode-number can be either msc-number or sgsn-number
+	-- NetworkNode-number can be msc-number, sgsn-number or a dummy value of "0"
 	lmsi			[0] LMSI		OPTIONAL,
 	extensionContainer	[1] ExtensionContainer	OPTIONAL,
 	... ,
@@ -110,7 +110,9 @@ LCSLocationInfo ::= SEQUENCE {
 	-- gprsNodeIndicator is set only if the SGSN number is sent as the Network Node Number
 	additional-Number	[3] Additional-Number	OPTIONAL,
 	supportedLCS-CapabilitySets	[4]	SupportedLCS-CapabilitySets	OPTIONAL,
-	additional-LCS-CapabilitySets	[5]	SupportedLCS-CapabilitySets	OPTIONAL
+	additional-LCS-CapabilitySets	[5]	SupportedLCS-CapabilitySets	OPTIONAL,
+	mme-Name		[6]	DiameterIdentity	OPTIONAL,
+	aaa-Server-Name	[8]	DiameterIdentity	OPTIONAL
 	}
 
 ProvideSubscriberLocation-Arg ::= SEQUENCE {
@@ -402,7 +404,8 @@ ProvideSubscriberLocation-Res ::= SEQUENCE {
 	sai-Present	[7] NULL		OPTIONAL,
 	accuracyFulfilmentIndicator	[8] AccuracyFulfilmentIndicator		OPTIONAL,
 	velocityEstimate	[9] VelocityEstimate	OPTIONAL,
-	mo-lrShortCircuitIndicator	[10] NULL		OPTIONAL }
+	mo-lrShortCircuitIndicator	[10] NULL		OPTIONAL,
+	targetServingNodeForHandover	[11] ServingNodeAddress	OPTIONAL }
 
 --	if deferredmt-lrResponseIndicator is set, locationEstimate is ignored.
 
@@ -575,7 +578,8 @@ SubscriberLocationReport-Arg ::= SEQUENCE {
 	velocityEstimate	[20] VelocityEstimate	OPTIONAL,
 	sequenceNumber	[21] SequenceNumber	OPTIONAL,
 	periodicLDRInfo	[22] PeriodicLDRInfo	OPTIONAL,
-	mo-lrShortCircuitIndicator	[23] NULL		OPTIONAL }
+	mo-lrShortCircuitIndicator	[23] NULL		OPTIONAL,
+	targetServingNodeForHandover	[24] ServingNodeAddress	OPTIONAL }
 
 	-- one of msisdn or imsi is mandatory
 	-- a location estimate that is valid for the locationEstimate parameter should 
@@ -607,7 +611,8 @@ LCS-Event ::= ENUMERATED {
 	mo-lr  (2),
 	...,
 	deferredmt-lrResponse  (3) ,
-	deferredmo-lrTTTPInitiation  (4)  }
+	deferredmo-lrTTTPInitiation  (4),
+	emergencyCallHandover (5)  }
 	--	deferredmt-lrResponse is applicable to the delivery of a location estimate 
 	--	for an LDR initiated earlier by either the network (via an MT-LR activate deferred 
 	--	location) or the UE (via a deferred MO-LR TTTP initiation)
@@ -637,6 +642,14 @@ TerminationCause ::= ENUMERATED {
 
 SequenceNumber ::= INTEGER (1..maxReportingAmount)
 
+ServingNodeAddress ::= CHOICE {
+	msc-Number	[0] ISDN-AddressString,
+	sgsn-Number	[1] ISDN-AddressString,
+	mme-Number	[2] DiameterIdentity }
+
+DiameterIdentity ::= OCTET STRING (SIZE(9..255))
+-- content of DiameterIdentity is defined in IETF RFC 3588 [139]
+
 SubscriberLocationReport-Res ::= SEQUENCE {
 	extensionContainer	ExtensionContainer	OPTIONAL, 
 	..., 
diff --git a/asn1/gsm_map/MAP-LocationServiceOperations.asn b/asn1/gsm_map/MAP-LocationServiceOperations.asn
index e226ef9b75..25c160dea4 100644
--- a/asn1/gsm_map/MAP-LocationServiceOperations.asn
+++ b/asn1/gsm_map/MAP-LocationServiceOperations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12)  
+-- 3GPP TS 29.002 V9.1.0 (2010-03)  
 -- 17.6.8	Location service operations
  
 MAP-LocationServiceOperations {
diff --git a/asn1/gsm_map/MAP-MS-DataTypes.asn b/asn1/gsm_map/MAP-MS-DataTypes.asn
index 91cb617484..a647085499 100644
--- a/asn1/gsm_map/MAP-MS-DataTypes.asn
+++ b/asn1/gsm_map/MAP-MS-DataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12) 
+-- 3GPP TS 29.002 V9.1.0 (2010-03) 
 -- 17.7.1	Mobile Service data types
 
 MAP-MS-DataTypes {
@@ -555,7 +555,12 @@ SGSN-Capability ::= SEQUENCE{
 	supportedLCS-CapabilitySets	[5]  SupportedLCS-CapabilitySets	OPTIONAL,
 	offeredCamel4CSIs	[6] OfferedCamel4CSIs	OPTIONAL,
 	smsCallBarringSupportIndicator	[7]	NULL		OPTIONAL,	supportedRAT-TypesIndicator	[8]	SupportedRAT-Types	OPTIONAL,
-	supportedFeatures	[9] SupportedFeatures	OPTIONAL }
+	supportedFeatures	[9] SupportedFeatures	OPTIONAL,
+	t-adsDataRetrieval	[10] NULL		OPTIONAL,
+	homogeneousSupportOfIMSVoiceOverPSSessions [11] BOOLEAN	OPTIONAL
+	--	"true" indicates homogeneous support, "false" indicates homogeneous non-support
+	--	in the complete SGSN area
+ }
 
 SupportedFeatures::= BIT STRING {
 	odb-all-apn (0),
@@ -612,7 +617,9 @@ ForwardAccessSignalling-Arg ::= [3] SEQUENCE {
 	rab-ConfigurationIndicator	[13] NULL		OPTIONAL,
 	iuSelectedCodec	[14]	Codec	OPTIONAL,
 	alternativeChannelType	[15]	RadioResourceInformation	OPTIONAL,
-	tracePropagationList	[17]	TracePropagationList	OPTIONAL }
+	tracePropagationList	[17]	TracePropagationList	OPTIONAL,
+ 	aoipSupportedCodecsListAnchor	[18] AoIPCodecsList	OPTIONAL,
+ 	aoipSelectedCodecTarget	[19] AoIPCodec	OPTIONAL }
 
 AllowedGSM-Algorithms ::= OCTET STRING (SIZE (1))
 	-- internal structure is coded as Algorithm identifier octet from
@@ -682,7 +689,8 @@ PrepareHO-Arg ::= [3] SEQUENCE {
 	uesbi-Iu		[21]	UESBI-Iu	OPTIONAL,
 	imeisv		[22]	IMEI		OPTIONAL,
 	alternativeChannelType	[23]	RadioResourceInformation	OPTIONAL,
-	tracePropagationList	[25]	TracePropagationList	OPTIONAL	 }
+	tracePropagationList	[25]	TracePropagationList	OPTIONAL,
+	aoipSupportedCodecsListAnchor	[26] AoIPCodecsList	OPTIONAL	 }
 
 BSSMAP-ServiceHandoverList ::= SEQUENCE SIZE (1.. maxNumOfServiceHandovers) OF
 				BSSMAP-ServiceHandoverInfo
@@ -728,7 +736,9 @@ PrepareHO-Res ::= [3] SEQUENCE {
 	extensionContainer	[4]	ExtensionContainer	OPTIONAL,
 	...,
 	iuSelectedCodec	[7] Codec		OPTIONAL,
-	iuAvailableCodecsList	[8] CodecList	OPTIONAL }
+	iuAvailableCodecsList	[8] CodecList	OPTIONAL,
+	aoipSelectedCodecTarget	[9] AoIPCodec	OPTIONAL,
+	aoipAvailableCodecsListMap	[10] AoIPCodecsList	OPTIONAL }
 
 SelectedUMTS-Algorithms ::= SEQUENCE {
 	integrityProtectionAlgorithm	[0] 	ChosenIntegrityProtectionAlgorithm	OPTIONAL,
@@ -785,7 +795,32 @@ ProcessAccessSignalling-Arg ::= [3] SEQUENCE {
 	extensionContainer	[0]	ExtensionContainer 	OPTIONAL,
 	...,
 	iUSelectedCodec	[5] Codec		OPTIONAL,
-	iuAvailableCodecsList	[6] CodecList	OPTIONAL }
+	iuAvailableCodecsList	[6] CodecList	OPTIONAL,
+	aoipSelectedCodecTarget	[7] AoIPCodec	OPTIONAL,
+	aoipAvailableCodecsListMap	[8] AoIPCodecsList	OPTIONAL }
+
+AoIPCodecsList ::= SEQUENCE {
+	codec1		[1] AoIPCodec,
+	codec2		[2] AoIPCodec		OPTIONAL,
+	codec3		[3] AoIPCodec		OPTIONAL,
+	codec4		[4] AoIPCodec		OPTIONAL,
+	codec5		[5] AoIPCodec		OPTIONAL,
+	codec6		[6] AoIPCodec		OPTIONAL,
+	codec7		[7] AoIPCodec		OPTIONAL,
+	codec8		[8] AoIPCodec		OPTIONAL,
+	extensionContainer	[9] ExtensionContainer		OPTIONAL,
+	...}
+	-- Codecs are sent in priority order where codec1 has highest priority
+
+AoIPCodec ::= OCTET STRING (SIZE (1..3))
+
+	-- The internal structure is defined as follows:
+	-- octet 1	Coded as Speech Codec Elements in 3GPP TS 48.008
+	--				with the exception that FI, PI, PT and TF bits shall
+	--			be set to 0
+	-- octets 2,3	Optional; in case of AMR codec types it defines
+	--			the supported codec configurations as defined in
+	--			3GPP TS 48.008
 
 SupportedCodecsList ::= SEQUENCE {
 	utranCodecList	[0] CodecList	OPTIONAL,
@@ -920,7 +955,7 @@ EPC-AV ::= SEQUENCE {
 	extensionContainer	ExtensionContainer	OPTIONAL,
 	...}
 
-KASME ::= OCTET STRING (SIZE (16))
+KASME ::= OCTET STRING (SIZE (32))
 
 RequestingNodeType ::= ENUMERATED {
 	vlr  (0),
@@ -1118,7 +1153,7 @@ PDN-GW-Identity ::= SEQUENCE {
 	extensionContainer	[3] ExtensionContainer	OPTIONAL,
 	... }
 
-FQDN ::=  OCTET STRING (SIZE (9..100))
+FQDN ::=  OCTET STRING (SIZE (9..255))
 
 
 PDN-GW-AllocationType ::= ENUMERATED {
@@ -1194,9 +1229,18 @@ PDP-Context ::= SEQUENCE {
 	-- ext3-QoS-Subscribed may be present only if ext2-QoS-Subscribed is present.
 	ext4-QoS-Subscribed	[4] Ext4-QoS-Subscribed	OPTIONAL,
 	-- ext4-QoS-Subscribed may be present only if ext3-QoS-Subscribed is present. 
-	apn-oi-Replacement	[5]	APN-OI-Replacement	OPTIONAL
+	apn-oi-Replacement	[5]	APN-OI-Replacement	OPTIONAL,
 	-- this apn-oi-Replacement refers to the APN level apn-oi-Replacement and has
 	-- higher priority than UE level apn-oi-Replacement.
+	ext-pdp-Type	[6] Ext-PDP-Type	OPTIONAL,
+	-- contains the value IPv4v6 defined in 3GPP TS 29.060 [105], if the PDP can be
+	-- accessed by dual-stack UEs
+	ext-pdp-Address	[7] PDP-Address	OPTIONAL
+	-- contains an additional IP address in case of dual-stack static IP address assignment
+	-- for the UE.
+	-- it may contain an IPv4 or an IPv6 address/prefix, and it may be present
+	-- only if pdp-Address is present; if both are present, each parameter shall
+	-- contain a different type of address (IPv4 or IPv6).
 	 }
 
 ContextId ::= INTEGER (1..maxNumOfPDP-Contexts)
@@ -1275,6 +1319,11 @@ APN ::=  OCTET STRING (SIZE (2..63))
 
 PDP-Type ::= OCTET STRING (SIZE (2))
 	-- Octets are coded according to TS 3GPP TS 29.060 [105]
+	-- Only the values PPP, IPv4 and IPv6 are allowed for this parameter.
+
+Ext-PDP-Type ::= OCTET STRING (SIZE (2))
+	-- Octets are coded, similarly to PDP-Type, according to TS 3GPP TS 29.060 [105].
+	-- Only the value IPv4v6 is allowed for this parameter.
 
 PDP-Address ::= OCTET STRING (SIZE (1..16))
 	-- Octets are coded according to TS 3GPP TS 29.060 [105]
@@ -2354,7 +2403,12 @@ SubscriberInfo ::= SEQUENCE {
 	imei			[5] IMEI		OPTIONAL,
 	ms-Classmark2	[6] MS-Classmark2	OPTIONAL,
 	gprs-MS-Class	[7] GPRSMSClass	OPTIONAL,
-	mnpInfoRes	[8] MNPInfoRes	OPTIONAL }
+	mnpInfoRes	[8] MNPInfoRes	OPTIONAL,
+	imsVoiceOverPS-SessionsIndication	[9] IMS-VoiceOverPS-SessionsInd	OPTIONAL,
+	lastUE-ActivityTime	[10] Time		OPTIONAL,
+	lastRAT-Type	[11] Used-RAT-Type	OPTIONAL,
+	eps-SubscriberState	[12] PS-SubscriberState	OPTIONAL,
+	locationInformationEPS	[13] LocationInformationEPS	OPTIONAL }
 
 --	If the HLR receives locationInformation, subscriberState or ms-Classmark2 from an SGSN
 --	it shall discard them.
@@ -2362,6 +2416,11 @@ SubscriberInfo ::= SEQUENCE {
 --	a VLR it shall discard them.
 --	If the HLR receives parameters which it has not requested, it shall discard them.
 
+IMS-VoiceOverPS-SessionsInd ::= ENUMERATED {
+	imsVoiceOverPS-SessionsNotSupported	(0),
+	imsVoiceOverPS-SessionsSupported	(1)
+	}
+
 MNPInfoRes ::= SEQUENCE {
 	routeingNumber	[0] RouteingNumber 	OPTIONAL,
 	imsi			[1] IMSI		OPTIONAL,
@@ -2416,16 +2475,19 @@ RequestedInfo ::= SEQUENCE {
 	requestedDomain	[4] DomainType	OPTIONAL,
 	imei			[6] NULL		OPTIONAL,
 	ms-classmark	[5] NULL		OPTIONAL,
-	mnpRequestedInfo	[7] NULL 		OPTIONAL }
+	mnpRequestedInfo	[7] NULL 		OPTIONAL,
+	t-adsData		[8] NULL		OPTIONAL }
 
 --	currentLocation shall be absent if locationInformation is absent
+--	t-adsData shall be absent in messages sent to the VLR
 
 DomainType ::=  ENUMERATED {
 	cs-Domain		(0),
 	ps-Domain		(1),
-	...}
+	...,
+	eps-Domain	(2)}
 -- exception handling:
--- reception of values > 1 shall be mapped to 'cs-Domain'
+-- reception of values > 2 shall be mapped to 'cs-Domain'
 
 LocationInformation ::= SEQUENCE {
 	ageOfLocationInformation	AgeOfLocationInformation	OPTIONAL,
@@ -2440,11 +2502,17 @@ LocationInformation ::= SEQUENCE {
 	geodeticInformation	[7] GeodeticInformation	OPTIONAL, 
 	currentLocationRetrieved	[8] NULL		OPTIONAL,
 	sai-Present	[9] NULL		OPTIONAL,
-	locationInformationEPS	[10]LocationInformationEPS	OPTIONAL }
+	locationInformationEPS	[10] LocationInformationEPS	OPTIONAL,
+	userCSGInformation	[11] UserCSGInformation	OPTIONAL }
 -- sai-Present indicates that the cellGlobalIdOrServiceAreaIdOrLAI parameter contains
 -- a Service Area Identity.
 -- currentLocationRetrieved shall be present 
 -- if the location information were retrieved after a successfull paging.
+-- if the locationinformationEPS IE is present then the cellGlobalIdOrServiceAreaIdOrLAI IE
+-- shall be absent. 
+-- UserCSGInformation contains the CSG ID, Access mode, and the CSG Membership Indication in
+-- the case the Access mode is Hybrid Mode.
+
 
 LocationInformationEPS ::= SEQUENCE {
 	e-utranCellGlobalIdentity	[0] OCTET STRING (SIZE(7))		OPTIONAL,
@@ -2452,7 +2520,14 @@ LocationInformationEPS ::= SEQUENCE {
 	trackingAreaIdentity	[1] OCTET STRING (SIZE(6))		OPTIONAL,
 -- Octets are coded as described in 3GPP TS 29.118.
 	extensionContainer	[2] ExtensionContainer		OPTIONAL,
+	geographicalInformation	[3] GeographicalInformation		OPTIONAL,
+	geodeticInformation	[4] GeodeticInformation		OPTIONAL,
+	currentLocationRetrieved	[5] NULL			OPTIONAL,
+	ageOfLocationInformation	[6] AgeOfLocationInformation		OPTIONAL,
 	...}
+-- currentLocationRetrieved shall be present if the location information
+-- was retrieved after successful paging.
+
 
 LocationInformationGPRS ::= SEQUENCE {
 	cellGlobalIdOrServiceAreaIdOrLAI	[0] CellGlobalIdOrServiceAreaIdOrLAI OPTIONAL,
@@ -2465,11 +2540,23 @@ LocationInformationGPRS ::= SEQUENCE {
 	sai-Present	[6] NULL		OPTIONAL,
 	geodeticInformation	[7] GeodeticInformation	OPTIONAL,
 	currentLocationRetrieved	[8] NULL		OPTIONAL,
-	ageOfLocationInformation	[9] AgeOfLocationInformation	OPTIONAL }
+	ageOfLocationInformation	[9] AgeOfLocationInformation	OPTIONAL,
+	userCSGInformation	[10] UserCSGInformation	OPTIONAL }
 -- sai-Present indicates that the cellGlobalIdOrServiceAreaIdOrLAI parameter contains
 -- a Service Area Identity.
 -- currentLocationRetrieved shall be present if the location information
 -- was retrieved after successful paging.
+-- UserCSGInformation contains the CSG ID, Access mode, and the CSG Membership Indication in
+-- the case the Access mode is Hybrid Mode. 
+
+
+UserCSGInformation ::= SEQUENCE {
+	csg-Id	 	[0] CSG-Id,
+	extensionContainer	[1] ExtensionContainer		OPTIONAL,
+	...,
+	accessMode	[2] OCTET STRING (SIZE(1))		OPTIONAL,
+	cmi			[3] OCTET STRING (SIZE(1))		OPTIONAL }
+-- The encoding of the accessMode and cmi parameters are as defined in 3GPP TS 29.060 [105].
 
 RAIdentity ::= OCTET STRING (SIZE (6))
 -- Routing Area Identity is coded in accordance with 3GPP TS 29.060 [105].
@@ -2509,7 +2596,7 @@ SubscriberState ::= CHOICE {
 	notProvidedFromVLR	[2] NULL}
 
 PS-SubscriberState ::= CHOICE {
-	notProvidedFromSGSN	[0] NULL,
+	notProvidedFromSGSNorMME	[0] NULL,
 	ps-Detached	[1] NULL,
 	ps-AttachedNotReachableForPaging	[2] NULL,
 	ps-AttachedReachableForPaging	[3] NULL,
@@ -2546,12 +2633,28 @@ PDP-ContextInfo ::= SEQUENCE {
 	-- qos2-Requested may be present only if qos-Requested is present.
 	qos2-Negotiated	[20] Ext2-QoS-Subscribed	OPTIONAL,
 	-- qos2-Negotiated may be present only if qos-Negotiated is present.
-		qos3-Subscribed	[21] Ext3-QoS-Subscribed	OPTIONAL,
+	qos3-Subscribed	[21] Ext3-QoS-Subscribed	OPTIONAL,
 	-- qos3-Subscribed may be present only if qos2-Subscribed is present.
 	qos3-Requested	[22] Ext3-QoS-Subscribed	OPTIONAL,
 	-- qos3-Requested may be present only if qos2-Requested is present.
-	qos3-Negotiated	[23] Ext3-QoS-Subscribed	OPTIONAL
+	qos3-Negotiated	[23] Ext3-QoS-Subscribed	OPTIONAL,
 	-- qos3-Negotiated may be present only if qos2-Negotiated is present.
+	qos4-Subscribed	[25] Ext4-QoS-Subscribed	OPTIONAL,
+	-- qos4-Subscribed may be present only if qos3-Subscribed is present.
+	qos4-Requested	[26] Ext4-QoS-Subscribed	OPTIONAL,
+	-- qos4-Requested may be present only if qos3-Requested is present.
+	qos4-Negotiated	[27] Ext4-QoS-Subscribed	OPTIONAL,
+	-- qos4-Negotiated may be present only if qos3-Negotiated is present. 
+	ext-pdp-Type	[28] Ext-PDP-Type	OPTIONAL,
+	-- contains the value IPv4v6 defined in 3GPP TS 29.060 [105], if the PDP can be
+	-- accessed by dual-stack UEs.
+	ext-pdp-Address	[29] PDP-Address	OPTIONAL
+	-- contains an additional IP address in case of dual-stack static IP address assignment
+	-- for the UE.
+	-- it may contain an IPv4 or an IPv6 address/prefix, and it may be present
+	-- only if pdp-Address is present; if both are present, each parameter shall
+	-- contain a different type of address (IPv4 or IPv6).
+
 }
 
 NSAPI ::= INTEGER (0..15)
@@ -2613,7 +2716,8 @@ AnyTimeSubscriptionInterrogationRes ::= SEQUENCE {
 	... ,
 	offeredCamel4CSIsInVLR	[8] OfferedCamel4CSIs	OPTIONAL,
 	offeredCamel4CSIsInSGSN	[9] OfferedCamel4CSIs	OPTIONAL,
-	msisdn-BS-List	[10] MSISDN-BS-List	OPTIONAL }
+	msisdn-BS-List	[10] MSISDN-BS-List	OPTIONAL,
+	csg-SubscriptionDataList	[11] CSG-SubscriptionDataList	OPTIONAL }
 
 RequestedSubscriptionInfo ::= SEQUENCE {
 	requestedSS-Info	[1] SS-ForBS-Code	OPTIONAL,
@@ -2626,7 +2730,8 @@ RequestedSubscriptionInfo ::= SEQUENCE {
 	additionalRequestedCAMEL-SubscriptionInfo
 				[7] AdditionalRequestedCAMEL-SubscriptionInfo
 							OPTIONAL,
-	msisdn-BS-List	[8] NULL		OPTIONAL }
+	msisdn-BS-List	[8] NULL		OPTIONAL,
+	csg-SubscriptionDataRequested	[9] NULL		OPTIONAL }
 
 MSISDN-BS-List ::= SEQUENCE SIZE (1..maxNumOfMSISDN) OF
 				MSISDN-BS
@@ -2720,7 +2825,13 @@ AnyTimeModificationArg ::= SEQUENCE {
 	...,
 	modificationRequestFor-ODB-data	[7]	ModificationRequestFor-ODB-data OPTIONAL,
 	modificationRequestFor-IP-SM-GW-Data	[8]	ModificationRequestFor-IP-SM-GW-Data OPTIONAL,
-	activationRequestForUE-reachability	[9]	ServingNode	OPTIONAL }
+	activationRequestForUE-reachability	[9]	ServingNode	OPTIONAL,
+	modificationRequestFor-CSG	[10]	ModificationRequestFor-CSG	OPTIONAL }
+
+ModificationRequestFor-CSG ::= SEQUENCE {
+	modifyNotificationToCSE	[0]	ModificationInstruction	OPTIONAL,
+	extensionContainer	[1]	ExtensionContainer	OPTIONAL,
+	...}
 
 ServingNode ::= BIT STRING {
 	mme (0)} (SIZE (1..8))
@@ -2793,7 +2904,8 @@ NoteSubscriberDataModifiedArg ::= SEQUENCE {
 	allInformationSent	[4] NULL		OPTIONAL,
 	extensionContainer	ExtensionContainer	OPTIONAL,
 	...,
-	ue-reachable	[5] ServingNode	OPTIONAL }
+	ue-reachable	[5] ServingNode	OPTIONAL,
+	csg-SubscriptionDataList	[6] CSG-SubscriptionDataList	OPTIONAL }
 
 NoteSubscriberDataModifiedRes ::= SEQUENCE {
 	extensionContainer	ExtensionContainer	OPTIONAL,
diff --git a/asn1/gsm_map/MAP-MobileServiceOperations.asn b/asn1/gsm_map/MAP-MobileServiceOperations.asn
index 73bd676c99..d9a18313f9 100644
--- a/asn1/gsm_map/MAP-MobileServiceOperations.asn
+++ b/asn1/gsm_map/MAP-MobileServiceOperations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.4.0 V9.0.0 (2009-12)
+-- 3GPP TS 29.002 V9.1.0 V9.0.0 (2010-03)
 -- 17.6.1	Mobile Service Operations
 
 MAP-MobileServiceOperations {
diff --git a/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn b/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn
index 30e271c686..c03d25fc2e 100644
--- a/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn
+++ b/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12) 
+-- 3GPP TS 29.002 V9.1.0 (2010-03) 
 --17.6.2	Operation and Maintenance Operations
 MAP-OperationAndMaintenanceOperations {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
diff --git a/asn1/gsm_map/MAP-Protocol.asn b/asn1/gsm_map/MAP-Protocol.asn
index 041dcbe205..3fed786585 100644
--- a/asn1/gsm_map/MAP-Protocol.asn
+++ b/asn1/gsm_map/MAP-Protocol.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12)
+-- 3GPP TS 29.002 V9.1.0 (2010-03)
 --17.5	MAP operation and error codes
 MAP-Protocol {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
diff --git a/asn1/gsm_map/MAP-SM-DataTypes.asn b/asn1/gsm_map/MAP-SM-DataTypes.asn
index b801d019e4..6e001453b1 100644
--- a/asn1/gsm_map/MAP-SM-DataTypes.asn
+++ b/asn1/gsm_map/MAP-SM-DataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002  V9.0.0 (2009-12)  
+-- 3GPP TS 29.002  V9.1.0 (2010-03)  
 -- 17.7.6	Short message data types
 
 MAP-SM-DataTypes {
@@ -267,4 +267,3 @@ maxNumOfDispatchers  INTEGER ::= 5
 
 
 END
-
diff --git a/asn1/gsm_map/MAP-SS-Code.asn b/asn1/gsm_map/MAP-SS-Code.asn
index ce64d47a78..ffb39e01a7 100644
--- a/asn1/gsm_map/MAP-SS-Code.asn
+++ b/asn1/gsm_map/MAP-SS-Code.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12)
+-- 3GPP TS 29.002 V9.1.0 (2010-03)
 -- 17.7.5	Supplementary service codes
 
 MAP-SS-Code {
diff --git a/asn1/gsm_map/MAP-SS-DataTypes.asn b/asn1/gsm_map/MAP-SS-DataTypes.asn
index ec7d6b44cd..ffcd54c281 100644
--- a/asn1/gsm_map/MAP-SS-DataTypes.asn
+++ b/asn1/gsm_map/MAP-SS-DataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12)  
+-- 3GPP TS 29.002 V9.1.0 (2010-03)  
 -- 17.7.4	Supplementary service data types
  
 MAP-SS-DataTypes {
diff --git a/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn b/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn
index bf63e4c38a..e70edf5ca3 100644
--- a/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn
+++ b/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12)  
+-- 3GPP TS 29.002 V9.1.0 (2010-03)  
 -- 17.6.5	Short message service operations
  
 MAP-ShortMessageServiceOperations {
diff --git a/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn b/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn
index 2d00ee4b89..26fec3f906 100644
--- a/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn
+++ b/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12)  
+-- 3GPP TS 29.002 V9.1.0 (2010-03)  
 --17.6.4	Supplementary service operations
 
 MAP-SupplementaryServiceOperations {
diff --git a/asn1/gsm_map/MAP-TS-Code.asn b/asn1/gsm_map/MAP-TS-Code.asn
index 961a3417d9..8b977c3b5e 100644
--- a/asn1/gsm_map/MAP-TS-Code.asn
+++ b/asn1/gsm_map/MAP-TS-Code.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12) 
+-- 3GPP TS 29.002 V9.1.0 (2010-03) 
 -- 17.7.9	Teleservice Codes
  
 MAP-TS-Code {
diff --git a/asn1/gsm_map/SS-DataTypes.asn b/asn1/gsm_map/SS-DataTypes.asn
index 49c1c9567b..034b240fee 100644
--- a/asn1/gsm_map/SS-DataTypes.asn
+++ b/asn1/gsm_map/SS-DataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 24.080 V9.0.0 (2009-12)
+-- 3GPP TS 24.080 V9.1.0 (2010-03)
 -- 4.4.2	ASN.1 data types
 SS-DataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Access (2) modules (3)
@@ -27,7 +27,7 @@ FROM MAP-SS-DataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3)
    map-SS-DataTypes (14) version10 (10)}
 
--- GSN-Address, WS fix, fault in spec this is now in CommonDataTypes
+--- GSN-Address, WS fix, fault in spec this is now in CommonDataTypes
 CUG-Index,
 NotificationToMSUser
 FROM MAP-MS-DataTypes {
@@ -41,9 +41,8 @@ AlertingPattern,
 LCSClientExternalID,
 AddressString,
 LCSServiceTypeID,
-AgeOfLocationInformation,
-GSN-Address -- WS fix
-
+GSN-Address, -- WS fix
+AgeOfLocationInformation
 FROM MAP-CommonDataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3)
    map-CommonDataTypes (18) version10 (10)}
@@ -312,7 +311,8 @@ LCS-MOLRArg	::= SEQUENCE {
 	sequenceNumber 		[17] SequenceNumber 		OPTIONAL,
 	terminationCause 	[18] TerminationCause 		OPTIONAL,
 	mo-lrShortCircuit	[19]	NULL				OPTIONAL,
-	ganssAssistanceData	[20] GANSSAssistanceData	OPTIONAL }
+	ganssAssistanceData	[20] GANSSAssistanceData	OPTIONAL,
+	multiplePositioningProtocolPDUs	[21] MultiplePositioningProtocolPDUs	OPTIONAL }
 -- The parameter locationMethod shall be included if and only if the molr-Type is set to value 
 -- deCipheringKeys or assistanceData.
 -- The parameter gpsAssistanceData shall be included if and only if the molr-Type is set to value 
@@ -321,6 +321,21 @@ LCS-MOLRArg	::= SEQUENCE {
 -- assistanceData and locationMethod is set to value assistedGANSS or assistedGPSandGANSS.
 -- supportedGADShapes shall not be included for deferred MO-LR initiation or deferred MO-LR or MT-LR
 -- responses 
+-- multiplePositioningProtocolPDUs may only be included for E-UTRAN access.
+-- locationMethod shall not be included for E-UTRAN access.
+-- gpsAssistanceData shall not be included for E-UTRAN access.
+-- h-gmlc-address shall not be included for E-UTRAN access.
+-- locationEstimate shall not be included for E-UTRAN access.
+-- velocityEstimate shall not be included for E-UTRAN access.
+-- referenceNumber shall not be included for E-UTRAN access.
+-- periodicLDRInfo shall not be included for E-UTRAN access.
+-- locationUpdateRequest shall not be included for E-UTRAN access.
+-- sequenceNumber shall not be included for E-UTRAN access.
+-- terminationCause shall not be included for E-UTRAN access.
+-- mo-lrShortCircuit shall not be included for E-UTRAN access.
+-- ganssAssistanceData shall not be included for E-UTRAN access.
+
+
 
 MOLR-Type::= ENUMERATED {
 	locationEstimate			(0),
@@ -333,7 +348,9 @@ MOLR-Type::= ENUMERATED {
 	deferredMt-lrOrmo-lrCancellation (6)}
 -- exception handling:
 -- an unrecognized value shall be rejected by the receiver with a return error cause of
--- unexpected data value.
+-- unexpected data value. 
+-- For E-UTRAN access, only locationEstimate or assistanceData shall be included
+
 
 LocationMethod::= ENUMERATED {
 	msBasedEOTD			(0),
@@ -367,6 +384,14 @@ TerminationCause ::= ENUMERATED {
 	uETermination     (1),
 	...} 
 
+MultiplePositioningProtocolPDUs ::= SEQUENCE (SIZE (1..maxNumLPPMsg)) OF PositioningProtocolPDU
+
+PositioningProtocolPDU ::= OCTET STRING
+-- PositioningProtocolPDU contains a LPP message defined in 3GPP TS 36.355 [17].
+
+maxNumLPPMsg INTEGER ::= 3
+
+
 
 LCS-MOLRRes::= SEQUENCE {
 	locationEstimate		[0]	Ext-GeographicalInformation		OPTIONAL,
@@ -394,6 +419,12 @@ LCS-MOLRRes::= SEQUENCE {
 -- in LocationRequestArg was set to value deCipheringKeys.
 -- Parameter velocityEstimate may only be included if the lcs-QoS in LCS-MOLRarg includes
 -- velocityRequest
+-- decipheringKeys shall not be included for E-UTRAN access.
+-- referenceNumber shall not be included for E-UTRAN access.
+-- h-gmlc-address shall not be included for E-UTRAN access.
+-- mo-lrShortCircuit shall not be included for E-UTRAN access.
+-- reportingPLMNList shall not be included for E-UTRAN access.
+
 
 
 DecipheringKeys::= OCTET STRING (SIZE (15))
diff --git a/asn1/gsm_map/SS-Errors.asn b/asn1/gsm_map/SS-Errors.asn
index 233d363fcb..6c48975c00 100644
--- a/asn1/gsm_map/SS-Errors.asn
+++ b/asn1/gsm_map/SS-Errors.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 24.080 V9.0.0 (2009-12)
+-- 3GPP TS 24.080 V9.1.0 (2010-03)
 -- 4.3.1	Errors ASN.1 specification
 -- The following ASN.1 module provides an ASN.1 specification of errors. Errors from MAP are imported in the SS Protocol module in subclause 4.5. The module defines errors by allocating them a local value. For the involved errors the same local values as in MAP are allocated.
 
@@ -43,3 +43,4 @@ rejectedByUser  ERROR ::= {
 	CODE	local:121 }
 
 END
+
diff --git a/asn1/gsm_map/SS-Operations.asn b/asn1/gsm_map/SS-Operations.asn
index 9003c91a15..e239c18cef 100644
--- a/asn1/gsm_map/SS-Operations.asn
+++ b/asn1/gsm_map/SS-Operations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 24.080 V9.0.0 (2009-12)
+-- 3GPP TS 24.080 V9.1.0 (2010-03)
 -- 4.2	Operation types
 SS-Operations {
    itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Access (2) modules (3)
diff --git a/asn1/gsm_map/SS-Protocol.asn b/asn1/gsm_map/SS-Protocol.asn
index 6ac9532c0c..6985b9ab5b 100644
--- a/asn1/gsm_map/SS-Protocol.asn
+++ b/asn1/gsm_map/SS-Protocol.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 24.080 V7.4.0 (2007-09)
+-- 3GPP TS 24.080 V9.1.0 (2010-03)
 -- 4.5	Operations and errors implementation
 -- For the actual implementation of supplementary services, operations and errors have to be defined by value. The following ASN.1 module, imports operation from the ASN.1 module described in subclause 4.2 and operations and errors from MAP.