diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-17 15:02:12 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-17 15:02:12 +0000 |
commit | 89162943b036ae57f2ffcad004cdab2a1f3d9d36 (patch) | |
tree | cf21350f5c7ec55170d57231300c5267907e745b /asn1/s1ap | |
parent | fae33ea17724f3f16afa17bd162ffcdcc7902b7c (diff) |
From Anders:
Update to June specification.
svn path=/trunk/; revision=28767
Diffstat (limited to 'asn1/s1ap')
-rw-r--r-- | asn1/s1ap/S1AP-CommonDataTypes.asn | 3 | ||||
-rw-r--r-- | asn1/s1ap/S1AP-Constants.asn | 9 | ||||
-rw-r--r-- | asn1/s1ap/S1AP-Containers.asn | 3 | ||||
-rw-r--r-- | asn1/s1ap/S1AP-IEs.asn | 140 | ||||
-rw-r--r-- | asn1/s1ap/S1AP-PDU-Contents.asn | 46 | ||||
-rw-r--r-- | asn1/s1ap/S1AP-PDU-Descriptions.asn | 3 | ||||
-rw-r--r-- | asn1/s1ap/s1ap.cnf | 11 |
7 files changed, 114 insertions, 101 deletions
diff --git a/asn1/s1ap/S1AP-CommonDataTypes.asn b/asn1/s1ap/S1AP-CommonDataTypes.asn index 505ec121c0..f08907557a 100644 --- a/asn1/s1ap/S1AP-CommonDataTypes.asn +++ b/asn1/s1ap/S1AP-CommonDataTypes.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 36.413 version 8.5.1 (2009-04) +-- 3GPP TS 36.413 V8.6.0 (2009-06) -- 9.3.5 Common Definitions -- ************************************************************** -- @@ -35,3 +35,4 @@ TriggeringMessage ::= ENUMERATED { initiating-message, successful-outcome, unsuc END + diff --git a/asn1/s1ap/S1AP-Constants.asn b/asn1/s1ap/S1AP-Constants.asn index 9defdbc5a9..ada265d7f7 100644 --- a/asn1/s1ap/S1AP-Constants.asn +++ b/asn1/s1ap/S1AP-Constants.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 36.413 version 8.5.1 (2009-04) +-- 3GPP TS 36.413 V8.6.0 (2009-06) -- 9.3.6 Constant Definitions -- ************************************************************** -- @@ -95,18 +95,16 @@ maxProtocolIEs INTEGER ::= 65535 maxNrOfCSGs INTEGER ::= 256 maxNrOfE-RABs INTEGER ::= 256 -maxNrOfInterfaces INTEGER ::= 3 --FFS maxnoofTAIs INTEGER ::= 256 maxnoofTACs INTEGER ::= 256 maxNrOfErrors INTEGER ::= 256 maxnoofBPLMNs INTEGER ::= 6 -maxnoofPLMNsPerMME INTEGER ::= 32 -- FFS +maxnoofPLMNsPerMME INTEGER ::= 32 maxnoofEPLMNs INTEGER ::= 15 maxnoofEPLMNsPlusOne INTEGER ::= 16 maxnoofForbLACs INTEGER ::= 4096 maxnoofForbTACs INTEGER ::= 4096 maxNrOfIndividualS1ConnectionsToReset INTEGER ::= 256 -maxnoofGUMMEIs INTEGER ::= 256 -- FFS maxnoofCells INTEGER ::= 16 maxnoofTAIforWarning INTEGER ::= 65535 maxnoofCellID INTEGER ::= 65535 @@ -248,5 +246,8 @@ id-RRC-Establishment-Cause ProtocolIE-ID ::= 134 id-NASSecurityParametersfromE-UTRAN ProtocolIE-ID ::= 135 id-NASSecurityParameterstoE-UTRAN ProtocolIE-ID ::= 136 id-DefaultPagingDRX ProtocolIE-ID ::= 137 +id-Source-ToTarget-TransparentContainer-Secondary ProtocolIE-ID ::= 138 +id-Target-ToSource-TransparentContainer-Secondary ProtocolIE-ID ::= 139 END + diff --git a/asn1/s1ap/S1AP-Containers.asn b/asn1/s1ap/S1AP-Containers.asn index f5ca56d586..5d85c9045f 100644 --- a/asn1/s1ap/S1AP-Containers.asn +++ b/asn1/s1ap/S1AP-Containers.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 36.413 version 8.5.1 (2009-04) +-- 3GPP TS 36.413 V8.6.0 (2009-06) -- 9.3.7 Container Definitions -- ************************************************************** -- @@ -204,3 +204,4 @@ END + diff --git a/asn1/s1ap/S1AP-IEs.asn b/asn1/s1ap/S1AP-IEs.asn index 79d4cadaed..46ea9fea6d 100644 --- a/asn1/s1ap/S1AP-IEs.asn +++ b/asn1/s1ap/S1AP-IEs.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 36.413 version 8.5.1 (2009-04) +-- 3GPP TS 36.413 V8.6.0 (2009-06) -- 9.3.4 Information Element Definitions -- ************************************************************** -- @@ -21,7 +21,6 @@ IMPORTS id-Bearers-SubjectToStatusTransfer-Item, maxNrOfCSGs, maxNrOfE-RABs, - maxNrOfInterfaces, maxNrOfErrors, maxnoofBPLMNs, maxnoofPLMNsPerMME, @@ -31,7 +30,6 @@ IMPORTS maxnoofForbLACs, maxnoofForbTACs, maxnoofTACs, - maxnoofGUMMEIs, maxnoofCells, maxnoofCellID, maxnoofEmergencyAreaID, @@ -102,15 +100,10 @@ BitRate ::= INTEGER (0..10000000000) BPLMNs ::= SEQUENCE (SIZE(1.. maxnoofBPLMNs)) OF PLMNidentity -BroadcastCompletedAreaList ::= SEQUENCE { +BroadcastCompletedAreaList ::= CHOICE { cellID-Broadcast CellID-Broadcast, tAI-Broadcast TAI-Broadcast, emergencyAreaID-Broadcast EmergencyAreaID-Broadcast, - iE-Extensions ProtocolExtensionContainer { {BroadcastCompletedAreaList-ExtIEs} } OPTIONAL, - ... -} - -BroadcastCompletedAreaList-ExtIEs S1AP-PROTOCOL-EXTENSION ::= { ... } @@ -184,7 +177,8 @@ CauseRadioNetwork ::= ENUMERATED { s1-intra-system-handover-triggered, s1-inter-system-handover-triggered, x2-handover-triggered, - ... + ..., + redirection-towards-1xRTT } @@ -292,8 +286,10 @@ CNDomain ::= ENUMERATED { } CSFallbackIndicator ::= ENUMERATED { - cs-fallback-required, - ... + cs-fallback-required, + cs-fallback-high-priority, + ..., + cs-fallback-high-priority } CSG-Id ::= BIT STRING (SIZE (27)) @@ -453,6 +449,60 @@ EventType ::= ENUMERATED { ... } +E-RAB-ID ::= INTEGER (0..15, ...) + +E-RABInformationList ::= SEQUENCE (SIZE (1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { { E-RABInformationListIEs } } + +E-RABInformationListIEs S1AP-PROTOCOL-IES ::= { + { ID id-E-RABInformationListItem CRITICALITY ignore TYPE E-RABInformationListItem PRESENCE mandatory }, + ... +} + +E-RABInformationListItem ::= SEQUENCE { + e-RAB-ID E-RAB-ID, + dL-Forwarding DL-Forwarding OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {E-RABInformationListItem-ExtIEs} } OPTIONAL, + ... +} + +E-RABInformationListItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= { + ... +} + +E-RABList ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {E-RABItemIEs} } + +E-RABItemIEs S1AP-PROTOCOL-IES ::= { + { ID id-E-RABItem CRITICALITY ignore TYPE E-RABItem PRESENCE mandatory }, + ... +} + +E-RABItem ::= SEQUENCE { + e-RAB-ID E-RAB-ID, + cause Cause, + iE-Extensions ProtocolExtensionContainer { {E-RABItem-ExtIEs} } OPTIONAL, + ... +} + +E-RABItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= { + ... +} + + + + +E-RABLevelQoSParameters ::= SEQUENCE { + qCI QCI, + allocationRetentionPriority AllocationAndRetentionPriority, + gbrQosInformation GBR-QosInformation OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {E-RABQoSParameters-ExtIEs} } OPTIONAL, + ... +} + +E-RABQoSParameters-ExtIEs S1AP-PROTOCOL-EXTENSION ::= { + ... +} + + EUTRAN-CGI ::= SEQUENCE { pLMNidentity PLMNidentity, cell-ID CellIdentity, @@ -736,7 +786,7 @@ ReportArea ::= ENUMERATED { ... } -RepetitionPeriod ::= INTEGER (1..4096) +RepetitionPeriod ::= INTEGER (0..4096) RNC-ID ::= INTEGER (0..4095) @@ -754,71 +804,15 @@ RRC-Establishment-Cause ::= ENUMERATED { -- S -E-RAB-ID ::= INTEGER (0..15, ...) - -E-RABInformationList ::= SEQUENCE (SIZE (1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { { E-RABInformationListIEs } } - -E-RABInformationListIEs S1AP-PROTOCOL-IES ::= { - { ID id-E-RABInformationListItem CRITICALITY ignore TYPE E-RABInformationListItem PRESENCE mandatory }, - ... -} - -E-RABInformationListItem ::= SEQUENCE { - e-RAB-ID E-RAB-ID, - dL-Forwarding DL-Forwarding OPTIONAL, - iE-Extensions ProtocolExtensionContainer { {E-RABInformationListItem-ExtIEs} } OPTIONAL, - ... -} - -E-RABInformationListItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= { - ... -} - -E-RABList ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {E-RABItemIEs} } - -E-RABItemIEs S1AP-PROTOCOL-IES ::= { - { ID id-E-RABItem CRITICALITY ignore TYPE E-RABItem PRESENCE mandatory }, - ... -} - -E-RABItem ::= SEQUENCE { - e-RAB-ID E-RAB-ID, - cause Cause, - iE-Extensions ProtocolExtensionContainer { {E-RABItem-ExtIEs} } OPTIONAL, - ... -} - -E-RABItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= { - ... -} - - - - -E-RABLevelQoSParameters ::= SEQUENCE { - qCI QCI, - allocationRetentionPriority AllocationAndRetentionPriority, - gbrQosInformation GBR-QosInformation OPTIONAL, - iE-Extensions ProtocolExtensionContainer { {E-RABQoSParameters-ExtIEs} } OPTIONAL, - ... -} - -E-RABQoSParameters-ExtIEs S1AP-PROTOCOL-EXTENSION ::= { - ... -} - - - - SecurityKey ::= BIT STRING (SIZE(256)) SecurityContext ::= SEQUENCE { - nextHopParameter INTEGER (0..7), - nextHopChainingCount SecurityKey, - iE-Extensions ProtocolExtensionContainer { { SecurityContext-ExtIEs} } OPTIONAL, + nextHopChainingCount INTEGER (0..7), + nextHopParameter SecurityKey, + iE-Extensions ProtocolExtensionContainer { { SecurityContext-ExtIEs} } OPTIONAL, ... } @@ -943,6 +937,7 @@ SupportedTAs-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= { S-TMSI ::= SEQUENCE { mMEC MME-Code, + m-TMSI M-TMSI, iE-Extensions ProtocolExtensionContainer { {S-TMSI-ExtIEs} } OPTIONAL, ... } @@ -1185,3 +1180,4 @@ END + diff --git a/asn1/s1ap/S1AP-PDU-Contents.asn b/asn1/s1ap/S1AP-PDU-Contents.asn index 440b201e8c..836e233798 100644 --- a/asn1/s1ap/S1AP-PDU-Contents.asn +++ b/asn1/s1ap/S1AP-PDU-Contents.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 36.413 version 8.5.1 (2009-04) +-- 3GPP TS 36.413 V8.6.0 (2009-06) -- 9.3.3 PDU Definitions -- ************************************************************** -- @@ -205,6 +205,7 @@ FROM S1AP-Containers id-SONConfigurationTransferECT, id-SONConfigurationTransferMCT, id-Source-ToTarget-TransparentContainer, + id-Source-ToTarget-TransparentContainer-Secondary, id-SourceMME-UE-S1AP-ID, id-SRVCCOperationPossible, id-SRVCCHOIndication, @@ -215,6 +216,7 @@ FROM S1AP-Containers id-TAIItem, id-TAIList, id-Target-ToSource-TransparentContainer, + id-Target-ToSource-TransparentContainer-Secondary, id-TargetID, id-TimeToWait, id-TraceActivation, @@ -289,10 +291,9 @@ HandoverRequiredIEs S1AP-PROTOCOL-IES ::= { { ID id-Direct-Forwarding-Path-Availability CRITICALITY ignore TYPE Direct-Forwarding-Path-Availability PRESENCE optional } | { ID id-SRVCCHOIndication CRITICALITY reject TYPE SRVCCHOIndication PRESENCE optional }| { ID id-Source-ToTarget-TransparentContainer CRITICALITY reject TYPE Source-ToTarget-TransparentContainer PRESENCE mandatory }| - { ID id-Source-ToTarget-TransparentContainer CRITICALITY reject TYPE Source-ToTarget-TransparentContainer PRESENCE optional }| + { ID id-Source-ToTarget-TransparentContainer-Secondary CRITICALITY reject TYPE Source-ToTarget-TransparentContainer PRESENCE optional }| { ID id-MSClassmark2 CRITICALITY reject TYPE MSClassmark2 PRESENCE conditional }| { ID id-MSClassmark3 CRITICALITY ignore TYPE MSClassmark3 PRESENCE conditional }, - ... } @@ -317,7 +318,7 @@ HandoverCommandIEs S1AP-PROTOCOL-IES ::= { { ID id-E-RABSubjecttoDataForwardingList CRITICALITY ignore TYPE E-RABSubjecttoDataForwardingList PRESENCE optional } | { ID id-E-RABtoReleaseListHOCmd CRITICALITY ignore TYPE E-RABList PRESENCE optional } | { ID id-Target-ToSource-TransparentContainer CRITICALITY reject TYPE Target-ToSource-TransparentContainer PRESENCE mandatory }| - { ID id-Target-ToSource-TransparentContainer CRITICALITY reject TYPE Target-ToSource-TransparentContainer PRESENCE optional }| + { ID id-Target-ToSource-TransparentContainer-Secondary CRITICALITY reject TYPE Target-ToSource-TransparentContainer PRESENCE optional }| { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }, ... } @@ -366,7 +367,7 @@ HandoverPreparationFailureIEs S1AP-PROTOCOL-IES ::= { -- ************************************************************** -- --- HANDOVER RESOURCE ALLOCATION ELEMTARY PROCEDURE +-- HANDOVER RESOURCE ALLOCATION ELEMENTARY PROCEDURE -- -- ************************************************************** @@ -502,7 +503,7 @@ HandoverFailureIEs S1AP-PROTOCOL-IES ::= { -- ************************************************************** -- --- HANDOVER NOTIFICATION ELEMTARY PROCEDURE +-- HANDOVER NOTIFICATION ELEMENTARY PROCEDURE -- -- ************************************************************** @@ -527,7 +528,7 @@ HandoverNotifyIEs S1AP-PROTOCOL-IES ::= { -- ************************************************************** -- --- PATH SWITCH REQUEST ELEMTARY PROCEDURE +-- PATH SWITCH REQUEST ELEMENTARY PROCEDURE -- -- ************************************************************** @@ -634,7 +635,7 @@ PathSwitchRequestFailureIEs S1AP-PROTOCOL-IES ::= { -- ************************************************************** -- --- HANDOVER CANCEL ELEMTARY PROCEDURE +-- HANDOVER CANCEL ELEMENTARY PROCEDURE -- -- ************************************************************** @@ -1067,6 +1068,13 @@ InitialContextSetupFailureIEs S1AP-PROTOCOL-IES ::= { -- ************************************************************** -- +-- PAGING ELEMENTARY PROCEDURE +-- +-- ************************************************************** + + +-- ************************************************************** +-- -- Paging -- -- ************************************************************** @@ -1270,7 +1278,8 @@ InitialUEMessage-IEs S1AP-PROTOCOL-IES ::= { { ID id-EUTRAN-CGI CRITICALITY ignore TYPE EUTRAN-CGI PRESENCE mandatory} | { ID id-RRC-Establishment-Cause CRITICALITY ignore TYPE RRC-Establishment-Cause PRESENCE mandatory} | { ID id-S-TMSI CRITICALITY reject TYPE S-TMSI PRESENCE optional} | - { ID id-CSG-Id CRITICALITY reject TYPE CSG-Id PRESENCE optional}, + { ID id-CSG-Id CRITICALITY reject TYPE CSG-Id PRESENCE optional} | + { ID id-GUMMEI-ID CRITICALITY reject TYPE GUMMEI PRESENCE optional}, ... } @@ -1592,7 +1601,7 @@ MMEConfigurationUpdateFailureIEs S1AP-PROTOCOL-IES ::= { -- ************************************************************** -- --- DOWNLINK S1 CDMA2000 TUNNELING ELEMTARY PROCEDURE +-- DOWNLINK S1 CDMA2000 TUNNELING ELEMENTARY PROCEDURE -- -- ************************************************************** @@ -1619,7 +1628,7 @@ DownlinkS1cdma2000tunnelingIEs S1AP-PROTOCOL-IES ::= { -- ************************************************************** -- --- UPLINK S1 CDMA2000 TUNNELING ELEMTARY PROCEDURE +-- UPLINK S1 CDMA2000 TUNNELING ELEMENTARY PROCEDURE -- -- ************************************************************** @@ -1648,7 +1657,7 @@ UplinkS1cdma2000tunnelingIEs S1AP-PROTOCOL-IES ::= { -- ************************************************************** -- --- UE CAPABILITY INFO INDICATION PROCEDURE +-- UE CAPABILITY INFO INDICATION ELEMENTARY PROCEDURE -- -- ************************************************************** @@ -1672,7 +1681,7 @@ UECapabilityInfoIndicationIEs S1AP-PROTOCOL-IES ::= { -- ************************************************************** -- --- eNB STATUS TRANSFER +-- eNB STATUS TRANSFER ELEMENTARY PROCEDURE -- -- ************************************************************** @@ -1697,7 +1706,7 @@ ENBStatusTransferIEs S1AP-PROTOCOL-IES ::= { -- ************************************************************** -- --- MME STATUS TRANSFER +-- MME STATUS TRANSFER ELEMENTARY PROCEDURE -- -- ************************************************************** @@ -1722,7 +1731,7 @@ MMEStatusTransferIEs S1AP-PROTOCOL-IES ::= { -- ************************************************************** -- --- Trace Procedures +-- TRACE ELEMENTARY PROCEDURES -- -- ************************************************************** -- ************************************************************** @@ -1788,7 +1797,7 @@ DeactivateTraceIEs S1AP-PROTOCOL-IES ::= { -- ************************************************************** -- --- CELL TRAFFIC TRACE PROCEDURE +-- CELL TRAFFIC TRACE ELEMENTARY PROCEDURE -- -- ************************************************************** @@ -1814,7 +1823,7 @@ CellTrafficTraceIEs S1AP-PROTOCOL-IES ::= { -- ************************************************************** -- --- LOCATION ELEMENTARY PROCEDURE +-- LOCATION ELEMENTARY PROCEDURES -- -- ************************************************************** @@ -1876,7 +1885,7 @@ LocationReportIEs S1AP-PROTOCOL-IES ::= { -- ************************************************************** -- --- OVERLOAD ELEMENTARY PROCEDURE +-- OVERLOAD ELEMENTARY PROCEDURES -- -- ************************************************************** @@ -2074,3 +2083,4 @@ PrivateMessageIEs S1AP-PRIVATE-IES ::= { END + diff --git a/asn1/s1ap/S1AP-PDU-Descriptions.asn b/asn1/s1ap/S1AP-PDU-Descriptions.asn index 049d33de43..d746bae502 100644 --- a/asn1/s1ap/S1AP-PDU-Descriptions.asn +++ b/asn1/s1ap/S1AP-PDU-Descriptions.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 36.413 version 8.5.1 (2009-04) +-- 3GPP TS 36.413 V8.6.0 (2009-06) -- 9.3.2 Elementary Procedure Definitions -- ************************************************************** -- @@ -549,3 +549,4 @@ END + diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf index db46c7704f..a658d31dde 100644 --- a/asn1/s1ap/s1ap.cnf +++ b/asn1/s1ap/s1ap.cnf @@ -29,7 +29,6 @@ ProtocolError-IE-ContainerList E-RAB-IE-ContainerPairList Presence L3-Information -M-TMSI NumberofBroadcast OldBSS-ToNewBSS-Information SourceBSS-ToTargetBSS-TransparentContainer @@ -420,6 +419,8 @@ id-RRC-Establishment-Cause ProtocolIE-ID id-NASSecurityParametersfromE-UTRAN ProtocolIE-ID id-NASSecurityParameterstoE-UTRAN ProtocolIE-ID id-DefaultPagingDRX ProtocolIE-ID +id-Source-ToTarget-TransparentContainer-Secondary ProtocolIE-ID +id-Target-ToSource-TransparentContainer-Secondary ProtocolIE-ID #.END #.REGISTER_NEW @@ -542,13 +543,15 @@ RRC-Establishment-Cause N s1ap.ies id-RRC-Establishment-Cause NASSecurityParametersfromE-UTRAN N s1ap.ies id-NASSecurityParametersfromE-UTRAN NASSecurityParameterstoE-UTRAN N s1ap.ies id-NASSecurityParameterstoE-UTRAN PagingDRX N s1ap.ies id-DefaultPagingDRX +Source-ToTarget-TransparentContainer N s1ap.ies id-Source-ToTarget-TransparentContainer-Secondary +Target-ToSource-TransparentContainer N s1ap.ies id-Target-ToSource-TransparentContainer-Secondary #S1AP-PROTOCOL-IES-PAIR -#RAB-SetupOrModifyItemFirst N s1ap.ies.pair.first id-RAB-SetupOrModifyItem -#RAB-SetupOrModifyItemSecond N s1ap.ies.pair.second id-RAB-SetupOrModifyItem +#RAB-SetupOrModifyItemFirst N s1ap.ies.pair.first id-RAB-SetupOrModifyItem +#RAB-SetupOrModifyItemSecond N s1ap.ies.pair.second id-RAB-SetupOrModifyItem #NBAP-PROTOCOL-EXTENSION -#RAB-Parameters N s1ap.extension id-AlternativeRABConfiguration +#RAB-Parameters N s1ap.extension id-AlternativeRABConfiguration #Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf N s1ap.extension id-Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf #NBAP-ELEMENTARY-PROCEDURE |