diff options
Diffstat (limited to 'asn1/ranap')
-rw-r--r-- | asn1/ranap/RANAP-CommonDataTypes.asn | 3 | ||||
-rw-r--r-- | asn1/ranap/RANAP-Constants.asn | 5 | ||||
-rw-r--r-- | asn1/ranap/RANAP-Containers.asn | 2 | ||||
-rw-r--r-- | asn1/ranap/RANAP-IEs.asn | 50 | ||||
-rw-r--r-- | asn1/ranap/RANAP-PDU-Contents.asn | 18 | ||||
-rw-r--r-- | asn1/ranap/RANAP-PDU-Descriptions.asn | 2 | ||||
-rw-r--r-- | asn1/ranap/ranap.cnf | 4 |
7 files changed, 45 insertions, 39 deletions
diff --git a/asn1/ranap/RANAP-CommonDataTypes.asn b/asn1/ranap/RANAP-CommonDataTypes.asn index a315747ba7..ffce4f9875 100644 --- a/asn1/ranap/RANAP-CommonDataTypes.asn +++ b/asn1/ranap/RANAP-CommonDataTypes.asn @@ -1,6 +1,6 @@ -- RANAP-CommonDataTypes.asn -- --- 3GPP TS 25.413 V9.1.0 (2009-12) +-- 3GPP TS 25.413 V9.2.0 (2010-03) -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm -- -- 9.3.5 Common Definitions @@ -41,3 +41,4 @@ TriggeringMessage ::= ENUMERATED { initiating-message, successful-outcome, unsuc END + diff --git a/asn1/ranap/RANAP-Constants.asn b/asn1/ranap/RANAP-Constants.asn index 77d2f23786..fa38197319 100644 --- a/asn1/ranap/RANAP-Constants.asn +++ b/asn1/ranap/RANAP-Constants.asn @@ -1,6 +1,6 @@ -- RANAP-Constants.asn -- --- 3GPP TS 25.413 V9.1.0 (2009-12) +-- 3GPP TS 25.413 V9.2.0 (2010-03) -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm -- -- 9.3.6 Constant Definitions @@ -355,6 +355,7 @@ id-E-UTRAN-Service-Handover INTEGER ::= 231 id-UE-AggregateMaximumBitRate INTEGER ::= 233 id-CSG-Membership-Status INTEGER ::= 234 id-Cell-Access-Mode INTEGER ::= 235 - +id-IP-Source-Address INTEGER ::= 236 +id-CSFB-Information INTEGER ::= 237 END diff --git a/asn1/ranap/RANAP-Containers.asn b/asn1/ranap/RANAP-Containers.asn index 6ed2ddee24..2fb2b0b50c 100644 --- a/asn1/ranap/RANAP-Containers.asn +++ b/asn1/ranap/RANAP-Containers.asn @@ -1,6 +1,6 @@ -- RANAP-Containers.asn -- --- 3GPP TS 25.413 V9.1.0 (2009-12) +-- 3GPP TS 25.413 V9.2.0 (2010-03) -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm -- -- 9.3.7 Container Definitions diff --git a/asn1/ranap/RANAP-IEs.asn b/asn1/ranap/RANAP-IEs.asn index aa5bbf22c8..0087f78e9e 100644 --- a/asn1/ranap/RANAP-IEs.asn +++ b/asn1/ranap/RANAP-IEs.asn @@ -1,6 +1,6 @@ -- RANAP-IEs.asn -- --- 3GPP TS 25.413 V9.1.0 (2009-12) +-- 3GPP TS 25.413 V9.2.0 (2010-03) -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm -- -- 9.3.4 Information Element Definitions @@ -87,7 +87,9 @@ IMPORTS id-Requested-RAB-Parameter-SupportedGuaranteedBitrateList, id-PSRABtobeReplaced, id-SRVCC-Information, - id-CSG-Id + id-CSG-Id, + id-CSFB-Information + FROM RANAP-Constants @@ -334,7 +336,8 @@ CauseMisc ::= INTEGER { CauseNAS ::= INTEGER { user-restriction-start-indication (81), user-restriction-end-indication (82), - normal-release (83) + normal-release (83), + csg-subscription-expiry(84) } (81..96) CauseProtocol ::= INTEGER { @@ -561,6 +564,12 @@ CN-DomainIndicator ::= ENUMERATED { CN-ID ::= INTEGER (0..4095) +CSFB-Information ::= ENUMERATED { + csfb, + csfb-high-priority, + ... +} + CSG-Id ::= BIT STRING (SIZE (27)) CSG-Id-List ::= SEQUENCE (SIZE (1..maxNrOfCSGs)) OF @@ -640,18 +649,6 @@ ENB-ID ::= CHOICE { ... } -Global-ENB-ID ::= SEQUENCE { - pLMNidentity PLMNidentity, - eNB-ID ENB-ID, - iE-Extensions ProtocolExtensionContainer { {GlobalENB-ID-ExtIEs} } OPTIONAL, - selectedTAI TAI, - ... -} - -GlobalENB-ID-ExtIEs RANAP-PROTOCOL-EXTENSION ::= { - ... -} - EncryptionAlgorithm ::= INTEGER { no-encryption (0), standard-UMTS-encryption-algorith-UEA1 (1), standard-UMTS-encryption-algorithm-UEA2 (2) } (0..15) EncryptionInformation ::= SEQUENCE { @@ -1551,7 +1548,8 @@ RIM-Transfer-ExtIEs RANAP-PROTOCOL-EXTENSION ::= { RIMRoutingAddress ::= CHOICE { targetRNC-ID TargetRNC-ID, gERAN-Cell-ID GERAN-Cell-ID, - ... + ... , + targeteNB-ID TargetENB-ID } @@ -1740,8 +1738,8 @@ SourceRNC-ToTargetRNC-TransparentContainer-ExtIEs RANAP-PROTOCOL-EXTENSION ::= { -- Extension for Release 8 to transfer to the Target RNC parameters required for SRVCC operation -- {ID id-SRVCC-Information CRITICALITY reject EXTENSION SRVCC-Information PRESENCE optional}| {ID id-PSRABtobeReplaced CRITICALITY reject EXTENSION RAB-ID PRESENCE optional}| --- Extension for Release 9 to transfer to the Target RNC parameters required for CSG ID validation -- - {ID id-CSG-Id CRITICALITY reject EXTENSION CSG-Id PRESENCE optional}, +-- Extension for Release 9 to transfer to the Target RNC parameters required for CSFB operation -- + {ID id-CSFB-Information CRITICALITY ignore EXTENSION CSFB-Information PRESENCE optional}, ... } @@ -1841,10 +1839,20 @@ TargetID ::= CHOICE { cGI CGI, ..., - targeteNB-ID Global-ENB-ID + targeteNB-ID TargetENB-ID } +TargetENB-ID ::= SEQUENCE { + pLMNidentity PLMNidentity, + eNB-ID ENB-ID, + iE-Extensions ProtocolExtensionContainer { {TargetENB-ID-ExtIEs} } OPTIONAL, + selectedTAI TAI, + ... +} +TargetENB-ID-ExtIEs RANAP-PROTOCOL-EXTENSION ::= { + ... +} TargetRNC-ID ::= SEQUENCE { @@ -1856,9 +1864,7 @@ TargetRNC-ID ::= SEQUENCE { TargetRNC-ID-ExtIEs RANAP-PROTOCOL-EXTENSION ::= { -- Extension for Release 7 to indicate extended RNC-ID -- - { ID id-ExtendedRNC-ID CRITICALITY reject EXTENSION ExtendedRNC-ID PRESENCE optional }| --- Extension for Release 9 to transfer to the Target RNC parameters required for access control during inbound CSG mobility -- - {ID id-CSG-Id CRITICALITY reject EXTENSION CSG-Id PRESENCE optional}, + { ID id-ExtendedRNC-ID CRITICALITY reject EXTENSION ExtendedRNC-ID PRESENCE optional }, ... } diff --git a/asn1/ranap/RANAP-PDU-Contents.asn b/asn1/ranap/RANAP-PDU-Contents.asn index ed66739f12..3a9bcd191d 100644 --- a/asn1/ranap/RANAP-PDU-Contents.asn +++ b/asn1/ranap/RANAP-PDU-Contents.asn @@ -1,6 +1,6 @@ -- RANAP-PDU-Contents.asn -- --- 3GPP TS 25.413 V9.1.0 (2009-12) +-- 3GPP TS 25.413 V9.2.0 (2010-03) -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm -- -- 9.3.3 PDU Definitions @@ -61,7 +61,6 @@ IMPORTS FrequenceLayerConvergenceFlag, GERAN-BSC-Container, GERAN-Classmark, - Global-ENB-ID, GlobalCN-ID, GlobalRNC-ID, GTP-TEI, @@ -217,7 +216,6 @@ FROM RANAP-Containers id-GERAN-Classmark, id-GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item, id-GERAN-Iumode-RAB-FailedList-RABAssgntResponse, - id-Global-ENB-ID, id-GlobalCN-ID, id-GlobalCN-IDCS, id-GlobalCN-IDPS, @@ -276,13 +274,6 @@ FROM RANAP-Containers id-RAB-ContextList, id-RAB-ContextFailedtoTransferItem, id-RAB-ContextFailedtoTransferList, - id-PositionDataSpecificToGERANIuMode, - id-PositioningPriority, - id-ProvidedData, - id-RAB-ContextItem, - id-RAB-ContextList, - id-RAB-ContextFailedtoTransferItem, - id-RAB-ContextFailedtoTransferList, id-RAB-ContextItem-RANAP-RelocInf, id-RAB-ContextList-RANAP-RelocInf, id-RAB-DataForwardingItem, @@ -383,7 +374,8 @@ FROM RANAP-Containers id-PeriodicLocationInfo, id-BroadcastGANSSAssistanceDataDecipheringKeys, id-SubscriberProfileIDforRFP, - id-E-UTRAN-Service-Handover + id-E-UTRAN-Service-Handover, + id-IP-Source-Address FROM RANAP-Constants; @@ -814,7 +806,8 @@ RAB-FailedItem-ExtIEs RANAP-PROTOCOL-EXTENSION ::= { RelocationRequestAcknowledgeExtensions RANAP-PROTOCOL-EXTENSION ::= { -- Extension for Release 5 to enable Inter RAN Load Information Exchange over Iu -- - {ID id-NewBSS-To-OldBSS-Information CRITICALITY ignore EXTENSION NewBSS-To-OldBSS-Information PRESENCE optional }, + {ID id-NewBSS-To-OldBSS-Information CRITICALITY ignore EXTENSION NewBSS-To-OldBSS-Information PRESENCE optional }| + {ID id-CSG-Id CRITICALITY ignore EXTENSION CSG-Id PRESENCE optional }, ... } @@ -2896,6 +2889,7 @@ MBMSSynchronisationInformation ::= SEQUENCE { } MBMSSynchronisationInformation-ExtIEs RANAP-PROTOCOL-EXTENSION ::= { + { ID id-IP-Source-Address CRITICALITY reject EXTENSION IPMulticastAddress PRESENCE optional }, ... } diff --git a/asn1/ranap/RANAP-PDU-Descriptions.asn b/asn1/ranap/RANAP-PDU-Descriptions.asn index d2f510099d..242c794b6a 100644 --- a/asn1/ranap/RANAP-PDU-Descriptions.asn +++ b/asn1/ranap/RANAP-PDU-Descriptions.asn @@ -1,6 +1,6 @@ -- RANAP-PDU-Descriptions.asn -- --- 3GPP TS 25.413 V9.1.0 (2009-12) +-- 3GPP TS 25.413 V9.2.0 (2010-03) -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm -- -- 9.3.2 Elementary Procedure Definitions diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf index 2a1d71f36f..bcf64a3ecc 100644 --- a/asn1/ranap/ranap.cnf +++ b/asn1/ranap/ranap.cnf @@ -625,6 +625,8 @@ id-E-UTRAN-Service-Handover ProtocolIE-ID id-UE-AggregateMaximumBitRate ProtocolIE-ID id-CSG-Membership-Status ProtocolIE-ID id-Cell-Access-Mode ProtocolIE-ID +id-IP-Source-Address ProtocolIE-ID +id-CSFB-Information ProtocolIE-ID #.END #.REGISTER_NEW @@ -869,6 +871,8 @@ E-UTRAN-Service-Handover N ranap.extension id-E-UTRAN-Service-Handover UE-AggregateMaximumBitRate N ranap.extension id-UE-AggregateMaximumBitRate CSG-Membership-Status N ranap.extension id-CSG-Membership-Status Cell-Access-Mode N ranap.extension id-Cell-Access-Mode +IPMulticastAddress N ranap.extension id-IP-Source-Address +CSFB-Information N ranap.extension id-CSFB-Information #RANAP-ELEMENTARY-PROCEDURE Iu-ReleaseCommand N ranap.proc.imsg id-Iu-Release |