Update the Camel and MAP ASN.1 files.

svn path=/trunk/; revision=39386

12 files changed, 43 insertions, 26 deletions

diff --git a/asn1/camel/CAP-GPRS-ReferenceNumber.asn b/asn1/camel/CAP-GPRS-ReferenceNumber.asn
index 7b243b3dfb..8168816cd7 100644
--- a/asn1/camel/CAP-GPRS-ReferenceNumber.asn
+++ b/asn1/camel/CAP-GPRS-ReferenceNumber.asn
@@ -1,6 +1,7 @@
 -- $Id$
--- 3GPP TS 29.078 29.078 9.2.0 (2010-06)
+-- 3GPP TS 29.078 29.078 11.0.0 (2011-09)
 -- 8.1.1	GPRS Reference Number
+
 CAP-GPRS-ReferenceNumber {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
 umts-network(1) modules(3) cap-dialogueInformation(111) version8(7)}
 -- Module CAP-GPRS-ReferenceNumber is updated to version8(7) for Rel-6. The definitions
diff --git a/asn1/camel/CAP-SMS-ops-args.asn b/asn1/camel/CAP-SMS-ops-args.asn
index aaa9dce8ef..2eb89a830a 100644
--- a/asn1/camel/CAP-SMS-ops-args.asn
+++ b/asn1/camel/CAP-SMS-ops-args.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.078 9.2.0 (2010-06)
+-- 3GPP TS 29.078 11.0.0 (2011-09)
 -- 7	SMS Control
 -- 7.1	SMS operations and arguments
 CAP-SMS-ops-args {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-SMS-ops-args(105) version8(7)}
@@ -9,7 +9,7 @@ CAP-SMS-ops-args {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) um
 DEFINITIONS IMPLICIT TAGS::= BEGIN
 
 -- This module contains the operations and operation arguments used for the
--- smsSSF– gsmSCF interface, for the control of MO-SMS and MT-SMS.
+-- smsSSF? gsmSCF interface, for the control of MO-SMS and MT-SMS.
 
 -- The table in subclause 2.1 lists the specifications that contain the modules
 -- that are used by CAP.
diff --git a/asn1/camel/CAP-U-ABORT-Data.asn b/asn1/camel/CAP-U-ABORT-Data.asn
index 8e401ea9e6..4a706720f9 100644
--- a/asn1/camel/CAP-U-ABORT-Data.asn
+++ b/asn1/camel/CAP-U-ABORT-Data.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.078 9.2.0 (2010-06)
+-- 3GPP TS 29.078 11.0.0 (2011-09)
 -- 5.7	User Abort Data
 CAP-U-ABORT-Data {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-u-abort-data(110) version8(7)}
 
diff --git a/asn1/camel/CAP-classes.asn b/asn1/camel/CAP-classes.asn
index b24aef04a7..4b9ab91daf 100644
--- a/asn1/camel/CAP-classes.asn
+++ b/asn1/camel/CAP-classes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.078 9.2.0 (2010-06)
+-- 3GPP TS 29.078 11.0.0 (2011-09)
 -- 5.5	Classes
 CAP-classes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1)
 modules(3) cap-classes(54) version8(7)}
diff --git a/asn1/camel/CAP-datatypes.asn b/asn1/camel/CAP-datatypes.asn
index 66fbc28c69..3ef9f78d13 100644
--- a/asn1/camel/CAP-datatypes.asn
+++ b/asn1/camel/CAP-datatypes.asn
@@ -1,7 +1,8 @@
 -- $Id$
--- 3GPP TS 29.078 9.2.0 (2010-06)
+-- 3GPP TS 29.078 11.0.0 (2011-09)
 -- 5	Common CAP Types
 -- 5.1	Data types
+
 CAP-datatypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-datatypes(52) version8(7)}
 
 DEFINITIONS IMPLICIT TAGS ::= BEGIN
@@ -29,6 +30,7 @@ cs2(20) modules(0) in-cs2-datatypes(0) version1(0)}
 	ISDN-AddressString,
 	LAIFixedLength,
 	GSN-Address, -- WS moved to common datatypes in rel 9.0.0	
+	RAIdentity, -- WS moved to common datatypes in rel 10.4.0
 	NAEA-CIC
 FROM MAP-CommonDataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
 gsm-Network(1) modules(3) map-CommonDataTypes(18) version12(12)}
@@ -37,11 +39,11 @@ gsm-Network(1) modules(3) map-CommonDataTypes(18) version12(12)}
 	Ext2-QoS-Subscribed, 
 	Ext3-QoS-Subscribed,
 	GeographicalInformation,
---	GSN-Address,  WS moved to common datatypes in rel 9.0.0
+--	GSN-Address,  WS moved to common datatypes in rel 9.0.0	
 	LocationInformation,
 	LSAIdentity,
 	QoS-Subscribed,
