Update gsm map asn1 files to latest version.

svn path=/trunk/; revision=24270

29 files changed, 194 insertions, 84 deletions

diff --git a/asn1/gsmmap/MAP-ApplicationContexts.asn b/asn1/gsmmap/MAP-ApplicationContexts.asn
index 7bd87c9e8c..2df7ad7c38 100644
--- a/asn1/gsmmap/MAP-ApplicationContexts.asn
+++ b/asn1/gsmmap/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 V8.1.0 (2007-03)
+-- 3GPP TS 29.002 V8.4.0 (2007-12)
 MAP-ApplicationContexts {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-ApplicationContexts (2) version11 (11)}
diff --git a/asn1/gsmmap/MAP-BS-Code.asn b/asn1/gsmmap/MAP-BS-Code.asn
index 2be44ecfcc..136300e5da 100644
--- a/asn1/gsmmap/MAP-BS-Code.asn
+++ b/asn1/gsmmap/MAP-BS-Code.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.1.0 (2007-03) 
+-- 3GPP TS 29.002 V8.4.0 (2007-12) 
 -- 17.7.10	Bearer Service Codes
  
 MAP-BS-Code {
diff --git a/asn1/gsmmap/MAP-CH-DataTypes.asn b/asn1/gsmmap/MAP-CH-DataTypes.asn
index 0f10e9a794..cf5ec3ffc1 100644
--- a/asn1/gsmmap/MAP-CH-DataTypes.asn
+++ b/asn1/gsmmap/MAP-CH-DataTypes.asn
@@ -1,6 +1,7 @@
 -- $Id$
+-- 3GPP TS 29.002 V8.4.0 (2007-12)
 -- 17.7.3	Call handling data types
--- 3GPP TS 29.002 V8.1.0 (2007-03) 
+ 
 MAP-CH-DataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-CH-DataTypes (13) version11 (11)}
@@ -38,8 +39,7 @@ ReleaseResourcesArg,
 ReleaseResourcesRes,
 -- WS added exports needed by gsmmap.asn (extra asn1 file to handle older proto. ver.)
 RoutingInfo,
-CUG-CheckInfo
-;
+CUG-CheckInfo;
 
 IMPORTS
 	SubscriberInfo,
@@ -123,7 +123,8 @@ SendRoutingInfoArg ::= SEQUENCE {
 	gsmSCF-InitiatedCall	[24]	NULL		OPTIONAL,
 	basicServiceGroup2	[25] Ext-BasicServiceCode	OPTIONAL,
 	networkSignalInfo2	[26] ExternalSignalInfo	OPTIONAL,
-	suppressMTSS	[27] SuppressMTSS	OPTIONAL
+	suppressMTSS	[27] SuppressMTSS	OPTIONAL,
+	mtRoamingRetrySupported	[28] NULL		OPTIONAL
 	 }
 
 SuppressionOfAnnouncement ::= NULL
