diff options
author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-11-12 14:50:58 +0000 |
---|---|---|
committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-11-12 14:50:58 +0000 |
commit | 3dbe8e882191ed3b4ec3c6084bb869d9bc5c6fbe (patch) | |
tree | cfda4b6310104bb790f85c2a9e3849dfb439f8a5 /asn1 | |
parent | 59b535b0ed622d25891e4ac1495451ccc8528078 (diff) |
Update Camel to TS 29.078 9.2.0 (2010-06)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34849 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/camel/CAP-GPRS-ReferenceNumber.asn | 6 | ||||
-rw-r--r-- | asn1/camel/CAP-SMS-ops-args.asn | 27 | ||||
-rw-r--r-- | asn1/camel/CAP-U-ABORT-Data.asn | 7 | ||||
-rw-r--r-- | asn1/camel/CAP-classes.asn | 10 | ||||
-rw-r--r-- | asn1/camel/CAP-datatypes.asn | 102 | ||||
-rw-r--r-- | asn1/camel/CAP-errorcodes.asn | 6 | ||||
-rw-r--r-- | asn1/camel/CAP-errortypes.asn | 6 | ||||
-rw-r--r-- | asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn | 29 | ||||
-rw-r--r-- | asn1/camel/CAP-gsmSCF-gsmSRF-ops-args.asn | 16 | ||||
-rw-r--r-- | asn1/camel/CAP-gsmSSF-gsmSCF-ops-args.asn | 85 | ||||
-rw-r--r-- | asn1/camel/CAP-object-identifiers.asn | 46 | ||||
-rw-r--r-- | asn1/camel/CAP-operationcodes.asn | 91 |
12 files changed, 230 insertions, 201 deletions
diff --git a/asn1/camel/CAP-GPRS-ReferenceNumber.asn b/asn1/camel/CAP-GPRS-ReferenceNumber.asn index e62681e4c7..7b243b3dfb 100644 --- a/asn1/camel/CAP-GPRS-ReferenceNumber.asn +++ b/asn1/camel/CAP-GPRS-ReferenceNumber.asn @@ -1,9 +1,9 @@ -- $Id$ --- 3GPP TS 29.078 9.0.0 (2009-12) +-- 3GPP TS 29.078 29.078 9.2.0 (2010-06) -- 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)} --- Module CAP-GPRS-ReferenceNumber is updated to version5(4) for Rel-6. The definitions +umts-network(1) modules(3) cap-dialogueInformation(111) version8(7)} +-- Module CAP-GPRS-ReferenceNumber is updated to version8(7) for Rel-6. The definitions -- in this module are not modified, compared to Rel-5. DEFINITIONS ::= BEGIN diff --git a/asn1/camel/CAP-SMS-ops-args.asn b/asn1/camel/CAP-SMS-ops-args.asn index 460686526d..aaa9dce8ef 100644 --- a/asn1/camel/CAP-SMS-ops-args.asn +++ b/asn1/camel/CAP-SMS-ops-args.asn @@ -1,15 +1,15 @@ -- $Id$ --- 3GPP TS 29.078 9.0.0 (2009-12) +-- 3GPP TS 29.078 9.2.0 (2010-06) -- 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)} --- The module CAP-SMS-ops-args is updated to version5(4) for Rel-6. The OPERATION definitions +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)} +-- The module CAP-SMS-ops-args is updated to version8(7) for Rel-6. The OPERATION definitions -- are not modified. 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. @@ -23,7 +23,7 @@ IMPORTS ros-InformationObjects, tc-Messages 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)} +umts-network(1) modules(3) cap-object-identifiers(100) version8(7)} OPERATION FROM Remote-Operations-Information-Objects ros-InformationObjects @@ -40,13 +40,13 @@ cs2(20) modules(0) in-cs2-datatypes (0) version1(0)} IMSI, ISDN-AddressString FROM MAP-CommonDataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) -gsm-Network(1) modules(3) map-CommonDataTypes(18) version9(9)} +gsm-Network(1) modules(3) map-CommonDataTypes(18) version12(12)} GPRSMSClass, LocationInformation, MS-Classmark2 FROM MAP-MS-DataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) -gsm-Network(1) modules(3) map-MS-DataTypes(11) version9(9)} +gsm-Network(1) modules(3) map-MS-DataTypes(11) version12(12)} PARAMETERS-BOUND FROM CAP-classes classes @@ -79,8 +79,8 @@ FROM CAP-operationcodes operationcodes TPShortMessageSpecificInfo, TPValidityPeriod FROM CAP-datatypes datatypes --- For Rel-6, the CAP-datatypes module is updated to version5(4); Object Identifier 'datatypes' --- is also updated to version5(4). As a result, the present module uses Rel-6 data type definitions. +-- For Rel-6, the CAP-datatypes module is updated to version8(7); Object Identifier 'datatypes' +-- is also updated to version8(7). As a result, the present module uses Rel-6 data type definitions. missingCustomerRecord, missingParameter, @@ -91,13 +91,13 @@ FROM CAP-datatypes datatypes unexpectedDataValue, unexpectedParameter FROM CAP-errortypes errortypes --- For Rel-6, the CAP-errortypes module is updated to version5(4); Object Identifier --- 'errortypes' is also updated to version5(4). As a result, the present module uses Rel-6 +-- For Rel-6, the CAP-errortypes module is updated to version8(7); Object Identifier +-- 'errortypes' is also updated to version8(7). As a result, the present module uses Rel-6 -- error type definitions. CallReferenceNumber FROM MAP-CH-DataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) -gsm-Network(1) modules(3) map-CH-DataTypes(13) version9(9)} +gsm-Network(1) modules(3) map-CH-DataTypes(13) version12(12)} ; @@ -210,6 +210,9 @@ InitialDPSMSArg {PARAMETERS-BOUND : bound} ::= SEQUENCE { calledPartyNumber [20] ISDN-AddressString OPTIONAL } +-- The UserCSGInformation is conveyed in the LocationInformation for CS and LocationInformationGPRS +-- for GPRS. The encoding of the parameter is as defined in 3GPP TS 29.002 [11]. + releaseSMS OPERATION ::= { ARGUMENT ReleaseSMSArg RETURN RESULT FALSE diff --git a/asn1/camel/CAP-U-ABORT-Data.asn b/asn1/camel/CAP-U-ABORT-Data.asn index 2130987589..8e401ea9e6 100644 --- a/asn1/camel/CAP-U-ABORT-Data.asn +++ b/asn1/camel/CAP-U-ABORT-Data.asn @@ -1,7 +1,7 @@ -- $Id$ --- 3GPP TS 29.078 9.0.0 (2009-12) +-- 3GPP TS 29.078 9.2.0 (2010-06) -- 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)} +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)} DEFINITIONS ::= BEGIN @@ -39,10 +39,11 @@ CAP-U-ABORT-REASON ::= ENUMERATED { -- originationReference is absent in the received message but is -- required to be present according to the procedures in -- subclause 14.1.7. --- This abort reason is used for CAP defined GPRS-ReferenceNumber. +-- This abort reason is used for CAP defined GPRS ReferenceNumber. -- overlapping-dialogue shall be used by the gprsSSF to indicate to the gsmSCF that a -- specific instance already has a TC dialogue open. This error -- cause is typically obtained when both the gsmSCF and gprsSSF -- open a new dialogue at the same time. -- no-reason-given shall be set when any other reasons above do not apply END -- of CAP-U-ABORT-Data + diff --git a/asn1/camel/CAP-classes.asn b/asn1/camel/CAP-classes.asn index 1ce4612ca1..b24aef04a7 100644 --- a/asn1/camel/CAP-classes.asn +++ b/asn1/camel/CAP-classes.asn @@ -1,8 +1,8 @@ -- $Id$ --- 3GPP TS 29.078 9.0.0 (2009-12) +-- 3GPP TS 29.078 9.2.0 (2010-06) -- 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)} +modules(3) cap-classes(54) version8(7)} DEFINITIONS ::= BEGIN @@ -23,7 +23,7 @@ FROM Remote-Operations-Information-Objects ros-InformationObjects smsSSF-gsmSCF-Protocol, gprsSSF-gsmSCF-Protocol 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)} +umts-network(1) modules(3) cap-object-identifiers(100) version8(7)} capSsfToScfGeneric, capAssistHandoffssfToScf, @@ -123,7 +123,7 @@ firstExtension EXTENSION ::= { -- firstExtension is just an example. SupportedExtensions EXTENSION ::= {firstExtension, ... --- full set of network operator extensions -- +-- full set of network operator extensions –- } -- SupportedExtension is the full set of the network operator extensions. @@ -304,4 +304,4 @@ cAPSpecificBoundSet PARAMETERS-BOUND ::= { NUM-OF-GENERIC-NUMBERS 5 NUM-OF-MESSAGE-IDS 16} -END
\ No newline at end of file +END diff --git a/asn1/camel/CAP-datatypes.asn b/asn1/camel/CAP-datatypes.asn index db11a1914c..66fbc28c69 100644 --- a/asn1/camel/CAP-datatypes.asn +++ b/asn1/camel/CAP-datatypes.asn @@ -1,8 +1,8 @@ -- $Id$ --- 3GPP TS 29.078 9.0.0 (2009-12) +-- 3GPP TS 29.078 9.2.0 (2010-06) -- 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)} +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 @@ -28,15 +28,16 @@ cs2(20) modules(0) in-cs2-datatypes(0) version1(0)} IMSI, ISDN-AddressString, LAIFixedLength, - GSN-Address, -- WS moved to common datatypes in rel 9.0.0 + GSN-Address, -- WS moved to common datatypes in rel 9.0.0 NAEA-CIC FROM MAP-CommonDataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) -gsm-Network(1) modules(3) map-CommonDataTypes(18) version9(9)} +gsm-Network(1) modules(3) map-CommonDataTypes(18) version12(12)} Ext-QoS-Subscribed, - Ext2-QoS-Subscribed, + Ext2-QoS-Subscribed, Ext3-QoS-Subscribed, GeographicalInformation, +-- GSN-Address, WS moved to common datatypes in rel 9.0.0 LocationInformation, LSAIdentity, QoS-Subscribed, @@ -44,17 +45,17 @@ gsm-Network(1) modules(3) map-CommonDataTypes(18) version9(9)} SubscriberState, GPRSChargingID FROM MAP-MS-DataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) -gsm-Network(1) modules(3) map-MS-DataTypes(11) version9(9)} +gsm-Network(1) modules(3) map-MS-DataTypes(11) version12(12)} CallReferenceNumber, SuppressionOfAnnouncement FROM MAP-CH-DataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) -gsm-Network(1) modules(3) map-CH-DataTypes(13) version9(9)} +gsm-Network(1) modules(3) map-CH-DataTypes(13) version12(12)} tc-Messages, 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)} +umts-network(1) modules(3) cap-object-identifiers(100) version8(7)} EXTENSION, PARAMETERS-BOUND, @@ -63,7 +64,7 @@ FROM CAP-classes classes ExtensionContainer FROM MAP-ExtensionDataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) -gsm-Network(1) modules(3) map-ExtensionDataTypes(21) version9(9)} +gsm-Network(1) modules(3) map-ExtensionDataTypes(21) version12(12)} ; @@ -230,12 +231,12 @@ CalledPartyBCDNumber {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE( -- InitialDPSMSArg, a CalledPartyBCDNumber may also contain an alphanumeric -- character string. In this case, type-of-number '101'B is used, in accordance -- with 3GPP TS 23.040 [6]. The address is coded in accordance with the --- GSM 7-bit default alphabet definition and the SMS packing rules +-- GSM 7 bit default alphabet definition and the SMS packing rules -- as specified in 3GPP TS 23.038 [15] in this case. CalledPartyNumber {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE( bound.&minCalledPartyNumberLength .. bound.&maxCalledPartyNumberLength)) --- Indicates the Called Party Number. Refer to ETS EN 300 356-1 [23] for encoding. +-- Indicates the Called Party Number. Refer to ETS EN 300 356 1 [23] for encoding. -- A CalledPartyNumber may contain national-specific values of the Nature Of Address -- indicator. The filling-in of the national-specific Nature Of Address indicator @@ -249,7 +250,7 @@ CalledPartyNumber {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE( CallingPartyNumber {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE( bound.&minCallingPartyNumberLength .. bound.&maxCallingPartyNumberLength)) --- Indicates the Calling Party Number. Refer to ETSI EN 300 356-1 [23] for encoding. +-- Indicates the Calling Party Number. Refer to ETSI EN 300 356 1 [23] for encoding. CallResult {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE( bound.&minCallResultLength .. bound.&maxCallResultLength)) @@ -372,8 +373,8 @@ Carrier {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE( Cause {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE( bound.&minCauseLength .. bound.&maxCauseLength)) -- Indicates the cause for interface related information. --- Refer to ETSI EN 300 356-1 [23] Cause parameter for encoding. --- For the use of cause and location values refer to ITU-T Recommendation Q.850 [47] +-- Refer to ETSI EN 300 356 1 [23] Cause parameter for encoding. +-- For the use of cause and location values refer to ITU T Recommendation Q.850 [47] -- Shall always include the cause value and shall also include the diagnostics field, -- if available. @@ -528,7 +529,7 @@ DestinationRoutingAddress {PARAMETERS-BOUND : bound} ::= SEQUENCE SIZE(1) OF Digits {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE( bound.&minDigitsLength .. bound.&maxDigitsLength)) -- Indicates the address signalling digits. --- Refer to ETSI EN 300 356-1 [23] Generic Number & Generic Digits parameters for encoding. +-- Refer to ETSI EN 300 356 1 [23] Generic Number & Generic Digits parameters for encoding. -- The coding of the subfields 'NumberQualifier' in Generic Number and 'TypeOfDigits' in -- Generic Digits are irrelevant to the CAP; -- the ASN.1 tags are sufficient to identify the parameter. @@ -575,28 +576,30 @@ DpSpecificCriteria {PARAMETERS-BOUND : bound}::= CHOICE { DpSpecificCriteriaAlt {PARAMETERS-BOUND : bound} ::= SEQUENCE { ..., - changeOfPositionControlInfo [0] ChangeOfPositionControlInfo {bound}, - numberOfDigits [1] NumberOfDigits OPTIONAL, - interDigitTimeout [2] INTEGER (1..127) OPTIONAL + changeOfPositionControlInfo [0] ChangeOfPositionControlInfo {bound}, + numberOfDigits [1] NumberOfDigits OPTIONAL, + interDigitTimeout [2] INTEGER (1..127) OPTIONAL } -- interDigitTimeout duration in seconds. DpSpecificInfoAlt {PARAMETERS-BOUND : bound} ::= SEQUENCE { ..., oServiceChangeSpecificInfo [0] SEQUENCE { - ext-basicServiceCode [0] Ext-BasicServiceCode OPTIONAL, + ext-basicServiceCode [0] Ext-BasicServiceCode OPTIONAL, ..., initiatorOfServiceChange [1] InitiatorOfServiceChange OPTIONAL, - natureOfServiceChange [2] NatureOfServiceChange OPTIONAL + natureOfServiceChange [2] NatureOfServiceChange OPTIONAL + }, tServiceChangeSpecificInfo [1] SEQUENCE { - ext-basicServiceCode [0] Ext-BasicServiceCode OPTIONAL, + ext-basicServiceCode [0] Ext-BasicServiceCode OPTIONAL, ..., initiatorOfServiceChange [1] InitiatorOfServiceChange OPTIONAL, - natureOfServiceChange [2] NatureOfServiceChange OPTIONAL + natureOfServiceChange [2] NatureOfServiceChange OPTIONAL }, - collectedInfoSpecificInfo [2] SEQUENCE { - calledPartyNumber [0] CalledPartyNumber OPTIONAL, + + collectedInfoSpecificInfo [2] SEQUENCE { + calledPartyNumber [0] CalledPartyNumber OPTIONAL, ... } } @@ -739,7 +742,7 @@ EventSpecificInformationSMS ::= CHOICE { ... }, o-smsSubmissionSpecificInfo [1] SEQUENCE { - -- no specific info defined- + -- no specific info defined— ... }, t-smsFailureSpecificInfo [2] SEQUENCE { @@ -747,7 +750,7 @@ EventSpecificInformationSMS ::= CHOICE { ... }, t-smsDeliverySpecificInfo [3] SEQUENCE { - -- no specific info defined- + -- no specific info defined— ... } } @@ -870,7 +873,7 @@ GapTreatment {PARAMETERS-BOUND : bound} ::= CHOICE { GenericNumber {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE( bound.&minGenericNumberLength .. bound.&maxGenericNumberLength)) --- Indicates a generic number. Refer to ETSI EN 300 356-1 [23] Generic number for encoding. +-- Indicates a generic number. Refer to ETSI EN 300 356 1 [23] Generic number for encoding. GenericNumbers {PARAMETERS-BOUND : bound} ::= SET SIZE(1..bound.&numOfGenericNumbers) OF GenericNumber {bound} @@ -887,9 +890,8 @@ GPRS-QoS ::= CHOICE { GPRS-QoS-Extension ::= SEQUENCE { supplement-to-long-QoS-format [0] Ext2-QoS-Subscribed, - ..., - additionalSupplement [1] Ext3-QoS-Subscribed OPTIONAL - + ... , + additionalSupplement [1] Ext3-QoS-Subscribed OPTIONAL } GPRSCause {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE @@ -996,14 +998,14 @@ InformationToSend {PARAMETERS-BOUND : bound} ::= CHOICE { InitiatingEntity ::= ENUMERATED { mobileStation (0), - sgsn (1), - hlr (2), - ggsn (3) + sgsn (1), + hlr (2), + ggsn (3) } InitiatorOfServiceChange ::= ENUMERATED { - a-side (0), - b-side (1) + a-side (0), + b-side (1) } InvokeID ::= INTEGER (-128..127) @@ -1058,18 +1060,24 @@ LocationInformationGPRS ::= SEQUENCE { selectedLSAIdentity [4] LSAIdentity OPTIONAL, extensionContainer [5] ExtensionContainer OPTIONAL, ..., - sai-Present [6] NULL OPTIONAL + sai-Present [6] NULL OPTIONAL, + userCSGInformation [7] UserCSGInformation OPTIONAL } -- cellGlobalIdOrServiceAreaIdOrLAI shall contain the value part of the -- CellGlobalIdOrServiceAreaIdFixedLength type or the LAIFixedLength type (i.e. excluding tags -- and lengths) as defined in 3GPP TS 29.002 [13]. -- sai-Present indicates that the cellGlobalIdOrServiceAreaIdOrLAI parameter contains --- a Service Area Identity. +-- a Service Area Identity. +-- UserCSGInformation contains the CSG ID, Access mode, and the CSG Membership Indication in the +-- case the Access mode is Hybrid Mode, as defined in 3GPP TS 23.060 [93]. + +-- WS define UserCSGInformation +UserCSGInformation ::= OCTET STRING LocationNumber {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE ( bound.&minLocationNumberLength .. bound.&maxLocationNumberLength)) -- Indicates the Location Number for the calling party. --- Refer to ETSI EN 300 356-1 [23] for encoding. +-- Refer to ETSI EN 300 356 1 [23] for encoding. LowLayerCompatibility {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE ( bound.&minLowLayerCompatibilityLength .. bound.&maxLowLayerCompatibilityLength)) @@ -1179,9 +1187,9 @@ MT-SMSCause ::= OCTET STRING (SIZE (1)) NAOliInfo ::= OCTET STRING (SIZE (1)) -- NA Oli information takes the same value as defined in ANSI T1.113-1995 [92] --- e.g. '3D'H - Decimal value 61 - Cellular Service (Type 1) --- '3E'H - Decimal value 62 - Cellular Service (Type 2) --- '3F'H - Decimal value 63 - Cellular Service (roaming) +-- e.g. '3D'H – Decimal value 61 - Cellular Service (Type 1) +-- '3E'H – Decimal value 62 - Cellular Service (Type 2) +-- '3F'H – Decimal value 63 - Cellular Service (roaming) NatureOfServiceChange ::= ENUMERATED { userInitiated (0), @@ -1189,7 +1197,7 @@ NatureOfServiceChange ::= ENUMERATED { } NumberOfDigits ::= INTEGER (1..255) --- Indicates the number of digits to be collected. +-- Indicates the number of digits to be collected. OCSIApplicable ::= NULL -- Indicates that the Originating CAMEL Subscription Information, if present, shall be @@ -1198,7 +1206,7 @@ OCSIApplicable ::= NULL OriginalCalledPartyID {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE( bound.&minOriginalCalledPartyIDLength .. bound.&maxOriginalCalledPartyIDLength)) --- Indicates the original called number. Refer to ETSI EN 300 356-1 [23] Original Called Number +-- Indicates the original called number. Refer to ETSI EN 300 356 1 [23] Original Called Number -- for encoding. PDPID ::= OCTET STRING (SIZE (1)) @@ -1228,7 +1236,7 @@ ReceivingSideID ::= CHOICE { RedirectingPartyID {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE ( bound.&minRedirectingPartyIDLength .. bound.&maxRedirectingPartyIDLength)) -- Indicates redirecting number. --- Refer to ETSI EN 300 356-1 [23] Redirecting number for encoding. +-- Refer to ETSI EN 300 356 1 [23] Redirecting number for encoding. RequestedInformationList {PARAMETERS-BOUND : bound} ::= SEQUENCE SIZE (1.. numOfInfoItems) OF RequestedInformation {bound} @@ -1271,14 +1279,14 @@ ScfID {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE( SCIBillingChargingCharacteristics {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE ( bound.&minSCIBillingChargingLength .. bound.&maxSCIBillingChargingLength)) - (CONSTRAINED BY {-- shall be the result of the BER-encoded value of type -- + (CONSTRAINED BY {-- shall be the result of the BER-encoded value of type –- CAMEL-SCIBillingChargingCharacteristics}) -- Indicates AOC information to be sent to a Mobile Station -- The violation of the UserDefinedConstraint shall be handled as an ASN.1 syntax error. SCIGPRSBillingChargingCharacteristics {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE ( bound.&minSCIBillingChargingLength .. bound.&maxSCIBillingChargingLength)) - (CONSTRAINED BY {-- shall be the result of the BER-encoded value of type - + (CONSTRAINED BY {-- shall be the result of the BER-encoded value of type – CAMEL-SCIGPRSBillingChargingCharacteristics}) -- Indicates AOC information to be sent to a Mobile Station -- The violation of the UserDefinedConstraint shall be handled as an ASN.1 syntax error. @@ -1345,7 +1353,7 @@ SMS-AddressString ::= AddressString (SIZE (1 .. maxSMS-AddressStringLength)) -- If this data type is used for MO-SMS, then the maximum number of digits shall be 16. -- An SMS-AddressString may contain an alphanumeric character string. In this -- case, a nature of address indicator '101'B is used, in accordance with --- 3GPP TS 23.040 [6]. The address is coded in accordance with the GSM 7-bit +-- 3GPP TS 23.040 [6]. The address is coded in accordance with the GSM 7 bit -- default alphabet definition and the SMS packing rules as specified in -- 3GPP TS 23.038 [15] in this case. diff --git a/asn1/camel/CAP-errorcodes.asn b/asn1/camel/CAP-errorcodes.asn index d6f414b6b6..448baa9780 100644 --- a/asn1/camel/CAP-errorcodes.asn +++ b/asn1/camel/CAP-errorcodes.asn @@ -1,7 +1,7 @@ -- $Id$ --- 3GPP TS 29.078 9.0.0 (2009-12) +-- 3GPP TS 29.078 9.2.0 (2010-06) -- 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)} +CAP-errorcodes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-errorcodes(57) version8(7)} DEFINITIONS ::= BEGIN @@ -9,7 +9,7 @@ IMPORTS ros-InformationObjects 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)} +umts-network(1) modules(3) cap-object-identifiers(100) version8(7)} Code FROM Remote-Operations-Information-Objects ros-InformationObjects diff --git a/asn1/camel/CAP-errortypes.asn b/asn1/camel/CAP-errortypes.asn index c034f77902..3fe76cc4bb 100644 --- a/asn1/camel/CAP-errortypes.asn +++ b/asn1/camel/CAP-errortypes.asn @@ -1,7 +1,7 @@ -- $Id$ --- 3GPP TS 29.078 9.0.0 (2009-12) +-- 3GPP TS 29.078 9.2.0 (2010-06) -- 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)} +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. -- Where a parameter of type CHOICE is tagged with a specific tag value, the tag is automatically @@ -15,7 +15,7 @@ IMPORTS datatypes, errorcodes 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)} +umts-network(1) modules(3) cap-object-identifiers(100) version8(7)} ERROR FROM Remote-Operations-Information-Objects ros-InformationObjects diff --git a/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn b/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn index 78b708397c..07a5b49b20 100644 --- a/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn +++ b/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn @@ -1,16 +1,16 @@ -- $Id$ --- 3GPP TS 29.078 9.0.0 (2009-12) +-- 3GPP TS 29.078 9.2.0 (2010-06) -- 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) version5(4)} --- Module CAP-gprsSSF-gsmSCF-ops-args is updated to version5(4) for Rel-6. The OPERATION +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 -- definitions in this module are not modified, compared to Rel-5. 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. @@ -23,7 +23,7 @@ IMPORTS classes, ros-InformationObjects 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)} +umts-network(1) modules(3) cap-object-identifiers(100) version8(7)} OPERATION FROM Remote-Operations-Information-Objects ros-InformationObjects @@ -41,13 +41,14 @@ cs2(20) modules(0) in-cs2-datatypes (0) version1(0)} GSN-Address, -- WS moved to common datatypes in rel 9.0.0 ISDN-AddressString FROM MAP-CommonDataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) -gsm-Network(1) modules(3) map-CommonDataTypes(18) version9(9)} +gsm-Network(1) modules(3) map-CommonDataTypes(18) version12(12)} GPRSChargingID, GPRSMSClass, +-- GSN-Address, WS moved to common datatypes in rel 9.0.0 RAIdentity FROM MAP-MS-DataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) -gsm-Network(1) modules(3) map-MS-DataTypes(11) version9(9)} +gsm-Network(1) modules(3) map-MS-DataTypes(11) version12(12)} PARAMETERS-BOUND FROM CAP-classes classes @@ -91,8 +92,8 @@ FROM CAP-operationcodes operationcodes TimerID, TimerValue FROM CAP-datatypes datatypes --- For Rel-6, the CAP-datatypes module is updated to version5(4); Object Identifier 'datatypes' --- is also updated to version5(4). As a result, the present module uses Rel-6 data type definitions. +-- For Rel-6, the CAP-datatypes module is updated to version8(7); Object Identifier 'datatypes' +-- is also updated to version8(7). As a result, the present module uses Rel-6 data type definitions. missingCustomerRecord, missingParameter, @@ -104,8 +105,8 @@ FROM CAP-datatypes datatypes unexpectedParameter, unknownPDPID FROM CAP-errortypes errortypes --- For Rel-6, the CAP-errortypes module is updated to version5(4); Object Identifier --- 'errortypes' is also updated to version5(4). As a result, the present module uses Rel-6 +-- For Rel-6, the CAP-errortypes module is updated to version8(7); Object Identifier +-- 'errortypes' is also updated to version8(7). As a result, the present module uses Rel-6 -- error type definitions. ; @@ -319,7 +320,9 @@ InitialDPGPRSArg {PARAMETERS-BOUND : bound}::= SEQUENCE { } -- The RouteingAreaIdentity parameter is not used. -- The receiving entity shall ignore RouteingAreaIdentity if received. --- The RouteingAreaIdentity is conveyed in the LocationInformationGPRS parameter. +-- The RouteingAreaIdentity is conveyed in the LocationInformationGPRS parameter. +-- The CSGInformation is conveyed in the LocationInformationGPRS parameter. The encoding of the +-- parameter is as defined in 3GPP TS 29.002 [11]. releaseGPRS {PARAMETERS-BOUND : bound} OPERATION ::= { ARGUMENT ReleaseGPRSArg {bound} @@ -372,7 +375,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 ef77138931..7ef65e971d 100644 --- a/asn1/camel/CAP-gsmSCF-gsmSRF-ops-args.asn +++ b/asn1/camel/CAP-gsmSCF-gsmSRF-ops-args.asn @@ -1,14 +1,14 @@ -- $Id$ --- 3GPP TS 29.078 9.0.0 (2009-12) +-- 3GPP TS 29.078 9.2.0 (2010-06) -- 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) -umts-network(1) modules(3) cap-gsmSCF-gsmSRF-ops-args(103) version5(4)} +umts-network(1) modules(3) cap-gsmSCF-gsmSRF-ops-args(103) version8(7)} DEFINITIONS IMPLICIT TAGS ::= BEGIN -- This module contains the operations and operation arguments used for the --- gsmSRF - gsmSCF interface, for the control of circuit switched calls. +-- gsmSRF – gsmSCF interface, for the control of circuit switched calls. -- The table in subclause 2.1 lists the specifications that contain the modules -- that are used by CAP. @@ -31,8 +31,8 @@ FROM CAP-operationcodes operationcodes Extensions {}, InformationToSend {} FROM CAP-datatypes datatypes --- For Rel-6, the CAP-datatypes module is updated to version5(4); Object Identifier 'datatypes' --- is also updated to version5(4). As a result, the present module uses Rel-6 data type definitions. +-- For Rel-6, the CAP-datatypes module is updated to version8(7); Object Identifier 'datatypes' +-- is also updated to version8(7). As a result, the present module uses Rel-6 data type definitions. canceled, improperCallerResponse, @@ -46,8 +46,8 @@ FROM CAP-datatypes datatypes unexpectedParameter, unknownCSID FROM CAP-errortypes errortypes --- For Rel-6, the CAP-errortypes module is updated to version5(4); Object Identifier --- 'errortypes' is also updated to version5(4). As a result, the present module uses Rel-6 +-- For Rel-6, the CAP-errortypes module is updated to version8(7); Object Identifier +-- 'errortypes' is also updated to version8(7). As a result, the present module uses Rel-6 -- error type definitions. PARAMETERS-BOUND @@ -59,7 +59,7 @@ FROM CAP-classes classes 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)} +umts-network(1) modules(3) cap-object-identifiers(100) version8(7)} ; diff --git a/asn1/camel/CAP-gsmSSF-gsmSCF-ops-args.asn b/asn1/camel/CAP-gsmSSF-gsmSCF-ops-args.asn index 52f60037ed..1cfc346c3c 100644 --- a/asn1/camel/CAP-gsmSSF-gsmSCF-ops-args.asn +++ b/asn1/camel/CAP-gsmSSF-gsmSCF-ops-args.asn @@ -1,15 +1,15 @@ -- $Id$ --- 3GPP TS 29.078 9.0.0 (2009-12) +-- 3GPP TS 29.078 9.2.0 (2010-06) -- 6 Circuit Switched Call Control -- 6.1 gsmSSF/CCF - gsmSCF Interface -- 6.1.1 Operations and arguments CAP-gsmSSF-gsmSCF-ops-args {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) -umts-network(1) modules(3) cap-gsmSSF-gsmSCF-ops-args(101) version5(4)} +umts-network(1) modules(3) cap-gsmSSF-gsmSCF-ops-args(101) version8(7)} DEFINITIONS IMPLICIT TAGS ::= BEGIN -- This module contains the operations and operation arguments used for the --- gsmSSF - gsmSCF interface, for the control of circuit switched calls. +-- gsmSSF – gsmSCF interface, for the control of circuit switched calls. -- The table in subclause 2.1 lists the specifications that contain the modules -- that are used by CAP. @@ -23,7 +23,7 @@ IMPORTS tc-Messages, ros-InformationObjects 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)} +umts-network(1) modules(3) cap-object-identifiers(100) version8(7)} OPERATION FROM Remote-Operations-Information-Objects ros-InformationObjects @@ -45,7 +45,7 @@ cs2(20) modules(0) in-cs2-datatypes (0) version1(0)} IMSI, ISDN-AddressString FROM MAP-CommonDataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) -gsm-Network(1) modules(3) map-CommonDataTypes(18) version9(9)} +gsm-Network(1) modules(3) map-CommonDataTypes(18) version12(12)} CUG-Index, CUG-Interlock, @@ -56,13 +56,13 @@ gsm-Network(1) modules(3) map-CommonDataTypes(18) version9(9)} SupportedCamelPhases, OfferedCamel4Functionalities FROM MAP-MS-DataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) -gsm-Network(1) modules(3) map-MS-DataTypes(11) version9(9)} +gsm-Network(1) modules(3) map-MS-DataTypes(11) version12(12)} CallReferenceNumber, SuppressionOfAnnouncement, UU-Data FROM MAP-CH-DataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) -gsm-Network(1) modules(3) map-CH-DataTypes(13) version9(9)} +gsm-Network(1) modules(3) map-CH-DataTypes(13) version12(12)} PARAMETERS-BOUND FROM CAP-classes classes @@ -74,7 +74,7 @@ FROM CAP-classes classes opcode-callGap, opcode-callInformationReport, opcode-callInformationRequest, - opcode-cancel, + opcode-cancel, opcode-collectInformation, opcode-connect, opcode-connectToResource, @@ -155,8 +155,8 @@ FROM CAP-operationcodes operationcodes TimerID, TimerValue FROM CAP-datatypes datatypes --- For Rel-6, the CAP-datatypes module is updated to version5(4); Object Identifier 'datatypes' --- is also updated to version5(4). As a result, the present module uses Rel-6 data type definitions. +-- For Rel-6, the CAP-datatypes module is updated to version8(7); Object Identifier 'datatypes' +-- is also updated to version8(7). As a result, the present module uses Rel-6 data type definitions. cancelFailed, eTCFailed, @@ -172,8 +172,8 @@ FROM CAP-datatypes datatypes unknownLegID, unknownCSID FROM CAP-errortypes errortypes --- For Rel-6, the CAP-errortypes module is updated to version5(4); Object Identifier --- 'errortypes' is also updated to version5(4). As a result, the present module uses Rel-6 +-- For Rel-6, the CAP-errortypes module is updated to version8(7); Object Identifier +-- 'errortypes' is also updated to version8(7). As a result, the present module uses Rel-6 -- error type definitions. ; @@ -345,13 +345,25 @@ CancelArg {PARAMETERS-BOUND : bound} ::= CHOICE { } -- The InvokeID has the same value as that which was used for the operation to be cancelled. -collectInformation OPERATION::= { -RETURN RESULT FALSE -ALWAYS RESPONDS FALSE -CODE opcode-collectInformation} +collectInformation {PARAMETERS-BOUND : bound} OPERATION::= { + ARGUMENT CollectInformationArg {bound} + RETURN RESULT FALSE + ERRORS {missingParameter | + parameterOutOfRange | + SystemFailure | + TaskRefused | + UnexpectedComponentSequence | + UnexpectedDataValue | + UnexpectedParameter} + CODE opcode-collectInformation} -- Direction: gsmSCF-> gsmSSF, Timer: Tci -- This operation is used to request the gsmSSF to perform the call --- processing actions to prompt a calling party for additional destination informationdigits. +-- processing actions to prompt a calling party for additional digits. + +CollectInformationArg {PARAMETERS-BOUND : bound} ::= SEQUENCE{ + extensions [0] Extensions {bound} OPTIONAL, + ... + } connect {PARAMETERS-BOUND : bound} OPERATION ::= { ARGUMENT ConnectArg {bound} @@ -371,26 +383,25 @@ connect {PARAMETERS-BOUND : bound} OPERATION ::= { ConnectArg {PARAMETERS-BOUND : bound} ::= SEQUENCE { destinationRoutingAddress [0] DestinationRoutingAddress {bound}, - alertingPattern [1] AlertingPattern OPTIONAL, + alertingPattern [1] AlertingPattern OPTIONAL, originalCalledPartyID [6] OriginalCalledPartyID {bound} OPTIONAL, - extensions [10] Extensions {bound} OPTIONAL, - carrier [11] Carrier {bound} OPTIONAL, - callingPartysCategory [28] CallingPartysCategory OPTIONAL, - redirectingPartyID [29] RedirectingPartyID {bound} OPTIONAL, - redirectionInformation [30] RedirectionInformation OPTIONAL, - genericNumbers [14] GenericNumbers {bound} OPTIONAL, - serviceInteractionIndicatorsTwo [15] ServiceInteractionIndicatorsTwo OPTIONAL, - chargeNumber [19] ChargeNumber {bound} OPTIONAL, - legToBeConnected [21] LegID OPTIONAL, - cug-Interlock [31] CUG-Interlock OPTIONAL, - cug-OutgoingAccess [32] NULL OPTIONAL, + extensions [10] Extensions {bound} OPTIONAL, + carrier [11] Carrier {bound} OPTIONAL, + callingPartysCategory [28] CallingPartysCategory OPTIONAL, + redirectingPartyID [29] RedirectingPartyID {bound} OPTIONAL, + redirectionInformation [30] RedirectionInformation OPTIONAL, + genericNumbers [14] GenericNumbers {bound} OPTIONAL, + serviceInteractionIndicatorsTwo [15] ServiceInteractionIndicatorsTwo OPTIONAL, + chargeNumber [19] ChargeNumber {bound} OPTIONAL, + legToBeConnected [21] LegID OPTIONAL, + cug-Interlock [31] CUG-Interlock OPTIONAL, + cug-OutgoingAccess [32] NULL OPTIONAL, suppressionOfAnnouncement [55] SuppressionOfAnnouncement OPTIONAL, - oCSIApplicable [56] OCSIApplicable OPTIONAL, - naOliInfo [57] NAOliInfo OPTIONAL, - bor-InterrogationRequested [58] NULL OPTIONAL, - ..., - suppress-N-CSI [59] NULL OPTIONAL - + oCSIApplicable [56] OCSIApplicable OPTIONAL, + naOliInfo [57] NAOliInfo OPTIONAL, + bor-InterrogationRequested [58] NULL OPTIONAL, + ... , + suppress-N-CSI [59] NULL OPTIONAL } -- na-Info is included at the discretion of the gsmSCF operator. @@ -682,7 +693,9 @@ InitialDPArgExtension {PARAMETERS-BOUND : bound} ::= SEQUENCE { -- of playing announcements via elementaryMessageIDs and variableMessages, the playing of -- tones and the collection of DTMF digits. Other supported capabilities are explicitly -- detailed in the IPSSPCapabilities parameter itself. --- Carrier is included at the discretion of the gsmSSF operator. +-- Carrier is included at the discretion of the gsmSSF operator. +-- The UserCSGInformation is conveyed in the LocationInformation. The encoding of the parameter is +-- as defined in 3GPP TS 29.002 [11]. initiateCallAttempt {PARAMETERS-BOUND : bound} OPERATION ::= { ARGUMENT InitiateCallAttemptArg {bound} diff --git a/asn1/camel/CAP-object-identifiers.asn b/asn1/camel/CAP-object-identifiers.asn index aaa92c2c38..d9e54e1f53 100644 --- a/asn1/camel/CAP-object-identifiers.asn +++ b/asn1/camel/CAP-object-identifiers.asn @@ -1,8 +1,8 @@ -- $Id$ --- 3GPP TS 29.078 9.0.0 (2009-12) +-- 3GPP TS 29.078 9.2.0 (2010-06) -- 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)} +umts-network(1) modules(3) cap-object-identifiers(100) version8(7)} DEFINITIONS ::= BEGIN @@ -23,71 +23,71 @@ ros-InformationObjects OBJECT IDENTIFIER ::= -- For CAP Modules datatypes OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) - cap-datatypes(52) version5(4)} + cap-datatypes(52) version8(7)} errortypes OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) - cap-errortypes(51) version5(4)} + cap-errortypes(51) version8(7)} operationcodes OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) - cap-operationcodes(53) version5(4)} + cap-operationcodes(53) version8(7)} errorcodes OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) - cap-errorcodes(57) version5(4)} + cap-errorcodes(57) version8(7)} classes OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) - cap-classes(54) version5(4)} + cap-classes(54) version8(7)} gsmSSF-gsmSCF-Operations OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) - cap-gsmSSF-gsmSCF-ops-args(101) version5(4)} --- The Object Identifier 'gsmSSF-gsmSCF-Operations' is updated to version5(4) in Rel-6, so + cap-gsmSSF-gsmSCF-ops-args(101) version8(7)} +-- The Object Identifier 'gsmSSF-gsmSCF-Operations’ is updated to version8(7) in Rel-6, so -- other modules can IMPORT Rel-6 Operation definitions related to call control. gsmSSF-gsmSCF-Protocol OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) - cap-gsmSSF-gsmSCF-pkgs-contracts-acs(102) version5(4)} --- The Object Identifier 'gsmSSF-gsmSCF-Protocol' is updated to version5(4) in Rel-6, so + cap-gsmSSF-gsmSCF-pkgs-contracts-acs(102) version8(7)} +-- The Object Identifier 'gsmSSF-gsmSCF-Protocol' is updated to version8(7) in Rel-6, so -- other modules can IMPORT Rel-6 Protocol definitions related to call control. gsmSCF-gsmSRF-Operations OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) - cap-gsmSCF-gsmSRF-ops-args(103) version5(4)} --- The Object Identifier 'gsmSCF-gsmSRF-Operations' is updated to version5(4) in Rel-6, so + cap-gsmSCF-gsmSRF-ops-args(103) version8(7)} +-- The Object Identifier 'gsmSCF-gsmSRF-Operations' is updated to version8(7) in Rel-6, so -- other modules can IMPORT Rel-6 Operation definitions related to gsmSRF control. gsmSCF-gsmSRF-Protocol OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) - cap-gsmSCF-gsmSRF-pkgs-contracts-acs(104) version5(4)} --- The Object Identifier 'gsmSCF-gsmSRF-Protocol' is updated to version5(4) in Rel-6, so + cap-gsmSCF-gsmSRF-pkgs-contracts-acs(104) version8(7)} +-- The Object Identifier 'gsmSCF-gsmSRF-Protocol' is updated to version8(7) in Rel-6, so -- other modules can IMPORT Rel-6 Protocol definitions related to gsmSRF control. sms-Operations OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) - cap-SMS-ops-args(105) version5(4)} --- The Object Identifier 'sms-Operations' is updated to version5(4) in Rel-6, so other + cap-SMS-ops-args(105) version8(7)} +-- The Object Identifier 'sms-Operations' is updated to version8(7) in Rel-6, so other -- modules can IMPORT Rel-6 Operation definitions related to SMS control. smsSSF-gsmSCF-Protocol OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) - cap-smsSSF-gsmSCF-pkgs-contracts-acs(106) version5(4)} --- The Object Identifier 'smsSSF-gsmSCF-Protocol' is updated to version5(4) in Rel-6, so + cap-smsSSF-gsmSCF-pkgs-contracts-acs(106) version8(7)} +-- The Object Identifier 'smsSSF-gsmSCF-Protocol' is updated to version8(7) in Rel-6, so -- other modules can IMPORT Rel-6 Protocol definitions related to SMS control. gprsSSF-gsmSCF-Operations OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) - cap-GPRS-ops-args(107) version5(4)} --- The Object Identifier 'gprsSSF-gsmSCF-Operations' is updated to version5(4) in Rel-6, so + cap-GPRS-ops-args(107) version8(7)} +-- The Object Identifier 'gprsSSF-gsmSCF-Operations' is updated to version8(7) in Rel-6, so -- other modules can IMPORT Rel-6 Operation definitions related to GPRS control. gprsSSF-gsmSCF-Protocol OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) - cap-gprsSSF-gsmSCF-pkgs-contracts-acs(108) version5(4)} --- The Object Identifier 'gprsSSF-gsmSCF-Protocol' is updated to version5(4) in Rel-6, so + cap-gprsSSF-gsmSCF-pkgs-contracts-acs(108) version8(7)} +-- The Object Identifier 'gprsSSF-gsmSCF-Protocol' is updated to version8(7) in Rel-6, so -- other modules can IMPORT Rel-6 Protocol definitions related to GPRS control. id-CAP OBJECT IDENTIFIER ::= diff --git a/asn1/camel/CAP-operationcodes.asn b/asn1/camel/CAP-operationcodes.asn index 360c7efccb..12dc3859de 100644 --- a/asn1/camel/CAP-operationcodes.asn +++ b/asn1/camel/CAP-operationcodes.asn @@ -1,7 +1,7 @@ -- $Id$ --- 3GPP TS 29.078 9.0.0 (2009-12) +-- 3GPP TS 29.078 9.2.0 (2010-06) -- 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)} +CAP-operationcodes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-operationcodes(53) version8(7)} DEFINITIONS ::= BEGIN @@ -9,7 +9,7 @@ IMPORTS ros-InformationObjects 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)} +umts-network(1) modules(3) cap-object-identifiers(100) version8(7)} Code FROM Remote-Operations-Information-Objects ros-InformationObjects @@ -19,102 +19,103 @@ FROM Remote-Operations-Information-Objects ros-InformationObjects -- the operations are grouped by the identified operation packages. -- gsmSCF activation Package - opcode-initialDP Code ::= local: 0 + opcode-initialDP Code ::= local: 0 -- gsmSCF/gsmSRF activation of assist Package opcode-assistRequestInstructions Code ::= local: 16 -- Assist connection establishment Package opcode-establishTemporaryConnection Code ::= local: 17 -- Generic disconnect resource Package opcode-disconnectForwardConnection Code ::= local: 18 - opcode-dFCWithArgument Code ::= local: 86 + opcode-dFCWithArgument Code ::= local: 86 -- Non-assisted connection establishment Package - opcode-connectToResource Code ::= local: 19 + opcode-connectToResource Code ::= local: 19 -- Connect Package (elementary gsmSSF function) - opcode-connect Code ::= local: 20 + opcode-connect Code ::= local: 20 -- Call handling Package (elementary gsmSSF function) - opcode-releaseCall Code ::= local: 22 + opcode-releaseCall Code ::= local: 22 -- BCSM Event handling Package opcode-requestReportBCSMEvent Code ::= local: 23 - opcode-eventReportBCSM Code ::= local: 24 + opcode-eventReportBCSM Code ::= local: 24 -- gsmSSF call processing Package - opcode-collectInformation Code ::= local: 27 - opcode-continue Code ::= local: 31 + opcode-collectInformation Code ::= local: 27 + opcode-continue Code ::= local: 31 -- gsmSCF call initiation Package - opcode-initiateCallAttempt Code ::= local: 32 + opcode-initiateCallAttempt Code ::= local: 32 -- Timer Package - opcode-resetTimer Code ::= local: 33 + opcode-resetTimer Code ::= local: 33 -- Billing Package opcode-furnishChargingInformation Code ::= local: 34 -- Charging Package - opcode-applyCharging Code ::= local: 35 - opcode-applyChargingReport Code ::= local: 36 + opcode-applyCharging Code ::= local: 35 + opcode-applyChargingReport Code ::= local: 36 -- Traffic management Package - opcode-callGap Code ::= local: 41 + opcode-callGap Code ::= local: 41 -- Call report Package opcode-callInformationReport Code ::= local: 44 opcode-callInformationRequest Code ::= local: 45 -- Signalling control Package opcode-sendChargingInformation Code ::= local: 46 -- Specialized resource control Package - opcode-playAnnouncement Code ::= local: 47 - opcode-promptAndCollectUserInformation Code ::= local: 48 + opcode-playAnnouncement Code ::= local: 47 + opcode-promptAndCollectUserInformation Code ::= local: 48 opcode-specializedResourceReport Code ::= local: 49 -- Cancel Package - opcode-cancel Code ::= local: 53 + opcode-cancel Code ::= local: 53 -- Activity Test Package - opcode-activityTest Code ::= local: 55 + opcode-activityTest Code ::= local: 55 -- CPH Response Package - opcode-continueWithArgument Code ::= local: 88 - opcode-disconnectLeg Code ::= local: 90 - opcode-moveLeg Code ::= local: 93 - opcode-splitLeg Code ::= local: 95 + opcode-continueWithArgument Code ::= local: 88 + opcode-disconnectLeg Code ::= local: 90 + opcode-moveLeg Code ::= local: 93 + opcode-splitLeg Code ::= local: 95 -- Exception Inform Package - opcode-entityReleased Code ::= local: 96 + opcode-entityReleased Code ::= local: 96 -- Play Tone Package - opcode-playTone Code ::= local: 97 + opcode-playTone Code ::= local: 97 -- Sms Activation Package - opcode-initialDPSMS Code ::= local: 60 + opcode-initialDPSMS Code ::= local: 60 -- Sms Billing Package - opcode-furnishChargingInformationSMS Code ::= local: 61 + opcode-furnishChargingInformationSMS Code ::= local: 61 -- Sms Connect Package - opcode-connectSMS Code ::= local: 62 + opcode-connectSMS Code ::= local: 62 -- Sms Event Handling Package opcode-requestReportSMSEvent Code ::= local: 63 - opcode-eventReportSMS Code ::= local: 64 + opcode-eventReportSMS Code ::= local: 64 -- Sms Processing Package - opcode-continueSMS Code ::= local: 65 + opcode-continueSMS Code ::= local: 65 -- Sms Release Package - opcode-releaseSMS Code ::= local: 66 + opcode-releaseSMS Code ::= local: 66 -- Sms Timer Package - opcode-resetTimerSMS Code ::= local: 67 + opcode-resetTimerSMS Code ::= local: 67 -- Gprs Activity Test Package - opcode-activityTestGPRS Code ::= local: 70 + opcode-activityTestGPRS Code ::= local: 70 -- Gprs Charging Package - opcode-applyChargingGPRS Code ::= local: 71 + opcode-applyChargingGPRS Code ::= local: 71 opcode-applyChargingReportGPRS Code ::= local: 72 -- Gprs Cancel Package - opcode-cancelGPRS Code ::= local: 73 + opcode-cancelGPRS Code ::= local: 73 -- Gprs Connect Package - opcode-connectGPRS Code ::= local: 74 + opcode-connectGPRS Code ::= local: 74 -- Gprs Processing Package - opcode-continueGPRS Code ::= local: 75 + opcode-continueGPRS Code ::= local: 75 -- Gprs Exception Information Package - opcode-entityReleasedGPRS Code ::= local: 76 + opcode-entityReleasedGPRS Code ::= local: 76 -- Gprs Billing Package - opcode-furnishChargingInformationGPRS Code ::= local: 77 + opcode-furnishChargingInformationGPRS Code ::= local: 77 -- Gprs Scf Activation Package - opcode-initialDPGPRS Code ::= local: 78 + opcode-initialDPGPRS Code ::= local: 78 -- Gprs Release Package - opcode-releaseGPRS Code ::= local: 79 + opcode-releaseGPRS Code ::= local: 79 -- Gprs Event Handling Package - opcode-eventReportGPRS Code ::= local: 80 + opcode-eventReportGPRS Code ::= local: 80 opcode-requestReportGPRSEvent Code ::= local: 81 -- Gprs Timer Package - opcode-resetTimerGPRS Code ::= local: 82 + opcode-resetTimerGPRS Code ::= local: 82 -- Gprs Charge Advice Package opcode-sendChargingInformationGPRS Code ::= local: 83 -END
\ No newline at end of file +END + |