From 0aabfbf3f8bfb21b19ed85360f4fe4327a3491c2 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Sat, 2 Jan 2010 22:12:14 +0000 Subject: Update to V9.0.0 (2009-12) svn path=/trunk/; revision=31413 --- asn1/camel/CAP-GPRS-ReferenceNumber.asn | 5 +---- asn1/camel/CAP-SMS-ops-args.asn | 4 ++-- asn1/camel/CAP-U-ABORT-Data.asn | 2 +- asn1/camel/CAP-classes.asn | 4 ++-- asn1/camel/CAP-datatypes.asn | 16 ++++++++-------- asn1/camel/CAP-errorcodes.asn | 2 +- asn1/camel/CAP-errortypes.asn | 2 +- asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn | 4 ++-- asn1/camel/CAP-gsmSCF-gsmSRF-ops-args.asn | 19 +++++++++---------- asn1/camel/CAP-gsmSSF-gsmSCF-ops-args.asn | 2 +- asn1/camel/CAP-object-identifiers.asn | 4 ++-- asn1/camel/CAP-operationcodes.asn | 2 +- asn1/camel/Makefile.common | 1 - asn1/camel/camel.cnf | 3 +++ asn1/gsm_map/gsm_map.cnf | 1 + 15 files changed, 35 insertions(+), 36 deletions(-) (limited to 'asn1') diff --git a/asn1/camel/CAP-GPRS-ReferenceNumber.asn b/asn1/camel/CAP-GPRS-ReferenceNumber.asn index 746c4b4642..e62681e4c7 100644 --- a/asn1/camel/CAP-GPRS-ReferenceNumber.asn +++ b/asn1/camel/CAP-GPRS-ReferenceNumber.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.078 7.3.0 (2006-06) +-- 3GPP TS 29.078 9.0.0 (2009-12) -- 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) version5(4)} @@ -30,6 +30,3 @@ CAP-GPRS-ReferenceNumber ::= SEQUENCE { -- This parameter is used to identify the relationship between SGSN and the gsmSCF. END -- of CAP-GPRS-ReferenceNumber - - - diff --git a/asn1/camel/CAP-SMS-ops-args.asn b/asn1/camel/CAP-SMS-ops-args.asn index aa1cf411dd..460686526d 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 7.3.0 (2006-06) +-- 3GPP TS 29.078 9.0.0 (2009-12) -- 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) version5(4)} @@ -264,4 +264,4 @@ ResetTimerSMSArg {PARAMETERS-BOUND : bound} ::= SEQUENCE { ... } -END \ No newline at end of file +END diff --git a/asn1/camel/CAP-U-ABORT-Data.asn b/asn1/camel/CAP-U-ABORT-Data.asn index 308c9c5c78..2130987589 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 7.3.0 (2006-06) +-- 3GPP TS 29.078 9.0.0 (2009-12) -- 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) version5(4)} diff --git a/asn1/camel/CAP-classes.asn b/asn1/camel/CAP-classes.asn index c3a5af36c6..1ce4612ca1 100644 --- a/asn1/camel/CAP-classes.asn +++ b/asn1/camel/CAP-classes.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.078 7.3.0 (2006-06) +-- 3GPP TS 29.078 9.0.0 (2009-12) -- 5.5 Classes CAP-classes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-classes(54) version5(4)} @@ -10,7 +10,7 @@ IMPORTS ROS-OBJECT-CLASS, Code -FROM Remote-Operations-Information-Objects {joint-iso-itu-t remote-operations(4) informationObjects(5) version1(0)} +FROM Remote-Operations-Information-Objects ros-InformationObjects id-rosObject-gprsSSF, id-rosObject-gsmSRF, diff --git a/asn1/camel/CAP-datatypes.asn b/asn1/camel/CAP-datatypes.asn index 8760a300ac..db11a1914c 100644 --- a/asn1/camel/CAP-datatypes.asn +++ b/asn1/camel/CAP-datatypes.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.078 7.3.0 (2006-06) +-- 3GPP TS 29.078 9.0.0 (2009-12) -- 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) version5(4)} @@ -35,6 +35,7 @@ gsm-Network(1) modules(3) map-CommonDataTypes(18) version9(9)} Ext-QoS-Subscribed, Ext2-QoS-Subscribed, + Ext3-QoS-Subscribed, GeographicalInformation, LocationInformation, LSAIdentity, @@ -55,9 +56,6 @@ gsm-Network(1) modules(3) map-CH-DataTypes(13) version9(9)} FROM CAP-object-identifiers {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-object-identifiers(100) version5(4)} - TCInvokeIdSet -FROM TCAPMessages tc-Messages - EXTENSION, PARAMETERS-BOUND, SupportedExtensions @@ -577,7 +575,7 @@ DpSpecificCriteria {PARAMETERS-BOUND : bound}::= CHOICE { DpSpecificCriteriaAlt {PARAMETERS-BOUND : bound} ::= SEQUENCE { ..., - changeOfPositionControlInfo [0] ChangeOfPositionControlInfo {bound}, + changeOfPositionControlInfo [0] ChangeOfPositionControlInfo {bound}, numberOfDigits [1] NumberOfDigits OPTIONAL, interDigitTimeout [2] INTEGER (1..127) OPTIONAL } @@ -889,7 +887,9 @@ GPRS-QoS ::= CHOICE { GPRS-QoS-Extension ::= SEQUENCE { supplement-to-long-QoS-format [0] Ext2-QoS-Subscribed, - ... + ..., + additionalSupplement [1] Ext3-QoS-Subscribed OPTIONAL + } GPRSCause {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE @@ -972,7 +972,7 @@ GPRSEventType ::= ENUMERATED { detached (3), pdp-ContextEstablishment (11), pdp-ContextEstablishmentAcknowledgement (12), - disconnect (13), + disonnect (13), pdp-ContextChangeOfPosition (14) } @@ -1006,7 +1006,7 @@ InitiatorOfServiceChange ::= ENUMERATED { b-side (1) } -InvokeID ::= TCInvokeIdSet +InvokeID ::= INTEGER (-128..127) IPRoutingAddress {PARAMETERS-BOUND : bound} ::= CalledPartyNumber {bound} -- Indicates the routeing address for the IP. diff --git a/asn1/camel/CAP-errorcodes.asn b/asn1/camel/CAP-errorcodes.asn index 0cc296c5c9..d6f414b6b6 100644 --- a/asn1/camel/CAP-errorcodes.asn +++ b/asn1/camel/CAP-errorcodes.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.078 7.3.0 (2006-06) +-- 3GPP TS 29.078 9.0.0 (2009-12) -- 5.4 Error codes CAP-errorcodes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-errorcodes(57) version5(4)} diff --git a/asn1/camel/CAP-errortypes.asn b/asn1/camel/CAP-errortypes.asn index 5fc9e1c6de..c034f77902 100644 --- a/asn1/camel/CAP-errortypes.asn +++ b/asn1/camel/CAP-errortypes.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.078 7.3.0 (2006-06) +-- 3GPP TS 29.078 9.0.0 (2009-12) -- 5.2 Error types CAP-errortypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-errortypes(51) version5(4)} diff --git a/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn b/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn index 43bef51f5f..78b708397c 100644 --- a/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn +++ b/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.078 7.3.0 (2006-06) +-- 3GPP TS 29.078 9.0.0 (2009-12) -- 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) @@ -402,4 +402,4 @@ SendChargingInformationGPRSArg {PARAMETERS-BOUND: bound}::= SEQUENCE { ... } -END \ No newline at end of file +END diff --git a/asn1/camel/CAP-gsmSCF-gsmSRF-ops-args.asn b/asn1/camel/CAP-gsmSCF-gsmSRF-ops-args.asn index 2ee4b37525..ef77138931 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 7.3.0 (2006-06) +-- 3GPP TS 29.078 9.0.0 (2009-12) -- 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) @@ -15,14 +15,6 @@ DEFINITIONS IMPLICIT TAGS ::= BEGIN IMPORTS - ros-InformationObjects, - operationcodes, - datatypes, - errortypes, - classes -FROM CAP-object-identifiers {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) -umts-network(1) modules(3) cap-object-identifiers(100) version5(4)} - OPERATION FROM Remote-Operations-Information-Objects ros-InformationObjects @@ -61,6 +53,13 @@ FROM CAP-errortypes errortypes PARAMETERS-BOUND FROM CAP-classes classes + ros-InformationObjects, + operationcodes, + datatypes, + errortypes, + classes +FROM CAP-object-identifiers {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) +umts-network(1) modules(3) cap-object-identifiers(100) version5(4)} ; @@ -146,4 +145,4 @@ SpecializedResourceReportArg ::= CHOICE { firstAnnouncementStarted [51] NULL } -END \ No newline at end of file +END diff --git a/asn1/camel/CAP-gsmSSF-gsmSCF-ops-args.asn b/asn1/camel/CAP-gsmSSF-gsmSCF-ops-args.asn index f5042456b6..52f60037ed 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 7.3.0 (2006-06) +-- 3GPP TS 29.078 9.0.0 (2009-12) -- 6 Circuit Switched Call Control -- 6.1 gsmSSF/CCF - gsmSCF Interface -- 6.1.1 Operations and arguments diff --git a/asn1/camel/CAP-object-identifiers.asn b/asn1/camel/CAP-object-identifiers.asn index 6032cba9ce..aaa92c2c38 100644 --- a/asn1/camel/CAP-object-identifiers.asn +++ b/asn1/camel/CAP-object-identifiers.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.078 7.3.0 (2006-06) +-- 3GPP TS 29.078 9.0.0 (2009-12) -- 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) version5(4)} @@ -240,4 +240,4 @@ id-as-gsmSCF-gprsSSF-AS OBJECT IDENTIFIER ::= {id-as 51} -- gprsSSF/gsmSCF or gsmSSF/gsmSCF Abstract Syntaxes id-as-smsSSF-gsmSCF-AS OBJECT IDENTIFIER ::= {id-as 61} -END \ No newline at end of file +END diff --git a/asn1/camel/CAP-operationcodes.asn b/asn1/camel/CAP-operationcodes.asn index 03a3eab7b8..360c7efccb 100644 --- a/asn1/camel/CAP-operationcodes.asn +++ b/asn1/camel/CAP-operationcodes.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.078 7.3.0 (2006-06) +-- 3GPP TS 29.078 9.0.0 (2009-12) -- 5.3 Operation codes CAP-operationcodes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-operationcodes(53) version5(4)} diff --git a/asn1/camel/Makefile.common b/asn1/camel/Makefile.common index 63f664a111..ad3f7e0937 100644 --- a/asn1/camel/Makefile.common +++ b/asn1/camel/Makefile.common @@ -31,7 +31,6 @@ EXT_ASN_FILE_LIST_LATE = \ ../ros/Remote-Operations-Generic-ROS-PDUs.asn ASN_FILE_LIST = \ - TCAPMessages.asn \ CAP-object-identifiers.asn \ CAP-classes.asn \ CAP-datatypes.asn \ diff --git a/asn1/camel/camel.cnf b/asn1/camel/camel.cnf index 166309008c..ba4cdf77f0 100644 --- a/asn1/camel/camel.cnf +++ b/asn1/camel/camel.cnf @@ -20,6 +20,9 @@ CS2-datatypes inap #.ASSIGNED_OBJECT_IDENTIFIER sms-Operations #.ASSIGNED_OBJECT_IDENTIFIER gsmSSF-gsmSCF-Protocol #.ASSIGNED_OBJECT_IDENTIFIER gsmSCF-gsmSRF-Protocol +#.ASSIGNED_OBJECT_IDENTIFIER operationcodes +#.ASSIGNED_OBJECT_IDENTIFIER datatypes +#.ASSIGNED_OBJECT_IDENTIFIER errortypes #.OMIT_ASSIGNMENT Remote-Operations-Information-Objects Bind diff --git a/asn1/gsm_map/gsm_map.cnf b/asn1/gsm_map/gsm_map.cnf index 232c96ff75..d4876f9752 100644 --- a/asn1/gsm_map/gsm_map.cnf +++ b/asn1/gsm_map/gsm_map.cnf @@ -71,6 +71,7 @@ Ext-BasicServiceCode Ext-GeographicalInformation Ext-QoS-Subscribed Ext2-QoS-Subscribed +Ext3-QoS-Subscribed ExtensionContainer GeographicalInformation GetPasswordArg -- cgit v1.2.1