@@ -250,7 +251,8 @@ ProvideRoamingNumberArg ::= SEQUENCE {
 	pre-pagingSupported	[17] NULL		OPTIONAL,
 	longFTN-Supported	[18]	NULL		OPTIONAL,
 	suppress-VT-CSI	[19]	NULL		OPTIONAL,
-	offeredCamel4CSIsInInterrogatingNode	[20] OfferedCamel4CSIs	OPTIONAL
+	offeredCamel4CSIsInInterrogatingNode	[20] OfferedCamel4CSIs	OPTIONAL,
+	mtRoamingRetrySupported	[21] NULL		OPTIONAL
 	 }
 
 ProvideRoamingNumberRes ::= SEQUENCE {
@@ -274,7 +276,8 @@ ResumeCallHandlingArg ::= SEQUENCE {
 	...,
 	d-csi		[12]	D-CSI	OPTIONAL,
 	o-BcsmCamelTDPCriteriaList 	[13]	O-BcsmCamelTDPCriteriaList 	OPTIONAL,
-	basicServiceGroup2	[14] Ext-BasicServiceCode	OPTIONAL
+	basicServiceGroup2	[14] Ext-BasicServiceCode	OPTIONAL,
+	mtRoamingRetry	[15] NULL		OPTIONAL
 	 }
 
 UU-Data ::= SEQUENCE {
diff --git a/asn1/gsmmap/MAP-CallHandlingOperations.asn b/asn1/gsmmap/MAP-CallHandlingOperations.asn
index 7438645904..a60ef7f725 100644
--- a/asn1/gsmmap/MAP-CallHandlingOperations.asn
+++ b/asn1/gsmmap/MAP-CallHandlingOperations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.1.0 (2007-03) 
+-- 3GPP TS 29.002 V8.4.0 (2007-12) 
 --17.6.3	Call Handling Operations
 MAP-CallHandlingOperations {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
diff --git a/asn1/gsmmap/MAP-CommonDataTypes.asn b/asn1/gsmmap/MAP-CommonDataTypes.asn
index 3960535eb2..96452169fb 100644
--- a/asn1/gsmmap/MAP-CommonDataTypes.asn
+++ b/asn1/gsmmap/MAP-CommonDataTypes.asn
@@ -1,6 +1,7 @@
 -- $Id$
+-- 3GPP TS 29.002 V8.4.0 (2007-12)
 -- 17.7.8	Common data types
--- 3GPP TS 29.002 V8.1.0 (2007-03) 
+
 MAP-CommonDataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-CommonDataTypes (18) version11 (11)}
@@ -66,9 +67,8 @@ AccessNetworkSignalInfo,
 	LCSClientExternalID,
 	LCSClientInternalID,
 	LCSServiceTypeID,
--- WS added exports needed by gsmmap.asn (extra asn1 file to handle older proto. ver.)
-ProtocolId
-;
+-- WS added exports needed by gsmmap.asn (extra asn1 file to handle older prot. ver.)
+	ProtocolId;
 
 IMPORTS
 	TeleserviceCode,
@@ -159,8 +159,7 @@ maxISDN-AddressLength  INTEGER ::= 9
 FTN-AddressString ::= 
 			AddressString (SIZE (1..maxFTN-AddressLength))
 	-- This type is used to represent forwarded-to numbers. 
-	-- For long forwarded-to numbers (longer than 15 digits) NPI shall be unknown;
-	-- if NAI = international the first digits represent the country code (CC)
+	-- If NAI = international the first digits represent the country code (CC)
 	-- and the network destination code (NDC) as for E.164.
 
 maxFTN-AddressLength  INTEGER ::= 15
@@ -374,7 +373,8 @@ AdditionalNetworkResource ::= ENUMERATED {
 	gsmSCF (3),
 	nplr (4),
 	auc (5),
-	...}
+	... ,
+	ue (6)}
 	-- if unknown value is received in AdditionalNetworkResource
 	-- it shall be ignored.
 
diff --git a/asn1/gsmmap/MAP-DialogueInformation.asn b/asn1/gsmmap/MAP-DialogueInformation.asn
index 05f6652f92..9d1fcc8618 100644
--- a/asn1/gsmmap/MAP-DialogueInformation.asn
+++ b/asn1/gsmmap/MAP-DialogueInformation.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.1.0 (2007-03) 
+-- 3GPP TS 29.002 V8.4.0 (2007-12) 
 -- 17.4	MAP Dialogue Information
 
 MAP-DialogueInformation {
@@ -126,3 +126,4 @@ MAP-ProviderAbortReason ::= ENUMERATED {
 	invalidPDU  (1)}
 
 END
+
diff --git a/asn1/gsmmap/MAP-ER-DataTypes.asn b/asn1/gsmmap/MAP-ER-DataTypes.asn
index 1d028fba0e..1b9a958634 100644
--- a/asn1/gsmmap/MAP-ER-DataTypes.asn
+++ b/asn1/gsmmap/MAP-ER-DataTypes.asn
@@ -1,6 +1,7 @@
 -- $Id$
+-- 3GPP TS 29.002 V8.4.0 (2007-12) 
 -- 17.7.7	Error data types
--- 3GPP TS 29.002 V8.1.0 (2007-03) 
+
 MAP-ER-DataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-ER-DataTypes (17) version11 (11)}
@@ -187,7 +188,14 @@ ExtensibleSystemFailureParam ::= SEQUENCE {
 	networkResource	NetworkResource	OPTIONAL,
 	extensionContainer	ExtensionContainer	OPTIONAL,
 	...,
-	additionalNetworkResource	[0] AdditionalNetworkResource	OPTIONAL }
+	additionalNetworkResource	[0] AdditionalNetworkResource	OPTIONAL,
+	failureCauseParam	[1] FailureCauseParam	OPTIONAL }
+
+FailureCauseParam ::= ENUMERATED {
+	limitReachedOnNumberOfConcurrentLocationRequests (0),
+	... }
+	-- if unknown value is received in FailureCauseParam it shall be ignored
+
 
 DataMissingParam ::= SEQUENCE {
 	extensionContainer	ExtensionContainer	OPTIONAL,
diff --git a/asn1/gsmmap/MAP-Errors.asn b/asn1/gsmmap/MAP-Errors.asn
index 48c5e34d14..16bde71fb3 100644
--- a/asn1/gsmmap/MAP-Errors.asn
+++ b/asn1/gsmmap/MAP-Errors.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.1.0 (2007-03)  
+-- 3GPP TS 29.002 V8.4.0 (2007-12)  
 -- 17.6.6	Errors
  
 MAP-Errors {
diff --git a/asn1/gsmmap/MAP-ExtensionDataTypes.asn b/asn1/gsmmap/MAP-ExtensionDataTypes.asn
index 1c62f5cb9a..acd0075b96 100644
--- a/asn1/gsmmap/MAP-ExtensionDataTypes.asn
+++ b/asn1/gsmmap/MAP-ExtensionDataTypes.asn
@@ -1,8 +1,8 @@
 -- $Id$
 -- MAP-ExtensionDataTypes.asn
 --
--- Taken from 3GPP TS 29.002 V8.1.0 (2007-03)
--- http://www.3gpp.org/ftp/Specs/archive/29_series/29.002/29002-810.zip/29002-810.doc
+-- Taken from 3GPP TS 29.002 V8.4.0 (2007-12)
+-- http://www.3gpp.org/ftp/Specs/archive/29_series/29.002/29002-840.zip/29002-840.doc
 --
 -- 17.7.11 Extension data types
 --
@@ -25,8 +25,10 @@ EXPORTS
 	ExtensionContainer,
 	SLR-ArgExtensionContainer;
 
+
 -- IOC for private MAP extensions
 
+
 MAP-EXTENSION  ::= CLASS {
 	&ExtensionType				OPTIONAL,
 	&extensionId 	OBJECT IDENTIFIER }
diff --git a/asn1/gsmmap/MAP-GR-DataTypes.asn b/asn1/gsmmap/MAP-GR-DataTypes.asn
index 87c133f71f..1586749a20 100644
--- a/asn1/gsmmap/MAP-GR-DataTypes.asn
+++ b/asn1/gsmmap/MAP-GR-DataTypes.asn
@@ -1,7 +1,7 @@
 -- $Id$
 --
--- Taken from 3GPP TS 29.002 V8.1.0 (2007-03)
--- http://www.3gpp.org/ftp/Specs/archive/29_series/29.002/29002-810.zip/29002-810.doc
+-- Taken from 3GPP TS 29.002 V8.4.0 (2007-12)
+-- http://www.3gpp.org/ftp/Specs/archive/29_series/29.002/29002-840.zip/29002-840.doc
 --
 --17.7.12	Group Call data types
  
@@ -35,7 +35,8 @@ IMPORTS
 	EMLPP-Priority,
 	ASCI-CallReference,
 	SignalInfo,
-	GlobalCellId
+	GlobalCellId,
+	AccessNetworkSignalInfo
 FROM MAP-CommonDataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-CommonDataTypes (18) version11 (11)}
@@ -75,7 +76,8 @@ PrepareGroupCallArg ::= SEQUENCE {
 	extensionContainer	[4] ExtensionContainer	OPTIONAL,
 	...,
 	vstk			[5] VSTK		OPTIONAL,
-	vstk-rand		[6] VSTK-RAND	OPTIONAL }
+	vstk-rand		[6] VSTK-RAND	OPTIONAL,
+	talkerChannelParameter	[7] NULL		OPTIONAL }
 
 VSTK ::= OCTET STRING (SIZE (16))
 
@@ -118,7 +120,7 @@ ForwardGroupCallSignallingArg ::= SEQUENCE {
 	additionalInfo	[7] AdditionalInfo	OPTIONAL,
 	emergencyModeResetCommandFlag	[8] NULL		OPTIONAL,
 	sm-RP-UI		[9] SignalInfo	OPTIONAL,
-	notificationData	[10] SignalInfo	OPTIONAL
+	an-APDU	[10] AccessNetworkSignalInfo	OPTIONAL
  }
 
 ProcessGroupCallSignallingArg ::= SEQUENCE {
@@ -130,7 +132,7 @@ ProcessGroupCallSignallingArg ::= SEQUENCE {
 	talkerPriority	[3] TalkerPriority	OPTIONAL,
 	additionalInfo	[4] AdditionalInfo	OPTIONAL,
 	emergencyModeResetCommandFlag	[5] NULL		OPTIONAL,
-	notificationData	[6] SignalInfo	OPTIONAL }
+	an-APDU	[6] AccessNetworkSignalInfo	OPTIONAL }
 
 GroupKeyNumber ::= INTEGER (0..15)
 
diff --git a/asn1/gsmmap/MAP-Group-Call-Operations.asn b/asn1/gsmmap/MAP-Group-Call-Operations.asn
index 68bd66d61b..3cd98126b2 100644
--- a/asn1/gsmmap/MAP-Group-Call-Operations.asn
+++ b/asn1/gsmmap/MAP-Group-Call-Operations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.1.0 (2007-03)  
+-- 3GPP TS 29.002 V8.4.0 (2007-12)  
 -- 17.6.7	Group Call operations
  
 MAP-Group-Call-Operations {
diff --git a/asn1/gsmmap/MAP-LCS-DataTypes.asn b/asn1/gsmmap/MAP-LCS-DataTypes.asn
index 9eb7f498d7..7849c96b9a 100644
--- a/asn1/gsmmap/MAP-LCS-DataTypes.asn
+++ b/asn1/gsmmap/MAP-LCS-DataTypes.asn
@@ -1,8 +1,8 @@
 -- $Id$
 -- MAP-LCS-DataTypes.asn
 --
--- Taken from 3GPP TS 29.002 V8.1.0 (2007-03)
--- http://www.3gpp.org/ftp/Specs/archive/29_series/29.002/29002-810.zip/29002-810.doc
+-- Taken from 3GPP TS 29.002 V8.4.0 (2007-12)
+-- http://www.3gpp.org/ftp/Specs/archive/29_series/29.002/29002-840.zip/29002-840.doc
 --
 -- 17.7.13 Location service data types
 --
@@ -23,23 +23,23 @@ EXPORTS
 	ProvideSubscriberLocation-Res,
 	SubscriberLocationReport-Arg,
 	SubscriberLocationReport-Res,
-	LocationType, 
-	DeferredLocationEventType,
-	LCSClientName,
-	LCS-QoS,
-	Horizontal-Accuracy,
-	ResponseTime,
-	Ext-GeographicalInformation, 
-	VelocityEstimate,
-	SupportedGADShapes,
-	Add-GeographicalInformation,
-	LCSRequestorID, 
-	LCS-ReferenceNumber,
-	LCSCodeword,
-	AreaEventInfo,
-	ReportingPLMNList,
-	PeriodicLDRInfo,
-	SequenceNumber
+LocationType, 
+DeferredLocationEventType,
+LCSClientName,
+LCS-QoS,
+Horizontal-Accuracy,
+ResponseTime,
+Ext-GeographicalInformation, 
+VelocityEstimate,
+SupportedGADShapes,
+Add-GeographicalInformation,
+LCSRequestorID, 
+LCS-ReferenceNumber,
+LCSCodeword,
+AreaEventInfo,
+ReportingPLMNList,
+PeriodicLDRInfo,
+SequenceNumber
 ;
 
 IMPORTS
@@ -52,9 +52,9 @@ IMPORTS
 	AgeOfLocationInformation,
 	LCSClientExternalID,
 	LCSClientInternalID,
-	LCSServiceTypeID,
-	CellGlobalIdOrServiceAreaIdOrLAI,
-	PLMN-Id
+LCSServiceTypeID,
+CellGlobalIdOrServiceAreaIdOrLAI,
+PLMN-Id
 FROM MAP-CommonDataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-CommonDataTypes (18) version11 (11)}