-	RAIdentity,
+--	RAIdentity, WS moved to common datatypes in rel 10.4.0
 	SubscriberState,
 	GPRSChargingID
 FROM MAP-MS-DataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
@@ -601,8 +603,8 @@ DpSpecificInfoAlt {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	collectedInfoSpecificInfo			[2]	SEQUENCE {
 		calledPartyNumber					[0]	CalledPartyNumber					OPTIONAL,
 		...
-		}
-	}
+	    }
+   }
 --	This datatype is for extension in future releases.
 
 ElapsedTime ::= CHOICE {
diff --git a/asn1/camel/CAP-errorcodes.asn b/asn1/camel/CAP-errorcodes.asn
index 448baa9780..63cf594f52 100644
--- a/asn1/camel/CAP-errorcodes.asn
+++ b/asn1/camel/CAP-errorcodes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.078 9.2.0 (2010-06)
+-- 3GPP TS 29.078 11.0.0 (2011-09)
 -- 5.4	Error codes
 CAP-errorcodes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-errorcodes(57) version8(7)}
 
diff --git a/asn1/camel/CAP-errortypes.asn b/asn1/camel/CAP-errortypes.asn
index 3fe76cc4bb..e48ff64d83 100644
--- a/asn1/camel/CAP-errortypes.asn
+++ b/asn1/camel/CAP-errortypes.asn
@@ -1,6 +1,7 @@
 -- $Id$
--- 3GPP TS 29.078 9.2.0 (2010-06)
+-- 3GPP TS 29.078 11.0.0 (2011-09)
 -- 5.2	Error types
+
 CAP-errortypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-errortypes(51) version8(7)}
 
 -- This module contains the type definitions for the CAP Error Types.
diff --git a/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn b/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn
index 07a5b49b20..46db201ce1 100644
--- a/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn
+++ b/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn
@@ -1,7 +1,8 @@
 -- $Id$
--- 3GPP TS 29.078 9.2.0 (2010-06)
+-- 3GPP TS 29.078 11.0.0 (2011-09)
 -- 8	GPRS Control
 -- 8.1	gsmSCF/gprsSSF operations and arguments
+
 CAP-gprsSSF-gsmSCF-ops-args {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
 umts-network(1) modules(3) cap-GPRS-ops-args(107) version8(7)}
 -- Module CAP-gprsSSF-gsmSCF-ops-args is updated to version8(7) for Rel-6. The OPERATION
@@ -10,7 +11,7 @@ umts-network(1) modules(3) cap-GPRS-ops-args(107) version8(7)}
 DEFINITIONS IMPLICIT TAGS ::= BEGIN
 
 -- This module contains the operations and operation arguments used for the
--- gprsSSF – gsmSCF interface, for the control of GPRS.
+-- gprsSSF ? gsmSCF interface, for the control of GPRS.
 
 -- The table in subclause 2.1 lists the specifications that contain the modules
 -- that are used by CAP.
@@ -39,14 +40,15 @@ cs2(20) modules(0) in-cs2-datatypes (0) version1(0)}
 	IMEI,
 	IMSI,
 	GSN-Address, -- WS moved to common datatypes in rel 9.0.0
+	RAIdentity,  -- WS moved to common datatypes in rel 10.4.0
 	ISDN-AddressString
 FROM MAP-CommonDataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
 gsm-Network(1) modules(3) map-CommonDataTypes(18) version12(12)}
 
 	GPRSChargingID,
-	GPRSMSClass,
+	GPRSMSClass
 --	GSN-Address,  WS moved to common datatypes in rel 9.0.0
-	RAIdentity
+--	RAIdentity  WS moved to common datatypes in rel 10.4.0
 FROM MAP-MS-DataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
 gsm-Network(1) modules(3) map-MS-DataTypes(11) version12(12)}
 
@@ -375,7 +377,7 @@ resetTimerGPRS OPERATION ::= {
 					unexpectedParameter |
 					unknownPDPID}
 	CODE			opcode-resetTimerGPRS}
