diff options
author | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-07-30 12:08:38 +0000 |
---|---|---|
committer | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-07-30 12:08:38 +0000 |
commit | 236e5d9e4269b00a14c16ddde3037fd0f034f9b7 (patch) | |
tree | e41619b3adb2e28f68eb4116c3234108abd64cce /asn1 | |
parent | 95def4eb879f41b5efb4a3d56c0b7d1a77178642 (diff) |
RNSAP updated to V7.5.0 (2007-06)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22419 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/rnsap/RNSAP-CommonDataTypes.asn | 7 | ||||
-rw-r--r-- | asn1/rnsap/RNSAP-Constants.asn | 29 | ||||
-rw-r--r-- | asn1/rnsap/RNSAP-Containers.asn | 7 | ||||
-rw-r--r-- | asn1/rnsap/RNSAP-IEs.asn | 591 | ||||
-rw-r--r-- | asn1/rnsap/RNSAP-PDU-Contents.asn | 73 | ||||
-rw-r--r-- | asn1/rnsap/RNSAP-PDU-Descriptions.asn | 7 | ||||
-rw-r--r-- | asn1/rnsap/packet-rnsap-template.c | 5 | ||||
-rw-r--r-- | asn1/rnsap/rnsap.cnf | 19 |
8 files changed, 668 insertions, 70 deletions
diff --git a/asn1/rnsap/RNSAP-CommonDataTypes.asn b/asn1/rnsap/RNSAP-CommonDataTypes.asn index ca4ff4c4e2..2d6acbedd6 100644 --- a/asn1/rnsap/RNSAP-CommonDataTypes.asn +++ b/asn1/rnsap/RNSAP-CommonDataTypes.asn @@ -1,14 +1,13 @@ -- RNSAP-CommonDataTypes.asn -- --- Taken from 3GPP TS 25.423 V7.4.0 (2007-03) --- http://www.3gpp.org/ftp/Specs/archive/25_series/25.423/25423-740.zip/25423-740.DOC +-- Taken from 3GPP TS 25.423 V7.5.0 (2007-06) +-- http://www.3gpp.org/ftp/Specs/archive/25_series/25.423/25423-750.zip/25423-750.DOC -- --- 9.3.5 Common Definitions +-- 9.3.5 Common Definitions -- -- $Id$ -- - -- ************************************************************** -- -- Common definitions diff --git a/asn1/rnsap/RNSAP-Constants.asn b/asn1/rnsap/RNSAP-Constants.asn index f1beb84c73..9c6c9a74fe 100644 --- a/asn1/rnsap/RNSAP-Constants.asn +++ b/asn1/rnsap/RNSAP-Constants.asn @@ -1,14 +1,13 @@ -- RNSAP-Constants.asn -- --- Taken from 3GPP TS 25.423 V7.4.0 (2007-03) --- http://www.3gpp.org/ftp/Specs/archive/25_series/25.423/25423-740.zip/25423-740.DOC +-- Taken from 3GPP TS 25.423 V7.5.0 (2007-06) +-- http://www.3gpp.org/ftp/Specs/archive/25_series/25.423/25423-750.zip/25423-750.DOC -- --- 9.3.6 Constant Definitions +-- 9.3.6 Constant Definitions -- -- $Id$ -- - -- ************************************************************** -- -- Constant definitions @@ -180,6 +179,9 @@ maxNrOfHS-DSCHTBSs INTEGER ::= 90 maxNrOfHS-DSCHTBSs-HS-SCCHless INTEGER ::= 4 maxHS-PDSCHCodeNrComp-1 INTEGER ::= 15 maxNrOfEHICHCodes INTEGER ::= 4 +maxGANSSSat INTEGER ::= 32 +maxNoGANSS INTEGER ::= 8 +maxSgnType INTEGER ::= 4 @@ -717,8 +719,27 @@ id-E-DCH-LCR-Information-Reconfig ProtocolIE-ID ::= 678 id-E-DCH-LCR-Information-Response ProtocolIE-ID ::= 679 id-HS-PDSCH-Code-Change-Grant ProtocolIE-ID ::= 680 id-HS-PDSCH-Code-Change-Indicator ProtocolIE-ID ::= 681 +id-Extended-SRNC-ID ProtocolIE-ID ::= 682 +id-Extended-RNC-ID ProtocolIE-ID ::= 683 id-SixtyfourQAM-DL-SupportIndicator ProtocolIE-ID ::= 684 +id-Enhanced-FACH-Support-Indicator ProtocolIE-ID ::= 685 +id-Enhanced-FACH-Information-ResponseFDD ProtocolIE-ID ::= 686 +id-SixteenQAM-UL-Information ProtocolIE-ID ::= 688 +id-HSDSCH-MACdPDUSizeFormat ProtocolIE-ID ::= 690 +id-MaximumMACdPDU-SizeExtended ProtocolIE-ID ::= 691 +id-F-DPCH-SlotFormat ProtocolIE-ID ::= 692 +id-F-DPCH-SlotFormatSupportRequest ProtocolIE-ID ::= 693 id-eDCH-MACdFlow-Retransmission-Timer-LCR ProtocolIE-ID ::= 694 +id-Max-UE-DTX-Cycle ProtocolIE-ID ::= 695 +id-SixteenQAM-UL-Information-to-Modify ProtocolIE-ID ::= 696 +id-E-TFCI-BetaEC-Boost ProtocolIE-ID ::= 697 +id-E-TFCI-BetaED-Switch ProtocolIE-ID ::= 698 +id-GANSS-Common-Data ProtocolIE-ID ::= 699 +id-GANSS-Information ProtocolIE-ID ::= 700 +id-GANSS-Generic-Data ProtocolIE-ID ::= 701 +id-TUTRANGANSSMeasurementThresholdInformation ProtocolIE-ID ::= 702 +id-TUTRANGANSSMeasurementValueInformation ProtocolIE-ID ::= 703 +id-Enhanced-PCH-Support-Indicator ProtocolIE-ID ::= 704 END diff --git a/asn1/rnsap/RNSAP-Containers.asn b/asn1/rnsap/RNSAP-Containers.asn index c04eee0336..eb20890272 100644 --- a/asn1/rnsap/RNSAP-Containers.asn +++ b/asn1/rnsap/RNSAP-Containers.asn @@ -1,14 +1,13 @@ -- RNSAP-Containers.asn -- --- Taken from 3GPP TS 25.423 V7.4.0 (2007-03) --- http://www.3gpp.org/ftp/Specs/archive/25_series/25.423/25423-740.zip/25423-740.DOC +-- Taken from 3GPP TS 25.423 V7.5.0 (2007-06) +-- http://www.3gpp.org/ftp/Specs/archive/25_series/25.423/25423-750.zip/25423-750.DOC -- --- 9.3.7 Container Definitions +-- 9.3.7 Container Definitions -- -- $Id$ -- - -- ************************************************************** -- -- Container definitions diff --git a/asn1/rnsap/RNSAP-IEs.asn b/asn1/rnsap/RNSAP-IEs.asn index 32036394c2..2e914abd90 100644 --- a/asn1/rnsap/RNSAP-IEs.asn +++ b/asn1/rnsap/RNSAP-IEs.asn @@ -1,14 +1,13 @@ -- RNSAP-IEs.asn -- --- Taken from 3GPP TS 25.423 V7.4.0 (2007-03) --- http://www.3gpp.org/ftp/Specs/archive/25_series/25.423/25423-740.zip/25423-740.DOC +-- Taken from 3GPP TS 25.423 V7.5.0 (2007-06) +-- http://www.3gpp.org/ftp/Specs/archive/25_series/25.423/25423-750.zip/25423-750.DOC -- --- 9.3.4 Information Element Definitions +-- 9.3.4 Information Element Definitions -- -- $Id$ -- - -- ************************************************************** -- -- Information Element Definitions @@ -96,6 +95,9 @@ IMPORTS maxNrOfHS-DSCHTBSs-HS-SCCHless, maxHS-PDSCHCodeNrComp-1, maxNrOfEHICHCodes, + maxGANSSSat, + maxNoGANSS, + maxSgnType, id-Allowed-Rate-Information, @@ -113,6 +115,8 @@ IMPORTS id-E-RGCH-E-HICH-ChannelisationCodeValidityIndicator, id-Extended-Round-Trip-Time-Value, id-ExtendedPropagationDelay, + id-Extended-SRNC-ID, + id-Extended-RNC-ID, id-GERAN-Cell-Capability, id-GERAN-Classmark, id-Guaranteed-Rate-Information, @@ -181,7 +185,18 @@ IMPORTS id-eDCH-MACdFlow-Retransmission-Timer-LCR, id-MIMO-Information, id-MIMO-InformationResponse, - id-MIMO-InformationToModify + id-MIMO-InformationToModify, + id-SixteenQAM-UL-Information, + id-SixteenQAM-UL-Information-to-Modify, + id-E-TFCI-BetaEC-Boost, + id-E-TFCI-BetaED-Switch, + id-HSDSCH-MACdPDUSizeFormat, + id-MaximumMACdPDU-SizeExtended, + id-GANSS-Common-Data, + id-GANSS-Information, + id-GANSS-Generic-Data, + id-TUTRANGANSSMeasurementThresholdInformation, + id-TUTRANGANSSMeasurementValueInformation FROM RNSAP-Constants @@ -442,9 +457,17 @@ CauseRadioNetwork ::= ENUMERATED { ue-not-capable-of-support, f-dpch-not-supported, e-dch-not-supported, - continuos-packet-connectivity-dtx-drx-operation-not-supported, - continuos-packet-connectivity-hs-scch-less-operation-not-supported, - mimo-not-supported + continuous-packet-connectivity-dtx-drx-operation-not-supported, + continuous-packet-connectivity-hs-scch-less-operation-not-supported, + mimo-not-supported, + e-dch-tti2ms-not-supported, + continuous-packet-connectivity-DTX-DRX-operation-not-available, + continuous-packet-connectivity-UE-DTX-Cycle-not-available, + mimo-not-available, + sixteenQAM-UL-not-Supported, + hSDSCH-MACdPDU-SizeFormatNotSupported, + f-dpch-slot-format-operation-not-supported + } CauseTransport ::= ENUMERATED { @@ -471,24 +494,31 @@ CellCapabilityContainer-FDD ::= BIT STRING (SIZE (32)) -- Fifteenth bit: Continuous Packet Connectivity DTX-DRX Support Indicator -- Sixteenth bit: Continuous Packet Connectivity HS-SCCH less Support Indicator -- Seventeenth bit: MIMO Support Indicator +-- Eighteenth bit: SixteenQAM UL Support Indicator +-- Nineteenth bit: Flexible MAC-d PDU Size Support Indicator +-- Twentieth bit: F-DPCH Slot Format Support Indicator +-- Twentyfirst bit: Continuous Packet Connectivity UE DTX Cycle Not available -- Note that undefined bits are considered as a spare bit and spare bits shall be set to 0 by the transmitter and shall be ignored by the receiver. CellCapabilityContainer-TDD ::= BIT STRING (SIZE (32)) -- First bit: Delayed Activation Support Indicator -- Second bit: HS-DSCH Support Indicator -- Third bit: DSCH Support Indicator +-- The fourth bit: Flexible MAC-d PDU Size Support Indicator -- Note that undefined bits are considered as a spare bit and spare bits shall be set to 0 by the transmitter and shall be ignored by the receiver. CellCapabilityContainer-TDD-LCR ::= BIT STRING (SIZE (32)) -- First bit: Delayed Activation Support Indicator -- Second bit: HS-DSCH Support Indicator -- Third bit: DSCH Support Indicator +-- The fourth bit: Flexible MAC-d PDU Size Support Indicator -- Note that undefined bits are considered as a spare bit and spare bits shall be set to 0 by the transmitter and shall be ignored by the receiver. CellCapabilityContainer-TDD768 ::= BIT STRING (SIZE (32)) -- First bit: Delayed Activation Support Indicator -- Second bit: HS-DSCH Support Indicator -- Third bit: DSCH Support Indicator +-- The fourth bit: Flexible MAC-d PDU Size Support Indicator -- Note that undefined bits are considered as a spare bit and spare bits shall be set to 0 by the transmitter and shall be ignored by the receiver. C-ID ::= INTEGER (0..65535) @@ -559,7 +589,8 @@ CodingRate ::= ENUMERATED { CommonMeasurementAccuracy ::= CHOICE { tUTRANGPSMeasurementAccuracyClass TUTRANGPSAccuracyClass, - ... + ..., + tUTRANGANSSMeasurementAccuracyClass TUTRANGANSSAccuracyClass } CommonMeasurementType ::= ENUMERATED { @@ -572,27 +603,30 @@ CommonMeasurementType ::= ENUMERATED { ..., rT-load, nRT-load-Information, - upPTSInterference + upPTSInterference, + uTRAN-GANSS-timing-of-cell-frames-for-UE-Positioning } -- For measurements on the Iur-g interface, only load, RT Load and NRT Load information are requested. CommonMeasurementValue ::= CHOICE { tUTRANGPSMeasurementValueInformation TUTRANGPSMeasurementValueInformation, sFNSFNMeasurementValueInformation SFNSFNMeasurementValueInformation, - loadValue LoadValue, - transmittedCarrierPowerValue INTEGER(0..100), - receivedTotalWideBandPowerValue INTEGER(0..621), - uplinkTimeslotISCPValue UL-TimeslotISCP, + loadValue LoadValue, + transmittedCarrierPowerValue INTEGER(0..100), + receivedTotalWideBandPowerValue INTEGER(0..621), + uplinkTimeslotISCPValue UL-TimeslotISCP, ..., - extension-CommonMeasurementValue Extension-CommonMeasurementValue + extension-CommonMeasurementValue Extension-CommonMeasurementValue, + tUTRANGANSSMeasurementValueInformation TUTRANGANSSMeasurementValueInformation } Extension-CommonMeasurementValue ::= ProtocolIE-Single-Container {{ Extension-CommonMeasurementValueIE }} Extension-CommonMeasurementValueIE RNSAP-PROTOCOL-IES ::= { - { ID id-RTLoadValue CRITICALITY ignore TYPE RTLoadValue PRESENCE mandatory }| - { ID id-NRTLoadInformationValue CRITICALITY ignore TYPE NRTLoadInformationValue PRESENCE mandatory }| - { ID id-UpPTSInterferenceValue CRITICALITY reject TYPE UpPTSInterferenceValue PRESENCE mandatory } + { ID id-RTLoadValue CRITICALITY ignore TYPE RTLoadValue PRESENCE mandatory }| + { ID id-NRTLoadInformationValue CRITICALITY ignore TYPE NRTLoadInformationValue PRESENCE mandatory }| + { ID id-UpPTSInterferenceValue CRITICALITY reject TYPE UpPTSInterferenceValue PRESENCE mandatory }| + { ID id-TUTRANGANSSMeasurementValueInformation CRITICALITY reject TYPE TUTRANGANSSMeasurementValueInformation PRESENCE mandatory } } -- For measurements on the Iur-g interface, only load, RT Load and NRT Load values are reported. @@ -1011,6 +1045,45 @@ Execution-Type ::= CHOICE { DeltaSIR ::= INTEGER (0..30) -- Step 0.1 dB, Range 0..3 dB. +DGANSSCorrections ::= SEQUENCE { + dGANSS-ReferenceTime INTEGER(0..119), + dGANSS-Information SEQUENCE (SIZE (1..maxSgnType)) OF SEQUENCE { + gANSS-SignalId INTEGER(0..3,...) OPTIONAL, + gANSS-StatusHealth GANSS-StatusHealth, +-- The following IE shall be present if the StatusHealth IE value is not equal to "no data" or "invalid data" + dGANSS-SignalInformation SEQUENCE (SIZE (1..maxGANSSSat)) OF SEQUENCE { + satId INTEGER(0..63), + gANSS-iod BIT STRING (SIZE (10)), + udre UDRE, + ganss-prc INTEGER(-2047..2047), + ganss-rrc INTEGER(-127..127), + ie-Extensions ProtocolExtensionContainer { { DGANSS-SignalInformationItem-ExtIEs } } OPTIONAL, + ... + } OPTIONAL, + ie-Extensions ProtocolExtensionContainer { { DGANSS-InformationItem-ExtIEs } } OPTIONAL, + ... + }, + ie-Extensions ProtocolExtensionContainer { { DGANSSCorrections-ExtIEs } } OPTIONAL, + ... +} + +DGANSSCorrections-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +DGANSS-InformationItem-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +DGANSS-SignalInformationItem-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +DGANSSThreshold ::= SEQUENCE { + pRCDeviation PRCDeviation, + ... +} + DGPSCorrections ::= SEQUENCE { gPSTOW GPSTOW, gPS-Status-Health GPS-Status-Health, @@ -1461,7 +1534,8 @@ EDCH-FDD-Information ::= SEQUENCE { } EDCH-FDD-Information-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { -{ ID id-E-DCH-PowerOffset-for-SchedulingInfo CRITICALITY ignore EXTENSION E-DCH-PowerOffset-for-SchedulingInfo PRESENCE optional}, +{ ID id-E-DCH-PowerOffset-for-SchedulingInfo CRITICALITY ignore EXTENSION E-DCH-PowerOffset-for-SchedulingInfo PRESENCE optional}| +{ ID id-SixteenQAM-UL-Information CRITICALITY reject EXTENSION SixteenQAM-UL-Information PRESENCE optional}, ... } @@ -1504,7 +1578,8 @@ EDCH-FDD-Information-To-Modify ::= SEQUENCE { } EDCH-FDD-Information-To-Modify-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { -{ ID id-E-DCH-PowerOffset-for-SchedulingInfo CRITICALITY ignore EXTENSION E-DCH-PowerOffset-for-SchedulingInfo PRESENCE optional}, +{ ID id-E-DCH-PowerOffset-for-SchedulingInfo CRITICALITY ignore EXTENSION E-DCH-PowerOffset-for-SchedulingInfo PRESENCE optional}| +{ ID id-SixteenQAM-UL-Information-to-Modify CRITICALITY reject EXTENSION SixteenQAM-UL-Information-to-Modify PRESENCE optional}, ... } E-DCH-FDD-Update-Information ::= SEQUENCE { @@ -1710,7 +1785,7 @@ E-DCH-Non-Scheduled-Transmission-Grant-Items-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= ... } -E-DCH-TFCI-Table-Index ::= INTEGER (0..1,...) +E-DCH-TFCI-Table-Index ::= INTEGER (0..1,...,2..7) E-DCH-Serving-cell-change-informationResponse ::= SEQUENCE { e-DCH-serving-cell-outcome-choice E-DCH-serving-cell-change-choice, @@ -1866,10 +1941,30 @@ EDCH-Serving-RL-in-this-DRNS-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { ... } +Enhanced-FACH-Information-ResponseFDD ::= SEQUENCE { + priorityQueueInfo-Common-HS-DSCH-RNTI PriorityQueue-InfoList-EnhancedFACH, + priorityQueueInfo-Dedicated-HS-DSCH-RNTI PriorityQueue-InfoList-EnhancedFACH, + hSDSCH-Initial-Capacity-Allocation HSDSCH-Initial-Capacity-Allocation, + iE-Extensions ProtocolExtensionContainer { { Enhanced-FACH-Information-ResponseFDD-ExtIEs } } OPTIONAL, + ... +} + +Enhanced-FACH-Information-ResponseFDD-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +Enhanced-FACH-Support-Indicator ::= NULL + +Enhanced-PCH-Support-Indicator ::= NULL + E-RNTI ::= INTEGER (0..65535) E-TFCI ::= INTEGER (0..127) +E-TFCI-BetaEC-Boost ::= INTEGER (0..127,...) + +E-TFCI-BetaED-Switch ::= INTEGER (0..127,...) + E-TFCS-Information ::= SEQUENCE { e-DCH-TFCI-Table-Index E-DCH-TFCI-Table-Index, e-DCH-Min-Set-E-TFCI E-TFCI, @@ -1880,7 +1975,9 @@ E-TFCS-Information ::= SEQUENCE { } E-TFCS-Information-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { - { ID id-E-DCH-Minimum-Set-E-TFCIValidityIndicator CRITICALITY reject EXTENSION E-DCH-Minimum-Set-E-TFCIValidityIndicator PRESENCE optional }, + { ID id-E-DCH-Minimum-Set-E-TFCIValidityIndicator CRITICALITY reject EXTENSION E-DCH-Minimum-Set-E-TFCIValidityIndicator PRESENCE optional }| + { ID id-E-TFCI-BetaEC-Boost CRITICALITY reject EXTENSION E-TFCI-BetaEC-Boost PRESENCE mandatory }| + { ID id-E-TFCI-BetaED-Switch CRITICALITY reject EXTENSION E-TFCI-BetaED-Switch PRESENCE mandatory }, ... } @@ -2046,7 +2143,8 @@ E-DCH-MACdFlow-InfoTDDItem ::= SEQUENCE { } E-DCH-MACdFlow-InfoTDDItem-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { - { ID id-eDCH-MACdFlow-Retransmission-Timer-LCR CRITICALITY ignore EXTENSION E-DCH-MACdFlow-Retransmission-Timer-LCR PRESENCE optional }, + { ID id-eDCH-MACdFlow-Retransmission-Timer-LCR CRITICALITY ignore EXTENSION E-DCH-MACdFlow-Retransmission-Timer-LCR PRESENCE optional }| + { ID id-TrafficClass CRITICALITY ignore EXTENSION TrafficClass PRESENCE mandatory}, ... } @@ -2065,7 +2163,7 @@ E-DCH-Grant-TypeTDD ::= ENUMERATED { E-DCH-TimeslotResource ::= BIT STRING (SIZE (13)) -E-DCH-PowerResource ::= INTEGER(1..16) +E-DCH-PowerResource ::= INTEGER(1..32) TddE-PUCH-Offset ::= INTEGER(0..255) @@ -2130,7 +2228,8 @@ E-DCH-MACdFlow-ModifyTDDItem ::= SEQUENCE { } E-DCH-MACdFlow-ModifyTDDItem-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { - { ID id-eDCH-MACdFlow-Retransmission-Timer-LCR CRITICALITY ignore EXTENSION E-DCH-MACdFlow-Retransmission-Timer-LCR PRESENCE optional }, + { ID id-eDCH-MACdFlow-Retransmission-Timer-LCR CRITICALITY ignore EXTENSION E-DCH-MACdFlow-Retransmission-Timer-LCR PRESENCE optional }| + { ID id-TrafficClass CRITICALITY ignore EXTENSION TrafficClass PRESENCE optional}, ... } @@ -2426,6 +2525,7 @@ E-HICH-InformationResp-LCR::= SEQUENCE { timeSlotLCR TimeSlotLCR, midambleShiftLCR MidambleShiftLCR, tDD-ChannelisationCode TDD-ChannelisationCode, + signatureSequenceGroupIndex SignatureSequenceGroupIndex, iE-Extensions ProtocolExtensionContainer { { E-HICH-InformationResp-LCR-ExtIEs } } OPTIONAL, ... } @@ -2465,6 +2565,8 @@ Enabling-Delay ::= ENUMERATED {v0, v1, v2, v4, v8, v16, v32, v64, v128} ExtendedPropagationDelay ::= INTEGER(255..1023) +Extended-RNC-ID ::= INTEGER (4096..65535) + Extended-Round-Trip-Time-Value ::= INTEGER(32767..103041) -- See also mapping in [23] @@ -2568,6 +2670,10 @@ FDD-TPC-DownlinkStepSize ::= ENUMERATED { SchedulingPriorityIndicator ::= INTEGER { lowest(0), highest(15) } (0..15) +F-DPCH-SlotFormat ::= INTEGER (0..9) + +F-DPCH-SlotFormatSupportRequest ::= NULL + FirstRLS-Indicator ::= ENUMERATED { first-RLS, not-first-RLS @@ -2667,6 +2773,298 @@ GA-EllipsoidArc-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { ... } +GANSS-Almanac ::= SEQUENCE{ + ganss-wk-number INTEGER(0..255), + ganss-sat-id BIT STRING (SIZE (36)), + gANSS-AlmanacModel CHOICE { + gANSS-keplerianParameters SEQUENCE { + t-oa INTEGER(0..255), + iod-a INTEGER(0..3), + gANSS-SatelliteInformationKP GANSS-SatelliteInformationKP, + ie-Extensions ProtocolExtensionContainer { { GANSS-KeplerianParametersAlm-ExtIEs } } OPTIONAL, + ... + }, + ... + }, + ie-Extensions ProtocolExtensionContainer { { GANSS-Almanac-ExtIEs } } OPTIONAL, + ... +} + +GANSS-KeplerianParametersAlm-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +GANSS-Almanac-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} +GANSS-Clock-Model ::= SEQUENCE (SIZE (1..4)) OF SEQUENCE { + t-oc-lsb INTEGER(0..511), + a-i2 BIT STRING (SIZE (12)), + a-i1 BIT STRING (SIZE (18)), + a-i0 BIT STRING (SIZE (28)), + t-gd BIT STRING (SIZE (10)), + model-id INTEGER(0..1) OPTIONAL, + ie-Extensions ProtocolExtensionContainer { { GANSS-ClockModelItem-ExtIEs } } OPTIONAL, + ... +} + +GANSS-ClockModelItem-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +GANSS-Common-Data ::= SEQUENCE { + ganss-Ionospheric-Model GANSS-Ionospheric-Model OPTIONAL, + ganss-Rx-Pos GANSS-RX-Pos OPTIONAL, + ie-Extensions ProtocolExtensionContainer { { GANSS-Common-Data-ExtIEs } } OPTIONAL, + ... +} + +GANSS-Common-Data-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +GANSS-CommonDataInfoReq ::= SEQUENCE { + ionospheric-Model BOOLEAN OPTIONAL, + ie-Extensions ProtocolExtensionContainer { { GANSS-CommonDataInfoReq-ExtIEs } } OPTIONAL, + ... +} + +GANSS-CommonDataInfoReq-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +GANSS-GenericDataInfoReqList ::= SEQUENCE (SIZE(1..maxNoGANSS)) OF GANSS-GenericDataInfoReqItem + +GANSS-GenericDataInfoReqItem ::= SEQUENCE { + ganss-Id INTEGER(0..7) OPTIONAL, + ganss-Navigation-Model BOOLEAN OPTIONAL, + ganss-Time-Model BIT STRING (SIZE (8)) OPTIONAL, + ganss-UTC-Model BOOLEAN OPTIONAL, + ganss-Almanac BOOLEAN OPTIONAL, + ganss-Real-Time-Integrity BOOLEAN OPTIONAL, + ie-Extensions ProtocolExtensionContainer { { GANSS-GenericDataInfoReqItem-ExtIEs } } OPTIONAL, + ... +} + +GANSS-GenericDataInfoReqItem-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + + +GANSS-Generic-Data ::= SEQUENCE (SIZE(1..maxNoGANSS)) OF GANSS-Generic-DataItem + +GANSS-Generic-DataItem ::= SEQUENCE { + ganss-Id INTEGER(0..7) OPTIONAL, + dganss-Correction DGANSSCorrections OPTIONAL, + ganss-Navigation-Model GANSS-Navigation-Model OPTIONAL, + ganss-Time-Model GANSS-Time-Model OPTIONAL, + ganss-UTC-TIME GANSS-UTC-Model OPTIONAL, + ganss-Almanac GANSS-Almanac OPTIONAL, + ganss-Real-Time-Integrity GANSS-Real-Time-Integrity OPTIONAL, + ie-Extensions ProtocolExtensionContainer { { GANSS-Generic-DataItem-ExtIEs } } OPTIONAL, + ... +} + +GANSS-Generic-DataItem-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +GANSS-Information ::= SEQUENCE { + gANSS-CommonDataInfoReq GANSS-CommonDataInfoReq OPTIONAL, + gANSS-GenericDataInfoReqList GANSS-GenericDataInfoReqList OPTIONAL, + ie-Extensions ProtocolExtensionContainer { { GANSS-Information-ExtIEs } } OPTIONAL, + ... +} + +GANSS-Information-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +GANSS-Ionospheric-Model ::= SEQUENCE { + alpha-zero-ionos BIT STRING (SIZE (12)), + alpha-one-ionos BIT STRING (SIZE (12)), + alpha-two-ionos BIT STRING (SIZE (12)), + gANSS-IonosphereRegionalStormFlags GANSS-IonosphereRegionalStormFlags OPTIONAL, + ie-Extensions ProtocolExtensionContainer { { GANSS-Ionospheric-Model-ExtIEs } } OPTIONAL, + ... +} + +GANSS-Ionospheric-Model-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +GANSS-IonosphereRegionalStormFlags ::= SEQUENCE { + storm-flag-one BOOLEAN, + storm-flag-two BOOLEAN, + storm-flag-three BOOLEAN, + storm-flag-four BOOLEAN, + storm-flag-five BOOLEAN, + ie-Extensions ProtocolExtensionContainer { { GANSS-IonosphereRegionalStormFlags-ExtIEs } } OPTIONAL, + ... +} + +GANSS-IonosphereRegionalStormFlags-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +GANSS-Navigation-Model ::= SEQUENCE { + ganss-Ref-Time GANSS-Reference-Time, + non-broadcastIndication ENUMERATED{true} OPTIONAL, +-- The three following IEs shall be present if the GANSS Orbit Model IE indicates "Keplerian Parameters" + toe-c-msb INTEGER(0..31) OPTIONAL, + e-msb INTEGER(0..127) OPTIONAL, + sqrtA-msb INTEGER(0..63) OPTIONAL, + ganssSatInfoNav GANSS-Sat-Info-Nav, + ie-Extensions ProtocolExtensionContainer { { GANSS-Navigation-Model-ExtIEs } } OPTIONAL, + ... +} + +GANSS-Navigation-Model-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +GANSS-Orbit-Model ::= CHOICE { + gANSS-keplerianParameters SEQUENCE { + toe-lsb-nav INTEGER (0..511), + ganss-omega-nav BIT STRING (SIZE (32)), + delta-n-nav BIT STRING (SIZE (16)), + m-zero-nav BIT STRING (SIZE (32)), + omegadot-nav BIT STRING (SIZE (24)), + ganss-e-lsb-nav INTEGER(0..33554431), + idot-nav BIT STRING (SIZE (14)), + a-sqrt-lsb-nav INTEGER(0..67108863), + i-zero-nav BIT STRING (SIZE (32)), + omega-zero-nav BIT STRING (SIZE (32)), + c-rs-nav BIT STRING (SIZE (16)), + c-is-nav BIT STRING (SIZE (16)), + c-us-nav BIT STRING (SIZE (16)), + c-rc-nav BIT STRING (SIZE (16)), + c-ic-nav BIT STRING (SIZE (16)), + c-uc-nav BIT STRING (SIZE (16)), + ie-Extensions ProtocolExtensionContainer { { GANSS-KeplerianParametersOrb-ExtIEs } } OPTIONAL, + ... + }, + ... +} + +GANSS-KeplerianParametersOrb-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +GANSS-Real-Time-Integrity ::= SEQUENCE (SIZE (1..maxGANSSSat)) OF SEQUENCE { + bad-ganss-satId INTEGER(0..63), + bad-ganss-signalId INTEGER(0..4,...) OPTIONAL, + ie-Extensions ProtocolExtensionContainer { { GANSS-RealTimeInformationItem-ExtIEs } } OPTIONAL, + ... +} + +GANSS-RealTimeInformationItem-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +GANSS-Reference-Time ::= SEQUENCE { + ganssDay INTEGER(0..8191) OPTIONAL, + ganssTod INTEGER(0..86399), + ganssTodUncertainty INTEGER(0..127) OPTIONAL, + ie-Extensions ProtocolExtensionContainer { { GANSS-Reference-Time-ExtIEs } } OPTIONAL, + ... +} + +GANSS-Reference-Time-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +GANSS-RX-Pos ::= SEQUENCE { + latitudeSign ENUMERATED{north,south}, + degreesOfLatitude INTEGER(0..2147483647), + degreesOfLongitude INTEGER(-2147483648..2147483647), + directionOfAltitude ENUMERATED{height,depth}, + altitude INTEGER(0..32767), + ie-Extensions ProtocolExtensionContainer { { GANSS-RX-Pos-ExtIEs } } OPTIONAL, + ... +} + +GANSS-RX-Pos-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +GANSS-SatelliteInformationKP ::= SEQUENCE (SIZE (1..maxGANSSSat)) OF SEQUENCE { + ganss-e-alm BIT STRING (SIZE (11)), + ganss-delta-I-alm BIT STRING (SIZE (11)), + ganss-omegadot-alm BIT STRING (SIZE (11)), + ganss-svhealth-alm BIT STRING (SIZE (4)), + ganss-delta-a-sqrt-alm BIT STRING (SIZE (17)), + ganss-omegazero-alm BIT STRING (SIZE (16)), + ganss-m-zero-alm BIT STRING (SIZE (16)), + ganss-omega-alm BIT STRING (SIZE (16)), + ganss-af-zero-alm BIT STRING (SIZE (14)), + ganss-af-one-alm BIT STRING (SIZE (11)), + ie-Extensions ProtocolExtensionContainer { { GANSS-SatelliteInformationKPItem-ExtIEs } } OPTIONAL, + ... +} + +GANSS-SatelliteInformationKPItem-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +GANSS-Sat-Info-Nav ::= SEQUENCE (SIZE(1..maxGANSSSat)) OF SEQUENCE { + satId INTEGER(0..63), + svHealth BIT STRING (SIZE(5)), + iod BIT STRING (SIZE(10)), + ganssClockModel GANSS-Clock-Model, + ganssOrbitModel GANSS-Orbit-Model, + ie-Extensions ProtocolExtensionContainer { { GANSS-Sat-Info-Nav-ExtIEs } } OPTIONAL, + ... +} + +GANSS-Sat-Info-Nav-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +GANSS-StatusHealth ::= ENUMERATED { + udre-scale-1dot0, + udre-scale-0dot75, + udre-scale-0dot5, + udre-scale-0dot3, + udre-scale-0dot2, + udre-scale-0dot1, + no-data, + invalid-data +} + +GANSS-Time-Model ::= SEQUENCE { + ganss-time-model INTEGER(0..65535), + ganss-t-a0 INTEGER(-2147483648..2147483647), + ganss-t-a1 INTEGER(-8388608..8388607) OPTIONAL, + ganss-t-a2 INTEGER(-64..63) OPTIONAL, + ganss-to-id INTEGER(0..7), + ganss-wk-number INTEGER(0..8191) OPTIONAL, + ie-Extensions ProtocolExtensionContainer { { GANSS-Time-Model-ExtIEs } } OPTIONAL, + ... +} + +GANSS-Time-Model-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +GANSS-UTC-Model ::= SEQUENCE { + a-one-utc BIT STRING (SIZE (24)), + a-zero-utc BIT STRING (SIZE (32)), + t-ot-utc BIT STRING (SIZE (8)), + w-n-t-utc BIT STRING (SIZE (8)), + delta-t-ls-utc BIT STRING (SIZE (8)), + w-n-lsf-utc BIT STRING (SIZE (8)), + dn-utc BIT STRING (SIZE (8)), + delta-t-lsf-utc BIT STRING (SIZE (8)), + ie-Extensions ProtocolExtensionContainer { { GANSS-UTC-Model-ExtIEs } } OPTIONAL, + ... +} + +GANSS-UTC-Model-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + + GA-PointWithAltitude ::= SEQUENCE { geographicalCoordinates GeographicalCoordinate, altitudeAndDirection GA-AltitudeAndDirection, @@ -3066,7 +3464,8 @@ HSDSCH-FDD-Information ::= SEQUENCE { HSDSCH-FDD-Information-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { { ID id-HARQ-Preamble-Mode CRITICALITY ignore EXTENSION HARQ-Preamble-Mode PRESENCE optional}| -{ ID id-MIMO-Information CRITICALITY reject EXTENSION MIMO-Information PRESENCE optional}, +{ ID id-MIMO-Information CRITICALITY reject EXTENSION MIMO-Information PRESENCE optional}| +{ ID id-HSDSCH-MACdPDUSizeFormat CRITICALITY reject EXTENSION HSDSCH-MACdPDUSizeFormat PRESENCE optional}, ... } @@ -3108,7 +3507,8 @@ HSDSCH-Information-to-Modify-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { { ID id-HARQ-Preamble-Mode CRITICALITY ignore EXTENSION HARQ-Preamble-Mode PRESENCE optional}| { ID id-HS-PDSCH-Code-Change-Grant CRITICALITY ignore EXTENSION HS-PDSCH-Code-Change-Grant PRESENCE optional}| -- Applicable to FDD only -{ ID id-MIMO-InformationToModify CRITICALITY reject EXTENSION MIMO-InformationToModify PRESENCE optional}, +{ ID id-MIMO-InformationToModify CRITICALITY reject EXTENSION MIMO-InformationToModify PRESENCE optional}| +{ ID id-HSDSCH-MACdPDUSizeFormat CRITICALITY reject EXTENSION HSDSCH-MACdPDUSizeFormat PRESENCE optional}, ... } @@ -3134,6 +3534,11 @@ HSDSCH-MACdFlow-ID ::= INTEGER (0..maxNrOfMACdFlows-1) HSDSCH-MACdFlow-Specific-InfoList ::= SEQUENCE (SIZE (1..maxNrOfMACdFlows)) OF HSDSCH-MACdFlow-Specific-InfoItem +HSDSCH-MACdPDUSizeFormat ::= ENUMERATED { + indexedMACdPDU-Size, + flexibleMACdPDU-Size +} + HSDSCH-MACdFlow-Specific-InfoItem ::= SEQUENCE { hSDSCH-MACdFlow-ID HSDSCH-MACdFlow-ID, allocationRetentionPriority AllocationRetentionPriority, @@ -3218,6 +3623,7 @@ HSDSCH-Initial-Capacity-AllocationItem ::= SEQUENCE { } HSDSCH-Initial-Capacity-AllocationItem-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { +{ ID id-MaximumMACdPDU-SizeExtended CRITICALITY ignore EXTENSION MAC-PDU-SizeExtended PRESENCE optional}, ... } @@ -3298,6 +3704,7 @@ HSDSCH-TDD-Information ::= SEQUENCE { } HSDSCH-TDD-Information-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { +{ ID id-HSDSCH-MACdPDUSizeFormat CRITICALITY reject EXTENSION HSDSCH-MACdPDUSizeFormat PRESENCE optional}, ... } @@ -3578,7 +3985,8 @@ InformationReportPeriodicity ::= CHOICE { InformationThreshold ::= CHOICE { dGPSThreshold DGPSThreshold, - ... + ..., + dGANSSThreshold DGANSSThreshold } @@ -3595,7 +4003,10 @@ InformationType ::= SEQUENCE { cell-Capacity-Class, nACC-Related-Data, mBMSBearerServiceFullAddress, - interFrequencyCellInformation + interFrequencyCellInformation, + gANSSInformation, + dGANSSCorrections, + gANSS-RX-Pos }, gPSInformation GPSInformation OPTIONAL, iE-Extensions ProtocolExtensionContainer { { InformationType-ExtIEs} } OPTIONAL, @@ -3606,6 +4017,8 @@ InformationType ::= SEQUENCE { -- For information exchange on the Iur-g interface, only the Cell Capacity Class is used. InformationType-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { +-- The following IE shall be present if the Information Type Item IE indicates 'GANSS Information' + { ID id-GANSS-Information CRITICALITY ignore EXTENSION GANSS-Information PRESENCE conditional }, ... } @@ -3825,6 +4238,8 @@ MAC-DTX-Cycle-10ms ::= ENUMERATED {v5, v10, v20} MACdPDU-Size ::= INTEGER (1..5000,...) +MAC-PDU-SizeExtended ::= INTEGER (1..12032,...) + MACdPDU-Size-IndexList ::= SEQUENCE (SIZE (1..maxNrOfPDUIndexes)) OF MACdPDU-Size-IndexItem MACdPDU-Size-IndexItem ::= SEQUENCE { @@ -3885,11 +4300,17 @@ MaxNrULPhysicalchannels ::= INTEGER (1..2) Max-Set-E-DPDCHs ::= ENUMERATED { vN256, vN128, vN64, vN32, vN16, vN8, vN4, v2xN4, v2xN2, v2xN2plus2xN4, - ... + ..., + v2xM2plus2xM4 } -- Values releated to [9] +Max-UE-DTX-Cycle ::= ENUMERATED { + v5, v10, v20, v40, v64, v80, v128, v160, + ... + } + MBMS-Bearer-Service-Full-Address ::= SEQUENCE { accessPointName AccessPointName, iPMulticastAddress IPMulticastAddress, @@ -4072,7 +4493,8 @@ Extension-MeasurementThresholdIE RNSAP-PROTOCOL-IES ::= { { ID id-UpPTSInterferenceValue CRITICALITY reject TYPE UpPTSInterferenceValue PRESENCE mandatory }| { ID id-Rx-Timing-Deviation-Value-768 CRITICALITY reject TYPE Rx-Timing-Deviation-Value-768 PRESENCE mandatory}| { ID id-Rx-Timing-Deviation-Value-ext CRITICALITY reject TYPE Rx-Timing-Deviation-Value-ext PRESENCE mandatory}| - { ID id-Extended-Round-Trip-Time-Value CRITICALITY reject TYPE Extended-Round-Trip-Time-Value PRESENCE mandatory } + { ID id-Extended-Round-Trip-Time-Value CRITICALITY reject TYPE Extended-Round-Trip-Time-Value PRESENCE mandatory }| + { ID id-TUTRANGANSSMeasurementThresholdInformation CRITICALITY reject TYPE TUTRANGANSSMeasurementThresholdInformation PRESENCE mandatory } } MidambleConfigurationBurstType1And3 ::= ENUMERATED {v4, v8, v16} @@ -4287,7 +4709,8 @@ Neighbouring-UMTS-CellInformationItem ::= SEQUENCE { } Neighbouring-UMTS-CellInformationItem-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { - { ID id-neighbouring-LCR-TDD-CellInformation CRITICALITY ignore EXTENSION Neighbouring-LCR-TDD-CellInformation PRESENCE optional }, + { ID id-neighbouring-LCR-TDD-CellInformation CRITICALITY ignore EXTENSION Neighbouring-LCR-TDD-CellInformation PRESENCE optional }| + { ID id-Extended-RNC-ID CRITICALITY reject EXTENSION Extended-RNC-ID PRESENCE optional }, ... } @@ -4477,7 +4900,7 @@ NRTLoadInformationValue ::= SEQUENCE { N-E-UCCH ::= INTEGER (1..12) -N-E-UCCH-LCR ::= INTEGER (1..5) +N-E-UCCH-LCR ::= INTEGER (1..8) -- O @@ -4674,6 +5097,24 @@ PriorityQueue-InfoItem ::= SEQUENCE { } PriorityQueue-InfoItem-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { +{ ID id-MaximumMACdPDU-SizeExtended CRITICALITY reject EXTENSION MAC-PDU-SizeExtended PRESENCE optional}, + ... +} + +PriorityQueue-InfoList-EnhancedFACH ::= SEQUENCE (SIZE (1..maxNrOfPrioQueues)) OF PriorityQueue-InfoItem-EnhancedFACH + +PriorityQueue-InfoItem-EnhancedFACH ::= SEQUENCE { + priorityQueue-Id PriorityQueue-Id, + schedulingPriorityIndicator SchedulingPriorityIndicator, + t1 T1, + discardTimer DiscardTimer OPTIONAL, + mAC-hsWindowSize MAC-hsWindowSize, + maximum-MACdPDU-Size MAC-PDU-SizeExtended, + iE-Extensions ProtocolExtensionContainer { { PriorityQueue-InfoItem-EnhancedFACH-ExtIEs } } OPTIONAL, + ... +} + +PriorityQueue-InfoItem-EnhancedFACH-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { ... } @@ -4694,6 +5135,7 @@ PriorityQueue-InfoItem-to-Add ::= SEQUENCE { } PriorityQueue-InfoItem-to-Add-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { +{ ID id-MaximumMACdPDU-SizeExtended CRITICALITY reject EXTENSION MAC-PDU-SizeExtended PRESENCE optional}, ... } @@ -4710,6 +5152,7 @@ PriorityQueue-InfoItem-to-Modify ::= SEQUENCE { } PriorityQueue-InfoItem-to-Modify-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { +{ ID id-MaximumMACdPDU-SizeExtended CRITICALITY reject EXTENSION MAC-PDU-SizeExtended PRESENCE optional}, ... } @@ -4859,7 +5302,9 @@ RequestedDataValue-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { { ID id-Cell-Capacity-Class-Value CRITICALITY ignore EXTENSION Cell-Capacity-Class-Value PRESENCE optional }| { ID id-NACC-Related-Data CRITICALITY ignore EXTENSION NACC-Related-Data PRESENCE optional }| { ID id-MBMS-Bearer-Service-Full-Address CRITICALITY ignore EXTENSION MBMS-Bearer-Service-Full-Address PRESENCE optional }| - { ID id-Inter-Frequency-Cell-Information CRITICALITY ignore EXTENSION Inter-Frequency-Cell-Information PRESENCE optional }, + { ID id-Inter-Frequency-Cell-Information CRITICALITY ignore EXTENSION Inter-Frequency-Cell-Information PRESENCE optional }| + { ID id-GANSS-Common-Data CRITICALITY ignore EXTENSION GANSS-Common-Data PRESENCE optional }| + { ID id-GANSS-Generic-Data CRITICALITY ignore EXTENSION GANSS-Generic-Data PRESENCE optional }, ... } @@ -5277,11 +5722,43 @@ SIR-Value ::= INTEGER (0..63) SIR-Value-IncrDecrThres ::= INTEGER (0..62) +SixteenQAM-UL-Delta-T2TP ::= INTEGER (0..6,...) + + +SixteenQAM-UL-Information ::= SEQUENCE { + sixteenQAM-UL-Operation-Indicator SixteenQAM-UL-Operation-Indicator, + sixteenQAM-UL-Delta-T2TP SixteenQAM-UL-Delta-T2TP, + iE-Extensions ProtocolExtensionContainer { { SixteenQAM-UL-Information-ExtIEs } } OPTIONAL, + ... +} + +SixteenQAM-UL-Information-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +SixteenQAM-UL-Information-to-Modify ::= SEQUENCE { + sixteenQAM-UL-Operation-Indicator SixteenQAM-UL-Operation-Indicator OPTIONAL, + sixteenQAM-UL-Delta-T2TP SixteenQAM-UL-Delta-T2TP OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { SixteenQAM-UL-Information-to-Modify-ExtIEs } } OPTIONAL, + ... +} + +SixteenQAM-UL-Information-to-Modify-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +SixteenQAM-UL-Operation-Indicator ::= ENUMERATED { + activate, + deactivate +} + SixtyfourQAM-DL-SupportIndicator ::= ENUMERATED { sixteenQAM-DL-supported, sixteenQAM-DL-not-supported } +SignatureSequenceGroupIndex ::= INTEGER (0..19) + SNA-Information ::= SEQUENCE { pLMN-Identity PLMN-Identity, listOfSNAs ListOfSNAs OPTIONAL, @@ -5809,6 +6286,42 @@ Transmitted-Carrier-Power-Value-IncrDecrThres ::= INTEGER(0..100) Transport-Block-Size-Index ::= INTEGER(1..maxNrOfHS-DSCHTBSs) +TUTRANGANSS ::= SEQUENCE { + mS INTEGER(0..16383), + lS INTEGER(0..4294967295) +} + +TUTRANGANSSAccuracyClass ::= ENUMERATED { + ganssAccuracy-class-A, + ganssAccuracy-class-B, + ganssAccuracy-class-C, + ... +} + +TUTRANGANSSMeasurementThresholdInformation ::= SEQUENCE { + tUTRANGANSSChangeLimit INTEGER(1..256) OPTIONAL, + predictedTUTRANGANSSDeviationLimit INTEGER(1..256) OPTIONAL, + ie-Extensions ProtocolExtensionContainer { { TUTRANGANSSMeasurementThresholdInformation-ExtIEs } } OPTIONAL, + ... +} + +TUTRANGANSSMeasurementThresholdInformation-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + +TUTRANGANSSMeasurementValueInformation ::= SEQUENCE { + tUTRANGANSS TUTRANGANSS, + tUTRANGANSSQuality INTEGER(0..255) OPTIONAL, + tUTRANGANSSDriftRate INTEGER(-50..50), + tUTRANGANSSDriftRateQuality INTEGER(0..50) OPTIONAL, + ie-Extensions ProtocolExtensionContainer { { TUTRANGANSSMeasurementValueInformation-ExtIEs } } OPTIONAL, + ... +} + +TUTRANGANSSMeasurementValueInformation-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + ... +} + TUTRANGPS ::= SEQUENCE { ms-part INTEGER (0..16383), ls-part INTEGER (0..4294967295) @@ -6088,8 +6601,8 @@ UE-DTX-Cycle2-10ms ::= ENUMERATED {v5, v10, v20, v40, v80, v160} UE-DTX-DRX-Offset ::= INTEGER (0..159) -- Unit subframe -UE-DTX-Long-Preamble ::= BOOLEAN - -- true: applied, false: not applied +UE-DTX-Long-Preamble ::= ENUMERATED {v2, v4, v15} + -- Units of slots UE-Inactivity-Threshold ::= ENUMERATED {v1, v2, v4, v8, v16, v32, v64, v128, v256, v512, infinity} -- Unit subframe @@ -6509,6 +7022,7 @@ Ura-Pch-State ::= SEQUENCE { } Ura-Pch-State-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + { ID id-Extended-SRNC-ID CRITICALITY reject EXTENSION Extended-RNC-ID PRESENCE optional }, ... } @@ -6642,6 +7156,7 @@ UC-ID ::= SEQUENCE { } UC-ID-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + { ID id-Extended-RNC-ID CRITICALITY reject EXTENSION Extended-RNC-ID PRESENCE optional}, ... } @@ -6711,6 +7226,7 @@ URA-Information ::= SEQUENCE { } URA-Information-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + { ID id-Extended-RNC-ID CRITICALITY reject EXTENSION Extended-RNC-ID PRESENCE optional }, ... } @@ -6746,8 +7262,9 @@ USCH-InformationItem-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { { ID id-TrafficClass CRITICALITY ignore EXTENSION TrafficClass PRESENCE mandatory }| { ID id-BindingID CRITICALITY ignore EXTENSION BindingID PRESENCE optional }| -- Shall be ignored if bearer establishment with ALCAP. - { ID id-TransportLayerAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional }, + { ID id-TransportLayerAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional }| -- Shall be ignored if bearer establishment with ALCAP. + { ID id-TnlQos CRITICALITY ignore EXTENSION TnlQos PRESENCE optional }, ... } diff --git a/asn1/rnsap/RNSAP-PDU-Contents.asn b/asn1/rnsap/RNSAP-PDU-Contents.asn index 567ba3ed07..76afafcce3 100644 --- a/asn1/rnsap/RNSAP-PDU-Contents.asn +++ b/asn1/rnsap/RNSAP-PDU-Contents.asn @@ -1,14 +1,13 @@ -- RNSAP-PDU-Contents.asn -- --- Taken from 3GPP TS 25.423 V7.4.0 (2007-03) --- http://www.3gpp.org/ftp/Specs/archive/25_series/25.423/25423-740.zip/25423-740.DOC +-- Taken from 3GPP TS 25.423 V7.5.0 (2007-06) +-- http://www.3gpp.org/ftp/Specs/archive/25_series/25.423/25423-750.zip/25423-750.DOC -- --- 9.3.3 PDU Definitions +-- 9.3.3 PDU Definitions -- -- $Id$ -- - -- ************************************************************** -- -- PDU definitions for RNSAP. @@ -134,9 +133,15 @@ IMPORTS E-RNTI, E-TFCS-Information, E-TTI, + Enhanced-FACH-Support-Indicator, + Enhanced-FACH-Information-ResponseFDD, + Enhanced-PCH-Support-Indicator, ExtendedPropagationDelay, + Extended-RNC-ID, SchedulingPriorityIndicator, Enhanced-PrimaryCPICH-EcNo, + F-DPCH-SlotFormat, + F-DPCH-SlotFormatSupportRequest, FACH-FlowControlInformation, Fast-Reconfiguration-Mode, Fast-Reconfiguration-Permission, @@ -189,6 +194,7 @@ IMPORTS MACes-Guaranteed-Bitrate, MaxNr-Retransmissions-EDCH, Max-Set-E-DPDCHs, + Max-UE-DTX-Cycle, MeasurementFilterCoefficient, MeasurementID, MeasurementRecoveryBehavior, @@ -538,10 +544,17 @@ FROM RNSAP-Containers id-EDCH-MacdFlowSpecificInformationItem-RL-PreemptRequiredInd, id-EDCH-MacdFlowSpecificInformationList-RL-CongestInd, id-EDCH-MacdFlowSpecificInformationItem-RL-CongestInd, + id-Enhanced-FACH-Support-Indicator, + id-Enhanced-FACH-Information-ResponseFDD, + id-Enhanced-PCH-Support-Indicator, id-ExtendedPropagationDelay, + id-Extended-SRNC-ID, + id-Extended-RNC-ID, id-Serving-cell-change-CFN, id-E-DCH-Serving-cell-change-informationResponse, id-Enhanced-PrimaryCPICH-EcNo, + id-F-DPCH-SlotFormat, + id-F-DPCH-SlotFormatSupportRequest, id-FACH-InfoForUESelectedS-CCPCH-CTCH-ResourceRspFDD, id-FACH-InfoForUESelectedS-CCPCH-CTCH-ResourceRspTDD, id-Fast-Reconfiguration-Mode, @@ -590,6 +603,7 @@ FROM RNSAP-Containers id-AdjustmentPeriod, id-ListOfInterfacesToTrace, id-MaxAdjustmentStep, + id-Max-UE-DTX-Cycle, id-MBMS-Bearer-Service-List, id-MBMS-Bearer-Service-List-InfEx-Rsp, id-MeasurementFilterCoefficient, @@ -991,7 +1005,8 @@ RadioLinkSetupRequestFDD-Extensions RNSAP-PROTOCOL-EXTENSION ::= { { ID id-DCH-Indicator-For-E-DCH-HSDPA-Operation CRITICALITY reject EXTENSION DCH-Indicator-For-E-DCH-HSDPA-Operation PRESENCE optional }| { ID id-Serving-cell-change-CFN CRITICALITY reject EXTENSION CFN PRESENCE optional }| { ID id-Continuous-Packet-Connectivity-DTX-DRX-Information CRITICALITY reject EXTENSION Continuous-Packet-Connectivity-DTX-DRX-Information PRESENCE optional }| - { ID id-Continuous-Packet-Connectivity-HS-SCCH-Less-Information CRITICALITY reject EXTENSION Continuous-Packet-Connectivity-HS-SCCH-Less-Information PRESENCE optional }, + { ID id-Continuous-Packet-Connectivity-HS-SCCH-Less-Information CRITICALITY reject EXTENSION Continuous-Packet-Connectivity-HS-SCCH-Less-Information PRESENCE optional }| + { ID id-Extended-SRNC-ID CRITICALITY reject EXTENSION Extended-RNC-ID PRESENCE optional }, ... } @@ -1006,6 +1021,7 @@ F-DPCH-Information-RL-SetupRqstFDD ::= SEQUENCE { } F-DPCH-Information-RL-SetupRqstFDD-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + { ID id-F-DPCH-SlotFormatSupportRequest CRITICALITY reject EXTENSION F-DPCH-SlotFormatSupportRequest PRESENCE optional }, ... } @@ -1168,7 +1184,8 @@ RadioLinkSetupRequestTDD-Extensions RNSAP-PROTOCOL-EXTENSION ::= { { ID id-E-DCH-Information CRITICALITY reject EXTENSION E-DCH-Information PRESENCE optional }| { ID id-E-DCH-Serving-RL-ID CRITICALITY reject EXTENSION RL-ID PRESENCE optional }| { ID id-E-DCH-768-Information CRITICALITY reject EXTENSION E-DCH-768-Information PRESENCE optional }| - { ID id-E-DCH-LCR-Information CRITICALITY reject EXTENSION E-DCH-LCR-Information PRESENCE optional }, + { ID id-E-DCH-LCR-Information CRITICALITY reject EXTENSION E-DCH-LCR-Information PRESENCE optional }| + { ID id-Extended-SRNC-ID CRITICALITY reject EXTENSION Extended-RNC-ID PRESENCE optional }, ... } @@ -1241,7 +1258,8 @@ RL-InformationResponseItem-RL-SetupRspFDD-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { { ID id-Active-MBMS-Bearer-ServiceFDD-PFL CRITICALITY ignore EXTENSION Active-MBMS-Bearer-Service-ListFDD-PFL PRESENCE optional }| { ID id-EDCH-RLSet-Id CRITICALITY ignore EXTENSION RL-Set-ID PRESENCE optional }| { ID id-EDCH-FDD-DL-ControlChannelInformation CRITICALITY ignore EXTENSION EDCH-FDD-DL-ControlChannelInformation PRESENCE optional }| - { ID id-Initial-DL-DPCH-TimingAdjustment CRITICALITY ignore EXTENSION DL-DPCH-TimingAdjustment PRESENCE optional }, + { ID id-Initial-DL-DPCH-TimingAdjustment CRITICALITY ignore EXTENSION DL-DPCH-TimingAdjustment PRESENCE optional }| + { ID id-F-DPCH-SlotFormat CRITICALITY ignore EXTENSION F-DPCH-SlotFormat PRESENCE optional }, ... } @@ -1839,6 +1857,8 @@ UnsuccessfulRL-InformationResponse-RL-SetupFailureFDD ::= SEQUENCE { } UnsuccessfulRL-InformationResponse-RL-SetupFailureFDD-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + { ID id-Max-UE-DTX-Cycle CRITICALITY ignore EXTENSION Max-UE-DTX-Cycle PRESENCE CONDITIONAL }, + -- This IE shall be present if the Cause IE is set to "Continuous Packet Connectivity UE DTX Cycle not Available". ... } @@ -2045,7 +2065,7 @@ RadioLinkAdditionRequestFDD-Extensions RNSAP-PROTOCOL-EXTENSION ::= { { ID id-Initial-DL-DPCH-TimingAdjustment-Allowed CRITICALITY ignore EXTENSION Initial-DL-DPCH-TimingAdjustment-Allowed PRESENCE optional }| { ID id-HS-DSCH-serving-cell-change-information CRITICALITY reject EXTENSION HS-DSCH-serving-cell-change-information PRESENCE optional }| { ID id-Serving-cell-change-CFN CRITICALITY reject EXTENSION CFN PRESENCE optional }| - { ID id-EDPCH-Information-RLAdditionReq-FDD CRITICALITY reject EXTENSION EDPCH-Information-RLAdditionReq-FDD PRESENCE optional }| + { ID id-EDPCH-Information-RLAdditionReq-FDD CRITICALITY reject EXTENSION EDPCH-Information-RLAdditionReq-FDD PRESENCE optional }| { ID id-EDCH-FDD-Information CRITICALITY reject EXTENSION EDCH-FDD-Information PRESENCE optional }, -- This IE shall be present if E-DPCH Information is present ... @@ -2218,7 +2238,8 @@ RL-InformationResponseItem-RL-AdditionRspFDD-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { ID id-Active-MBMS-Bearer-ServiceFDD-PFL CRITICALITY ignore EXTENSION Active-MBMS-Bearer-Service-ListFDD-PFL PRESENCE optional }| { ID id-EDCH-RLSet-Id CRITICALITY ignore EXTENSION RL-Set-ID PRESENCE optional }| { ID id-EDCH-FDD-DL-ControlChannelInformation CRITICALITY ignore EXTENSION EDCH-FDD-DL-ControlChannelInformation PRESENCE optional }| - { ID id-Initial-DL-DPCH-TimingAdjustment CRITICALITY ignore EXTENSION DL-DPCH-TimingAdjustment PRESENCE optional }, + { ID id-Initial-DL-DPCH-TimingAdjustment CRITICALITY ignore EXTENSION DL-DPCH-TimingAdjustment PRESENCE optional }| + { ID id-F-DPCH-SlotFormat CRITICALITY ignore EXTENSION F-DPCH-SlotFormat PRESENCE optional }, ... } @@ -3196,6 +3217,7 @@ F-DPCH-Information-RL-ReconfPrepFDD ::= SEQUENCE { } F-DPCH-Information-RL-ReconfPrepFDD-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + { ID id-F-DPCH-SlotFormatSupportRequest CRITICALITY reject EXTENSION F-DPCH-SlotFormatSupportRequest PRESENCE optional }, ... } @@ -3552,7 +3574,8 @@ RL-InformationResponseItem-RL-ReconfReadyFDD-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { ID id-Secondary-CPICH-Information-Change CRITICALITY ignore EXTENSION Secondary-CPICH-Information-Change PRESENCE optional }| { ID id-EDCH-FDD-InformationResponse CRITICALITY ignore EXTENSION EDCH-FDD-InformationResponse PRESENCE optional }| { ID id-EDCH-RLSet-Id CRITICALITY ignore EXTENSION RL-Set-ID PRESENCE optional }| - { ID id-EDCH-FDD-DL-ControlChannelInformation CRITICALITY ignore EXTENSION EDCH-FDD-DL-ControlChannelInformation PRESENCE optional }, + { ID id-EDCH-FDD-DL-ControlChannelInformation CRITICALITY ignore EXTENSION EDCH-FDD-DL-ControlChannelInformation PRESENCE optional }| + { ID id-F-DPCH-SlotFormat CRITICALITY ignore EXTENSION F-DPCH-SlotFormat PRESENCE optional }, ... } @@ -4188,6 +4211,8 @@ RL-ReconfigurationFailure-RL-ReconfFail ::= SEQUENCE { } RL-ReconfigurationFailure-RL-ReconfFailure-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + { ID id-Max-UE-DTX-Cycle CRITICALITY ignore EXTENSION Max-UE-DTX-Cycle PRESENCE CONDITIONAL }, + -- This IE shall be present if the Cause IE is set to "Continuous Packet Connectivity UE DTX Cycle not Available". ... } @@ -4483,7 +4508,8 @@ RL-InformationResponseItem-RL-ReconfRspFDD-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { { ID id-DL-PowerBalancing-UpdatedIndicator CRITICALITY ignore EXTENSION DL-PowerBalancing-UpdatedIndicator PRESENCE optional}| { ID id-EDCH-FDD-InformationResponse CRITICALITY ignore EXTENSION EDCH-FDD-InformationResponse PRESENCE optional }| { ID id-EDCH-RLSet-Id CRITICALITY ignore EXTENSION RL-Set-ID PRESENCE optional }| - { ID id-EDCH-FDD-DL-ControlChannelInformation CRITICALITY ignore EXTENSION EDCH-FDD-DL-ControlChannelInformation PRESENCE optional }, + { ID id-EDCH-FDD-DL-ControlChannelInformation CRITICALITY ignore EXTENSION EDCH-FDD-DL-ControlChannelInformation PRESENCE optional }| + { ID id-F-DPCH-SlotFormat CRITICALITY ignore EXTENSION F-DPCH-SlotFormat PRESENCE optional }, ... } @@ -5425,7 +5451,8 @@ UplinkSignallingTransferIndicationFDD-Extensions RNSAP-PROTOCOL-EXTENSION ::= { { ID id-CellPortionID CRITICALITY ignore EXTENSION CellPortionID PRESENCE optional }| { ID id-Active-MBMS-Bearer-ServiceFDD CRITICALITY ignore EXTENSION Active-MBMS-Bearer-Service-ListFDD PRESENCE optional}| { ID id-Inter-Frequency-Cell-List CRITICALITY ignore EXTENSION Inter-Frequency-Cell-List PRESENCE optional }| - { ID id-ExtendedPropagationDelay CRITICALITY ignore EXTENSION ExtendedPropagationDelay PRESENCE optional }, + { ID id-ExtendedPropagationDelay CRITICALITY ignore EXTENSION ExtendedPropagationDelay PRESENCE optional }| + { ID id-HSDSCH-RNTI CRITICALITY ignore EXTENSION HSDSCH-RNTI PRESENCE optional }, ... } @@ -5498,7 +5525,9 @@ DownlinkSignallingTransferRequest-Extensions RNSAP-PROTOCOL-EXTENSION ::= { { ID id-URA-ID CRITICALITY ignore EXTENSION URA-ID PRESENCE optional}| { ID id-MBMS-Bearer-Service-List CRITICALITY ignore EXTENSION MBMS-Bearer-Service-List PRESENCE optional}| { ID id-Old-URA-ID CRITICALITY ignore EXTENSION URA-ID PRESENCE optional}| - { ID id-SRNC-ID CRITICALITY ignore EXTENSION RNC-ID PRESENCE conditional}, -- This IE shall be present if the URA-ID IE or Old URA-ID IE is present. + { ID id-SRNC-ID CRITICALITY ignore EXTENSION RNC-ID PRESENCE conditional}| + -- This IE shall be present if the URA-ID IE or Old URA-ID IE is present. + { ID id-Extended-SRNC-ID CRITICALITY reject EXTENSION Extended-RNC-ID PRESENCE optional}, ... } @@ -5586,6 +5615,7 @@ CNOriginatedPage-PagingRqst-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { } PagingRequest-Extensions RNSAP-PROTOCOL-EXTENSION ::= { + { ID id-Extended-SRNC-ID CRITICALITY reject EXTENSION Extended-RNC-ID PRESENCE optional}, ... } @@ -6213,10 +6243,14 @@ CommonTransportChannelResourcesRequest-Extensions RNSAP-PROTOCOL-EXTENSION ::= { { ID id-Permanent-NAS-UE-Identity CRITICALITY ignore EXTENSION Permanent-NAS-UE-Identity PRESENCE optional }| { ID id-BindingID CRITICALITY ignore EXTENSION BindingID PRESENCE optional }| -- Shall be ignored if bearer establishment with ALCAP. - { ID id-TransportLayerAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional }| + { ID id-TransportLayerAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional }| -- Shall be ignored if bearer establishment with ALCAP. { ID id-MBMS-Bearer-Service-List CRITICALITY notify EXTENSION MBMS-Bearer-Service-List PRESENCE optional}| - { ID id-TnlQos CRITICALITY ignore EXTENSION TnlQos PRESENCE optional }, + { ID id-TnlQos CRITICALITY ignore EXTENSION TnlQos PRESENCE optional }| + { ID id-Enhanced-FACH-Support-Indicator CRITICALITY ignore EXTENSION Enhanced-FACH-Support-Indicator PRESENCE optional }| + -- FDD only + { ID id-Enhanced-PCH-Support-Indicator CRITICALITY ignore EXTENSION Enhanced-PCH-Support-Indicator PRESENCE optional }, + -- FDD only ...} -- ************************************************************** @@ -6243,6 +6277,7 @@ CommonTransportChannelResourcesResponseFDD-IEs RNSAP-PROTOCOL-IES ::= { FACH-InfoForUESelectedS-CCPCH-CTCH-ResourceRspFDD ::= SEQUENCE { fACH-FlowControlInformation FACH-FlowControlInformation-CTCH-ResourceRspFDD, +-- If the Enhanced FACH Information Response IE is included in the message, the FACH Flow Control Information IE shall be ignored. iE-Extensions ProtocolExtensionContainer { {FACH-InfoForUESelectedS-CCPCH-CTCH-ResourceRspFDD-ExtIEs} } OPTIONAL, ... } @@ -6258,8 +6293,9 @@ FACH-FlowControlInformationIEs-CTCH-ResourceRspFDD RNSAP-PROTOCOL-IES ::= { } CommonTransportChannelResourcesResponseFDD-Extensions RNSAP-PROTOCOL-EXTENSION ::= { - { ID id-C-ID CRITICALITY ignore EXTENSION C-ID PRESENCE mandatory }| - { ID id-Active-MBMS-Bearer-ServiceFDD CRITICALITY ignore EXTENSION Active-MBMS-Bearer-Service-ListFDD PRESENCE optional}, + { ID id-C-ID CRITICALITY ignore EXTENSION C-ID PRESENCE mandatory }| + { ID id-Active-MBMS-Bearer-ServiceFDD CRITICALITY ignore EXTENSION Active-MBMS-Bearer-Service-ListFDD PRESENCE optional}| + { ID id-Enhanced-FACH-Information-ResponseFDD CRITICALITY ignore EXTENSION Enhanced-FACH-Information-ResponseFDD PRESENCE optional}, ... } @@ -6857,6 +6893,7 @@ ResetRequest-IEs RNSAP-PROTOCOL-IES ::= { } ResetRequest-Extensions RNSAP-PROTOCOL-EXTENSION ::= { + { ID id-Extended-RNC-ID CRITICALITY reject EXTENSION Extended-RNC-ID PRESENCE optional}, ... } @@ -6944,6 +6981,7 @@ ResetResponse-IEs RNSAP-PROTOCOL-IES ::= { } ResetResponse-Extensions RNSAP-PROTOCOL-EXTENSION ::= { + { ID id-Extended-RNC-ID CRITICALITY reject EXTENSION Extended-RNC-ID PRESENCE optional}, ... } @@ -7385,6 +7423,7 @@ DirectInformationTransfer-IEs RNSAP-PROTOCOL-IES ::= { } DirectInformationTransfer-Extensions RNSAP-PROTOCOL-EXTENSION ::= { + { ID id-Extended-RNC-ID CRITICALITY reject EXTENSION Extended-RNC-ID PRESENCE optional }, ... } diff --git a/asn1/rnsap/RNSAP-PDU-Descriptions.asn b/asn1/rnsap/RNSAP-PDU-Descriptions.asn index fed830fc25..81a21d3312 100644 --- a/asn1/rnsap/RNSAP-PDU-Descriptions.asn +++ b/asn1/rnsap/RNSAP-PDU-Descriptions.asn @@ -1,14 +1,13 @@ -- RNSAP-PDU-Descriptions.asn -- --- Taken from 3GPP TS 25.423 V7.4.0 (2007-03) --- http://www.3gpp.org/ftp/Specs/archive/25_series/25.423/25423-740.zip/25423-740.DOC +-- Taken from 3GPP TS 25.423 V7.5.0 (2007-06) +-- http://www.3gpp.org/ftp/Specs/archive/25_series/25.423/25423-750.zip/25423-750.DOC -- --- 9.3.2 Elementary Procedure Definitions +-- 9.3.2 Elementary Procedure Definitions -- -- $Id$ -- - -- ************************************************************** -- -- Elementary Procedure definitions diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c index b3a20c4475..6aa6f77f8c 100644 --- a/asn1/rnsap/packet-rnsap-template.c +++ b/asn1/rnsap/packet-rnsap-template.c @@ -43,6 +43,11 @@ #include "packet-per.h" +#ifdef _MSC_VER +/* disable: "warning C4146: unary minus operator applied to unsigned type, result still unsigned" */ +#pragma warning(disable:4146) +#endif + #define PNAME "UTRAN Iur interface Radio Network Subsystem Application Part" #define PSNAME "RNSAP" #define PFNAME "rnsap" diff --git a/asn1/rnsap/rnsap.cnf b/asn1/rnsap/rnsap.cnf index 663f87ffdc..25a6b0d1a5 100644 --- a/asn1/rnsap/rnsap.cnf +++ b/asn1/rnsap/rnsap.cnf @@ -123,6 +123,7 @@ BLER TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = NULL RTLoadValue N rnsap.ies id-RTLoadValue NRTLoadInformationValue N rnsap.ies id-NRTLoadInformationValue UpPTSInterferenceValue N rnsap.ies id-UpPTSInterferenceValue +TUTRANGANSSMeasurementValueInformation N rnsap.ies id-TUTRANGANSSMeasurementValueInformation Rx-Timing-Deviation-Value-LCR N rnsap.ies id-Rx-Timing-Deviation-Value-LCR Angle-Of-Arrival-Value-LCR N rnsap.ies id-Angle-Of-Arrival-Value-LCR HS-SICH-Reception-Quality-Value N rnsap.ies id-HS-SICH-Reception-Quality @@ -145,6 +146,7 @@ UL-Timeslot-ISCP-Value N rnsap.ies id-UL-Timeslot-ISCP-Value RT-Load-Value N rnsap.ies id-RT-Load-Value NRT-Load-Information-Value N rnsap.ies id-NRT-Load-Information-Value HS-SICH-Reception-Quality-Measurement-Value N rnsap.ies id-HS-SICH-Reception-Quality-Measurement-Value +TUTRANGANSSMeasurementThresholdInformation N rnsap.ies id-TUTRANGANSSMeasurementThresholdInformation Neighbouring-UMTS-CellInformationItem N rnsap.ies id-Neighbouring-UMTS-CellInformationItem Neighbouring-GSM-CellInformationIEs N rnsap.ies id-Neighbouring-GSM-CellInformation OnModification N rnsap.ies id-OnModification @@ -428,23 +430,31 @@ BindingID N rnsap.extension id-BindingID TransportLayerAddress N rnsap.extension id-TransportLayerAddress E-RGCH-E-HICH-ChannelisationCodeValidityIndicator N rnsap.extension id-E-RGCH-E-HICH-ChannelisationCodeValidityIndicator E-DCH-PowerOffset-for-SchedulingInfo N rnsap.extension id-E-DCH-PowerOffset-for-SchedulingInfo +SixteenQAM-UL-Information N rnsap.extension id-SixteenQAM-UL-Information +SixteenQAM-UL-Information-to-Modify N rnsap.extension id-SixteenQAM-UL-Information-to-Modify TrCH-SrcStatisticsDescr N rnsap.extension id-TrCH-SrcStatisticsDescr E-DCH-Minimum-Set-E-TFCIValidityIndicator N rnsap.extension id-E-DCH-Minimum-Set-E-TFCIValidityIndicator +E-TFCI-BetaEC-Boost N rnsap.extension id-E-TFCI-BetaEC-Boost +E-TFCI-BetaED-Switch N rnsap.extension id-E-TFCI-BetaED-Switch E-DCH-MACdFlow-Retransmission-Timer-LCR N rnsap.extension id-eDCH-MACdFlow-Retransmission-Timer-LCR Satellite-Almanac-Information-ExtItem N rnsap.extension id-Satellite-Almanac-Information-ExtItem HARQ-Preamble-Mode N rnsap.extension id-HARQ-Preamble-Mode MIMO-Information N rnsap.extension id-MIMO-Information +HSDSCH-MACdPDUSizeFormat N rnsap.extension id-HSDSCH-MACdPDUSizeFormat User-Plane-Congestion-Fields-Inclusion N rnsap.extension id-User-Plane-Congestion-Fields-Inclusion HARQ-Preamble-Mode-Activation-Indicator N rnsap.extension id-HARQ-Preamble-Mode-Activation-Indicator MIMO-InformationResponse N rnsap.extension id-MIMO-InformationResponse HS-PDSCH-Code-Change-Grant N rnsap.extension id-HS-PDSCH-Code-Change-Grant MIMO-InformationToModify N rnsap.extension id-MIMO-InformationToModify +MAC-PDU-SizeExtended N rnsap.extension id-MaximumMACdPDU-SizeExtended Continuous-Packet-Connectivity-HS-SCCH-Less-Information N rnsap.extension id-Continuous-Packet-Connectivity-HS-SCCH-Less-Information Continuous-Packet-Connectivity-HS-SCCH-Less-Information-Response N rnsap.extension id-Continuous-Packet-Connectivity-HS-SCCH-Less-Information-Response HSSCCH-TDD-Specific-InfoList-Response768 N rnsap.extension id-hSSCCH-TDD-Specific-InfoList-Response768 HSPDSCH-TDD-Specific-InfoList-Response768 N rnsap.extension id-hSPDSCH-TDD-Specific-InfoList-Response768 HS-PDSCH-Code-Change-Indicator N rnsap.extension id-HS-PDSCH-Code-Change-Indicator +GANSS-Information N rnsap.extension id-GANSS-Information Neighbouring-LCR-TDD-CellInformation N rnsap.extension id-neighbouring-LCR-TDD-CellInformation +Extended-RNC-ID N rnsap.extension id-Extended-RNC-ID RestrictionStateIndicator N rnsap.extension id-RestrictionStateIndicator DPC-Mode-Change-SupportIndicator N rnsap.extension id-DPC-Mode-Change-SupportIndicator CoverageIndicator N rnsap.extension id-CoverageIndicator @@ -463,8 +473,11 @@ Cell-Capacity-Class-Value N rnsap.extension id-Cell-Capacity-Class-Valu NACC-Related-Data N rnsap.extension id-NACC-Related-Data MBMS-Bearer-Service-Full-Address N rnsap.extension id-MBMS-Bearer-Service-Full-Address Inter-Frequency-Cell-Information N rnsap.extension id-Inter-Frequency-Cell-Information +GANSS-Common-Data N rnsap.extension id-GANSS-Common-Data +GANSS-Generic-Data N rnsap.extension id-GANSS-Generic-Data UEMeasurementValueTransmittedPowerList768 N rnsap.extension id-UEMeasurementValueTransmittedPowerList768 UEMeasurementValueTimeslotISCPList768 N rnsap.extension id-UEMeasurementValueTimeslotISCPList768 +Extended-RNC-ID N rnsap.extension id-Extended-SRNC-ID PLCCHinformation N rnsap.extension id-PLCCH-Information-UL-TimeslotLCR-Info DPC-Mode N rnsap.extension id-DPC-Mode UL-DPDCHIndicatorEDCH N rnsap.extension id-UL-DPDCHIndicatorEDCH @@ -487,6 +500,7 @@ Initial-DL-DPCH-TimingAdjustment-Allowed N rnsap.extension id-Initial-DL-DPCH-Ti DCH-Indicator-For-E-DCH-HSDPA-Operation N rnsap.extension id-DCH-Indicator-For-E-DCH-HSDPA-Operation CFN N rnsap.extension id-Serving-cell-change-CFN Continuous-Packet-Connectivity-DTX-DRX-Information N rnsap.extension id-Continuous-Packet-Connectivity-DTX-DRX-Information +F-DPCH-SlotFormatSupportRequest N rnsap.extension id-F-DPCH-SlotFormatSupportRequest Support-8PSK N rnsap.extension id-TDD-Support-8PSK MinimumSpreadingFactor768 N rnsap.extension id-TDD768-minimumSpreadingFactor-UL MaxNrDLPhysicalchannelsTS N rnsap.extension id-TDD-maxNrDLPhysicalchannels @@ -513,6 +527,7 @@ Active-MBMS-Bearer-Service-ListFDD-PFL N rnsap.extension id-Active-MBMS-Bearer-S RL-Set-ID N rnsap.extension id-EDCH-RLSet-Id EDCH-FDD-DL-ControlChannelInformation N rnsap.extension id-EDCH-FDD-DL-ControlChannelInformation DL-DPCH-TimingAdjustment N rnsap.extension id-Initial-DL-DPCH-TimingAdjustment +F-DPCH-SlotFormat N rnsap.extension id-F-DPCH-SlotFormat DCH-InformationResponse N rnsap.extension id-DCH-InformationResponse EDCH-FDD-InformationResponse N rnsap.extension id-EDCH-FDD-InformationResponse HSDSCH-RNTI N rnsap.extension id-HSDSCH-RNTI @@ -532,6 +547,7 @@ E-DCH-768-Information-Response N rnsap.extension id-E-DCH-768-Information-Re E-DCH-LCR-Information-Response N rnsap.extension id-E-DCH-LCR-Information-Response UL-TimingAdvanceCtrl-LCR N rnsap.extension id-UL-TimingAdvanceCtrl-LCR UL-SIR N rnsap.extension id-UL-SIR-Target-CCTrCH-LCR-InformationItem-RL-SetupRspTDD +Max-UE-DTX-Cycle N rnsap.extension id-Max-UE-DTX-Cycle DL-Power N rnsap.extension id-DLReferencePower SynchronisationIndicator N rnsap.extension id-SynchronisationIndicator HS-DSCH-serving-cell-change-information N rnsap.extension id-HS-DSCH-serving-cell-change-information @@ -638,7 +654,10 @@ HS-SICH-ID N rnsap.extension id-HSSICH-Info-DM-Rprt DPCH-ID768 N rnsap.extension id-DPCH-ID768-DM-Rprt MeasurementRecoveryReportingIndicator N rnsap.extension id-MeasurementRecoveryReportingIndicator DedicatedMeasurementObjectType-DM-Fail-Ind N rnsap.extension id-DedicatedMeasurementObjectType-DM-Fail-Ind +Enhanced-FACH-Support-Indicator N rnsap.extension id-Enhanced-FACH-Support-Indicator +Enhanced-PCH-Support-Indicator N rnsap.extension id-Enhanced-PCH-Support-Indicator C-ID N rnsap.extension id-C-ID +Enhanced-FACH-Information-ResponseFDD N rnsap.extension id-Enhanced-FACH-Information-ResponseFDD S-RNTI N rnsap.extension id-S-RNTI D-RNTI N rnsap.extension id-D-RNTI E-DCH-FDD-Update-Information N rnsap.extension id-E-DCH-FDD-Update-Information |