@@ -66,7 +66,7 @@ FROM MAP-ExtensionDataTypes {
    gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version11 (11)}
 
 	USSD-DataCodingScheme,
-	USSD-String
+USSD-String
 FROM MAP-SS-DataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3)
    map-SS-DataTypes (14) version11 (11)}
@@ -84,6 +84,7 @@ FROM MAP-SM-DataTypes {
    gsm-Network (1) modules (3) map-SM-DataTypes (16) version11 (11)}
 ;
 
+
 RoutingInfoForLCS-Arg ::= SEQUENCE {
 	mlcNumber		[0] ISDN-AddressString,
 	targetMS		[1] SubscriberIdentity,
@@ -652,4 +653,5 @@ SubscriberLocationReport-Res ::= SEQUENCE {
 -- exception handling
 -- receipt of both na-ESRK and na-ESRD shall be treated the same as a return error
 
+
 END
diff --git a/asn1/gsmmap/MAP-LocationServiceOperations.asn b/asn1/gsmmap/MAP-LocationServiceOperations.asn
index 176f696a61..150c60ab84 100644
--- a/asn1/gsmmap/MAP-LocationServiceOperations.asn
+++ b/asn1/gsmmap/MAP-LocationServiceOperations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.1.0 (2007-03)  
+-- 3GPP TS 29.002 V8.4.0 (2007-12)  
 -- 17.6.8	Location service operations
  
 MAP-LocationServiceOperations {
diff --git a/asn1/gsmmap/MAP-MS-DataTypes.asn b/asn1/gsmmap/MAP-MS-DataTypes.asn
index 2e7506e136..ea80404869 100644
--- a/asn1/gsmmap/MAP-MS-DataTypes.asn
+++ b/asn1/gsmmap/MAP-MS-DataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.1.0 (2007-03) 
+-- 3GPP TS 29.002 V8.4.0 (2007-12) 
 -- 17.7.1	Mobile Service data types
 
 MAP-MS-DataTypes {
@@ -64,7 +64,8 @@ AuthenticationFailureReportRes,
 	DeleteSubscriberDataArg,
 	DeleteSubscriberDataRes,
 	Ext-QoS-Subscribed,
-	Ext2-QoS-Subscribed,
+	Ext2-QoS-Subscribed, 
+	Ext3-QoS-Subscribed,
 	SubscriberData,
 	ODB-Data,
 	SubscriberStatus,
@@ -942,8 +943,10 @@ PDP-Context ::= SEQUENCE {
 	... ,
 	ext-QoS-Subscribed	[0] Ext-QoS-Subscribed	OPTIONAL, 
 	pdp-ChargingCharacteristics	[1] ChargingCharacteristics	OPTIONAL,
-	ext2-QoS-Subscribed	[2] Ext2-QoS-Subscribed	OPTIONAL
+	ext2-QoS-Subscribed	[2] Ext2-QoS-Subscribed	OPTIONAL,
 	-- ext2-QoS-Subscribed may be present only if ext-QoS-Subscribed is present.
+	ext3-QoS-Subscribed	[3] Ext3-QoS-Subscribed	OPTIONAL
+	-- ext3-QoS-Subscribed may be present only if ext2-QoS-Subscribed is present.
 	 }
 
 ContextId ::= INTEGER (1..maxNumOfPDP-Contexts)
@@ -1044,6 +1047,9 @@ Ext2-QoS-Subscribed ::= OCTET STRING (SIZE (1..3))
 	-- If Quality of Service information is structured with 14 octet length, then
 	-- Octet 1 is coded according to 3GPP TS 24.008 [35] Quality of Service Octet 14.
 
+Ext3-QoS-Subscribed ::= OCTET STRING (SIZE (1..2))
+	-- Octets 1-2 are coded according to 3GPP TS 24.008 [35] Quality of Service Octets 17-18.
+
 ChargingCharacteristics ::= OCTET STRING (SIZE (2))
 	-- Octets are coded according to 3GPP TS 32.215.
 
@@ -2253,9 +2259,15 @@ PDP-ContextInfo ::= SEQUENCE {
 	-- qos2-Subscribed may be present only if qos-Subscribed is present.
 	qos2-Requested	[19] Ext2-QoS-Subscribed	OPTIONAL,
 	-- qos2-Requested may be present only if qos-Requested is present.
-	qos2-Negotiated	[20] Ext2-QoS-Subscribed	OPTIONAL
+	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 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 may be present only if qos2-Negotiated is present.
+}
 
 NSAPI ::= INTEGER (0..15)
 --	This type is used to indicate the Network layer Service Access Point
diff --git a/asn1/gsmmap/MAP-MobileServiceOperations.asn b/asn1/gsmmap/MAP-MobileServiceOperations.asn
index 34c71a4949..135864e254 100644
--- a/asn1/gsmmap/MAP-MobileServiceOperations.asn
+++ b/asn1/gsmmap/MAP-MobileServiceOperations.asn
@@ -1,3 +1,5 @@
+-- $Id$
+-- 3GPP TS 29.002 V8.4.0 (2007-12)
 -- 17.6.1	Mobile Service Operations
 
 MAP-MobileServiceOperations {
diff --git a/asn1/gsmmap/MAP-OM-DataTypes.asn b/asn1/gsmmap/MAP-OM-DataTypes.asn
index 4555cd9ba1..792dff8833 100644
--- a/asn1/gsmmap/MAP-OM-DataTypes.asn
+++ b/asn1/gsmmap/MAP-OM-DataTypes.asn
@@ -1,6 +1,7 @@
 -- $Id$
 -- 17.7.2	Operation and maintenance data types
--- 3GPP TS 29.002 V8.1.0 (2007-03) 
+-- 3GPP TS 29.002 V8.4.0 (2007-12)
+ 
 MAP-OM-DataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-OM-DataTypes (12) version11 (11)}
diff --git a/asn1/gsmmap/MAP-OperationAndMaintenanceOperations.asn b/asn1/gsmmap/MAP-OperationAndMaintenanceOperations.asn
index 13a5f3f07b..fce9d478fd 100644
--- a/asn1/gsmmap/MAP-OperationAndMaintenanceOperations.asn
+++ b/asn1/gsmmap/MAP-OperationAndMaintenanceOperations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.1.0 (2007-03) 
+-- 3GPP TS 29.002 V8.4.0 (2007-12) 
 --17.6.2	Operation and Maintenance Operations
 MAP-OperationAndMaintenanceOperations {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
diff --git a/asn1/gsmmap/MAP-Protocol.asn b/asn1/gsmmap/MAP-Protocol.asn
index dd115911ab..a4f9056a73 100644
--- a/asn1/gsmmap/MAP-Protocol.asn
+++ b/asn1/gsmmap/MAP-Protocol.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.1.0 (2007-03)
+-- 3GPP TS 29.002 V8.4.0 (2007-12)
 --17.5	MAP operation and error codes
 MAP-Protocol {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
diff --git a/asn1/gsmmap/MAP-SM-DataTypes.asn b/asn1/gsmmap/MAP-SM-DataTypes.asn
index 2a6e1023a1..e2247b5166 100644
--- a/asn1/gsmmap/MAP-SM-DataTypes.asn
+++ b/asn1/gsmmap/MAP-SM-DataTypes.asn
@@ -1,6 +1,7 @@
 -- $Id$
---17.7.6	Short message data types
--- 3GPP TS 29.002 V8.1.0 (2007-03)  
+-- 3GPP TS 29.002 V8.4.0 (2007-12)  
+-- 17.7.6	Short message data types
+
 MAP-SM-DataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-SM-DataTypes (16) version11 (11)}
@@ -67,7 +68,13 @@ RoutingInfoForSM-Arg ::= SEQUENCE {
 	-- gprsSupportIndicator is set only if the SMS-GMSC supports
 	-- receiving of two numbers from the HLR
 	sm-RP-MTI		[8] SM-RP-MTI	OPTIONAL,
-	sm-RP-SMEA	[9] SM-RP-SMEA	OPTIONAL }
+	sm-RP-SMEA	[9] SM-RP-SMEA	OPTIONAL,
+	sm-deliveryNotIntended	[10] SM-DeliveryNotIntended	OPTIONAL }
+
+SM-DeliveryNotIntended ::= ENUMERATED {
+	onlyIMSI-requested  (0),
+	onlyMCC-MNC-requested  (1),
+	...}
 
 SM-RP-MTI ::= INTEGER (0..10)
 	-- 0 SMS Deliver 
@@ -97,7 +104,8 @@ LocationInfoWithLMSI ::= SEQUENCE {
 	-- gprsNodeIndicator is set only if the SGSN number is sent as the 
 	-- Network Node Number
 	additional-Number	[6] Additional-Number	OPTIONAL 
-	-- NetworkNode-number can be either msc-number or sgsn-number
+	-- NetworkNode-number can be either msc-number or sgsn-number or IP-SM-GW
+	-- number or SMS Router number
 	}
 
 Additional-Number ::= CHOICE {
@@ -163,11 +171,22 @@ ReportSM-DeliveryStatusArg ::= SEQUENCE {
 	additionalSM-DeliveryOutcome	[4] 	SM-DeliveryOutcome 	OPTIONAL,
 	-- If received, additionalSM-DeliveryOutcome is for GPRS
 	-- If DeliveryOutcomeIndicator is set, then AdditionalSM-DeliveryOutcome shall be absent
-	additionalAbsentSubscriberDiagnosticSM	[5] 	AbsentSubscriberDiagnosticSM OPTIONAL
+	additionalAbsentSubscriberDiagnosticSM	[5] 	AbsentSubscriberDiagnosticSM OPTIONAL,
 	-- If received additionalAbsentSubscriberDiagnosticSM is for GPRS
 	-- If DeliveryOutcomeIndicator is set, then AdditionalAbsentSubscriberDiagnosticSM 
 	-- shall be absent
-	}
+	ip-sm-gw-Indicator	[6] 	NULL		OPTIONAL,
+	-- the ip-sm-gw indicator indicates by its presence that sm-deliveryOutcome
+	-- is for delivery via IMS
+	-- If present, deliveryOutcomeIndicator shall be absent.
+	ip-sm-gw-sm-deliveryOutcome	[7] 	SM-DeliveryOutcome	OPTIONAL, 
+	-- If received ip-sm-gw-sm-deliveryOutcome is for delivery via IMS
+	-- If ip-sm-gw-Indicator is set, then ip-sm-gw-sm-deliveryOutcome shall be absent
+	ip-sm-gw-absentSubscriberDiagnosticSM	[8]	AbsentSubscriberDiagnosticSM	OPTIONAL
+	-- If received ip-sm-gw-sm-absentSubscriberDiagnosticSM is for delivery via IMS
+	-- If ip-sm-gw-Indicator is set, then ip-sm-gw-sm-absentSubscriberDiagnosticSM 
+	-- shall be absent
+}
 
 SM-DeliveryOutcome ::= ENUMERATED {
 	memoryCapacityExceeded  (0),
@@ -211,7 +230,11 @@ ReadyForSM-Arg ::= SEQUENCE {
 	-- alertReasonIndicator is set only when the alertReason 
 	-- sent to HLR is for GPRS
 	extensionContainer	ExtensionContainer	OPTIONAL,
-	...}
+	...,
+	additionalAlertReasonIndicator	[1] NULL		OPTIONAL
+	-- additionalAlertReasonIndicator is set only when the alertReason
+	-- sent to HLR is for IP-SM-GW
+	}
 
 ReadyForSM-Res ::= SEQUENCE {
 	extensionContainer	ExtensionContainer	OPTIONAL,
diff --git a/asn1/gsmmap/MAP-SS-Code.asn b/asn1/gsmmap/MAP-SS-Code.asn
index 7b1fd08ba1..6a1aeb8fd8 100644
--- a/asn1/gsmmap/MAP-SS-Code.asn
+++ b/asn1/gsmmap/MAP-SS-Code.asn
@@ -1,6 +1,7 @@
 -- $Id$
---17.7.5	Supplementary service codes
--- 3GPP TS 29.002 V8.1.0 (2007-03) 
+-- 3GPP TS 29.002 V8.4.0 (2007-12)
+-- 17.7.5	Supplementary service codes
+
 MAP-SS-Code {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-SS-Code (15) version11 (11)}
@@ -81,6 +82,8 @@ hold				SS-Code ::= '01000010'B
 	-- call hold
 ccbs-A			SS-Code ::= '01000011'B
 	-- completion of call to busy subscribers, originating side
+	-- this SS-Code is used only in InsertSubscriberData, DeleteSubscriberData 
+	-- and InterrogateSS
 ccbs-B			SS-Code ::= '01000100'B
 	-- completion of call to busy subscribers, destination side
 	-- this SS-Code is used only in InsertSubscriberData and DeleteSubscriberData
diff --git a/asn1/gsmmap/MAP-SS-DataTypes.asn b/asn1/gsmmap/MAP-SS-DataTypes.asn
index 40889549cc..d3c5dd3843 100644
--- a/asn1/gsmmap/MAP-SS-DataTypes.asn
+++ b/asn1/gsmmap/MAP-SS-DataTypes.asn
@@ -1,6 +1,6 @@
 -- $Id$
---17.7.4	Supplementary service data types
--- 3GPP TS 29.002 V8.1.0 (2007-03)  
+-- 3GPP TS 29.002 V8.4.0 (2007-12)  
+-- 17.7.4	Supplementary service data types
  
 MAP-SS-DataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
diff --git a/asn1/gsmmap/MAP-ShortMessageServiceOperations.asn b/asn1/gsmmap/MAP-ShortMessageServiceOperations.asn
index 7f6aabe75b..ccead07cad 100644
--- a/asn1/gsmmap/MAP-ShortMessageServiceOperations.asn
+++ b/asn1/gsmmap/MAP-ShortMessageServiceOperations.asn
@@ -1,6 +1,6 @@
 -- $Id$
+-- 3GPP TS 29.002 V8.4.0 (2007-12)  
 -- 17.6.5	Short message service operations
--- 3GPP TS 29.002 V8.1.0 (2007-03)  
  
 MAP-ShortMessageServiceOperations {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
@@ -170,3 +170,4 @@ mt-ForwardSM-VGCS  OPERATION ::= {				--Timer ml
 
 
 END
+
diff --git a/asn1/gsmmap/MAP-SupplementaryServiceOperations.asn b/asn1/gsmmap/MAP-SupplementaryServiceOperations.asn
index 1c0396669b..8ed0bb5501 100644
--- a/asn1/gsmmap/MAP-SupplementaryServiceOperations.asn
+++ b/asn1/gsmmap/MAP-SupplementaryServiceOperations.asn
@@ -1,6 +1,7 @@
 -- $Id$
--- 3GPP TS 29.002 V8.1.0 (2007-03)  
+-- 3GPP TS 29.002 V8.4.0 (2007-12)  
 --17.6.4	Supplementary service operations
+
 MAP-SupplementaryServiceOperations {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-SupplementaryServiceOperations (8)
diff --git a/asn1/gsmmap/MAP-TS-Code.asn b/asn1/gsmmap/MAP-TS-Code.asn
index 070327866b..be1fd9dea1 100644
--- a/asn1/gsmmap/MAP-TS-Code.asn
+++ b/asn1/gsmmap/MAP-TS-Code.asn
@@ -1,6 +1,6 @@
 -- $Id$
--- 3GPP TS 29.002 V8.1.0 (2007-03) 
---17.7.9	Teleservice Codes
+-- 3GPP TS 29.002 V8.4.0 (2007-12) 
+-- 17.7.9	Teleservice Codes
  
 MAP-TS-Code {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
diff --git a/asn1/gsmmap/SS-DataTypes.asn b/asn1/gsmmap/SS-DataTypes.asn
index f9f763ab0e..6ff5b79ef9 100644
--- a/asn1/gsmmap/SS-DataTypes.asn
+++ b/asn1/gsmmap/SS-DataTypes.asn
@@ -1,4 +1,5 @@
 -- $Id$
+-- 3GPP TS 24.080 V7.4.0 (2007-09)
 -- 4.4.2	ASN.1 data types
 SS-DataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Access (2) modules (3)
@@ -234,11 +235,45 @@ LocationNotificationArg	::= SEQUENCE {
 	lcsRequestorID		[4] LCSRequestorID			OPTIONAL,
 	lcsCodeword			[5]	LCSCodeword				OPTIONAL,
 	lcsServiceTypeID	[6]	LCSServiceTypeID		OPTIONAL }
+
+-- The notificationType may only be set to notifyLocationAllowed, 
+-- notifyAndVerify-LocationAllowedIfNoResponse, 
+-- or notifyAndVerify-LocationNotAllowedIfNoResponse.
+-- The locationEstimateType field of the locationType may only be set to 
+-- currentLocation, currentOrLastKnownLocation, 
+-- notificationVerificationOnly, or activateDeferredLocation.
+-- The deferredLocationEventType field of the locationType may only be set to 
+-- enteringIntoArea, and/or leavingFromArea, and/or beingInsideArea, 
+-- and/or periodicLDR.
+-- For LCS location notification of MT-LR for current location, the 
+-- locationEstimateType field of the locationType shall be set to currentLocation.
+-- For LCS location notification of MT-LR for current or last known location, the 
+-- locationEstimateType field of the locationType shall be set to currentOrLastKnownLocation.
+-- For the LCS location notification for the LDR of MS available event, 
+-- the locationEstimateType field of the locationType shall be set to currentLocation.
+-- For LCS location notification for the LDR of change of area event, 
+-- the locationEstimateType field of the locationType shall be set to
+-- activateDeferredLocation, and the deferredLocationEventType shall be 
+-- set to enteringIntoArea, and/or leavingFromArea, and/or beingInsideArea.
+-- For the post positioning LCS location notification, the locationEstimateType 
+-- field of the locationType shall be set to notificationVerificationOnly.
+-- For LCS location notification for the LDR of periodic location event, 
+-- the locationEstimateType field of the locationType shall be set to
+-- activateDeferredLocation, and the 
+-- deferredLocationEventType shall be set to periodicLDR.
+
 -- exception handling:
 -- At reception of an unrecognised notificationType value the receiver shall reject the 
 -- operation with a return error cause of unexpected data value.
 -- At reception of an unrecognised locationType value the receiver shall reject the
--- operation with a return error cause of unexpected data value.
+-- operation with a return error cause of unexpected data value. 
+-- At reception of an unallowed notificationType value the receiver shall either ignore the
+-- received operation or reject the operation with a return error cause of unexpected 
+-- data value.
+-- At reception of an unallowed locationType value the receiver shall either ignore the
+-- received operation or reject the operation with a return error cause of unexpected 
+-- data value.
+
 
 
 LocationNotificationRes	::= SEQUENCE {
@@ -274,11 +309,14 @@ LCS-MOLRArg	::= SEQUENCE {
 	locationUpdateRequest	[16]	NULL				OPTIONAL,
 	sequenceNumber 		[17] SequenceNumber 		OPTIONAL,
 	terminationCause 	[18] TerminationCause 		OPTIONAL,
-	mo-lrShortCircuit	[19]	NULL				OPTIONAL }
+	mo-lrShortCircuit	[19]	NULL				OPTIONAL,
+	ganssAssistanceData	[20] GANSSAssistanceData	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 
--- assistanceData and locationMethod is set to value assistedGPS.
+-- assistanceData and locationMethod is set to value assistedGPS or assistedGPSandGANSS.
+-- The parameter ganssAssistanceData shall be included if and only if the molr-Type is set to value 
+-- 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 
 
@@ -298,9 +336,11 @@ MOLR-Type::= ENUMERATED {
 LocationMethod::= ENUMERATED {
 	msBasedEOTD			(0),
 	msAssistedEOTD		(1),
-	assistedGPS			(2), 
+	assistedGPS			(2),
 	...,
-	msBasedOTDOA		(3)
+	msBasedOTDOA		(3),
+	assistedGANSS		(4),
+	assistedGPSandGANSS (5)
 	}
 -- exception handling:
 -- When this parameter is received with value msBasedEOTD or msAssistedEOTD and the MS 
@@ -314,7 +354,11 @@ LocationMethod::= ENUMERATED {
 
 GPSAssistanceData::= OCTET STRING (SIZE (1..38))
 -- Octets 1 to 38 are coded in the same way as the octets 3 to 7+2n of Requested GPS Data IE
--- in 3GPP TS 49.031.
+-- in 3GPP TS 49.031 [14].
+
+GANSSAssistanceData::= OCTET STRING (SIZE (1..40))
+-- Octets 1 to 40 are coded in the same way as the octets 3 to 9+2n of Requested GANSS Data IE
+-- in 3GPP TS 49.031 [14] .
 
 TerminationCause ::= ENUMERATED {
 	subscriberTermination  (0),
@@ -352,7 +396,7 @@ LCS-MOLRRes::= SEQUENCE {
 
 DecipheringKeys::= OCTET STRING (SIZE (15))
 -- Octets in DecipheringKeys are coded in the same way as the octets 3 to 17 of Deciphering Key IE
--- in 3GPP TS 49.031. I.e. these octets contain Current Deciphering Key, Next Deciphering Key and 
+-- in 3GPP TS 49.031 [14]. I.e. these octets contain Current Deciphering Key, Next Deciphering Key and 
 -- Ciphering Key Flag.
 LCS-AreaEventRequestArg	::= SEQUENCE {
 	referenceNumber				[0]	LCS-ReferenceNumber,
diff --git a/asn1/gsmmap/SS-Errors.asn b/asn1/gsmmap/SS-Errors.asn
index 0bdd70f0f4..2aa4358191 100644
--- a/asn1/gsmmap/SS-Errors.asn
+++ b/asn1/gsmmap/SS-Errors.asn
@@ -1,4 +1,5 @@
 -- $Id$
+-- 3GPP TS 24.080 V7.4.0 (2007-09)
 -- 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.
 
diff --git a/asn1/gsmmap/SS-Operations.asn b/asn1/gsmmap/SS-Operations.asn
index debeeebfbb..a7921c99f2 100644
--- a/asn1/gsmmap/SS-Operations.asn
+++ b/asn1/gsmmap/SS-Operations.asn
@@ -1,4 +1,6 @@
 -- $Id$
+-- 3GPP TS 24.080 V7.4.0 (2007-09)
+-- 4.2	Operation types
 SS-Operations {
    itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Access (2) modules (3)
    ss-Operations (0) version10 (10)}
diff --git a/asn1/gsmmap/SS-Protocol.asn b/asn1/gsmmap/SS-Protocol.asn
index d22c897983..6ac9532c0c 100644
--- a/asn1/gsmmap/SS-Protocol.asn
+++ b/asn1/gsmmap/SS-Protocol.asn
@@ -1,6 +1,8 @@
 -- $Id$
+-- 3GPP TS 24.080 V7.4.0 (2007-09)
 -- 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. 
+
 SS-Protocol {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Access (2) modules (3) ss-Protocol (3) version10 (10)}
diff --git a/asn1/gsmmap/packet-gsmmap-template.c b/asn1/gsmmap/packet-gsmmap-template.c
index 59ca82370f..75c7b42546 100644
--- a/asn1/gsmmap/packet-gsmmap-template.c
+++ b/asn1/gsmmap/packet-gsmmap-template.c
@@ -39,7 +39,7 @@
  * References GSM MAP: 
  * ETSI TS 129 002
  * Updated to ETSI TS 129 002 V7.5.0 (3GPP TS 29.002 V7.5.0 (2006-09) Release 7)
- * Updated to ETSI TS 129 002 V8.1.0 (3GPP TS 29.002 V8.1.0 (2007-06) Release 8)
+ * Updated to ETSI TS 129 002 V8.4.0 (3GPP TS 29.002 V8.1.0 (2007-06) Release 8)
  * References GSM SS
  * References: 3GPP TS 24.080
  */