forked from osmocom/wireshark
LTE RRC: upgrade dissector to v14.3.0
Change-Id: Ia64095a8a9bdd3b31589842809d8a5313b829f8e Reviewed-on: https://code.wireshark.org/review/22770 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Pascal Quantin
Michael Mann
parent
f2ffcdf3aa
commit
8ee06279ff
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V13.6.1 (2017-07)
|
||||
-- 3GPP TS 36.331 V14.3.0 (2017-06)
|
||||
--
|
||||
EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
@ -17,6 +17,7 @@ IMPORTS
|
|||
DRB-ToReleaseList,
|
||||
FreqBandIndicator-r11,
|
||||
InDeviceCoexIndication-r11,
|
||||
LWA-Config-r13,
|
||||
MasterInformationBlock,
|
||||
maxBands,
|
||||
maxFreq,
|
||||
|
|
@ -28,7 +29,9 @@ IMPORTS
|
|||
MBMSInterestIndication-r11,
|
||||
MeasConfig,
|
||||
MeasGapConfig,
|
||||
MeasGapConfigPerCC-List-r14,
|
||||
MeasResultForRSSI-r13,
|
||||
MeasResultListWLAN-r13,
|
||||
OtherConfig-r9,
|
||||
PhysCellId,
|
||||
P-Max,
|
||||
|
|
@ -54,6 +57,7 @@ IMPORTS
|
|||
ServCellIndex-r13,
|
||||
ShortMAC-I,
|
||||
MeasResultSSTD-r13,
|
||||
SL-V2X-ConfigDedicated-r14,
|
||||
SystemInformationBlockType1,
|
||||
SystemInformationBlockType1-v890-IEs,
|
||||
SystemInformationBlockType2,
|
||||
|
|
@ -107,7 +111,7 @@ HandoverPreparationInformation-r8-IEs ::= SEQUENCE {
|
|||
HandoverPreparationInformation-v920-IEs ::= SEQUENCE {
|
||||
ue-ConfigRelease-r9 ENUMERATED {
|
||||
rel9, rel10, rel11, rel12, v10j0, v11e0,
|
||||
v1280, rel13, ...} OPTIONAL, -- Cond HO2
|
||||
v1280, rel13, ..., rel14} OPTIONAL, -- Cond HO2
|
||||
nonCriticalExtension HandoverPreparationInformation-v9d0-IEs OPTIONAL
|
||||
}
|
||||
|
||||
|
|
@ -149,7 +153,13 @@ HandoverPreparationInformation-v1250-IEs ::= SEQUENCE {
|
|||
HandoverPreparationInformation-v1320-IEs ::= SEQUENCE {
|
||||
as-Config-v1320 AS-Config-v1320 OPTIONAL, -- Cond HO2
|
||||
as-Context-v1320 AS-Context-v1320 OPTIONAL, -- Cond HO2
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
nonCriticalExtension HandoverPreparationInformation-v1430-IEs OPTIONAL
|
||||
}
|
||||
|
||||
HandoverPreparationInformation-v1430-IEs ::= SEQUENCE {
|
||||
as-Config-v1430 AS-Config-v1430 OPTIONAL, -- Cond HO2
|
||||
makeBeforeBreakReq-r14 ENUMERATED {true} OPTIONAL, -- Cond HO2
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -212,6 +222,12 @@ SCG-ConfigInfo-v1310-IEs ::= SEQUENCE {
|
|||
|
||||
SCG-ConfigInfo-v1330-IEs ::= SEQUENCE {
|
||||
measResultListRSSI-SCG-r13 MeasResultListRSSI-SCG-r13 OPTIONAL,
|
||||
nonCriticalExtension SCG-ConfigInfo-v1430-IEs OPTIONAL
|
||||
}
|
||||
|
||||
SCG-ConfigInfo-v1430-IEs ::= SEQUENCE {
|
||||
makeBeforeBreakSCG-Req-r14 ENUMERATED {true} OPTIONAL,
|
||||
measGapConfigPerCC-List MeasGapConfigPerCC-List-r14 OPTIONAL,
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
}
|
||||
|
||||
|
|
@ -382,6 +398,12 @@ AS-Config-v1320 ::= SEQUENCE {
|
|||
sourceRCLWI-Configuration-r13 RCLWI-Configuration-r13 OPTIONAL
|
||||
}
|
||||
|
||||
AS-Config-v1430 ::= SEQUENCE {
|
||||
sourceSL-V2X-CommConfig-r14 SL-V2X-ConfigDedicated-r14 OPTIONAL,
|
||||
sourceLWA-Config-r14 LWA-Config-r13 OPTIONAL,
|
||||
sourceWLAN-MeasResult-r14 MeasResultListWLAN-r13 OPTIONAL
|
||||
}
|
||||
|
||||
|
||||
AS-Context ::= SEQUENCE {
|
||||
reestablishmentInfo ReestablishmentInfo OPTIONAL -- Cond HO
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V13.6.1 (2017-07)
|
||||
-- 3GPP TS 36.331 V14.3.0 (2017-06)
|
||||
--
|
||||
EUTRA-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
@ -8,23 +8,47 @@ IMPORTS
|
|||
AdditionalSpectrumEmission,
|
||||
ARFCN-ValueEUTRA-r9,
|
||||
FilterCoefficient,
|
||||
maxCBR-Level-r14,
|
||||
maxCBR-Level-1-r14,
|
||||
maxFreq,
|
||||
maxFreqV2X-r14,
|
||||
maxSL-TxPool-r12,
|
||||
maxSL-CommRxPoolPreconf-v1310,
|
||||
maxSL-CommTxPoolPreconf-v1310,
|
||||
maxSL-DiscRxPoolPreconf-r13,
|
||||
maxSL-DiscTxPoolPreconf-r13,
|
||||
maxSL-V2X-CBRConfig2-r14,
|
||||
maxSL-V2X-CBRConfig2-1-r14,
|
||||
maxSL-V2X-RxPoolPreconf-r14,
|
||||
maxSL-V2X-TxConfig2-r14,
|
||||
maxSL-V2X-TxConfig2-1-r14,
|
||||
maxSL-V2X-TxPoolPreconf-r14,
|
||||
P-Max,
|
||||
ReselectionInfoRelay-r13,
|
||||
SL-AnchorCarrierFreqList-V2X-r14,
|
||||
SL-CBR-Levels-Config-r14,
|
||||
SL-CBR-PSSCH-TxConfig-r14,
|
||||
SL-CommTxPoolSensingConfig-r14,
|
||||
SL-CP-Len-r12,
|
||||
SL-HoppingConfigComm-r12,
|
||||
SL-OffsetIndicator-r12,
|
||||
SL-OffsetIndicatorSync-r12,
|
||||
SL-OffsetIndicatorSync-v1430,
|
||||
SL-PeriodComm-r12,
|
||||
RSRP-RangeSL3-r12,
|
||||
SL-PriorityList-r13,
|
||||
SL-TF-ResourceConfig-r12,
|
||||
SL-TRPT-Subset-r12,
|
||||
SL-TxParameters-r12,
|
||||
SL-ZoneConfig-r14,
|
||||
P0-SL-r12,
|
||||
TDD-ConfigSL-r12
|
||||
TDD-ConfigSL-r12,
|
||||
SubframeBitmapSL-r14,
|
||||
SL-P2X-ResourceSelectionConfig-r14,
|
||||
SL-RestrictResourceReservationPeriodList-r14,
|
||||
SL-SyncAllowed-r14,
|
||||
SL-OffsetIndicatorSync-r14,
|
||||
SL-Priority-r13
|
||||
FROM EUTRA-RRC-Definitions;
|
||||
|
||||
|
||||
|
|
@ -126,4 +150,87 @@ SL-PreconfigRelay-r13 ::= SEQUENCE {
|
|||
reselectionInfoOoC-r13 ReselectionInfoRelay-r13
|
||||
}
|
||||
|
||||
|
||||
SL-V2X-Preconfiguration-r14 ::= SEQUENCE {
|
||||
v2x-PreconfigFreqList-r14 SL-V2X-PreconfigFreqList-r14,
|
||||
anchorCarrierFreqList-r14 SL-AnchorCarrierFreqList-V2X-r14 OPTIONAL,
|
||||
cbr-PreconfigList-r14 SL-CBR-PreconfigTxConfigList-r14 OPTIONAL,
|
||||
...
|
||||
}
|
||||
|
||||
SL-CBR-PreconfigTxConfigList-r14 ::= SEQUENCE {
|
||||
cbr-RangeCommonConfigList-r14 SEQUENCE (SIZE (1..maxSL-V2X-CBRConfig2-r14)) OF SL-CBR-Levels-Config-r14,
|
||||
sl-CBR-PSSCH-TxConfigList-r14 SEQUENCE (SIZE (1..maxSL-V2X-TxConfig2-r14)) OF SL-CBR-PSSCH-TxConfig-r14
|
||||
}
|
||||
|
||||
SL-V2X-PreconfigFreqList-r14 ::= SEQUENCE (SIZE (1..maxFreqV2X-r14)) OF SL-V2X-PreconfigFreqInfo-r14
|
||||
|
||||
SL-V2X-PreconfigFreqInfo-r14 ::= SEQUENCE {
|
||||
v2x-CommPreconfigGeneral-r14 SL-PreconfigGeneral-r12,
|
||||
v2x-CommPreconfigSync-r14 SL-PreconfigV2X-Sync-r14 OPTIONAL,
|
||||
v2x-CommRxPoolList-r14 SL-PreconfigV2X-RxPoolList-r14,
|
||||
v2x-CommTxPoolList-r14 SL-PreconfigV2X-TxPoolList-r14,
|
||||
p2x-CommTxPoolList-r14 SL-PreconfigV2X-TxPoolList-r14,
|
||||
v2x-ResourceSelectionConfig-r14 SL-CommTxPoolSensingConfig-r14 OPTIONAL,
|
||||
zoneConfig-r14 SL-ZoneConfig-r14 OPTIONAL,
|
||||
syncPriority-r14 ENUMERATED {gnss, enb},
|
||||
thresSL-TxPrioritization-r14 SL-Priority-r13 OPTIONAL,
|
||||
offsetDFN-r14 INTEGER (0..1000) OPTIONAL,
|
||||
...
|
||||
}
|
||||
|
||||
SL-PreconfigV2X-RxPoolList-r14 ::= SEQUENCE (SIZE (1..maxSL-V2X-RxPoolPreconf-r14)) OF SL-V2X-PreconfigCommPool-r14
|
||||
|
||||
SL-PreconfigV2X-TxPoolList-r14 ::= SEQUENCE (SIZE (1..maxSL-V2X-TxPoolPreconf-r14)) OF SL-V2X-PreconfigCommPool-r14
|
||||
|
||||
SL-V2X-PreconfigCommPool-r14 ::= SEQUENCE {
|
||||
-- This IE is same as SL-CommResourcePoolV2X with rxParametersNCell absent
|
||||
sl-OffsetIndicator-r14 SL-OffsetIndicator-r12 OPTIONAL,
|
||||
sl-Subframe-r14 SubframeBitmapSL-r14,
|
||||
adjacencyPSCCH-PSSCH-r14 BOOLEAN,
|
||||
sizeSubchannel-r14 ENUMERATED {
|
||||
n4, n5, n6, n8, n9, n10, n12, n15, n16, n18, n20, n25, n30,
|
||||
n48, n50, n72, n75, n96, n100, spare13, spare12, spare11,
|
||||
spare10, spare9, spare8, spare7, spare6, spare5, spare4,
|
||||
spare3, spare2, spare1},
|
||||
numSubchannel-r14 ENUMERATED {n1, n3, n5, n8, n10, n15, n20, spare1},
|
||||
startRB-Subchannel-r14 INTEGER (0..99),
|
||||
startRB-PSCCH-Pool-r14 INTEGER (0..99) OPTIONAL,
|
||||
dataTxParameters-r14 P0-SL-r12,
|
||||
zoneID-r14 INTEGER (0..7) OPTIONAL,
|
||||
threshS-RSSI-CBR-r14 INTEGER (0..45) OPTIONAL,
|
||||
cbr-pssch-TxConfigList-r14 SL-CBR-PPPP-TxPreconfigList-r14 OPTIONAL,
|
||||
resourceSelectionConfigP2X-r14 SL-P2X-ResourceSelectionConfig-r14 OPTIONAL,
|
||||
syncAllowed-r14 SL-SyncAllowed-r14 OPTIONAL,
|
||||
restrictResourceReservationPeriod-r14 SL-RestrictResourceReservationPeriodList-r14 OPTIONAL, -- Need OR
|
||||
...
|
||||
}
|
||||
|
||||
SL-PreconfigV2X-Sync-r14 ::= SEQUENCE {
|
||||
syncOffsetIndicators-r14 SL-V2X-SyncOffsetIndicators-r14,
|
||||
syncTxParameters-r14 P0-SL-r12,
|
||||
syncTxThreshOoC-r14 RSRP-RangeSL3-r12,
|
||||
filterCoefficient-r14 FilterCoefficient,
|
||||
syncRefMinHyst-r14 ENUMERATED {dB0, dB3, dB6, dB9, dB12},
|
||||
syncRefDiffHyst-r14 ENUMERATED {dB0, dB3, dB6, dB9, dB12, dBinf},
|
||||
...
|
||||
}
|
||||
|
||||
SL-V2X-SyncOffsetIndicators-r14 ::= SEQUENCE {
|
||||
syncOffsetIndicator1-r14 SL-OffsetIndicatorSync-r14,
|
||||
syncOffsetIndicator2-r14 SL-OffsetIndicatorSync-r14,
|
||||
syncOffsetIndicator3-r14 SL-OffsetIndicatorSync-r14 OPTIONAL
|
||||
}
|
||||
|
||||
SL-CBR-PPPP-TxPreconfigList-r14 ::= SEQUENCE (SIZE (1..8)) OF SL-PPPP-TxPreconfigIndex-r14
|
||||
|
||||
SL-PPPP-TxPreconfigIndex-r14 ::= SEQUENCE {
|
||||
priorityThreshold-r14 SL-Priority-r13,
|
||||
defaultTxConfigIndex-r14 INTEGER(0..maxCBR-Level-1-r14),
|
||||
cbr-ConfigIndex-r14 INTEGER(0..maxSL-V2X-CBRConfig2-1-r14),
|
||||
tx-ConfigIndexList-r14 SEQUENCE (SIZE (1..maxCBR-Level-r14)) OF Tx-PreconfigIndex-r14
|
||||
}
|
||||
|
||||
Tx-PreconfigIndex-r14 ::= INTEGER(0..maxSL-V2X-TxConfig2-1-r14)
|
||||
|
||||
END
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V13.6.1 (2017-07)
|
||||
-- 3GPP TS 36.331 V14.3.0 (2017-06)
|
||||
--
|
||||
EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
@ -41,6 +41,7 @@ IMPORTS
|
|||
RLF-Report-r9,
|
||||
TargetMBSFN-AreaList-r12,
|
||||
TraceReference-r10,
|
||||
Tx-ResourcePoolMeasList-r14,
|
||||
VisitedCellInfoList-r12,
|
||||
maxCellMeas,
|
||||
maxCSI-RS-Meas-r12,
|
||||
|
|
@ -50,8 +51,9 @@ IMPORTS
|
|||
WLAN-CarrierInfo-r13,
|
||||
WLAN-Identifiers-r12,
|
||||
WLAN-Id-List-r13,
|
||||
WLAN-Status-r13
|
||||
|
||||
WLAN-Status-r13,
|
||||
WLAN-Status-v1430,
|
||||
WLAN-SuspendConfig-r14
|
||||
|
||||
FROM EUTRA-RRC-Definitions;
|
||||
|
||||
|
|
@ -141,6 +143,7 @@ VarMeasReport ::= SEQUENCE {
|
|||
measId-v1250 MeasId-v1250 OPTIONAL,
|
||||
cellsTriggeredList CellsTriggeredList OPTIONAL,
|
||||
csi-RS-TriggeredList-r12 CSI-RS-TriggeredList-r12 OPTIONAL,
|
||||
poolsTriggeredList-r14 Tx-ResourcePoolMeasList-r14 OPTIONAL,
|
||||
numberOfReportsSent INTEGER
|
||||
}
|
||||
|
||||
|
|
@ -180,6 +183,7 @@ VarShortMAC-Input ::= SEQUENCE {
|
|||
c-RNTI C-RNTI
|
||||
}
|
||||
|
||||
|
||||
VarShortResumeMAC-Input-r13 ::= SEQUENCE {
|
||||
cellIdentity-r13 CellIdentity,
|
||||
physCellId-r13 PhysCellId,
|
||||
|
|
@ -190,12 +194,14 @@ VarShortResumeMAC-Input-r13 ::= SEQUENCE {
|
|||
|
||||
VarWLAN-MobilityConfig ::= SEQUENCE {
|
||||
wlan-MobilitySet-r13 WLAN-Id-List-r13 OPTIONAL,
|
||||
successReportRequested ENUMERATED {true} OPTIONAL
|
||||
successReportRequested ENUMERATED {true} OPTIONAL,
|
||||
wlan-SuspendConfig-r14 WLAN-SuspendConfig-r14 OPTIONAL
|
||||
}
|
||||
|
||||
|
||||
VarWLAN-Status-r13 ::= SEQUENCE {
|
||||
status-r13 WLAN-Status-r13
|
||||
status-r13 WLAN-Status-r13,
|
||||
status-r14 WLAN-Status-v1430 OPTIONAL
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V13.6.1 (2017-07)
|
||||
-- 3GPP TS 36.331 V14.3.0 (2017-06)
|
||||
--
|
||||
NBIOT-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V13.6.1 (2017-07)
|
||||
-- 3GPP TS 36.331 V14.3.0 (2017-06)
|
||||
--
|
||||
NBIOT-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
@ -25,8 +25,12 @@ IMPORTS
|
|||
maxMultiBands,
|
||||
maxPageRec,
|
||||
maxPLMN-r11,
|
||||
maxSAI-MBMS-r11,
|
||||
maxSIB,
|
||||
maxSIB-1,
|
||||
MBMS-SAI-r11,
|
||||
MBMS-SAI-List-r11,
|
||||
MBMSSessionInfo-r13,
|
||||
NextHopChainingCount,
|
||||
PagingUE-Identity,
|
||||
PLMN-Identity,
|
||||
|
|
@ -47,8 +51,12 @@ IMPORTS
|
|||
S-TMSI,
|
||||
SystemInformationBlockType16-r11,
|
||||
SystemInfoValueTagSI-r13,
|
||||
T-Reordering,
|
||||
TimeAlignmentTimer,
|
||||
TrackingAreaCode
|
||||
TMGI-r9,
|
||||
TrackingAreaCode,
|
||||
DataInactivityTimer-r14
|
||||
|
||||
FROM EUTRA-RRC-Definitions;
|
||||
|
||||
|
||||
|
|
@ -136,6 +144,19 @@ UL-CCCH-MessageType-NB ::= CHOICE {
|
|||
}
|
||||
|
||||
|
||||
SC-MCCH-Message-NB ::= SEQUENCE {
|
||||
message SC-MCCH-MessageType-NB
|
||||
}
|
||||
|
||||
|
||||
SC-MCCH-MessageType-NB ::= CHOICE {
|
||||
c1 CHOICE {
|
||||
scptmConfiguration-r14 SCPTMConfiguration-NB-r14
|
||||
},
|
||||
messageClassExtension SEQUENCE {}
|
||||
}
|
||||
|
||||
|
||||
UL-DCCH-Message-NB ::= SEQUENCE {
|
||||
message UL-DCCH-MessageType-NB
|
||||
}
|
||||
|
|
@ -279,7 +300,12 @@ RRCConnectionReestablishment-NB-r13-IEs ::= SEQUENCE {
|
|||
radioResourceConfigDedicated-r13 RadioResourceConfigDedicated-NB-r13,
|
||||
nextHopChainingCount-r13 NextHopChainingCount,
|
||||
lateNonCriticalExtension OCTET STRING OPTIONAL,
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
nonCriticalExtension RRCConnectionReestablishment-NB-v1430-IEs OPTIONAL
|
||||
}
|
||||
|
||||
RRCConnectionReestablishment-NB-v1430-IEs ::= SEQUENCE {
|
||||
dl-NAS-MAC BIT STRING (SIZE (16)), -- Cond Reestablish-CP
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -301,21 +327,36 @@ RRCConnectionReestablishmentRequest-NB ::= SEQUENCE {
|
|||
criticalExtensions CHOICE {
|
||||
rrcConnectionReestablishmentRequest-r13
|
||||
RRCConnectionReestablishmentRequest-NB-r13-IEs,
|
||||
criticalExtensionsFuture SEQUENCE {}
|
||||
later CHOICE {
|
||||
rrcConnectionReestablishmentRequest-r14
|
||||
RRCConnectionReestablishmentRequest-NB-r14-IEs,
|
||||
criticalExtensionsFuture SEQUENCE {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
RRCConnectionReestablishmentRequest-NB-r13-IEs ::= SEQUENCE {
|
||||
ue-Identity-r13 ReestabUE-Identity,
|
||||
reestablishmentCause-r13 ReestablishmentCause-NB-r13,
|
||||
reestablishmentCause-r13 ReestablishmentCause-NB-r13,
|
||||
spare BIT STRING (SIZE (25))
|
||||
}
|
||||
|
||||
RRCConnectionReestablishmentRequest-NB-r14-IEs ::= SEQUENCE {
|
||||
ue-Identity-r14 ReestabUE-Identity-CP-NB-r14,
|
||||
reestablishmentCause-r14 ReestablishmentCause-NB-r13,
|
||||
spare BIT STRING (SIZE (4))
|
||||
}
|
||||
|
||||
ReestablishmentCause-NB-r13 ::= ENUMERATED {
|
||||
reconfigurationFailure, otherFailure,
|
||||
spare2, spare1}
|
||||
|
||||
ReestabUE-Identity-CP-NB-r14 ::= SEQUENCE {
|
||||
s-TMSI-r14 S-TMSI,
|
||||
ul-NAS-MAC-r14 BIT STRING (SIZE (16)),
|
||||
ul-NAS-Count-r14 BIT STRING (SIZE (5))
|
||||
}
|
||||
|
||||
|
||||
RRCConnectionReject-NB ::= SEQUENCE {
|
||||
criticalExtensions CHOICE {
|
||||
|
|
@ -352,15 +393,29 @@ RRCConnectionRelease-NB-r13-IEs ::= SEQUENCE {
|
|||
extendedWaitTime-r13 INTEGER (1..1800) OPTIONAL, -- Need ON
|
||||
redirectedCarrierInfo-r13 RedirectedCarrierInfo-NB-r13 OPTIONAL, -- Need ON
|
||||
lateNonCriticalExtension OCTET STRING OPTIONAL,
|
||||
nonCriticalExtension RRCConnectionRelease-NB-v1430-IEs OPTIONAL
|
||||
}
|
||||
|
||||
RRCConnectionRelease-NB-v1430-IEs ::= SEQUENCE {
|
||||
redirectedCarrierInfo-v1430 RedirectedCarrierInfo-NB-v1430 OPTIONAL, -- Cond Redirection
|
||||
extendedWaitTime-CPdata-r14 INTEGER (1..1800) OPTIONAL, -- Cond NoExtendedWaitTime
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
}
|
||||
|
||||
|
||||
ReleaseCause-NB-r13 ::= ENUMERATED {loadBalancingTAUrequired, other,
|
||||
rrc-Suspend, spare1}
|
||||
|
||||
RedirectedCarrierInfo-NB-r13::= CarrierFreq-NB-r13
|
||||
|
||||
RedirectedCarrierInfo-NB-v1430 ::= SEQUENCE {
|
||||
redirectedCarrierOffsetDedicated-r14 ENUMERATED{
|
||||
dB1, dB2, dB3, dB4, dB5, dB6, dB8, dB10,
|
||||
dB12, dB14, dB16, dB18, dB20, dB22, dB24, dB26},
|
||||
t322-r14 ENUMERATED{
|
||||
min5, min10, min20, min30, min60, min120, min180,
|
||||
spare1}
|
||||
}
|
||||
|
||||
|
||||
RRCConnectionRequest-NB ::= SEQUENCE {
|
||||
criticalExtensions CHOICE {
|
||||
rrcConnectionRequest-r13 RRCConnectionRequest-NB-r13-IEs,
|
||||
|
|
@ -462,7 +517,21 @@ RRCConnectionSetupComplete-NB-r13-IEs ::= SEQUENCE {
|
|||
attachWithoutPDN-Connectivity-r13 ENUMERATED {true} OPTIONAL,
|
||||
up-CIoT-EPS-Optimisation-r13 ENUMERATED {true} OPTIONAL,
|
||||
lateNonCriticalExtension OCTET STRING OPTIONAL,
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
nonCriticalExtension RRCConnectionSetupComplete-NB-v1430-IEs OPTIONAL
|
||||
}
|
||||
|
||||
RRCConnectionSetupComplete-NB-v1430-IEs ::= SEQUENCE {
|
||||
gummei-Type-r14 ENUMERATED { mapped} OPTIONAL,
|
||||
dcn-ID-r14 INTEGER (0..65535) OPTIONAL,
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
}
|
||||
|
||||
|
||||
SCPTMConfiguration-NB-r14 ::= SEQUENCE {
|
||||
sc-mtch-InfoList-r14 SC-MTCH-InfoList-NB-r14,
|
||||
scptm-NeighbourCellList-r14 SCPTM-NeighbourCellList-NB-r14 OPTIONAL, -- Need OP
|
||||
lateNonCriticalExtension OCTET STRING OPTIONAL,
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -480,7 +549,10 @@ SystemInformation-NB-r13-IEs ::= SEQUENCE {
|
|||
sib5-r13 SystemInformationBlockType5-NB-r13,
|
||||
sib14-r13 SystemInformationBlockType14-NB-r13,
|
||||
sib16-r13 SystemInformationBlockType16-NB-r13,
|
||||
...
|
||||
...,
|
||||
sib15-v1430 SystemInformationBlockType15-NB-r14,
|
||||
sib20-v1430 SystemInformationBlockType20-NB-r14,
|
||||
sib22-v1430 SystemInformationBlockType22-NB-r14
|
||||
},
|
||||
lateNonCriticalExtension OCTET STRING OPTIONAL,
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
|
|
@ -518,12 +590,17 @@ SystemInformationBlockType1-NB ::= SEQUENCE {
|
|||
si-RadioFrameOffset-r13 INTEGER (1..15) OPTIONAL, -- Need OP
|
||||
systemInfoValueTagList-r13 SystemInfoValueTagList-NB-r13 OPTIONAL, -- Need OR
|
||||
lateNonCriticalExtension OCTET STRING OPTIONAL,
|
||||
nonCriticalExtension SystemInformationBlockType1-NB-v1350-IEs OPTIONAL
|
||||
nonCriticalExtension SystemInformationBlockType1-NB-v1350 OPTIONAL
|
||||
}
|
||||
|
||||
SystemInformationBlockType1-NB-v1350-IEs ::= SEQUENCE {
|
||||
cellSelectionInfo-v1350 CellSelectionInfo-NB-v1350 OPTIONAL, -- Cond Qrxlevmin
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
SystemInformationBlockType1-NB-v1350 ::= SEQUENCE {
|
||||
cellSelectionInfo-v1350 CellSelectionInfo-NB-v1350 OPTIONAL, -- Cond Qrxlevmin
|
||||
nonCriticalExtension SystemInformationBlockType1-NB-v1430 OPTIONAL
|
||||
}
|
||||
|
||||
SystemInformationBlockType1-NB-v1430 ::= SEQUENCE {
|
||||
cellSelectionInfo-v1430 CellSelectionInfo-NB-v1430 OPTIONAL, -- Need OR
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
}
|
||||
|
||||
PLMN-IdentityList-NB-r13 ::= SEQUENCE (SIZE (1..maxPLMN-r11)) OF PLMN-IdentityInfo-NB-r13
|
||||
|
|
@ -552,12 +629,18 @@ SIB-MappingInfo-NB-r13 ::= SEQUENCE (SIZE (0..maxSIB-1)) OF SIB-Type-NB-r13
|
|||
|
||||
SIB-Type-NB-r13 ::= ENUMERATED {
|
||||
sibType3-NB-r13, sibType4-NB-r13, sibType5-NB-r13,
|
||||
sibType14-NB-r13, sibType16-NB-r13, spare3, spare2, spare1}
|
||||
sibType14-NB-r13, sibType16-NB-r13, sibType15-NB-r14, sibType20-NB-r14,
|
||||
sibType22-NB-r14}
|
||||
|
||||
CellSelectionInfo-NB-v1350 ::= SEQUENCE {
|
||||
delta-RxLevMin-v1350 INTEGER (-8..-1)
|
||||
}
|
||||
|
||||
CellSelectionInfo-NB-v1430 ::= SEQUENCE {
|
||||
powerClass14dBm-Offset-r14 ENUMERATED {dB-6, dB-3, dB3, dB6, dB9, dB12} OPTIONAL, -- Need OP
|
||||
ce-authorisationOffset-r14 ENUMERATED {dB5, dB10, dB15, dB20, dB25, dB30, dB35} OPTIONAL -- Need OP
|
||||
}
|
||||
|
||||
|
||||
UECapabilityEnquiry-NB ::= SEQUENCE {
|
||||
rrc-TransactionIdentifier RRC-TransactionIdentifier,
|
||||
|
|
@ -610,13 +693,15 @@ SystemInformationBlockType2-NB-r13 ::= SEQUENCE {
|
|||
radioResourceConfigCommon-r13 RadioResourceConfigCommonSIB-NB-r13,
|
||||
ue-TimersAndConstants-r13 UE-TimersAndConstants-NB-r13,
|
||||
freqInfo-r13 SEQUENCE {
|
||||
ul-CarrierFreq-r13 CarrierFreq-NB-r13 OPTIONAL,-- Need OP
|
||||
ul-CarrierFreq-r13 CarrierFreq-NB-r13 OPTIONAL, -- Need OP
|
||||
additionalSpectrumEmission-r13 AdditionalSpectrumEmission
|
||||
},
|
||||
timeAlignmentTimerCommon-r13 TimeAlignmentTimer,
|
||||
multiBandInfoList-r13 SEQUENCE (SIZE (1..maxMultiBands)) OF AdditionalSpectrumEmission OPTIONAL,-- Need OR
|
||||
multiBandInfoList-r13 SEQUENCE (SIZE (1..maxMultiBands)) OF AdditionalSpectrumEmission OPTIONAL, -- Need OR
|
||||
lateNonCriticalExtension OCTET STRING OPTIONAL,
|
||||
...
|
||||
...,
|
||||
[[ cp-Reestablishment-r14 ENUMERATED {true} OPTIONAL -- Need OP
|
||||
]]
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -645,6 +730,8 @@ SystemInformationBlockType3-NB-r13 ::= SEQUENCE {
|
|||
[[ intraFreqCellReselectionInfo-v1350 IntraFreqCellReselectionInfo-NB-v1350 OPTIONAL -- Cond Qrxlevmin
|
||||
]],
|
||||
[[ intraFreqCellReselectionInfo-v1360 IntraFreqCellReselectionInfo-NB-v1360 OPTIONAL -- Need OR
|
||||
]],
|
||||
[[ intraFreqCellReselectionInfo-v1430 IntraFreqCellReselectionInfo-NB-v1430 OPTIONAL -- Need OR
|
||||
]]
|
||||
}
|
||||
|
||||
|
|
@ -653,9 +740,15 @@ IntraFreqCellReselectionInfo-NB-v1350 ::= SEQUENCE {
|
|||
}
|
||||
|
||||
IntraFreqCellReselectionInfo-NB-v1360 ::= SEQUENCE {
|
||||
s-IntraSearchP-v1360 ReselectionThreshold-NB-v1360
|
||||
s-IntraSearchP-v1360 ReselectionThreshold-NB-v1360
|
||||
}
|
||||
|
||||
IntraFreqCellReselectionInfo-NB-v1430 ::= SEQUENCE {
|
||||
powerClass14dBm-Offset-r14 ENUMERATED {dB-6, dB-3, dB3, dB6, dB9, dB12} OPTIONAL, -- Need OP
|
||||
ce-AuthorisationOffset-r14 ENUMERATED {dB5, dB10, dB15, dB20, dB25, dB30, dB35} OPTIONAL -- Need OP
|
||||
}
|
||||
|
||||
|
||||
SystemInformationBlockType4-NB-r13 ::= SEQUENCE {
|
||||
intraFreqNeighCellList-r13 IntraFreqNeighCellList OPTIONAL, -- Need OR
|
||||
intraFreqBlackCellList-r13 IntraFreqBlackCellList OPTIONAL, -- Need OR
|
||||
|
|
@ -669,7 +762,9 @@ SystemInformationBlockType5-NB-r13 ::= SEQUENCE {
|
|||
interFreqCarrierFreqList-r13 InterFreqCarrierFreqList-NB-r13,
|
||||
t-Reselection-r13 T-Reselection-NB-r13,
|
||||
lateNonCriticalExtension OCTET STRING OPTIONAL,
|
||||
...
|
||||
...,
|
||||
[[ scptm-FreqOffset-r14 INTEGER (1..8) OPTIONAL -- Need OP
|
||||
]]
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -686,7 +781,10 @@ InterFreqCarrierFreqInfo-NB-r13 ::= SEQUENCE {
|
|||
interFreqBlackCellList-r13 InterFreqBlackCellList-NB-r13 OPTIONAL, -- Need OR
|
||||
multiBandInfoList-r13 MultiBandInfoList-NB-r13 OPTIONAL, -- Need OR
|
||||
...,
|
||||
[[ delta-RxLevMin-v1350 INTEGER (-8..-1) OPTIONAL -- Cond Qrxlevmin
|
||||
[[ delta-RxLevMin-v1350 INTEGER (-8..-1) OPTIONAL -- Cond Qrxlevmin
|
||||
]],
|
||||
[[ powerClass14dBm-Offset-r14 ENUMERATED {dB-6, dB-3, dB3, dB6, dB9, dB12} OPTIONAL, -- Need OP
|
||||
ce-AuthorisationOffset-r14 ENUMERATED {dB5, dB10, dB15, dB20, dB25, dB30, dB35} OPTIONAL -- Need OP
|
||||
]]
|
||||
}
|
||||
|
||||
|
|
@ -718,9 +816,171 @@ AB-Config-NB-r13 ::= SEQUENCE {
|
|||
}
|
||||
|
||||
|
||||
SystemInformationBlockType15-NB-r14 ::= SEQUENCE {
|
||||
mbms-SAI-IntraFreq-r14 MBMS-SAI-List-r11 OPTIONAL, -- Need OR
|
||||
mbms-SAI-InterFreqList-r14 MBMS-SAI-InterFreqList-NB-r14 OPTIONAL, -- Need OR
|
||||
lateNonCriticalExtension OCTET STRING OPTIONAL,
|
||||
...
|
||||
}
|
||||
|
||||
MBMS-SAI-InterFreqList-NB-r14 ::= SEQUENCE (SIZE (1..maxFreq)) OF MBMS-SAI-InterFreq-NB-r14
|
||||
|
||||
MBMS-SAI-InterFreq-NB-r14 ::= SEQUENCE {
|
||||
dl-CarrierFreq-r14 CarrierFreq-NB-r13,
|
||||
mbms-SAI-List-r14 MBMS-SAI-List-r11,
|
||||
multiBandInfoList-r14 AdditionalBandInfoList-NB-r14 OPTIONAL -- Need OR
|
||||
}
|
||||
|
||||
|
||||
SystemInformationBlockType16-NB-r13 ::= SystemInformationBlockType16-r11
|
||||
|
||||
|
||||
SystemInformationBlockType20-NB-r14 ::= SEQUENCE {
|
||||
npdcch-SC-MCCH-Config-r14 NPDCCH-SC-MCCH-Config-NB-r14,
|
||||
sc-mcch-CarrierConfig-r14 CHOICE {
|
||||
dl-CarrierConfig-r14 DL-CarrierConfigCommon-NB-r14,
|
||||
dl-CarrierIndex-r14 INTEGER (0.. maxNonAnchorCarriers-NB-r14)
|
||||
},
|
||||
sc-mcch-RepetitionPeriod-r14 ENUMERATED {rf32, rf128, rf512, rf1024,
|
||||
rf2048, rf4096, rf8192, rf16384},
|
||||
sc-mcch-Offset-r14 INTEGER (0..10),
|
||||
sc-mcch-ModificationPeriod-r14 ENUMERATED { rf32, rf128, rf256, rf512, rf1024,
|
||||
rf2048, rf4096, rf8192, rf16384, rf32768,
|
||||
rf65536, rf131072, rf262144, rf524288,
|
||||
rf1048576, spare1},
|
||||
sc-mcch-SchedulingInfo-r14 SC-MCCH-SchedulingInfo-NB-r14 OPTIONAL, -- Need OP
|
||||
lateNonCriticalExtension OCTET STRING OPTIONAL,
|
||||
...
|
||||
}
|
||||
|
||||
NPDCCH-SC-MCCH-Config-NB-r14 ::= SEQUENCE {
|
||||
npdcch-NumRepetitions-SC-MCCH-r14 ENUMERATED {r1, r2, r4, r8, r16,
|
||||
r32, r64, r128, r256,
|
||||
r512, r1024, r2048},
|
||||
npdcch-StartSF-SC-MCCH-r14 ENUMERATED {v1dot5, v2, v4, v8,
|
||||
v16, v32, v48, v64},
|
||||
npdcch-Offset-SC-MCCH-r14 ENUMERATED {zero, oneEighth, oneQuarter,
|
||||
threeEighth, oneHalf, fiveEighth,
|
||||
threeQuarter, sevenEighth}
|
||||
}
|
||||
|
||||
SC-MCCH-SchedulingInfo-NB-r14::= SEQUENCE {
|
||||
onDurationTimerSCPTM-r14 ENUMERATED {
|
||||
pp1, pp2, pp3, pp4,
|
||||
pp8, pp16, pp32, spare},
|
||||
drx-InactivityTimerSCPTM-r14 ENUMERATED {
|
||||
pp0, pp1, pp2, pp3,
|
||||
pp4, pp8, pp16, pp32},
|
||||
schedulingPeriodStartOffsetSCPTM-r14 CHOICE {
|
||||
sf10 INTEGER(0..9),
|
||||
sf20 INTEGER(0..19),
|
||||
sf32 INTEGER(0..31),
|
||||
sf40 INTEGER(0..39),
|
||||
sf64 INTEGER(0..63),
|
||||
sf80 INTEGER(0..79),
|
||||
sf128 INTEGER(0..127),
|
||||
sf160 INTEGER(0..159),
|
||||
sf256 INTEGER(0..255),
|
||||
sf320 INTEGER(0..319),
|
||||
sf512 INTEGER(0..511),
|
||||
sf640 INTEGER(0..639),
|
||||
sf1024 INTEGER(0..1023),
|
||||
sf2048 INTEGER(0..2047),
|
||||
sf4096 INTEGER(0..4095),
|
||||
sf8192 INTEGER(0..8191)
|
||||
},
|
||||
...
|
||||
}
|
||||
|
||||
|
||||
SystemInformationBlockType22-NB-r14 ::= SEQUENCE {
|
||||
dl-ConfigList-r14 DL-ConfigCommonList-NB-r14 OPTIONAL, -- Need OR
|
||||
ul-ConfigList-r14 UL-ConfigCommonList-NB-r14 OPTIONAL, -- Need OR
|
||||
pagingWeightAnchor-r14 PagingWeight-NB-r14 OPTIONAL, -- Cond pcch-config
|
||||
nprach-ProbabilityAnchorList-r14 NPRACH-ProbabilityAnchorList-NB-r14 OPTIONAL, -- Cond nprach-config
|
||||
lateNonCriticalExtension OCTET STRING OPTIONAL,
|
||||
...
|
||||
}
|
||||
|
||||
DL-ConfigCommonList-NB-r14 ::= SEQUENCE (SIZE (1.. maxNonAnchorCarriers-NB-r14)) OF
|
||||
DL-ConfigCommon-NB-r14
|
||||
|
||||
UL-ConfigCommonList-NB-r14 ::= SEQUENCE (SIZE (1.. maxNonAnchorCarriers-NB-r14)) OF
|
||||
UL-ConfigCommon-NB-r14
|
||||
|
||||
|
||||
DL-ConfigCommon-NB-r14 ::= SEQUENCE {
|
||||
dl-CarrierConfig-r14 DL-CarrierConfigCommon-NB-r14,
|
||||
pcch-Config-r14 PCCH-Config-NB-r14 OPTIONAL, -- Need OR
|
||||
...
|
||||
}
|
||||
|
||||
PCCH-Config-NB-r14 ::= SEQUENCE {
|
||||
npdcch-NumRepetitionPaging-r14 ENUMERATED {
|
||||
r1, r2, r4, r8, r16, r32, r64, r128,
|
||||
r256, r512, r1024, r2048,
|
||||
spare4, spare3, spare2, spare1} OPTIONAL, -- Need OP
|
||||
pagingWeight-r14 PagingWeight-NB-r14 DEFAULT w1,
|
||||
...
|
||||
}
|
||||
|
||||
PagingWeight-NB-r14 ::= ENUMERATED {w1, w2, w3, w4, w5, w6, w7, w8,
|
||||
w9, w10, w11, w12, w13, w14, w15, w16}
|
||||
|
||||
UL-ConfigCommon-NB-r14 ::= SEQUENCE {
|
||||
ul-CarrierFreq-r14 CarrierFreq-NB-r13,
|
||||
nprach-ParametersList-r14 NPRACH-ParametersList-NB-r14 OPTIONAL, -- Need OR
|
||||
...
|
||||
}
|
||||
|
||||
NPRACH-ParametersList-NB-r14 ::= SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF
|
||||
NPRACH-Parameters-NB-r14
|
||||
|
||||
|
||||
NPRACH-Parameters-NB-r14 ::= SEQUENCE {
|
||||
nprach-Parameters-r14 SEQUENCE {
|
||||
nprach-Periodicity-r14 ENUMERATED {ms40, ms80, ms160, ms240,
|
||||
ms320, ms640, ms1280, ms2560}
|
||||
OPTIONAL, -- NEED OP
|
||||
nprach-StartTime-r14 ENUMERATED {ms8, ms16, ms32, ms64,
|
||||
ms128, ms256, ms512, ms1024}
|
||||
OPTIONAL, -- NEED OP
|
||||
nprach-SubcarrierOffset-r14 ENUMERATED {n0, n12, n24, n36, n2, n18, n34, spare1}
|
||||
OPTIONAL, -- NEED OP
|
||||
nprach-NumSubcarriers-r14 ENUMERATED {n12, n24, n36, n48}
|
||||
OPTIONAL, -- NEED OP
|
||||
nprach-SubcarrierMSG3-RangeStart-r14 ENUMERATED {zero, oneThird, twoThird, one}
|
||||
OPTIONAL, -- NEED OP
|
||||
npdcch-NumRepetitions-RA-r14 ENUMERATED {r1, r2, r4, r8, r16, r32, r64, r128,
|
||||
r256, r512, r1024, r2048,
|
||||
spare4, spare3, spare2, spare1}
|
||||
OPTIONAL, -- NEED OP
|
||||
npdcch-StartSF-CSS-RA-r14 ENUMERATED {v1dot5, v2, v4, v8, v16, v32, v48, v64}
|
||||
OPTIONAL, -- NEED OP
|
||||
npdcch-Offset-RA-r14 ENUMERATED {zero, oneEighth, oneFourth, threeEighth}
|
||||
OPTIONAL, -- NEED OP
|
||||
nprach-NumCBRA-StartSubcarriers-r14 ENUMERATED {n8, n10, n11, n12, n20, n22, n23, n24,
|
||||
n32, n34, n35, n36, n40, n44, n46, n48}
|
||||
OPTIONAL, -- NEED OP
|
||||
npdcch-CarrierIndex-r14 INTEGER (1..maxNonAnchorCarriers-NB-r14)
|
||||
OPTIONAL, -- Need OP
|
||||
...
|
||||
} OPTIONAL -- Need OR
|
||||
}
|
||||
|
||||
NPRACH-ProbabilityAnchorList-NB-r14 ::= SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF
|
||||
NPRACH-ProbabilityAnchor-NB-r14
|
||||
|
||||
NPRACH-ProbabilityAnchor-NB-r14 ::= SEQUENCE {
|
||||
nprach-ProbabilityAnchor-r14 ENUMERATED {
|
||||
zero, oneSixteenth, oneFifteenth, oneFourteenth,
|
||||
oneThirteenth, oneTwelfth, oneEleventh, oneTenth,
|
||||
oneNinth, oneEightth, oneSeventh, oneSixth,
|
||||
oneFifth, oneFourth, oneThird, oneHalf}
|
||||
OPTIONAL -- Need OP
|
||||
}
|
||||
|
||||
|
||||
CarrierConfigDedicated-NB-r13 ::= SEQUENCE {
|
||||
dl-CarrierConfig-r13 DL-CarrierConfigDedicated-NB-r13,
|
||||
ul-CarrierConfig-r13 UL-CarrierConfigDedicated-NB-r13
|
||||
|
|
@ -779,6 +1039,35 @@ DL-Bitmap-NB-r13 ::= CHOICE {
|
|||
}
|
||||
|
||||
|
||||
DL-CarrierConfigCommon-NB-r14 ::= SEQUENCE {
|
||||
dl-CarrierFreq-r14 CarrierFreq-NB-r13,
|
||||
downlinkBitmapNonAnchor-r14 CHOICE {
|
||||
useNoBitmap-r14 NULL,
|
||||
useAnchorBitmap-r14 NULL,
|
||||
explicitBitmapConfiguration-r14 DL-Bitmap-NB-r13
|
||||
},
|
||||
dl-GapNonAnchor-r14 CHOICE {
|
||||
useNoGap-r14 NULL,
|
||||
useAnchorGapConfig-r14 NULL,
|
||||
explicitGapConfiguration-r14 DL-GapConfig-NB-r13
|
||||
},
|
||||
inbandCarrierInfo-r14 SEQUENCE {
|
||||
samePCI-Indicator-r14 CHOICE {
|
||||
samePCI-r14 SEQUENCE {
|
||||
indexToMidPRB-r14 INTEGER (-55..54)
|
||||
},
|
||||
differentPCI-r14 SEQUENCE {
|
||||
eutra-NumCRS-Ports-r14 ENUMERATED {same, four}
|
||||
}
|
||||
} OPTIONAL, -- Cond anchor-guardband
|
||||
eutraControlRegionSize-r14 ENUMERATED {n1, n2, n3}
|
||||
} OPTIONAL, -- Cond non-anchor-inband
|
||||
nrs-PowerOffsetNonAnchor-r14 ENUMERATED {dB-12, dB-10, dB-8, dB-6,
|
||||
dB-4, dB-2, dB0, dB3} DEFAULT dB0,
|
||||
...
|
||||
}
|
||||
|
||||
|
||||
|
||||
DL-GapConfig-NB-r13 ::= SEQUENCE {
|
||||
dl-GapThreshold-r13 ENUMERATED {n32, n64, n128, n256},
|
||||
|
|
@ -809,7 +1098,19 @@ MAC-MainConfig-NB-r13 ::= SEQUENCE {
|
|||
pp1024, pp2048, spare}
|
||||
}
|
||||
} OPTIONAL, -- Need ON
|
||||
...
|
||||
...,
|
||||
[[ rai-Activation-r14 ENUMERATED {true} OPTIONAL, -- Need OR
|
||||
dataInactivityTimerConfig-r14 CHOICE {
|
||||
release NULL,
|
||||
setup SEQUENCE {
|
||||
dataInactivityTimer-r14 DataInactivityTimer-r14
|
||||
}
|
||||
} OPTIONAL -- Need ON
|
||||
]],
|
||||
[[ drx-Cycle-v1430 ENUMERATED {
|
||||
sf1280, sf2560, sf5120, sf10240} OPTIONAL -- Need ON
|
||||
]]
|
||||
|
||||
}
|
||||
|
||||
PeriodicBSR-Timer-NB-r13 ::= ENUMERATED {
|
||||
|
|
@ -959,7 +1260,9 @@ PhysicalConfigDedicated-NB-r13 ::= SEQUENCE {
|
|||
npdcch-ConfigDedicated-r13 NPDCCH-ConfigDedicated-NB-r13 OPTIONAL, -- Need ON
|
||||
npusch-ConfigDedicated-r13 NPUSCH-ConfigDedicated-NB-r13 OPTIONAL, -- Need ON
|
||||
uplinkPowerControlDedicated-r13 UplinkPowerControlDedicated-NB-r13 OPTIONAL, -- Need ON
|
||||
...
|
||||
...,
|
||||
[[ twoHARQ-ProcessesConfig-r14 ENUMERATED {true} OPTIONAL -- Need OR
|
||||
]]
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1038,7 +1341,9 @@ SRB-ToAddMod-NB-r13 ::= SEQUENCE {
|
|||
explicitValue LogicalChannelConfig-NB-r13,
|
||||
defaultValue NULL
|
||||
} OPTIONAL, -- Cond Setup
|
||||
...
|
||||
...,
|
||||
[[ rlc-Config-v1430 RLC-Config-NB-v1430 OPTIONAL -- Need ON
|
||||
]]
|
||||
}
|
||||
|
||||
DRB-ToAddModList-NB-r13 ::= SEQUENCE (SIZE (1..maxDRB-NB-r13)) OF DRB-ToAddMod-NB-r13
|
||||
|
|
@ -1050,7 +1355,9 @@ DRB-ToAddMod-NB-r13 ::= SEQUENCE {
|
|||
rlc-Config-r13 RLC-Config-NB-r13 OPTIONAL, -- Cond Setup
|
||||
logicalChannelIdentity-r13 INTEGER (3..10) OPTIONAL, -- Cond DRB-Setup
|
||||
logicalChannelConfig-r13 LogicalChannelConfig-NB-r13 OPTIONAL, -- Cond Setup
|
||||
...
|
||||
...,
|
||||
[[ rlc-Config-v1430 RLC-Config-NB-v1430 OPTIONAL -- Need ON
|
||||
]]
|
||||
}
|
||||
|
||||
DRB-ToReleaseList-NB-r13 ::= SEQUENCE (SIZE (1..maxDRB-NB-r13)) OF DRB-Identity
|
||||
|
|
@ -1064,6 +1371,9 @@ RLC-Config-NB-r13 ::= CHOICE {
|
|||
...
|
||||
}
|
||||
|
||||
RLC-Config-NB-v1430 ::= SEQUENCE {
|
||||
t-Reordering-r14 T-Reordering OPTIONAL -- Cond twoHARQ
|
||||
}
|
||||
|
||||
UL-AM-RLC-NB-r13 ::= SEQUENCE {
|
||||
t-PollRetransmit-r13 T-PollRetransmit-NB-r13,
|
||||
|
|
@ -1118,6 +1428,9 @@ UplinkPowerControlDedicated-NB-r13 ::= SEQUENCE {
|
|||
}
|
||||
|
||||
|
||||
AdditionalBandInfoList-NB-r14 ::= SEQUENCE (SIZE (1..maxMultiBands)) OF FreqBandIndicator-NB-r13
|
||||
|
||||
|
||||
FreqBandIndicator-NB-r13 ::= INTEGER (1.. maxFBI2)
|
||||
|
||||
|
||||
|
|
@ -1155,10 +1468,17 @@ UE-Capability-NB-r13 ::= SEQUENCE {
|
|||
pdcp-Parameters-r13 PDCP-Parameters-NB-r13 OPTIONAL,
|
||||
phyLayerParameters-r13 PhyLayerParameters-NB-r13,
|
||||
rf-Parameters-r13 RF-Parameters-NB-r13,
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
nonCriticalExtension UE-Capability-NB-v1430-IEs OPTIONAL
|
||||
}
|
||||
|
||||
AccessStratumRelease-NB-r13 ::= ENUMERATED {rel13, spare7, spare6, spare5, spare4, spare3, spare2, spare1, ...}
|
||||
UE-Capability-NB-v1430-IEs ::= SEQUENCE {
|
||||
ue-Category-NB-r14 ENUMERATED {nb2} OPTIONAL,
|
||||
mac-Parameters-r14 MAC-Parameters-NB-r14 OPTIONAL, phyLayerParameters-v1430 PhyLayerParameters-NB-v1430 OPTIONAL,
|
||||
rf-Parameters-v1430 RF-Parameters-NB-v1430,
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
}
|
||||
|
||||
AccessStratumRelease-NB-r13 ::= ENUMERATED {rel13, rel14, spare6, spare5, spare4, spare3, spare2, spare1, ...}
|
||||
|
||||
PDCP-Parameters-NB-r13 ::= SEQUENCE {
|
||||
supportedROHC-Profiles-r13 SEQUENCE {
|
||||
|
|
@ -1174,16 +1494,30 @@ PDCP-Parameters-NB-r13 ::= SEQUENCE {
|
|||
...
|
||||
}
|
||||
|
||||
MAC-Parameters-NB-r14 ::= SEQUENCE {
|
||||
dataInactMon-r14 ENUMERATED {supported} OPTIONAL,
|
||||
rai-Support-r14 ENUMERATED {supported} OPTIONAL
|
||||
}
|
||||
|
||||
PhyLayerParameters-NB-r13 ::= SEQUENCE {
|
||||
multiTone-r13 ENUMERATED {supported} OPTIONAL,
|
||||
multiCarrier-r13 ENUMERATED {supported} OPTIONAL
|
||||
}
|
||||
|
||||
PhyLayerParameters-NB-v1430 ::= SEQUENCE {
|
||||
multiCarrier-NPRACH-r14 ENUMERATED {supported} OPTIONAL,
|
||||
twoHARQ-Processes-r14 ENUMERATED {supported} OPTIONAL
|
||||
}
|
||||
|
||||
RF-Parameters-NB-r13 ::= SEQUENCE {
|
||||
supportedBandList-r13 SupportedBandList-NB-r13,
|
||||
multiNS-Pmax-r13 ENUMERATED {supported} OPTIONAL
|
||||
}
|
||||
|
||||
RF-Parameters-NB-v1430 ::= SEQUENCE {
|
||||
powerClassNB-14dBm-r14 ENUMERATED {supported} OPTIONAL
|
||||
}
|
||||
|
||||
SupportedBandList-NB-r13 ::= SEQUENCE (SIZE (1..maxBands)) OF SupportedBand-NB-r13
|
||||
|
||||
SupportedBand-NB-r13 ::= SEQUENCE {
|
||||
|
|
@ -1192,10 +1526,11 @@ SupportedBand-NB-r13 ::= SEQUENCE {
|
|||
}
|
||||
|
||||
|
||||
|
||||
UE-RadioPagingInfo-NB-r13 ::= SEQUENCE {
|
||||
ue-Category-NB-r13 ENUMERATED {nb1} OPTIONAL,
|
||||
...
|
||||
...,
|
||||
[[ multiCarrierPaging-r14 ENUMERATED {true} OPTIONAL
|
||||
]]
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1223,9 +1558,73 @@ UE-TimersAndConstants-NB-r13 ::= SEQUENCE {
|
|||
}
|
||||
|
||||
|
||||
SC-MTCH-InfoList-NB-r14 ::= SEQUENCE (SIZE (0.. maxSC-MTCH-NB-r14)) OF SC-MTCH-Info-NB-r14
|
||||
|
||||
SC-MTCH-Info-NB-r14 ::= SEQUENCE {
|
||||
sc-mtch-CarrierConfig-r14 CHOICE {
|
||||
dl-CarrierConfig-r14 DL-CarrierConfigCommon-NB-r14,
|
||||
dl-CarrierIndex-r14 INTEGER (0.. maxNonAnchorCarriers-NB-r14)
|
||||
},
|
||||
mbmsSessionInfo-r14 MBMSSessionInfo-r13,
|
||||
g-RNTI-r14 BIT STRING(SIZE(16)),
|
||||
sc-mtch-SchedulingInfo-r14 SC-MTCH-SchedulingInfo-NB-r14 OPTIONAL, -- Need OP
|
||||
sc-mtch-NeighbourCell-r14 BIT STRING (SIZE(maxNeighCell-SCPTM-NB-r14)) OPTIONAL, -- Need OP
|
||||
npdcch-NPDSCH-MaxTBS-SC-MTCH-r14 ENUMERATED {n680, n2536},
|
||||
npdcch-NumRepetitions-SC-MTCH-r14 ENUMERATED {r1, r2, r4, r8, r16,
|
||||
r32, r64, r128, r256,
|
||||
r512, r1024, r2048, spare4,
|
||||
spare3, spare2, spare1},
|
||||
npdcch-StartSF-SC-MTCH-r14 ENUMERATED {v1dot5, v2, v4, v8,
|
||||
v16, v32, v48, v64},
|
||||
npdcch-Offset-SC-MTCH-r14 ENUMERATED {zero, oneEight, oneQuarter,
|
||||
threeEight, oneHalf, fiveEight,
|
||||
threeQuarter, sevenEight},
|
||||
...
|
||||
}
|
||||
|
||||
SC-MTCH-SchedulingInfo-NB-r14 ::= SEQUENCE {
|
||||
onDurationTimerSCPTM-r14 ENUMERATED {
|
||||
pp1, pp2, pp3, pp4,
|
||||
pp8, pp16, pp32, spare},
|
||||
drx-InactivityTimerSCPTM-r14 ENUMERATED {
|
||||
pp0, pp1, pp2, pp3,
|
||||
pp4, pp8, pp16, pp32},
|
||||
schedulingPeriodStartOffsetSCPTM-r14 CHOICE {
|
||||
sf10 INTEGER(0..9),
|
||||
sf20 INTEGER(0..19),
|
||||
sf32 INTEGER(0..31),
|
||||
sf40 INTEGER(0..39),
|
||||
sf64 INTEGER(0..63),
|
||||
sf80 INTEGER(0..79),
|
||||
sf128 INTEGER(0..127),
|
||||
sf160 INTEGER(0..159),
|
||||
sf256 INTEGER(0..255),
|
||||
sf320 INTEGER(0..319),
|
||||
sf512 INTEGER(0..511),
|
||||
sf640 INTEGER(0..639),
|
||||
sf1024 INTEGER(0..1023),
|
||||
sf2048 INTEGER(0..2047),
|
||||
sf4096 INTEGER(0..4095),
|
||||
sf8192 INTEGER(0..8191)
|
||||
},
|
||||
...
|
||||
}
|
||||
|
||||
|
||||
SCPTM-NeighbourCellList-NB-r14 ::= SEQUENCE (SIZE (1..maxNeighCell-SCPTM-NB-r14)) OF PCI-ARFCN-NB-r14
|
||||
|
||||
PCI-ARFCN-NB-r14 ::= SEQUENCE {
|
||||
physCellId-r14 PhysCellId,
|
||||
carrierFreq-r14 CarrierFreq-NB-r13 OPTIONAL -- Need OP
|
||||
}
|
||||
|
||||
|
||||
maxNPRACH-Resources-NB-r13 INTEGER ::= 3 -- Maximum number of NPRACH resources for NB-IoT
|
||||
maxNonAnchorCarriers-NB-r14 INTEGER ::= 15 -- Maximum number of non-anchor carriers for NB-IoT
|
||||
maxDRB-NB-r13 INTEGER ::= 2 -- Maximum number of Data Radio Bearers for NB-IoT
|
||||
maxNeighCell-SCPTM-NB-r14 INTEGER ::= 8 -- Maximum number of SCPTM neighbour cells
|
||||
maxNS-Pmax-NB-r13 INTEGER ::= 4 -- Maximum number of NS and P-Max values per band
|
||||
maxSC-MTCH-NB-r14 INTEGER ::= 64 -- Maximum number of SC-MTCHs in one cell for NB-IoT
|
||||
maxSI-Message-NB-r13 INTEGER ::= 8 -- Maximum number of SI messages for NB-IoT
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V13.6.1 (2017-07)
|
||||
-- 3GPP TS 36.331 V14.3.0 (2017-06)
|
||||
--
|
||||
NBIOT-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
@ -15,5 +15,4 @@ VarShortMAC-Input-NB-r13 ::= VarShortMAC-Input
|
|||
VarShortResumeMAC-Input-NB-r13 ::= VarShortResumeMAC-Input-r13
|
||||
|
||||
|
||||
|
||||
END
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V13.6.1 (2017-07)
|
||||
-- 3GPP TS 36.331 V14.3.0 (2017-06)
|
||||
--
|
||||
PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
@ -16,6 +16,13 @@ SBCCH-SL-BCH-Message ::= SEQUENCE {
|
|||
SBCCH-SL-BCH-MessageType ::= MasterInformationBlock-SL
|
||||
|
||||
|
||||
SBCCH-SL-BCH-Message-V2X-r14 ::= SEQUENCE {
|
||||
message SBCCH-SL-BCH-MessageType-V2X-r14
|
||||
}
|
||||
|
||||
SBCCH-SL-BCH-MessageType-V2X-r14 ::= MasterInformationBlock-SL-V2X-r14
|
||||
|
||||
|
||||
MasterInformationBlock-SL ::= SEQUENCE {
|
||||
sl-Bandwidth-r12 ENUMERATED {
|
||||
n6, n15, n25, n50, n75, n100},
|
||||
|
|
@ -28,4 +35,16 @@ MasterInformationBlock-SL ::= SEQUENCE {
|
|||
|
||||
|
||||
|
||||
MasterInformationBlock-SL-V2X-r14 ::= SEQUENCE {
|
||||
sl-Bandwidth-r14 ENUMERATED {
|
||||
n6, n15, n25, n50, n75, n100},
|
||||
tdd-ConfigSL-r14 TDD-ConfigSL-r12,
|
||||
directFrameNumber-r14 BIT STRING (SIZE (10)),
|
||||
directSubframeNumber-r14 INTEGER (0..9),
|
||||
inCoverage-r14 BOOLEAN,
|
||||
reserved-r14 BIT STRING (SIZE (27))
|
||||
}
|
||||
|
||||
|
||||
|
||||
END
|
||||
|
|
|
|||
|
|
@ -65,6 +65,7 @@ SC-MCCH-Message-r13 @sc.mcch
|
|||
UECapabilityInformation @ue_cap_info
|
||||
UE-EUTRA-Capability @ue_eutra_cap
|
||||
SBCCH-SL-BCH-Message @sbcch.sl.bch
|
||||
SBCCH-SL-BCH-Message-V2X-r14 @sbcch.sl.bch.v2x
|
||||
BCCH-BCH-Message-NB @bcch.bch.nb
|
||||
BCCH-DL-SCH-Message-NB @bcch.dl.sch.nb
|
||||
PCCH-Message-NB @pcch.nb
|
||||
|
|
@ -72,6 +73,9 @@ DL-CCCH-Message-NB @dl.ccch.nb
|
|||
DL-DCCH-Message-NB @dl.dcch.nb
|
||||
UL-CCCH-Message-NB @ul.ccch.nb
|
||||
UL-DCCH-Message-NB @ul.dcch.nb
|
||||
SC-MCCH-Message-NB @sc.mcch.nb
|
||||
BCCH-BCH-Message-MBMS @bcch.bch.mbms
|
||||
BCCH-DL-SCH-Message-MBMS @bcch.dl.sch.mbms
|
||||
#.END
|
||||
|
||||
#.OMIT_ASSIGNMENT
|
||||
|
|
@ -80,6 +84,10 @@ CellsTriggeredList
|
|||
CSI-RS-TriggeredList-r12
|
||||
LogMeasInfoList2-r10
|
||||
RSRP-RangeSL3-r12
|
||||
SL-CBR-PPPP-TxPreconfigList-r14
|
||||
SL-CBR-PreconfigTxConfigList-r14
|
||||
SL-OffsetIndicatorSync-r14
|
||||
SL-PPPP-TxPreconfigIndex-r14
|
||||
SL-PreconfigCommPool-r12
|
||||
SL-PreconfigCommPoolList4-r12
|
||||
SL-PreconfigCommRxPoolList-r13
|
||||
|
|
@ -90,7 +98,17 @@ SL-PreconfigDiscTxPoolList-r13
|
|||
SL-PreconfigGeneral-r12
|
||||
SL-PreconfigRelay-r13
|
||||
SL-PreconfigSync-r12
|
||||
SL-PreconfigV2X-Sync-r14
|
||||
SL-PreconfigV2X-RxPoolList-r14
|
||||
SL-PreconfigV2X-TxPoolList-r14
|
||||
SL-Preconfiguration-r12
|
||||
SL-TypeTxSyncList-r14
|
||||
SL-V2X-PreconfigCommPool-r14
|
||||
SL-V2X-PreconfigFreqInfo-r14
|
||||
SL-V2X-PreconfigFreqList-r14
|
||||
SL-V2X-Preconfiguration-r14
|
||||
SL-V2X-SyncOffsetIndicators-r14
|
||||
Tx-PreconfigIndex-r14
|
||||
VarConnEstFailReport-r11
|
||||
VarLogMeasConfig-r10
|
||||
VarLogMeasConfig-r11
|
||||
|
|
@ -920,6 +938,20 @@ CellSelectionInfoCE1-v1360/delta-RxLevMinCE1-v1360 STRINGS=VALS(lte_rrc_delta_Rx
|
|||
#.TYPE_ATTR
|
||||
CellSelectionInfo-v920/q-QualMinOffset-r9 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
|
||||
|
||||
#.TYPE_ATTR
|
||||
TrafficPatternInfo-r14/timingOffset-r14 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_milliseconds
|
||||
|
||||
#.FN_BODY TrafficPatternInfo-r14/messageSize-r14 VAL_PTR = &messageSize_r14_tvb HF_INDEX = -1
|
||||
tvbuff_t *messageSize_r14_tvb = NULL;
|
||||
%(DEFAULT_BODY)s
|
||||
if (messageSize_r14_tvb) {
|
||||
guint bitvalue = tvb_get_bits8(messageSize_r14_tvb, 0, 6);
|
||||
actx->created_item = proto_tree_add_uint(tree, hf_index, messageSize_r14_tvb, 0, 1, bitvalue);
|
||||
}
|
||||
|
||||
#.TYPE_ATTR
|
||||
TrafficPatternInfo-r14/messageSize-r14 TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_messageSize_r14_vals_ext
|
||||
|
||||
#.TYPE_ATTR
|
||||
RLF-Report-r9/eag_1/timeConnFailure-r10 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lte_rrc_timeConnFailure_r10_fmt)
|
||||
|
||||
|
|
@ -1123,6 +1155,12 @@ UplinkPowerControlCommonSCell-v1310/p0-NominalPUCCH DISPLAY=BASE_DEC|BASE_UNIT_S
|
|||
#.TYPE_ATTR
|
||||
UplinkPowerControlCommonSCell-r10/p0-NominalPUSCH-r10 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
|
||||
|
||||
#.TYPE_ATTR
|
||||
UplinkPowerControlCommonPUSCH-LessCell-v1430/p0-Nominal-PeriodicSRS-r14 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
|
||||
|
||||
#.TYPE_ATTR
|
||||
UplinkPowerControlCommonPUSCH-LessCell-v1430/p0-Nominal-AperiodicSRS-r14 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
|
||||
|
||||
#.TYPE_ATTR
|
||||
UplinkPowerControlDedicated/p0-UE-PUSCH DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
|
||||
|
||||
|
|
@ -1135,6 +1173,12 @@ UplinkPowerControlDedicated-v1250/set2PowerControlParameter/setup/p0-NominalPUSC
|
|||
#.TYPE_ATTR
|
||||
UplinkPowerControlDedicated-v1250/set2PowerControlParameter/setup/p0-UE-PUSCH-SubframeSet2-r12 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
|
||||
|
||||
#.TYPE_ATTR
|
||||
UplinkPUSCH-LessPowerControlDedicated-v1430/p0-UE-PeriodicSRS-r14 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
|
||||
|
||||
#.TYPE_ATTR
|
||||
UplinkPUSCH-LessPowerControlDedicated-v1430/p0-UE-AperiodicSRS-r14 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
|
||||
|
||||
#.TYPE_ATTR
|
||||
UplinkPowerControlDedicatedSCell-r10/p0-UE-PUSCH-r10 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
|
||||
|
||||
|
|
@ -1394,6 +1438,10 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val)
|
|||
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB20");
|
||||
|
||||
#.FN_HDR SystemInformationBlockType21-r14
|
||||
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB21");
|
||||
|
||||
#.FN_HDR MBSFNAreaConfiguration-r9
|
||||
|
||||
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MBSFNAreaConfiguration-r9");
|
||||
|
|
@ -1639,6 +1687,12 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val)
|
|||
}
|
||||
}
|
||||
|
||||
#.TYPE_ATTR
|
||||
SystemInformationBlockType5/eag_6/scptm-FreqOffset-r14 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lte_rrc_scptm_FreqOffset_r14_fmt)
|
||||
|
||||
#.TYPE_ATTR
|
||||
SL-V2X-ConfigCommon-r14/offsetDFN-r14 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lte_rrc_offsetDFN_r14_fmt)
|
||||
|
||||
#.FN_BODY Paging/etws-Indication
|
||||
%(DEFAULT_BODY)s
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, " (ETWS)");
|
||||
|
|
@ -1775,6 +1829,9 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val)
|
|||
mapping->ul_priority_present = TRUE;
|
||||
}
|
||||
|
||||
#.TYPE_ATTR
|
||||
LWA-Config-r13/eag_1/wt-MAC-Address-r14 TYPE=FT_ETHER
|
||||
|
||||
#.FN_BODY PDCP-Config/rlc-UM/pdcp-SN-Size VAL_PTR=&value
|
||||
guint32 value;
|
||||
drb_mapping_t *mapping = private_data_get_drb_mapping(actx);
|
||||
|
|
@ -1800,6 +1857,12 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val)
|
|||
mapping->pdcp_sn_size_present = TRUE;
|
||||
}
|
||||
|
||||
#.TYPE_ATTR
|
||||
LBT-Config-r14/maxEnergyDetectionThreshold-r14 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
|
||||
|
||||
#.TYPE_ATTR
|
||||
LBT-Config-r14/energyDetectionThresholdOffset-r14 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
|
||||
|
||||
#.FN_BODY NeighCellsInfo-r12/transmissionModeList-r12 VAL_PTR=&tm_list_tvb
|
||||
tvbuff_t *tm_list_tvb=NULL;
|
||||
proto_tree *subtree;
|
||||
|
|
@ -2197,6 +2260,15 @@ WLAN-OffloadConfig-r12/thresholdWLAN-RSSI-r12/thresholdWLAN-RSSI-High-r12 DISPLA
|
|||
%(DEFAULT_BODY)s
|
||||
proto_item_append_text(actx->created_item, "Kbps");
|
||||
|
||||
#.TYPE_ATTR
|
||||
SL-CBR-PSSCH-TxConfig-r14/cr-Limit-r14 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lte_rrc_cr_Limit_r14_fmt)
|
||||
|
||||
#.TYPE_ATTR
|
||||
SL-CBR-r14 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lte_rrc_SL_CBR_r14_fmt)
|
||||
|
||||
#.TYPE_ATTR
|
||||
SL-CommResourcePoolV2X-r14/threshS-RSSI-CBR-r14 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lte_rrc_threshS_RSSI_CBR_r14_fmt)
|
||||
|
||||
#.TYPE_ATTR
|
||||
SL-DiscResourcePool-r12/eag_1/txParamsAddNeighFreq-r13/setup/referenceSignalPower DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
|
||||
|
||||
|
|
@ -2206,9 +2278,22 @@ SL-DiscSysInfoReport-r13/cellSelectionInfo-r13/q-RxLevMinOffset-r13 STRINGS=VALS
|
|||
#.TYPE_ATTR
|
||||
SL-DiscSysInfoReport-r13/referenceSignalPower-r13 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
|
||||
|
||||
#.TYPE_ATTR
|
||||
SL-V2X-InterFreqUE-Config-r14/offsetDFN-r14 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lte_rrc_offsetDFN_r14_fmt)
|
||||
|
||||
#.TYPE_ATTR
|
||||
P0-SL-r12 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
|
||||
|
||||
#
|
||||
# EUTRA-Sidelink-Preconf
|
||||
#
|
||||
|
||||
#.TYPE_ATTR
|
||||
SL-V2X-PreconfigFreqInfo-r14/offsetDFN-r14 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lte_rrc_offsetDFN_r14_fmt)
|
||||
|
||||
#.TYPE_ATTR
|
||||
SL-V2X-PreconfigCommPool-r14/threshS-RSSI-CBR-r14 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lte_rrc_threshS_RSSI_CBR_r14_fmt)
|
||||
|
||||
#
|
||||
# PC5-RRC-Definitions
|
||||
#
|
||||
|
|
@ -2216,6 +2301,9 @@ P0-SL-r12 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
|
|||
#.FN_HDR MasterInformationBlock-SL
|
||||
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MasterInformationBlock-SL");
|
||||
|
||||
#.FN_HDR MasterInformationBlock-SL-V2X-r14
|
||||
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MasterInformationBlock-SL-V2X-r14");
|
||||
|
||||
#
|
||||
# NBIOT-RRC-Definitions
|
||||
#
|
||||
|
|
@ -2290,6 +2378,9 @@ P0-SL-r12 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
|
|||
#.FN_HDR RRCConnectionResumeRequest-NB
|
||||
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RRCConnectionResumeRequest-NB");
|
||||
|
||||
#.FN_HDR SCPTMConfiguration-NB-r14
|
||||
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SCPTMConfiguration-NB-r14");
|
||||
|
||||
#.FN_HDR RRCConnectionReconfigurationComplete-NB
|
||||
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RRCConnectionReconfigurationComplete-NB");
|
||||
|
||||
|
|
@ -2308,6 +2399,15 @@ P0-SL-r12 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
|
|||
#.FN_HDR RRCConnectionResumeComplete-NB
|
||||
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RRCConnectionResumeComplete-NB");
|
||||
|
||||
#.FN_HDR SystemInformationBlockType15-NB-r14
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB15");
|
||||
|
||||
#.FN_HDR SystemInformationBlockType20-NB-r14
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB20");
|
||||
|
||||
#.FN_HDR SystemInformationBlockType22-NB-r14
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB22");
|
||||
|
||||
#.TYPE_ATTR
|
||||
MasterInformationBlock-NB/schedulingInfoSIB1-r13 TYPE=FT_UINT32 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_schedulingInfoSIB1_NB_r13_vals_ext
|
||||
|
||||
|
|
@ -2317,6 +2417,9 @@ RRCConnectionReject-NB-r13-IEs/extendedWaitTime-r13 DISPLAY=BASE_DEC|BASE_UNIT_S
|
|||
#.TYPE_ATTR
|
||||
RRCConnectionRelease-NB-r13-IEs/extendedWaitTime-r13 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
|
||||
|
||||
#.TYPE_ATTR
|
||||
RRCConnectionRelease-NB-v1430-IEs/extendedWaitTime-CPdata-r14 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
|
||||
|
||||
#.TYPE_ATTR
|
||||
CellSelectionInfo-NB-v1350/delta-RxLevMin-v1350 STRINGS=VALS(lte_rrc_delta_RxLevMin_vals)
|
||||
|
||||
|
|
@ -2326,6 +2429,9 @@ SystemInformationBlockType2-NB-r13/multiBandInfoList-r13 AdditionalSpectrumEmiss
|
|||
#.TYPE_ATTR
|
||||
IntraFreqCellReselectionInfo-NB-v1350/delta-RxLevMin-v1350 STRINGS=VALS(lte_rrc_delta_RxLevMin_vals)
|
||||
|
||||
#.TYPE_ATTR
|
||||
SystemInformationBlockType5/eag_1/scptm-FreqOffset-r14 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lte_rrc_scptm_FreqOffset_r14_fmt)
|
||||
|
||||
#.TYPE_ATTR
|
||||
InterFreqCarrierFreqInfo-NB-r13/eag_1/delta-RxLevMin-v1350 STRINGS=VALS(lte_rrc_delta_RxLevMin_vals)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-lte-rrc-template.c
|
||||
* Routines for Evolved Universal Terrestrial Radio Access (E-UTRA);
|
||||
* Radio Resource Control (RRC) protocol specification
|
||||
* (3GPP TS 36.331 V13.6.1 Release 13) packet dissection
|
||||
* (3GPP TS 36.331 V14.3.0 Release 14) packet dissection
|
||||
* Copyright 2008, Vincent Helfre
|
||||
* Copyright 2009-2017, Pascal Quantin
|
||||
*
|
||||
|
|
@ -839,6 +839,76 @@ static const value_string lte_rrc_delta_RxLevMin_vals[] = {
|
|||
{ 0, NULL}
|
||||
};
|
||||
|
||||
static const value_string lte_rrc_messageSize_r14_vals[] =
|
||||
{
|
||||
{ 0, "size = 0"},
|
||||
{ 1, "0 < size <= 10"},
|
||||
{ 2, "10 < size <= 12"},
|
||||
{ 3, "12 < size <= 14"},
|
||||
{ 4, "14 < size <= 17"},
|
||||
{ 5, "17 < size <= 19"},
|
||||
{ 6, "19 < size <= 22"},
|
||||
{ 7, "22 < size <= 26"},
|
||||
{ 8, "26 < size <= 31"},
|
||||
{ 9, "31 < size <= 36"},
|
||||
{ 10, "36 < size <= 42"},
|
||||
{ 11, "42 < size <= 49"},
|
||||
{ 12, "49 < size <= 57"},
|
||||
{ 13, "57 < size <= 67"},
|
||||
{ 14, "67 < size <= 78"},
|
||||
{ 15, "78 < size <= 91"},
|
||||
{ 16, "91 < size <= 107"},
|
||||
{ 17, "107 < size <= 125"},
|
||||
{ 18, "125 < size <= 146"},
|
||||
{ 19, "146 < size <= 171"},
|
||||
{ 20, "171 < size <= 200"},
|
||||
{ 21, "200 < size <= 234"},
|
||||
{ 22, "234 < size <= 274"},
|
||||
{ 23, "274 < size <= 321"},
|
||||
{ 24, "321 < size <= 376"},
|
||||
{ 25, "376 < size <= 440"},
|
||||
{ 26, "440 < size <= 515"},
|
||||
{ 27, "515 < size <= 603"},
|
||||
{ 28, "603 < size <= 706"},
|
||||
{ 29, "706 < size <= 826"},
|
||||
{ 30, "826 < size <= 967"},
|
||||
{ 31, "967 < size <= 1132"},
|
||||
{ 32, "1132 < size <= 1326"},
|
||||
{ 33, "1326 < size <= 1552"},
|
||||
{ 34, "1552 < size <= 1817"},
|
||||
{ 35, "1817 < size <= 2127"},
|
||||
{ 36, "2127 < size <= 2490"},
|
||||
{ 37, "2490 < size <= 2915"},
|
||||
{ 38, "2915 < size <= 3413"},
|
||||
{ 39, "3413 < size <= 3995"},
|
||||
{ 40, "3995 < size <= 4677"},
|
||||
{ 41, "4677 < size <= 5476"},
|
||||
{ 42, "5476 < size <= 6411"},
|
||||
{ 43, "6411 < size <= 7505"},
|
||||
{ 44, "7505 < size <= 8787"},
|
||||
{ 45, "8787 < size <= 10276"},
|
||||
{ 46, "10287 < size <= 12043"},
|
||||
{ 47, "12043 < size <= 14099"},
|
||||
{ 48, "14099 < size <= 16507"},
|
||||
{ 49, "16507 < size <= 19325"},
|
||||
{ 50, "19325 < size <= 22624"},
|
||||
{ 51, "22624 < size <= 26487"},
|
||||
{ 52, "26487 < size <= 31009"},
|
||||
{ 53, "31009 < size <= 36304"},
|
||||
{ 54, "36304 < size <= 42502"},
|
||||
{ 55, "42502 < size <= 49759"},
|
||||
{ 56, "49759 < size <= 58255"},
|
||||
{ 57, "58255 < size <= 68201"},
|
||||
{ 58, "68201 < size <= 79846"},
|
||||
{ 59, "79846 < size <= 93479"},
|
||||
{ 60, "93479 < size <= 109439"},
|
||||
{ 61, "109439 < size <= 128125"},
|
||||
{ 62, "128125 < size <= 150000"},
|
||||
{ 63, "size > 150000"},
|
||||
{ 0, NULL }
|
||||
};
|
||||
static value_string_ext lte_rrc_messageSize_r14_vals_ext = VALUE_STRING_EXT_INIT(lte_rrc_messageSize_r14_vals);
|
||||
|
||||
static void
|
||||
lte_rrc_timeConnFailure_r10_fmt(gchar *s, guint32 v)
|
||||
{
|
||||
|
|
@ -2410,12 +2480,60 @@ lte_rrc_RSSI_Range_r13_fmt(gchar *s, guint32 v)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
lte_rrc_scptm_FreqOffset_r14_fmt(gchar *s, guint32 v)
|
||||
{
|
||||
g_snprintf(s, ITEM_LABEL_LENGTH, "%udB (%u)", 2*v, v);
|
||||
}
|
||||
|
||||
static void
|
||||
lte_rrc_offsetDFN_r14_fmt(gchar *s, guint32 v)
|
||||
{
|
||||
if (v == 0) {
|
||||
g_snprintf(s, ITEM_LABEL_LENGTH, "0ms (0)");
|
||||
} else if (v < 1000) {
|
||||
g_snprintf(s, ITEM_LABEL_LENGTH, "%.3fms (%u)", ((float)v)/1000, v);
|
||||
} else {
|
||||
g_snprintf(s, ITEM_LABEL_LENGTH, "1ms (1000)");
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
lte_rrc_thresholdWLAN_RSSI_fmt(gchar *s, guint32 v)
|
||||
{
|
||||
g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm (%u)", -128+v, v);
|
||||
}
|
||||
|
||||
static void
|
||||
lte_rrc_cr_Limit_r14_fmt(gchar *s, guint32 v)
|
||||
{
|
||||
if (v == 0) {
|
||||
g_snprintf(s, ITEM_LABEL_LENGTH, "0 (0)");
|
||||
} else if (v < 10000) {
|
||||
g_snprintf(s, ITEM_LABEL_LENGTH, "%.4f (%u)", ((float)v)/10000, v);
|
||||
} else {
|
||||
g_snprintf(s, ITEM_LABEL_LENGTH, "1 (10000)");
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
lte_rrc_SL_CBR_r14_fmt(gchar *s, guint32 v)
|
||||
{
|
||||
if (v == 0) {
|
||||
g_snprintf(s, ITEM_LABEL_LENGTH, "0 (0)");
|
||||
} else if (v < 100) {
|
||||
g_snprintf(s, ITEM_LABEL_LENGTH, "%.2f (%u)", ((float)v)/100, v);
|
||||
} else {
|
||||
g_snprintf(s, ITEM_LABEL_LENGTH, "1 (100)");
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
lte_rrc_threshS_RSSI_CBR_r14_fmt(gchar *s, guint32 v)
|
||||
{
|
||||
g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm (%u)", -112+(2*v), v);
|
||||
}
|
||||
|
||||
static const value_string lte_rrc_schedulingInfoSIB1_NB_r13_vals[] = {
|
||||
{ 0, "4 NPDSCH repetitions - TBS 208 bits"},
|
||||
{ 1, "8 NPDSCH repetitions - TBS 208 bits"},
|
||||
|
|
@ -3137,6 +3255,21 @@ dissect_lte_rrc_SBCCH_SL_BCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
|
|||
return tvb_captured_length(tvb);
|
||||
}
|
||||
|
||||
static int
|
||||
dissect_lte_rrc_SBCCH_SL_BCH_V2X(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
|
||||
{
|
||||
proto_item *ti;
|
||||
proto_tree *lte_rrc_tree;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC SBCCH_SL_BCH_V2X");
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
|
||||
lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
|
||||
dissect_SBCCH_SL_BCH_Message_V2X_r14_PDU(tvb, pinfo, lte_rrc_tree, NULL);
|
||||
return tvb_captured_length(tvb);
|
||||
}
|
||||
|
||||
static int
|
||||
dissect_lte_rrc_SC_MCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
|
||||
{
|
||||
|
|
@ -3257,6 +3390,51 @@ dissect_lte_rrc_PCCH_NB(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
|
|||
return tvb_captured_length(tvb);
|
||||
}
|
||||
|
||||
static int
|
||||
dissect_lte_rrc_SC_MCCH_NB(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
|
||||
{
|
||||
proto_item *ti;
|
||||
proto_tree *lte_rrc_tree;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC SC MCCH_NB");
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
|
||||
lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
|
||||
dissect_SC_MCCH_Message_NB_PDU(tvb, pinfo, lte_rrc_tree, NULL);
|
||||
return tvb_captured_length(tvb);
|
||||
}
|
||||
|
||||
static int
|
||||
dissect_lte_rrc_BCCH_BCH_MBMS(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
|
||||
{
|
||||
proto_item *ti;
|
||||
proto_tree *lte_rrc_tree;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC BCCH_BCH_MBMS");
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
|
||||
lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
|
||||
dissect_BCCH_BCH_Message_MBMS_PDU(tvb, pinfo, lte_rrc_tree, NULL);
|
||||
return tvb_captured_length(tvb);
|
||||
}
|
||||
|
||||
static int
|
||||
dissect_lte_rrc_BCCH_DL_SCH_MBMS(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
|
||||
{
|
||||
proto_item *ti;
|
||||
proto_tree *lte_rrc_tree;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC DL_SCH_MBMS");
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
|
||||
lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
|
||||
dissect_BCCH_DL_SCH_Message_MBMS_PDU(tvb, pinfo, lte_rrc_tree, NULL);
|
||||
return tvb_captured_length(tvb);
|
||||
}
|
||||
|
||||
/*--- proto_register_rrc -------------------------------------------*/
|
||||
void proto_register_lte_rrc(void) {
|
||||
|
||||
|
|
@ -4048,6 +4226,7 @@ void proto_register_lte_rrc(void) {
|
|||
register_dissector("lte_rrc.mcch", dissect_lte_rrc_MCCH, proto_lte_rrc);
|
||||
register_dissector("lte_rrc.handover_prep_info", dissect_lte_rrc_Handover_Preparation_Info, proto_lte_rrc);
|
||||
register_dissector("lte_rrc.sbcch_sl_bch", dissect_lte_rrc_SBCCH_SL_BCH, proto_lte_rrc);
|
||||
register_dissector("lte_rrc.sbcch_sl_bch.v2x", dissect_lte_rrc_SBCCH_SL_BCH_V2X, proto_lte_rrc);
|
||||
register_dissector("lte_rrc.sc_mcch", dissect_lte_rrc_SC_MCCH, proto_lte_rrc);
|
||||
register_dissector("lte_rrc.dl_ccch.nb", dissect_lte_rrc_DL_CCCH_NB, proto_lte_rrc);
|
||||
register_dissector("lte_rrc.dl_dcch.nb", dissect_lte_rrc_DL_DCCH_NB, proto_lte_rrc);
|
||||
|
|
@ -4056,6 +4235,9 @@ void proto_register_lte_rrc(void) {
|
|||
register_dissector("lte_rrc.bcch_bch.nb", dissect_lte_rrc_BCCH_BCH_NB, proto_lte_rrc);
|
||||
register_dissector("lte_rrc.bcch_dl_sch.nb", dissect_lte_rrc_BCCH_DL_SCH_NB, proto_lte_rrc);
|
||||
register_dissector("lte_rrc.pcch.nb", dissect_lte_rrc_PCCH_NB, proto_lte_rrc);
|
||||
register_dissector("lte_rrc.sc_mcch.nb", dissect_lte_rrc_SC_MCCH_NB, proto_lte_rrc);
|
||||
register_dissector("lte_rrc.bcch_bch.mbms", dissect_lte_rrc_BCCH_BCH_MBMS, proto_lte_rrc);
|
||||
register_dissector("lte_rrc.bcch_dl_sch.mbms", dissect_lte_rrc_BCCH_DL_SCH_MBMS, proto_lte_rrc);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_lte_rrc, hf, array_length(hf));
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue