From 3ba1c7ff7749a6c55a0e6155fd5c4fef6ca8644d Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Sat, 6 Apr 2019 19:41:18 +0200 Subject: LTE RRC: upgrade dissector to v15.5.0 Change-Id: I227db32a59a16c31d7712cb9c48b55fa4aaf28ca Reviewed-on: https://code.wireshark.org/review/32759 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin --- .../asn1/lte-rrc/NBIOT-RRC-Definitions.asn | 40 ++++++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn') diff --git a/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn b/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn index aa21c0f249..5bf33c8fee 100644 --- a/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn +++ b/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.331 V15.4.0 (2018-12) +-- 3GPP TS 36.331 V15.5.0 (2019-03) -- NBIOT-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::= @@ -485,7 +485,12 @@ RRCConnectionRelease-NB-v1430-IEs ::= SEQUENCE { RRCConnectionRelease-NB-v1530-IEs ::= SEQUENCE { drb-ContinueROHC-r15 ENUMERATED {true} OPTIONAL, -- Cond UP-EDT nextHopChainingCount-r15 NextHopChainingCount OPTIONAL, -- Cond UP-EDT - nonCriticalExtension SEQUENCE {} OPTIONAL + nonCriticalExtension RRCConnectionRelease-NB-v1550-IEs OPTIONAL +} + +RRCConnectionRelease-NB-v1550-IEs ::= SEQUENCE { + redirectedCarrierInfo-v1550 RedirectedCarrierInfo-NB-v1550 OPTIONAL, -- Cond Redirection-TDD + nonCriticalExtension SEQUENCE {} OPTIONAL } ReleaseCause-NB-r13 ::= ENUMERATED {loadBalancingTAUrequired, other, @@ -501,6 +506,8 @@ RedirectedCarrierInfo-NB-v1430 ::= SEQUENCE { spare1} } +RedirectedCarrierInfo-NB-v1550::= CarrierFreq-NB-v1550 + RRCConnectionRequest-NB ::= SEQUENCE { criticalExtensions CHOICE { @@ -986,6 +993,8 @@ OPTIONAL, -- Need OP ]], [[ nsss-RRM-Config-r15 NSSS-RRM-Config-NB-r15 OPTIONAL, -- Need OR interFreqNeighCellList-v1530 InterFreqNeighCellList-NB-v1530 OPTIONAL -- Need OR + ]], + [[ dl-CarrierFreq-v1550 CarrierFreq-NB-v1550 OPTIONAL -- Cond TDD ]] } @@ -1226,6 +1235,8 @@ DL-CarrierConfigDedicated-NB-r13 ::= SEQUENCE { OPTIONAL -- Need ON ]], [[ dl-GapNonAnchor-v1530 DL-GapConfig-NB-v1530 OPTIONAL -- Cond TDD1 + ]], + [[ dl-CarrierFreq-v1550 CarrierFreq-NB-v1550 OPTIONAL -- Cond TDD1 ]] } @@ -1245,6 +1256,10 @@ CarrierFreq-NB-r13 ::= SEQUENCE { } OPTIONAL -- Need ON } +CarrierFreq-NB-v1550 ::= SEQUENCE { + carrierFreqOffset-v1550 ENUMERATED {v-8dot5, v-4dot5, v3dot5, v7dot5} +} + ChannelRasterOffset-NB-r13 ::= ENUMERATED {khz-7dot5, khz-2dot5, khz2dot5, khz7dot5} @@ -1282,6 +1297,8 @@ DL-CarrierConfigCommon-NB-r14 ::= SEQUENCE { dB-4, dB-2, dB0, dB3} DEFAULT dB0, ..., [[ dl-GapNonAnchor-v1530 DL-GapConfig-NB-v1530 OPTIONAL -- Cond TDD + ]], + [[ dl-CarrierFreq-v1550 CarrierFreq-NB-v1550 OPTIONAL -- Cond TDD ]] } @@ -1404,7 +1421,7 @@ NPRACH-ConfigSIB-NB-v1530 ::= SEQUENCE { tdd-Parameters-r15 SEQUENCE { nprach-PreambleFormat-r15 ENUMERATED { fmt0, fmt1, fmt2, fmt0-a, fmt1-a}, - numRepetitionsPerPreambleAttempt-r15 ENUMERATED { + dummy ENUMERATED { n1, n2, n4, n8, n16, n32, n64, n128, n256, n512, n1024}, nprach-ParametersListTDD-r15 NPRACH-ParametersListTDD-NB-r15 @@ -1420,6 +1437,12 @@ NPRACH-ConfigSIB-NB-v1530 ::= SEQUENCE { } OPTIONAL -- Cond EDT1 } +NPRACH-ConfigSIB-NB-v1550 ::= SEQUENCE { + tdd-Parameters-v1550 SEQUENCE { + nprach-ParametersListTDD-v1550 NPRACH-ParametersListTDD-NB-v1550 + } +} + NPRACH-ParametersList-NB-r13 ::= SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF NPRACH-Parameters-NB-r13 NPRACH-ParametersList-NB-v1330 ::= SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF NPRACH-Parameters-NB-v1330 @@ -1514,6 +1537,15 @@ NPRACH-ParametersTDD-NB-r15 ::= SEQUENCE { } OPTIONAL -- Need OR } +NPRACH-ParametersListTDD-NB-v1550 ::= SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF + NPRACH-ParametersTDD-NB-v1550 + +NPRACH-ParametersTDD-NB-v1550 ::= SEQUENCE { + maxNumPreambleAttemptCE-v1550 ENUMERATED {n3, n4, n5, n6, n7, n8, n10, spare1}, + numRepetitionsPerPreambleAttempt-v1550 ENUMERATED {n1, n2, n4, n8, n16, n32, n64, n128, + n256, n512, n1024} +} + NPRACH-ParametersListFmt2-NB-r15 ::= SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF NPRACH-ParametersFmt2-NB-r15 NPRACH-ParametersFmt2-NB-r15 ::= SEQUENCE { @@ -1695,6 +1727,8 @@ RadioResourceConfigCommonSIB-NB-r13 ::= SEQUENCE { [[ nprach-Config-v1530 NPRACH-ConfigSIB-NB-v1530 OPTIONAL, -- Need OR dl-Gap-v1530 DL-GapConfig-NB-v1530 OPTIONAL, -- Cond TDD wus-Config-r15 WUS-Config-NB-r15 OPTIONAL -- Need OR + ]], + [[ nprach-Config-v1550 NPRACH-ConfigSIB-NB-v1550 OPTIONAL -- Cond TDD1 ]] } -- cgit v1.2.3