---  Direction: gsmSCF –? gprsSSF, Timer: Trtg
+--  Direction: gsmSCF ? gprsSSF, Timer: Trtg
 --  This operation is used to request the gprsSSF to refresh an application timer in the gprsSSF.
 
 ResetTimerGPRSArg ::= SEQUENCE {
diff --git a/asn1/camel/CAP-gsmSCF-gsmSRF-ops-args.asn b/asn1/camel/CAP-gsmSCF-gsmSRF-ops-args.asn
index 7ef65e971d..f524ac0aaa 100644
--- a/asn1/camel/CAP-gsmSCF-gsmSRF-ops-args.asn
+++ b/asn1/camel/CAP-gsmSCF-gsmSRF-ops-args.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.078 9.2.0 (2010-06)
+-- 3GPP TS 29.078 11.0.0 (2011-09)
 -- 6.2	gsmSCF/gsmSRF interface
 -- 6.2.1	gsmSCF/gsmSRF operations and arguments
 CAP-gsmSCF-gsmSRF-ops-args {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
diff --git a/asn1/camel/CAP-gsmSSF-gsmSCF-ops-args.asn b/asn1/camel/CAP-gsmSSF-gsmSCF-ops-args.asn
index 1cfc346c3c..7728ae1e3f 100644
--- a/asn1/camel/CAP-gsmSSF-gsmSCF-ops-args.asn
+++ b/asn1/camel/CAP-gsmSSF-gsmSCF-ops-args.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.078 9.2.0 (2010-06)
+-- 3GPP TS 29.078 11.0.0 (2011-09)
 -- 6	Circuit Switched Call Control
 -- 6.1	gsmSSF/CCF - gsmSCF Interface
 -- 6.1.1	Operations and arguments
@@ -363,7 +363,7 @@ collectInformation {PARAMETERS-BOUND : bound} OPERATION::= {
 CollectInformationArg {PARAMETERS-BOUND : bound} ::= SEQUENCE{
 	extensions										[0]	Extensions {bound}	OPTIONAL,
 	...
-	}
+}
 
 connect {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		ConnectArg {bound}
@@ -686,7 +686,8 @@ InitialDPArgExtension {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	...,
 	enhancedDialledServicesAllowed		[11] NULL									OPTIONAL,
 	uu-Data								[12] UU-Data								OPTIONAL,
-	collectInformationAllowed			[13] NULL									OPTIONAL
+	collectInformationAllowed			[13] NULL									OPTIONAL,
+	releaseCallArgExtensionAllowed		[14] NULL									OPTIONAL
 }
 -- If iPSSPCapabilities is not present then this denotes that a colocated gsmSRF is not 
 -- supported by the gsmSSF. If present, then the gsmSSF supports a colocated gsmSRF capable 
@@ -729,7 +730,8 @@ InitiateCallAttemptRes {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	supportedCamelPhases				[0] SupportedCamelPhases					OPTIONAL,
 	offeredCamel4Functionalities		[1] OfferedCamel4Functionalities			OPTIONAL,
 	extensions							[2]	Extensions {bound}						OPTIONAL,
-	...
+	...,
+	releaseCallArgExtensionAllowed		[3]	NULL									OPTIONAL
 	}
 
 moveLeg {PARAMETERS-BOUND : bound} OPERATION ::= {
@@ -785,9 +787,19 @@ releaseCall {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- This operation is used to tear down an existing call at any phase of the call for all parties 
 -- involved in the call. 
 
-ReleaseCallArg {PARAMETERS-BOUND : bound} ::= Cause {bound} 
+ReleaseCallArg {PARAMETERS-BOUND : bound} ::= CHOICE {
+	allCallSegments					AllCallSegments,
+	allCallSegmentsWithExtension	[2] AllCallSegmentsWithExtension
+	}
+
+AllCallSegments ::= Cause {bound} 
 -- A default value of decimal 31 (normal unspecified) shall be given.
 
+AllCallSegmentsWithExtension ::= SEQUENCE {
+	allCallSegments				[0] AllCallSegments,
+	extensions					[1] Extensions {bound} OPTIONAL
+	}
+
 requestReportBCSMEvent {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		RequestReportBCSMEventArg {bound}
 	RETURN RESULT	FALSE
diff --git a/asn1/camel/CAP-object-identifiers.asn b/asn1/camel/CAP-object-identifiers.asn
index d9e54e1f53..5d799fbe5c 100644
--- a/asn1/camel/CAP-object-identifiers.asn
+++ b/asn1/camel/CAP-object-identifiers.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.078 9.2.0 (2010-06)
+-- 3GPP TS 29.078 11.0.0 (2011-09)
 -- 5.6	Object IDentifiers (IDs)
 CAP-object-identifiers {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
 umts-network(1) modules(3) cap-object-identifiers(100) version8(7)}
diff --git a/asn1/camel/CAP-operationcodes.asn b/asn1/camel/CAP-operationcodes.asn
index 12dc3859de..f6ebd1270a 100644
--- a/asn1/camel/CAP-operationcodes.asn
+++ b/asn1/camel/CAP-operationcodes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.078 9.2.0 (2010-06)
+-- 3GPP TS 29.078 11.0.0 (2011-09)
 -- 5.3	Operation codes
 CAP-operationcodes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-operationcodes(53) version8(7)}
 
@@ -118,4 +118,3 @@ FROM Remote-Operations-Information-Objects ros-InformationObjects
 	opcode-sendChargingInformationGPRS			Code ::= local: 83
 
 END
-