LTE RRC: upgrade dissector to v15.6.0
Change-Id: I05417ad4425e301af9d307a1c20fd3c16091c80c Reviewed-on: https://code.wireshark.org/review/33784 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
This commit is contained in:
Pascal Quantin
parent
9900c86548
commit
2a80a9b80a
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V15.5.0 (2019-03)
|
||||
-- 3GPP TS 36.331 V15.6.0 (2019-06)
|
||||
--
|
||||
EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
@ -264,7 +264,8 @@ SCG-ConfigInfo-r12-IEs ::= SEQUENCE {
|
|||
}
|
||||
|
||||
SCG-ConfigInfo-v1310-IEs ::= SEQUENCE {
|
||||
measResultSSTD-r13 MeasResultSSTD-r13 OPTIONAL, sCellToAddModListMCG-Ext-r13 SCellToAddModListExt-r13 OPTIONAL,
|
||||
measResultSSTD-r13 MeasResultSSTD-r13 OPTIONAL,
|
||||
sCellToAddModListMCG-Ext-r13 SCellToAddModListExt-r13 OPTIONAL,
|
||||
measResultServCellListSCG-Ext-r13 MeasResultServCellListSCG-Ext-r13 OPTIONAL,
|
||||
sCellToAddModListSCG-Ext-r13 SCellToAddModListSCG-Ext-r13 OPTIONAL,
|
||||
sCellToReleaseListSCG-Ext-r13 SCellToReleaseListExt-r13 OPTIONAL,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V15.5.0 (2019-03)
|
||||
-- 3GPP TS 36.331 V15.6.0 (2019-06)
|
||||
--
|
||||
EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
@ -1149,13 +1149,7 @@ RRCConnectionReconfiguration-v1510-IEs ::= SEQUENCE {
|
|||
sk-Counter-r15 INTEGER (0.. 65535) OPTIONAL, -- Need ON
|
||||
nr-RadioBearerConfig1-r15 OCTET STRING OPTIONAL, -- Need ON
|
||||
nr-RadioBearerConfig2-r15 OCTET STRING OPTIONAL, -- Need ON
|
||||
tdm-PatternConfig-r15 CHOICE {
|
||||
release NULL,
|
||||
setup SEQUENCE {
|
||||
subframeAssignment-r15 SubframeAssignment-r15,
|
||||
harq-Offset-r15 INTEGER (0.. 9)
|
||||
}
|
||||
} OPTIONAL, -- Cond FDD-PCell
|
||||
tdm-PatternConfig-r15 TDM-PatternConfig-r15 OPTIONAL, -- Cond FDD-PCell
|
||||
nonCriticalExtension RRCConnectionReconfiguration-v1530-IEs OPTIONAL
|
||||
}
|
||||
|
||||
|
|
@ -1338,6 +1332,11 @@ SCG-ConfigPartSCG-r12 ::= SEQUENCE {
|
|||
]],
|
||||
[[ sCellGroupToReleaseListSCG-r15 SCellGroupToReleaseList-r15 OPTIONAL, -- Need ON
|
||||
sCellGroupToAddModListSCG-r15 SCellGroupToAddModList-r15 OPTIONAL -- Need ON
|
||||
]],
|
||||
[[ -- NE-DC addition for setup/ modification and release SN configured measurements
|
||||
measConfigSN-r15 MeasConfig OPTIONAL, -- Need ON
|
||||
-- NE-DC additions concerning DRBs/ SRBs are within RadioResourceConfigDedicatedSCG
|
||||
tdm-PatternConfigNE-DC-r15 TDM-PatternConfig-r15 OPTIONAL -- Need ON
|
||||
]]
|
||||
}
|
||||
|
||||
|
|
@ -1386,6 +1385,14 @@ SecurityConfigHO-v1530 ::= SEQUENCE {
|
|||
...
|
||||
}
|
||||
|
||||
TDM-PatternConfig-r15 ::= CHOICE {
|
||||
release NULL,
|
||||
setup SEQUENCE {
|
||||
subframeAssignment-r15 SubframeAssignment-r15,
|
||||
harq-Offset-r15 INTEGER (0.. 9)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
RRCConnectionReconfigurationComplete ::= SEQUENCE {
|
||||
rrc-TransactionIdentifier RRC-TransactionIdentifier,
|
||||
|
|
@ -2961,6 +2968,11 @@ UECapabilityEnquiry-v1530-IEs ::= SEQUENCE {
|
|||
|
||||
UECapabilityEnquiry-v1550-IEs ::= SEQUENCE {
|
||||
requestedCapabilityNR-r15 OCTET STRING OPTIONAL,
|
||||
nonCriticalExtension UECapabilityEnquiry-v1560-IEs OPTIONAL
|
||||
}
|
||||
|
||||
UECapabilityEnquiry-v1560-IEs ::= SEQUENCE {
|
||||
requestedCapabilityCommon-r15 OCTET STRING OPTIONAL,
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
}
|
||||
|
||||
|
|
@ -6303,12 +6315,12 @@ PhysicalConfigDedicated ::= SEQUENCE {
|
|||
]],
|
||||
[[ csi-RS-Config-v1480 CSI-RS-Config-v1480 OPTIONAL -- Need ON
|
||||
]],
|
||||
[[ physicalConfigDedicatedSTTI-r15 PhysicalConfigDedicatedSTTI-r15 OPTIONAL, -- Need ON
|
||||
pdsch-ConfigDedicated-v1530 PDSCH-ConfigDedicated-v1530 OPTIONAL, -- Need ON
|
||||
pusch-ConfigDedicated-v1530 PUSCH-ConfigDedicated-v1530 OPTIONAL, -- Need ON
|
||||
dummy CQI-ReportConfig-v1530 OPTIONAL,-- Need ON
|
||||
[[ physicalConfigDedicatedSTTI-r15 PhysicalConfigDedicatedSTTI-r15 OPTIONAL,-- Need ON
|
||||
pdsch-ConfigDedicated-v1530 PDSCH-ConfigDedicated-v1530 OPTIONAL,-- Need ON
|
||||
pusch-ConfigDedicated-v1530 PUSCH-ConfigDedicated-v1530 OPTIONAL,-- Need ON
|
||||
cqi-ReportConfig-v1530 CQI-ReportConfig-v1530 OPTIONAL,-- Need ON
|
||||
antennaInfo-v1530 AntennaInfoDedicated-v1530 OPTIONAL,-- Need ON
|
||||
csi-RS-Config-v1530 CSI-RS-Config-v1530 OPTIONAL, -- Need ON
|
||||
csi-RS-Config-v1530 CSI-RS-Config-v1530 OPTIONAL,-- Need ON
|
||||
uplinkPowerControlDedicated-v1530
|
||||
UplinkPowerControlDedicated-v1530 OPTIONAL, -- Need ON
|
||||
semiStaticCFI-Config-r15 CHOICE{
|
||||
|
|
@ -6463,12 +6475,12 @@ PhysicalConfigDedicatedSCell-r10 ::= SEQUENCE {
|
|||
]],
|
||||
[[ csi-RS-Config-v1480 CSI-RS-Config-v1480 OPTIONAL -- Need ON
|
||||
]],
|
||||
[[ physicalConfigDedicatedSTTI-r15 PhysicalConfigDedicatedSTTI-r15 OPTIONAL, -- Need ON
|
||||
pdsch-ConfigDedicated-v1530 PDSCH-ConfigDedicated-v1530 OPTIONAL, -- Need ON
|
||||
cqi-ReportConfig-v1530 CQI-ReportConfig-v1530 OPTIONAL, -- Need ON
|
||||
[[ physicalConfigDedicatedSTTI-r15 PhysicalConfigDedicatedSTTI-r15 OPTIONAL, -- Need ON
|
||||
pdsch-ConfigDedicated-v1530 PDSCH-ConfigDedicated-v1530 OPTIONAL, -- Need ON
|
||||
dummy CQI-ReportConfig-v1530 OPTIONAL, -- Need ON
|
||||
cqi-ReportConfigSCell-r15 CQI-ReportConfigSCell-r15 OPTIONAL, -- Need ON
|
||||
cqi-ShortConfigSCell-r15 CQI-ShortConfigSCell-r15 OPTIONAL, -- Need ON
|
||||
csi-RS-Config-v1530 CSI-RS-Config-v1530 OPTIONAL, -- Need ON
|
||||
csi-RS-Config-v1530 CSI-RS-Config-v1530 OPTIONAL, -- Need ON
|
||||
uplinkPowerControlDedicatedSCell-v1530
|
||||
UplinkPowerControlDedicated-v1530 OPTIONAL, -- Need ON
|
||||
laa-SCellConfiguration-v1530 LAA-SCellConfiguration-v1530 OPTIONAL, -- Need ON
|
||||
|
|
@ -7252,6 +7264,8 @@ RadioResourceConfigCommonSIB ::= SEQUENCE {
|
|||
highSpeedConfig-v1530 HighSpeedConfig-v1530 OPTIONAL -- Need OR
|
||||
]],
|
||||
[[ uplinkPowerControlCommon-v1540 UplinkPowerControlCommon-v1530 OPTIONAL -- Need OR
|
||||
]],
|
||||
[[ wus-Config-v1560 WUS-Config-v1560 OPTIONAL -- Need OR
|
||||
]]
|
||||
}
|
||||
|
||||
|
|
@ -7489,8 +7503,8 @@ RadioResourceConfigDedicated ::= SEQUENCE {
|
|||
]],
|
||||
[[ sps-Config-v1430 SPS-Config-v1430 OPTIONAL -- Cond SPS
|
||||
]],
|
||||
[[ srb-ToAddModExtList-r15 SRB-ToAddModExtList-r15 OPTIONAL, -- Need ON
|
||||
srb-ToReleaseExtList-r15 INTEGER (4) OPTIONAL, -- Need ON
|
||||
[[ srb-ToAddModListExt-r15 SRB-ToAddModListExt-r15 OPTIONAL, -- Need ON
|
||||
srb-ToReleaseListExt-r15 INTEGER (4) OPTIONAL, -- Need ON
|
||||
|
||||
sps-Config-v1530 SPS-Config-v1530 OPTIONAL, -- Need ON
|
||||
|
||||
|
|
@ -7552,6 +7566,9 @@ RadioResourceConfigDedicatedSCG-r12 ::= SEQUENCE {
|
|||
]],
|
||||
[[ srb-ToAddModListSCG-r15 SRB-ToAddModList OPTIONAL, -- Need ON
|
||||
srb-ToReleaseListSCG-r15 SRB-ToReleaseList-r15 OPTIONAL -- Need ON
|
||||
]],
|
||||
[[ -- NE-DC additions for release of RLC bearer config for DRBs
|
||||
drb-ToReleaseListSCG-r15 DRB-ToReleaseList-r15 OPTIONAL -- Need ON
|
||||
]]
|
||||
}
|
||||
|
||||
|
|
@ -7579,7 +7596,7 @@ RadioResourceConfigDedicatedSCell-v13c0 ::= SEQUENCE {
|
|||
|
||||
SRB-ToAddModList ::= SEQUENCE (SIZE (1..2)) OF SRB-ToAddMod
|
||||
|
||||
SRB-ToAddModExtList-r15 ::= SEQUENCE (SIZE (1)) OF SRB-ToAddMod
|
||||
SRB-ToAddModListExt-r15 ::= SEQUENCE (SIZE (1)) OF SRB-ToAddMod
|
||||
|
||||
SRB-ToAddMod ::= SEQUENCE {
|
||||
srb-Identity INTEGER (1..2),
|
||||
|
|
@ -7596,6 +7613,8 @@ SRB-ToAddMod ::= SEQUENCE {
|
|||
rlc-Config-v1530 RLC-Config-v1530 OPTIONAL, -- Need ON
|
||||
rlc-BearerConfigSecondary-r15 RLC-BearerConfig-r15 OPTIONAL, -- Need ON
|
||||
srb-Identity-v1530 INTEGER (4) OPTIONAL -- Need ON
|
||||
]],
|
||||
[[ rlc-Config-v1560 RLC-Config-v1510 OPTIONAL -- Need ON
|
||||
]]
|
||||
}
|
||||
|
||||
|
|
@ -7653,6 +7672,8 @@ DRB-ToAddModSCG-r12 ::= SEQUENCE {
|
|||
[[ logicalChannelIdentitySCG-r15 INTEGER (32..38) OPTIONAL, -- Need ON
|
||||
rlc-Config-v1530 RLC-Config-v1530 OPTIONAL, -- Need ON
|
||||
rlc-BearerConfigSecondary-r15 RLC-BearerConfig-r15 OPTIONAL -- Need ON
|
||||
]],
|
||||
[[ rlc-Config-v1560 RLC-Config-v1510 OPTIONAL -- Need ON
|
||||
]]
|
||||
}
|
||||
|
||||
|
|
@ -8851,6 +8872,10 @@ WUS-Config-r15 ::= SEQUENCE {
|
|||
timeOffset-eDRX-Long-r15 ENUMERATED {ms1000, ms2000} OPTIONAL -- Need OP
|
||||
}
|
||||
|
||||
WUS-Config-v1560 ::= SEQUENCE {
|
||||
powerBoost-r15 ENUMERATED {dB0, dB1dot8, dB3, dB4dot8}
|
||||
}
|
||||
|
||||
|
||||
NextHopChainingCount ::= INTEGER (0..7)
|
||||
|
||||
|
|
@ -9392,6 +9417,9 @@ LogMeasResultWLAN-r15 ::= SEQUENCE {
|
|||
}
|
||||
|
||||
|
||||
MaxRS-IndexCellQualNR-r15::= INTEGER (1..maxRS-IndexCellQual-r15)
|
||||
|
||||
|
||||
MBSFN-RSRQ-Range-r12 ::= INTEGER(0..31)
|
||||
|
||||
MeasConfig ::= SEQUENCE {
|
||||
|
|
@ -10264,6 +10292,21 @@ MeasResultCellSFTD-r15 ::= SEQUENCE {
|
|||
}
|
||||
|
||||
|
||||
MeasResultSCG-FailureMRDC-r15 ::= SEQUENCE {
|
||||
measResultFreqListEUTRA-r15 MeasResultList3EUTRA-r15,
|
||||
...
|
||||
}
|
||||
|
||||
MeasResultList3EUTRA-r15 ::= SEQUENCE (SIZE (1..maxFreq)) OF MeasResult3EUTRA-r15
|
||||
|
||||
MeasResult3EUTRA-r15 ::= SEQUENCE {
|
||||
carrierFreq-r15 ARFCN-ValueEUTRA-r9,
|
||||
measResultServingCell-r15 MeasResultEUTRA OPTIONAL,
|
||||
measResultNeighCellList-r15 MeasResultListEUTRA OPTIONAL,
|
||||
...
|
||||
}
|
||||
|
||||
|
||||
MeasResultSSTD-r13 ::= SEQUENCE {
|
||||
sfn-OffsetResult-r13 INTEGER (0..1023),
|
||||
frameBoundaryOffsetResult-r13 INTEGER (-5..4),
|
||||
|
|
@ -10622,8 +10665,6 @@ ReportInterval ::= ENUMERATED {
|
|||
|
||||
RS-IndexNR-r15 ::= INTEGER (0.. maxRS-Index-1-r15)
|
||||
|
||||
MaxRS-IndexCellQualNR-r15::= INTEGER (1..maxRS-IndexCellQual-r15)
|
||||
|
||||
|
||||
RSRP-Range ::= INTEGER(0..97)
|
||||
|
||||
|
|
@ -11101,11 +11142,16 @@ UE-EUTRA-Capability-v1390-IEs ::= SEQUENCE {
|
|||
}
|
||||
|
||||
UE-EUTRA-Capability-v13x0-IEs ::= SEQUENCE {
|
||||
-- Following field is only to be used for late REL-13 extensions
|
||||
lateNonCriticalExtension OCTET STRING OPTIONAL,
|
||||
lateNonCriticalExtension OCTET STRING (CONTAINING UE-EUTRA-Capability-v13e0-IEs) OPTIONAL,
|
||||
nonCriticalExtension UE-EUTRA-Capability-v1470-IEs OPTIONAL
|
||||
}
|
||||
|
||||
UE-EUTRA-Capability-v13e0-IEs ::= SEQUENCE {
|
||||
phyLayerParameters-v13e0 PhyLayerParameters-v13e0,
|
||||
-- Following field is only to be used for late REL-13 extensions
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
}
|
||||
|
||||
UE-EUTRA-Capability-v1470-IEs ::= SEQUENCE {
|
||||
mbms-Parameters-v1470 MBMS-Parameters-v1470 OPTIONAL,
|
||||
phyLayerParameters-v1470 PhyLayerParameters-v1470 OPTIONAL,
|
||||
|
|
@ -11116,7 +11162,12 @@ UE-EUTRA-Capability-v1470-IEs ::= SEQUENCE {
|
|||
UE-EUTRA-Capability-v14a0-IEs ::= SEQUENCE {
|
||||
phyLayerParameters-v14a0 PhyLayerParameters-v14a0,
|
||||
-- Following field is only to be used for late REL-14 extensions
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
nonCriticalExtension UE-EUTRA-Capability-v14b0-IEs OPTIONAL
|
||||
}
|
||||
|
||||
UE-EUTRA-Capability-v14b0-IEs ::= SEQUENCE {
|
||||
rf-Parameters-v14b0 RF-Parameters-v14b0 OPTIONAL,
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
}
|
||||
|
||||
-- Regular non critical extensions
|
||||
|
|
@ -11133,8 +11184,7 @@ UE-EUTRA-Capability-v920-IEs ::= SEQUENCE {
|
|||
}
|
||||
|
||||
UE-EUTRA-Capability-v940-IEs ::= SEQUENCE {
|
||||
lateNonCriticalExtension OCTET STRING (CONTAINING UE-EUTRA-Capability-v9a0-IEs)
|
||||
OPTIONAL,
|
||||
lateNonCriticalExtension OCTET STRING (CONTAINING UE-EUTRA-Capability-v9a0-IEs) OPTIONAL,
|
||||
nonCriticalExtension UE-EUTRA-Capability-v1020-IEs OPTIONAL
|
||||
}
|
||||
|
||||
|
|
@ -11380,6 +11430,15 @@ UE-EUTRA-Capability-v1550-IEs ::= SEQUENCE {
|
|||
mac-Parameters-v1550 MAC-Parameters-v1550,
|
||||
fdd-Add-UE-EUTRA-Capabilities-v1550 UE-EUTRA-CapabilityAddXDD-Mode-v1550,
|
||||
tdd-Add-UE-EUTRA-Capabilities-v1550 UE-EUTRA-CapabilityAddXDD-Mode-v1550,
|
||||
nonCriticalExtension UE-EUTRA-Capability-v1560-IEs OPTIONAL
|
||||
}
|
||||
|
||||
UE-EUTRA-Capability-v1560-IEs ::= SEQUENCE {
|
||||
pdcp-ParametersNR-v1560 PDCP-ParametersNR-v1560,
|
||||
irat-ParametersNR-v1560 IRAT-ParametersNR-v1560,
|
||||
appliedCapabilityFilterCommon-r15 OCTET STRING OPTIONAL,
|
||||
fdd-Add-UE-EUTRA-Capabilities-v1560 UE-EUTRA-CapabilityAddXDD-Mode-v1560,
|
||||
tdd-Add-UE-EUTRA-Capabilities-v1560 UE-EUTRA-CapabilityAddXDD-Mode-v1560,
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
}
|
||||
|
||||
|
|
@ -11460,6 +11519,10 @@ UE-EUTRA-CapabilityAddXDD-Mode-v1550 ::= SEQUENCE {
|
|||
neighCellSI-AcquisitionParameters-v1550 NeighCellSI-AcquisitionParameters-v1550 OPTIONAL
|
||||
}
|
||||
|
||||
UE-EUTRA-CapabilityAddXDD-Mode-v1560 ::= SEQUENCE {
|
||||
pdcp-ParametersNR-v1560 PDCP-ParametersNR-v1560
|
||||
}
|
||||
|
||||
AccessStratumRelease ::= ENUMERATED {
|
||||
rel8, rel9, rel10, rel11, rel12, rel13,
|
||||
rel14, rel15, ...}
|
||||
|
|
@ -11679,6 +11742,10 @@ PhyLayerParameters-v1330 ::= SEQUENCE {
|
|||
crs-InterfMitigationTM1toTM9-r13 INTEGER (1.. maxServCell-r13) OPTIONAL
|
||||
}
|
||||
|
||||
PhyLayerParameters-v13e0 ::= SEQUENCE {
|
||||
mimo-UE-Parameters-v13e0 MIMO-UE-Parameters-v13e0
|
||||
}
|
||||
|
||||
PhyLayerParameters-v1430 ::= SEQUENCE {
|
||||
ce-PUSCH-NB-MaxTBS-r14 ENUMERATED {supported} OPTIONAL,
|
||||
ce-PDSCH-PUSCH-MaxBandwidth-r14 ENUMERATED {bw5, bw20} OPTIONAL,
|
||||
|
|
@ -11810,6 +11877,10 @@ MIMO-UE-Parameters-r13 ::= SEQUENCE {
|
|||
interferenceMeasRestriction-r13 ENUMERATED {supported} OPTIONAL
|
||||
}
|
||||
|
||||
MIMO-UE-Parameters-v13e0 ::= SEQUENCE {
|
||||
mimo-WeightedLayersCapabilities-r13 MIMO-WeightedLayersCapabilities-r13 OPTIONAL
|
||||
}
|
||||
|
||||
MIMO-UE-Parameters-v1430 ::= SEQUENCE {
|
||||
parametersTM9-v1430 MIMO-UE-ParametersPerTM-v1430 OPTIONAL,
|
||||
parametersTM10-v1430 MIMO-UE-ParametersPerTM-v1430 OPTIONAL
|
||||
|
|
@ -11910,7 +11981,14 @@ MIMO-BeamformedCapabilityList-r13 ::= SEQUENCE (SIZE (1..maxCSI-Proc-r11)) OF M
|
|||
MIMO-BeamformedCapabilities-r13 ::= SEQUENCE {
|
||||
k-Max-r13 INTEGER (1..8),
|
||||
n-MaxList-r13 BIT STRING (SIZE (1..7)) OPTIONAL
|
||||
}
|
||||
}
|
||||
|
||||
MIMO-WeightedLayersCapabilities-r13 ::= SEQUENCE {
|
||||
relWeightTwoLayers-r13 ENUMERATED {v1, v1dot25, v1dot5, v1dot75, v2, v2dot5, v3, v4},
|
||||
relWeightFourLayers-r13 ENUMERATED {v1, v1dot25, v1dot5, v1dot75, v2, v2dot5, v3, v4} OPTIONAL,
|
||||
relWeightEightLayers-r13 ENUMERATED {v1, v1dot25, v1dot5, v1dot75, v2, v2dot5, v3, v4} OPTIONAL,
|
||||
totalWeightedLayers-r13 INTEGER (2..128)
|
||||
}
|
||||
|
||||
NonContiguousUL-RA-WithinCC-List-r10 ::= SEQUENCE (SIZE (1..maxBands)) OF NonContiguousUL-RA-WithinCC-r10
|
||||
|
||||
|
|
@ -12035,6 +12113,12 @@ RF-Parameters-v1470 ::= SEQUENCE {
|
|||
supportedBandCombinationReduced-v1470 SupportedBandCombinationReduced-v1470 OPTIONAL
|
||||
}
|
||||
|
||||
RF-Parameters-v14b0 ::= SEQUENCE {
|
||||
supportedBandCombination-v14b0 SupportedBandCombination-v14b0 OPTIONAL,
|
||||
supportedBandCombinationAdd-v14b0 SupportedBandCombinationAdd-v14b0 OPTIONAL,
|
||||
supportedBandCombinationReduced-v14b0 SupportedBandCombinationReduced-v14b0 OPTIONAL
|
||||
}
|
||||
|
||||
RF-Parameters-v1530 ::= SEQUENCE {
|
||||
sTTI-SPT-Supported-r15 ENUMERATED {supported} OPTIONAL,
|
||||
supportedBandCombination-v1530 SupportedBandCombination-v1530 OPTIONAL,
|
||||
|
|
@ -12112,6 +12196,8 @@ SupportedBandCombination-v1450 ::= SEQUENCE (SIZE (1..maxBandComb-r10)) OF BandC
|
|||
|
||||
SupportedBandCombination-v1470 ::= SEQUENCE (SIZE (1..maxBandComb-r10)) OF BandCombinationParameters-v1470
|
||||
|
||||
SupportedBandCombination-v14b0 ::= SEQUENCE (SIZE (1..maxBandComb-r10)) OF BandCombinationParameters-v14b0
|
||||
|
||||
SupportedBandCombination-v1530 ::= SEQUENCE (SIZE (1..maxBandComb-r10)) OF BandCombinationParameters-v1530
|
||||
|
||||
SupportedBandCombinationAdd-r11 ::= SEQUENCE (SIZE (1..maxBandComb-r11)) OF BandCombinationParameters-r11
|
||||
|
|
@ -12134,6 +12220,8 @@ SupportedBandCombinationAdd-v1450 ::= SEQUENCE (SIZE (1..maxBandComb-r11)) OF Ba
|
|||
|
||||
SupportedBandCombinationAdd-v1470 ::= SEQUENCE (SIZE (1..maxBandComb-r11)) OF BandCombinationParameters-v1470
|
||||
|
||||
SupportedBandCombinationAdd-v14b0 ::= SEQUENCE (SIZE (1..maxBandComb-r11)) OF BandCombinationParameters-v14b0
|
||||
|
||||
SupportedBandCombinationAdd-v1530 ::= SEQUENCE (SIZE (1..maxBandComb-r11)) OF BandCombinationParameters-v1530
|
||||
|
||||
SupportedBandCombinationReduced-r13 ::= SEQUENCE (SIZE (1..maxBandComb-r13)) OF BandCombinationParameters-r13
|
||||
|
|
@ -12150,6 +12238,8 @@ SupportedBandCombinationReduced-v1450 ::= SEQUENCE (SIZE (1..maxBandComb-r13)) O
|
|||
|
||||
SupportedBandCombinationReduced-v1470 ::= SEQUENCE (SIZE (1..maxBandComb-r13)) OF BandCombinationParameters-v1470
|
||||
|
||||
SupportedBandCombinationReduced-v14b0 ::= SEQUENCE (SIZE (1..maxBandComb-r13)) OF BandCombinationParameters-v14b0
|
||||
|
||||
SupportedBandCombinationReduced-v1530 ::= SEQUENCE (SIZE (1..maxBandComb-r13)) OF BandCombinationParameters-v1530
|
||||
|
||||
BandCombinationParameters-r10 ::= SEQUENCE (SIZE (1..maxSimultaneousBands-r10)) OF BandParameters-r10
|
||||
|
|
@ -12253,11 +12343,17 @@ BandCombinationParameters-v1470 ::= SEQUENCE {
|
|||
srs-MaxSimultaneousCCs-r14 INTEGER (1..31) OPTIONAL
|
||||
}
|
||||
|
||||
BandCombinationParameters-v14b0 ::= SEQUENCE {
|
||||
bandParameterList-v14b0 SEQUENCE (SIZE (1..maxSimultaneousBands-r10)) OF
|
||||
BandParameters-v14b0 OPTIONAL
|
||||
}
|
||||
|
||||
BandCombinationParameters-v1530 ::= SEQUENCE {
|
||||
bandParameterList-v1530 SEQUENCE (SIZE (1..maxSimultaneousBands-r10)) OF BandParameters-v1530 OPTIONAL,
|
||||
spt-Parameters-r15 SPT-Parameters-r15 OPTIONAL
|
||||
}
|
||||
-- If an additional band combination parameter is defined, which are supported for EN-DC, it shall be defined in the IE CA-ParametersEUTRA in TS 38.331 [82].
|
||||
-- If an additional band combination parameter is defined, which is supported for MR-DC,
|
||||
-- it shall be defined in the IE CA-ParametersEUTRA in TS 38.331 [82].
|
||||
|
||||
SupportedBandwidthCombinationSet-r10 ::= BIT STRING (SIZE (1..maxBandwidthCombSet-r10))
|
||||
|
||||
|
|
@ -12311,8 +12407,8 @@ BandParameters-v1430 ::= SEQUENCE {
|
|||
bandParametersDL-v1430 MIMO-CA-ParametersPerBoBC-v1430 OPTIONAL,
|
||||
ul-256QAM-r14 ENUMERATED {supported} OPTIONAL,
|
||||
ul-256QAM-perCC-InfoList-r14 SEQUENCE (SIZE (2..maxServCell-r13)) OF UL-256QAM-perCC-Info-r14 OPTIONAL,
|
||||
retuningTimeInfoBandList-r14 SEQUENCE (SIZE (1..maxSimultaneousBands-r10)) OF
|
||||
RetuningTimeInfo-r14 OPTIONAL
|
||||
srs-CapabilityPerBandPairList-r14 SEQUENCE (SIZE (1..maxSimultaneousBands-r10)) OF
|
||||
SRS-CapabilityPerBandPair-r14 OPTIONAL
|
||||
}
|
||||
|
||||
BandParameters-v1450 ::= SEQUENCE {
|
||||
|
|
@ -12323,6 +12419,10 @@ BandParameters-v1470 ::= SEQUENCE {
|
|||
bandParametersDL-v1470 MIMO-CA-ParametersPerBoBC-v1470 OPTIONAL
|
||||
}
|
||||
|
||||
BandParameters-v14b0 ::= SEQUENCE {
|
||||
srs-CapabilityPerBandPairList-v14b0 SEQUENCE (SIZE (1..maxSimultaneousBands-r10)) OF SRS-CapabilityPerBandPair-v14b0 OPTIONAL
|
||||
}
|
||||
|
||||
BandParameters-v1530 ::= SEQUENCE {
|
||||
ue-TxAntennaSelection-SRS-1T4R-r15 ENUMERATED {supported} OPTIONAL,
|
||||
ue-TxAntennaSelection-SRS-2T4R-2Pairs-r15 ENUMERATED {supported} OPTIONAL,
|
||||
|
|
@ -12533,7 +12633,7 @@ MeasParameters-v1430 ::= SEQUENCE {
|
|||
}
|
||||
|
||||
MeasParameters-v1520 ::= SEQUENCE {
|
||||
measGapPatterns-v1520 BIT STRING (SIZE (8)) OPTIONAL
|
||||
measGapPatterns-r15 BIT STRING (SIZE (8)) OPTIONAL
|
||||
}
|
||||
|
||||
MeasParameters-v1530 ::= SEQUENCE {
|
||||
|
|
@ -12587,6 +12687,10 @@ IRAT-ParametersNR-v1540 ::= SEQUENCE {
|
|||
supportedBandListNR-SA-r15 SupportedBandListNR-r15 OPTIONAL
|
||||
}
|
||||
|
||||
IRAT-ParametersNR-v1560 ::= SEQUENCE {
|
||||
ng-EN-DC-r15 ENUMERATED {supported} OPTIONAL
|
||||
}
|
||||
|
||||
EUTRA-5GC-Parameters-r15 ::= SEQUENCE {
|
||||
eutra-5GC-r15 ENUMERATED {supported} OPTIONAL,
|
||||
eutra-EPC-HO-EUTRA-5GC-r15 ENUMERATED {supported} OPTIONAL,
|
||||
|
|
@ -12613,6 +12717,10 @@ PDCP-ParametersNR-r15 ::= SEQUENCE {
|
|||
ims-VoiceOverNR-PDCP-SCG-Bearer-r15 ENUMERATED {supported} OPTIONAL
|
||||
}
|
||||
|
||||
PDCP-ParametersNR-v1560 ::= SEQUENCE {
|
||||
ims-VoNR-PDCP-SCG-NGENDC-r15 ENUMERATED {supported} OPTIONAL
|
||||
}
|
||||
|
||||
ROHC-ProfileSupportList-r15 ::= SEQUENCE {
|
||||
profile0x0001-r15 BOOLEAN,
|
||||
profile0x0002-r15 BOOLEAN,
|
||||
|
|
@ -13049,7 +13157,7 @@ MMTEL-Parameters-r14 ::= SEQUENCE {
|
|||
recommendedBitRateQuery-r14 ENUMERATED {supported} OPTIONAL
|
||||
}
|
||||
|
||||
RetuningTimeInfo-r14 ::= SEQUENCE {
|
||||
SRS-CapabilityPerBandPair-r14 ::= SEQUENCE {
|
||||
retuningInfo SEQUENCE {
|
||||
rf-RetuningTimeDL-r14 ENUMERATED {n0, n0dot5, n1, n1dot5, n2, n2dot5, n3,
|
||||
n3dot5, n4, n4dot5, n5, n5dot5, n6, n6dot5,
|
||||
|
|
@ -13060,6 +13168,11 @@ RetuningTimeInfo-r14 ::= SEQUENCE {
|
|||
}
|
||||
}
|
||||
|
||||
SRS-CapabilityPerBandPair-v14b0 ::= SEQUENCE {
|
||||
srs-FlexibleTiming-r14 ENUMERATED {supported} OPTIONAL,
|
||||
srs-HARQ-ReferenceConfig-r14 ENUMERATED {supported} OPTIONAL
|
||||
}
|
||||
|
||||
HighSpeedEnhParameters-r14 ::= SEQUENCE {
|
||||
measurementEnhancements-r14 ENUMERATED {supported} OPTIONAL,
|
||||
demodulationEnhancements-r14 ENUMERATED {supported} OPTIONAL,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V15.5.0 (2019-03)
|
||||
-- 3GPP TS 36.331 V15.6.0 (2019-06)
|
||||
--
|
||||
EUTRA-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V15.5.0 (2019-03)
|
||||
-- 3GPP TS 36.331 V15.6.0 (2019-06)
|
||||
--
|
||||
EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V15.5.0 (2019-03)
|
||||
-- 3GPP TS 36.331 V15.6.0 (2019-06)
|
||||
--
|
||||
NBIOT-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V15.5.0 (2019-03)
|
||||
-- 3GPP TS 36.331 V15.6.0 (2019-06)
|
||||
--
|
||||
NBIOT-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V15.5.0 (2019-03)
|
||||
-- 3GPP TS 36.331 V15.6.0 (2019-06)
|
||||
--
|
||||
NBIOT-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V15.5.0 (2019-03)
|
||||
-- 3GPP TS 36.331 V15.6.0 (2019-06)
|
||||
--
|
||||
PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
|
|||
|
|
@ -109,6 +109,9 @@ BCCH-DL-SCH-Message-MBMS @bcch.dl.sch.mbms
|
|||
CellsTriggeredList
|
||||
CSI-RS-TriggeredList-r12
|
||||
LogMeasInfoList2-r10
|
||||
MeasResult3EUTRA-r15
|
||||
MeasResultList3EUTRA-r15
|
||||
MeasResultSCG-FailureMRDC-r15
|
||||
RSRP-RangeSL3-r12
|
||||
SL-CBR-PPPP-TxPreconfigList-r14
|
||||
SL-CBR-PPPP-TxPreconfigList-v1530
|
||||
|
|
@ -2480,26 +2483,26 @@ WLAN-OffloadConfig-r12/thresholdWLAN-RSSI-r12/thresholdWLAN-RSSI-Low-r12 DISPLAY
|
|||
#.TYPE_ATTR
|
||||
WLAN-OffloadConfig-r12/thresholdWLAN-RSSI-r12/thresholdWLAN-RSSI-High-r12 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lte_rrc_thresholdWLAN_RSSI_fmt)
|
||||
|
||||
#.FN_BODY MeasParameters-v1520/measGapPatterns-v1520 VAL_PTR = &meas_gap_pattern_tvb
|
||||
#.FN_BODY MeasParameters-v1520/measGapPatterns-r15 VAL_PTR = &meas_gap_pattern_tvb
|
||||
tvbuff_t *meas_gap_pattern_tvb = NULL;
|
||||
proto_tree *subtree;
|
||||
|
||||
%(DEFAULT_BODY)s
|
||||
|
||||
#.FN_BODY MeasParameters-v1520/measGapPatterns-v1520
|
||||
#.FN_BODY MeasParameters-v1520/measGapPatterns-r15
|
||||
if (meas_gap_pattern_tvb) {
|
||||
static const int *lte_rrc_meas_gap_pattern_flags[] = {
|
||||
&hf_lte_rrc_measGapPatterns_v1520_bit1,
|
||||
&hf_lte_rrc_measGapPatterns_v1520_bit2,
|
||||
&hf_lte_rrc_measGapPatterns_v1520_bit3,
|
||||
&hf_lte_rrc_measGapPatterns_v1520_bit4,
|
||||
&hf_lte_rrc_measGapPatterns_v1520_bit5,
|
||||
&hf_lte_rrc_measGapPatterns_v1520_bit6,
|
||||
&hf_lte_rrc_measGapPatterns_v1520_bit7,
|
||||
&hf_lte_rrc_measGapPatterns_v1520_bit8,
|
||||
&hf_lte_rrc_measGapPatterns_r15_bit1,
|
||||
&hf_lte_rrc_measGapPatterns_r15_bit2,
|
||||
&hf_lte_rrc_measGapPatterns_r15_bit3,
|
||||
&hf_lte_rrc_measGapPatterns_r15_bit4,
|
||||
&hf_lte_rrc_measGapPatterns_r15_bit5,
|
||||
&hf_lte_rrc_measGapPatterns_r15_bit6,
|
||||
&hf_lte_rrc_measGapPatterns_r15_bit7,
|
||||
&hf_lte_rrc_measGapPatterns_r15_bit8,
|
||||
NULL
|
||||
};
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_measGapPatterns_v1520);
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_measGapPatterns_r15);
|
||||
proto_tree_add_bitmask_list(subtree, meas_gap_pattern_tvb, 0, 1, lte_rrc_meas_gap_pattern_flags, ENC_NA);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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 V15.5.0 Release 15) packet dissection
|
||||
* (3GPP TS 36.331 V15.6.0 Release 15) packet dissection
|
||||
* Copyright 2008, Vincent Helfre
|
||||
* Copyright 2009-2019, Pascal Quantin
|
||||
*
|
||||
|
|
@ -256,14 +256,14 @@ static int hf_lte_rrc_sib12_fragment_count = -1;
|
|||
static int hf_lte_rrc_sib12_reassembled_in = -1;
|
||||
static int hf_lte_rrc_sib12_reassembled_length = -1;
|
||||
static int hf_lte_rrc_sib12_reassembled_data = -1;
|
||||
static int hf_lte_rrc_measGapPatterns_v1520_bit1 = -1;
|
||||
static int hf_lte_rrc_measGapPatterns_v1520_bit2 = -1;
|
||||
static int hf_lte_rrc_measGapPatterns_v1520_bit3 = -1;
|
||||
static int hf_lte_rrc_measGapPatterns_v1520_bit4 = -1;
|
||||
static int hf_lte_rrc_measGapPatterns_v1520_bit5 = -1;
|
||||
static int hf_lte_rrc_measGapPatterns_v1520_bit6 = -1;
|
||||
static int hf_lte_rrc_measGapPatterns_v1520_bit7 = -1;
|
||||
static int hf_lte_rrc_measGapPatterns_v1520_bit8 = -1;
|
||||
static int hf_lte_rrc_measGapPatterns_r15_bit1 = -1;
|
||||
static int hf_lte_rrc_measGapPatterns_r15_bit2 = -1;
|
||||
static int hf_lte_rrc_measGapPatterns_r15_bit3 = -1;
|
||||
static int hf_lte_rrc_measGapPatterns_r15_bit4 = -1;
|
||||
static int hf_lte_rrc_measGapPatterns_r15_bit5 = -1;
|
||||
static int hf_lte_rrc_measGapPatterns_r15_bit6 = -1;
|
||||
static int hf_lte_rrc_measGapPatterns_r15_bit7 = -1;
|
||||
static int hf_lte_rrc_measGapPatterns_r15_bit8 = -1;
|
||||
|
||||
/* Initialize the subtree pointers */
|
||||
static int ett_lte_rrc = -1;
|
||||
|
|
@ -305,7 +305,7 @@ static gint ett_lte_rrc_sourceRB_ConfigSN_NR_r15 = -1;
|
|||
static gint ett_lte_rrc_sourceOtherConfigSN_NR_r15 = -1;
|
||||
static gint ett_lte_rrc_sourceContextEN_DC_r15 = -1;
|
||||
static gint ett_lte_rrc_requestedFreqBandsNR_MRDC_r15 = -1;
|
||||
static gint ett_lte_rrc_measGapPatterns_v1520 = -1;
|
||||
static gint ett_lte_rrc_measGapPatterns_r15 = -1;
|
||||
static gint ett_lte_rrc_nas_Container_r15 = -1;
|
||||
static gint ett_lte_rrc_sourceRB_ConfigIntra5GC_r15 = -1;
|
||||
static gint ett_lte_rrc_selectedbandCombinationInfoEN_DC_v1540 = -1;
|
||||
|
|
@ -4268,36 +4268,36 @@ void proto_register_lte_rrc(void) {
|
|||
{ "Reassembled Data", "lte-rrc.warningMessageSegment_r9.reassembled_data",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_lte_rrc_measGapPatterns_v1520_bit1,
|
||||
{ "Gap Pattern 4", "lte-rrc.measGapPatterns_v1520.bit1",
|
||||
{ &hf_lte_rrc_measGapPatterns_r15_bit1,
|
||||
{ "Gap Pattern 4", "lte-rrc.measGapPatterns_r15.bit1",
|
||||
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80,
|
||||
NULL, HFILL }},
|
||||
{ &hf_lte_rrc_measGapPatterns_v1520_bit2,
|
||||
{ "Gap Pattern 5", "lte-rrc.measGapPatterns_v1520.bit2",
|
||||
{ &hf_lte_rrc_measGapPatterns_r15_bit2,
|
||||
{ "Gap Pattern 5", "lte-rrc.measGapPatterns_r15.bit2",
|
||||
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40,
|
||||
NULL, HFILL }},
|
||||
{ &hf_lte_rrc_measGapPatterns_v1520_bit3,
|
||||
{ "Gap Pattern 6", "lte-rrc.measGapPatterns_v1520.bit3",
|
||||
{ &hf_lte_rrc_measGapPatterns_r15_bit3,
|
||||
{ "Gap Pattern 6", "lte-rrc.measGapPatterns_r15.bit3",
|
||||
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x20,
|
||||
NULL, HFILL }},
|
||||
{ &hf_lte_rrc_measGapPatterns_v1520_bit4,
|
||||
{ "Gap Pattern 7", "lte-rrc.measGapPatterns_v1520.bit4",
|
||||
{ &hf_lte_rrc_measGapPatterns_r15_bit4,
|
||||
{ "Gap Pattern 7", "lte-rrc.measGapPatterns_r15.bit4",
|
||||
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10,
|
||||
NULL, HFILL }},
|
||||
{ &hf_lte_rrc_measGapPatterns_v1520_bit5,
|
||||
{ "Gap Pattern 8", "lte-rrc.measGapPatterns_v1520.bit5",
|
||||
{ &hf_lte_rrc_measGapPatterns_r15_bit5,
|
||||
{ "Gap Pattern 8", "lte-rrc.measGapPatterns_r15.bit5",
|
||||
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08,
|
||||
NULL, HFILL }},
|
||||
{ &hf_lte_rrc_measGapPatterns_v1520_bit6,
|
||||
{ "Gap Pattern 9", "lte-rrc.measGapPatterns_v1520.bit6",
|
||||
{ &hf_lte_rrc_measGapPatterns_r15_bit6,
|
||||
{ "Gap Pattern 9", "lte-rrc.measGapPatterns_r15.bit6",
|
||||
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04,
|
||||
NULL, HFILL }},
|
||||
{ &hf_lte_rrc_measGapPatterns_v1520_bit7,
|
||||
{ "Gap Pattern 10", "lte-rrc.measGapPatterns_v1520.bit7",
|
||||
{ &hf_lte_rrc_measGapPatterns_r15_bit7,
|
||||
{ "Gap Pattern 10", "lte-rrc.measGapPatterns_r15.bit7",
|
||||
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02,
|
||||
NULL, HFILL }},
|
||||
{ &hf_lte_rrc_measGapPatterns_v1520_bit8,
|
||||
{ "Gap Pattern 11", "lte-rrc.measGapPatterns_v1520.bit8",
|
||||
{ &hf_lte_rrc_measGapPatterns_r15_bit8,
|
||||
{ "Gap Pattern 11", "lte-rrc.measGapPatterns_r15.bit8",
|
||||
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
|
||||
NULL, HFILL }}
|
||||
};
|
||||
|
|
@ -4342,7 +4342,7 @@ void proto_register_lte_rrc(void) {
|
|||
&ett_lte_rrc_sourceOtherConfigSN_NR_r15,
|
||||
&ett_lte_rrc_sourceContextEN_DC_r15,
|
||||
&ett_lte_rrc_requestedFreqBandsNR_MRDC_r15,
|
||||
&ett_lte_rrc_measGapPatterns_v1520,
|
||||
&ett_lte_rrc_measGapPatterns_r15,
|
||||
&ett_lte_rrc_nas_Container_r15,
|
||||
&ett_lte_rrc_sourceRB_ConfigIntra5GC_r15,
|
||||
&ett_lte_rrc_selectedbandCombinationInfoEN_DC_v1540
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue