osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

NR RRC: upgrade dissector to v16.5.0

This commit is contained in:
Pascal Quantin 2021-07-07 17:56:43 +02:00 committed by Wireshark GitLab Utility
parent 4992806dba
commit 204642089a
8 changed files with 2048 additions and 598 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
epan/dissectors/asn1/nr-rrc/NR-InterNodeDefinitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.331 V16.4.1 (2021-03)
-- 3GPP TS 38.331 V16.5.0 (2021-06)
NR-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
@ -435,7 +435,7 @@ CG-ConfigInfo-v1610-IEs ::= SEQUENCE {
spare4, spare3, spare2, spare1},
measResultSCG-r16 OCTET STRING (CONTAINING MeasResultSCG-Failure)
} OPTIONAL,
scgFailureInfoEUTRA-r16 SEQUENCE {
dummy1 SEQUENCE {
failureTypeEUTRA-r16 ENUMERATED { scg-lbtFailure-r16, beamFailureRecoveryFailure-r16,
t312-Expiry-r16, spare5,
spare4, spare3, spare2, spare1},
@ -681,9 +681,18 @@ UERadioPagingInformation ::= SEQUENCE {
UERadioPagingInformation-IEs ::= SEQUENCE {
supportedBandListNRForPaging SEQUENCE (SIZE (1..maxBands)) OF FreqBandIndicatorNR OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
nonCriticalExtension UERadioPagingInformation-v15e0-IEs OPTIONAL
}
UERadioPagingInformation-v15e0-IEs ::= SEQUENCE {
dl-SchedulingOffset-PDSCH-TypeA-FDD-FR1 ENUMERATED {supported} OPTIONAL,
dl-SchedulingOffset-PDSCH-TypeA-TDD-FR1 ENUMERATED {supported} OPTIONAL,
dl-SchedulingOffset-PDSCH-TypeA-TDD-FR2 ENUMERATED {supported} OPTIONAL,
dl-SchedulingOffset-PDSCH-TypeB-FDD-FR1 ENUMERATED {supported} OPTIONAL,
dl-SchedulingOffset-PDSCH-TypeB-TDD-FR1 ENUMERATED {supported} OPTIONAL,
dl-SchedulingOffset-PDSCH-TypeB-TDD-FR2 ENUMERATED {supported} OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
-- TAG-UE-RADIO-PAGING-INFORMATION-STOP
-- TAG-UE-RADIO-ACCESS-CAPABILITY-INFORMATION-START

201
epan/dissectors/asn1/nr-rrc/NR-RRC-Definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.331 V16.4.1 (2021-03)
-- 3GPP TS 38.331 V16.5.0 (2021-06)
NR-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -849,6 +849,11 @@ RRCRelease-v1540-IEs ::= SEQUENCE {
RRCRelease-v1610-IEs ::= SEQUENCE {
voiceFallbackIndication-r16 ENUMERATED {true} OPTIONAL, -- Need N
measIdleConfig-r16 CHOICE {release NULL, setup MeasIdleConfigDedicated-r16} OPTIONAL, -- Need M
nonCriticalExtension RRCRelease-v1650-IEs OPTIONAL
}
RRCRelease-v1650-IEs ::= SEQUENCE {
mpsPriorityIndication-r16 ENUMERATED {true} OPTIONAL, -- Cond Redirection2
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -1203,8 +1208,8 @@ SCGFailureInformationEUTRA-v1590-IEs ::= SEQUENCE {
FailureReportSCG-EUTRA ::= SEQUENCE {
failureType ENUMERATED {
t313-Expiry, randomAccessProblem,rlc-MaxNumRetx,
scg-ChangeFailure,scg-lbtFailure-r16,
beamFailureRecoveryFailure-r16, t312-Expiry-r16, spare},
scg-ChangeFailure, spare4,
spare3, spare2, spare1},
measResultFreqListMRDC MeasResultFreqListFailMRDC OPTIONAL,
measResultSCG-FailureMRDC OCTET STRING OPTIONAL,
...,
@ -1585,7 +1590,7 @@ UECapabilityEnquiry ::= SEQUENCE {
UECapabilityEnquiry-IEs ::= SEQUENCE {
ue-CapabilityRAT-RequestList UE-CapabilityRAT-RequestList,
lateNonCriticalExtension OCTET STRING OPTIONAL,
ue-CapabilityEnquiryExt OCTET STRING (CONTAINING UECapabilityEnquiry-v1560-IEs) OPTIONAL
ue-CapabilityEnquiryExt OCTET STRING (CONTAINING UECapabilityEnquiry-v1560-IEs) OPTIONAL -- Need N
}
UECapabilityEnquiry-v1560-IEs ::= SEQUENCE {
@ -1811,7 +1816,7 @@ RLF-Report-r16 ::= CHOICE {
nrReconnectCellId-r16 CGI-Info-Logging-r16,
eutraReconnectCellId-r16 CGI-InfoEUTRALogging
} OPTIONAL,
timeUntilReconnection-16 TimeUntilReconnection-16 OPTIONAL,
timeUntilReconnection-r16 TimeUntilReconnection-r16 OPTIONAL,
reestablishmentCellId-r16 CGI-Info-Logging-r16 OPTIONAL,
timeConnFailure-r16 INTEGER (0..1023) OPTIONAL,
timeSinceFailure-r16 TimeSinceFailure-r16,
@ -1822,7 +1827,10 @@ RLF-Report-r16 ::= CHOICE {
locationInfo-r16 LocationInfo-r16 OPTIONAL,
noSuitableCellFound-r16 ENUMERATED {true} OPTIONAL,
ra-InformationCommon-r16 RA-InformationCommon-r16 OPTIONAL,
...
...,
[[
csi-rsRLMConfigBitmap-v1650 BIT STRING (SIZE (96)) OPTIONAL
]]
},
eutra-RLF-Report-r16 SEQUENCE {
failedPCellId-EUTRA CGI-InfoEUTRALogging,
@ -1879,7 +1887,7 @@ TimeSinceFailure-r16 ::= INTEGER (0..172800)
MobilityHistoryReport-r16 ::= VisitedCellInfoList-r16
TimeUntilReconnection-16 ::= INTEGER (0..172800)
TimeUntilReconnection-r16 ::= INTEGER (0..172800)
-- TAG-UEINFORMATIONRESPONSE-STOP
-- TAG-ULDEDICATEDMESSAGESEGMENT-START
@ -1958,7 +1966,7 @@ ULInformationTransferMRDC-IEs::= SEQUENCE {
-- TAG-SETUPRELEASE-START
-- WS modification: asn2wrs does not support this syntax; replace all occurrences
-- SetupRelease { ElementTypeParam } ::= CHOICE {
-- CHOICE {release NULL, setup ElementTypeParam } ::= CHOICE {
-- release NULL,
-- setup ElementTypeParam
-- }
@ -2946,6 +2954,9 @@ CGI-InfoNR ::= SEQUENCE {
...,
[[
npn-IdentityInfoList-r16 NPN-IdentityInfoList-r16 OPTIONAL
]],
[[
cellReservedForOtherUse-r16 ENUMERATED {true} OPTIONAL
]]
}
@ -6593,9 +6604,13 @@ EventTriggerConfigInterRAT ::= SEQUENCE {
...,
[[
reportQuantityUTRA-FDD-r16 MeasReportQuantityUTRA-FDD-r16 OPTIONAL -- Need R
]],
[[
includeCommonLocationInfo-r16 ENUMERATED {true} OPTIONAL, -- Need R
includeBT-Meas-r16 CHOICE {release NULL, setup BT-NameList-r16} OPTIONAL, -- Need M
includeWLAN-Meas-r16 CHOICE {release NULL, setup WLAN-NameList-r16} OPTIONAL, -- Need M
includeSensor-Meas-r16 CHOICE {release NULL, setup Sensor-NameList-r16} OPTIONAL -- Need M
]]
}
PeriodicalReportConfigInterRAT ::= SEQUENCE {
@ -6606,6 +6621,12 @@ PeriodicalReportConfigInterRAT ::= SEQUENCE {
...,
[[
reportQuantityUTRA-FDD-r16 MeasReportQuantityUTRA-FDD-r16 OPTIONAL -- Need R
]],
[[
includeCommonLocationInfo-r16 ENUMERATED {true} OPTIONAL, -- Need R
includeBT-Meas-r16 CHOICE {release NULL, setup BT-NameList-r16} OPTIONAL, -- Need M
includeWLAN-Meas-r16 CHOICE {release NULL, setup WLAN-NameList-r16} OPTIONAL, -- Need M
includeSensor-Meas-r16 CHOICE {release NULL, setup Sensor-NameList-r16} OPTIONAL -- Need M
]]
}
@ -7610,6 +7631,12 @@ SlotFormatIndicator ::= SEQUENCE {
switchTriggerToReleaseList-r16 SEQUENCE (SIZE(1..4)) OF ServCellIndex OPTIONAL, -- Need N
co-DurationsPerCellToAddModList-r16 SEQUENCE (SIZE(1..maxNrofAggregatedCellsPerCellGroup)) OF CO-DurationsPerCell-r16 OPTIONAL, -- Need N
co-DurationsPerCellToReleaseList-r16 SEQUENCE (SIZE(1..maxNrofAggregatedCellsPerCellGroup)) OF ServCellIndex OPTIONAL -- Need N
]],
[[
switchTriggerToAddModListSizeExt-r16 SEQUENCE (SIZE(1..maxNrofAggregatedCellsPerCellGroupMinus4-r16)) OF
SearchSpaceSwitchTrigger-r16 OPTIONAL, -- Need N
switchTriggerToReleaseListSizeExt-r16 SEQUENCE (SIZE(1.. maxNrofAggregatedCellsPerCellGroupMinus4-r16)) OF
ServCellIndex OPTIONAL -- Need N
]]
}
@ -7875,7 +7902,7 @@ SRS-PosResource-r16::= SEQUENCE {
cyclicShift-n2-r16 INTEGER (0..7)
},
n4-r16 SEQUENCE {
combOffset-n4-16 INTEGER (0..3),
combOffset-n4-r16 INTEGER (0..3),
cyclicShift-n4-r16 INTEGER (0..11)
},
n8-r16 SEQUENCE {
@ -8443,12 +8470,16 @@ BandCombinationList-v1630 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandComb
BandCombinationList-v1640 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-v1640
BandCombinationList-v1650 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-v1650
BandCombinationList-UplinkTxSwitch-r16 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-UplinkTxSwitch-r16
BandCombinationList-UplinkTxSwitch-v1630 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-UplinkTxSwitch-v1630
BandCombinationList-UplinkTxSwitch-v1640 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-UplinkTxSwitch-v1640
BandCombinationList-UplinkTxSwitch-v1650 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-UplinkTxSwitch-v1650
BandCombination ::= SEQUENCE {
bandList SEQUENCE (SIZE (1..maxSimultaneousBands)) OF BandParameters,
featureSetCombination FeatureSetCombinationId,
@ -8512,6 +8543,10 @@ BandCombination-v1640 ::= SEQUENCE {
ca-ParametersNRDC-v1640 CA-ParametersNRDC-v1640 OPTIONAL
}
BandCombination-v1650 ::= SEQUENCE {
ca-ParametersNRDC-v1650 CA-ParametersNRDC-v1650 OPTIONAL
}
BandCombination-UplinkTxSwitch-r16 ::= SEQUENCE {
bandCombination-r16 BandCombination,
bandCombination-v1540 BandCombination-v1540 OPTIONAL,
@ -8534,6 +8569,10 @@ BandCombination-UplinkTxSwitch-v1640 ::= SEQUENCE {
bandCombination-v1640 BandCombination-v1640 OPTIONAL
}
BandCombination-UplinkTxSwitch-v1650 ::= SEQUENCE {
bandCombination-v1650 BandCombination-v1650 OPTIONAL
}
ULTxSwitchingBandPair-r16 ::= SEQUENCE {
bandIndexUL1-r16 INTEGER(1..maxSimultaneousBands),
bandIndexUL2-r16 INTEGER(1..maxSimultaneousBands),
@ -8683,7 +8722,7 @@ CA-ParametersNR-v1610 ::= SEQUENCE {
-- R1 9-4: MsgA operation in a band combination including SUL
msgA-SUL-r16 ENUMERATED {supported} OPTIONAL,
-- R1 10-9c: Joint search space group switching across multiple cells
jointSearchSpaceGroupSwitchingAcrossCells-r16 ENUMERATED {supported} OPTIONAL,
jointSearchSpaceSwitchAcrossCells-r16 ENUMERATED {supported} OPTIONAL,
-- R1 14-5: Half-duplex UE behaviour in TDD CA for same SCS
half-DuplexTDD-CA-SameSCS-r16 ENUMERATED {supported} OPTIONAL,
-- R1 18-4: SCell dormancy within active time
@ -8765,13 +8804,13 @@ CA-ParametersNR-v1630 ::= SEQUENCE {
CA-ParametersNR-v1640 ::= SEQUENCE {
-- R4 7-5: Support of reporting UL Tx DC locations for uplink intra-band CA.
uplinkTxDC-TwoCarrierReport-r16 ENUMERATED {supported} OPTIONAL,
-- RAN 22-6: Support of up to 3 different numerologies in the same NR PUCCH group for NR part of EN-DC, NGEN-DC, NE-DC and NR-CA
-- RAN 22-6: Support of up to 3 different numerologies in the same NR PUCCH group for NR part of EN-DC, NGEN-DC, NE-DC and NR-CA
-- where UE is not configured with two NR PUCCH groups
maxUpTo3Diff-NumerologiesConfigSinglePUCCH-grp-r16 PUCCH-Grp-CarrierTypes-r16 OPTIONAL,
-- RAN 22-6a: Support of up to 4 different numerologies in the same NR PUCCH group for NR part of EN-DC, NGEN-DC, NE-DC and NR-CA
-- RAN 22-6a: Support of up to 4 different numerologies in the same NR PUCCH group for NR part of EN-DC, NGEN-DC, NE-DC and NR-CA
-- where UE is not configured with two NR PUCCH groups
maxUpTo4Diff-NumerologiesConfigSinglePUCCH-grp-r16 PUCCH-Grp-CarrierTypes-r16 OPTIONAL,
-- RAN 22-7: Support two PUCCH groups for NR-CA with 3 or more bands with at least two carrier types
-- RAN 22-7: Support two PUCCH groups for NR-CA with 3 or more bands with at least two carrier types
twoPUCCH-Grp-ConfigurationsList-r16 SEQUENCE (SIZE (1..maxTwoPUCCH-Grp-ConfigList-r16)) OF TwoPUCCH-Grp-Configurations-r16 OPTIONAL,
-- R1 22-7a: Different numerology across NR PUCCH groups
diffNumerologyAcrossPUCCH-Group-CarrierTypes-r16 ENUMERATED {supported} OPTIONAL,
@ -8842,6 +8881,10 @@ CA-ParametersNRDC-v1640 ::= SEQUENCE {
ca-ParametersNR-ForDC-v1640 CA-ParametersNR-v1640 OPTIONAL
}
CA-ParametersNRDC-v1650 ::= SEQUENCE {
supportedCellGrouping-r16 BIT STRING (SIZE (1..maxCellGroupings-r16)) OPTIONAL
}
-- TAG-CA-PARAMETERS-NRDC-STOP
-- TAG-CARRIERAGGREGATIONVARIANT-START
@ -9581,7 +9624,7 @@ AggregatedBandwidth ::= ENUMERATED {mhz50, mhz100, mhz150, mhz200, mhz25
-- TAG-FREQBANDLIST-STOP
-- TAG-FREQSEPARATIONCLASS-START
FreqSeparationClass ::= ENUMERATED { mhz800, mhz1200, mhz1400, ...}
FreqSeparationClass ::= ENUMERATED { mhz800, mhz1200, mhz1400, ..., mhz400-v1650, mhz600-v1650}
FreqSeparationClassDL-v1620 ::= ENUMERATED {mhz1000, mhz1600, mhz1800, mhz2000, mhz2200, mhz2400}
@ -9600,6 +9643,11 @@ HighSpeedParameters-r16 ::= SEQUENCE {
demodulationEnhancement-r16 ENUMERATED {supported} OPTIONAL
}
HighSpeedParameters-v1650 ::= CHOICE {
intraNR-MeasurementEnhancement-r16 ENUMERATED {supported},
interRAT-MeasurementEnhancement-r16 ENUMERATED {supported}
}
-- TAG-HIGHSPEEDPARAMETERS-STOP
-- TAG-IMS-PARAMETERS-START
@ -9616,7 +9664,7 @@ IMS-ParametersCommon ::= SEQUENCE {
voiceOverSCG-BearerEUTRA-5GC ENUMERATED {supported} OPTIONAL
]],
[[
voiceFallbackIndicationEPS-r16 ENUMERATED {supported} OPTIONAL
voiceFallbackIndicationEPS-r16 ENUMERATED {supported} OPTIONAL
]]
}
@ -9713,6 +9761,9 @@ MAC-ParametersCommon ::= SEQUENCE {
]],
[[
spCell-BFR-CBRA-r16 ENUMERATED {supported} OPTIONAL
]],
[[
srs-ResourceId-Ext-r16 ENUMERATED {supported} OPTIONAL
]]
}
@ -10098,6 +10149,10 @@ MIMO-ParametersPerBand ::= SEQUENCE {
} OPTIONAL,
-- R1 16-1i: Support of 64 configured candidate beam RSs for BFR
support64CandidateBeamRS-BFR-r16 ENUMERATED {supported} OPTIONAL
]],
[[
-- R1 16-2a-9: Interpretation of maxNumberMIMO-LayersPDSCH for multi-DCI based mTRP
maxMIMO-LayersForMulti-DCI-mTRP-r16 ENUMERATED {supported} OPTIONAL
]]
}
@ -10458,7 +10513,7 @@ Phy-ParametersCommon ::= SEQUENCE {
-- R1 18-9: Usage of the PDSCH starting time for HARQ-ACK type 2 codebook
type2-HARQ-ACK-Codebook-r16 ENUMERATED {supported} OPTIONAL,
-- R1 16-1g-1: Resources for beam management, pathloss measurement, BFD, RLM and new beam identification across frequency ranges
-- R1 16-1g-1: Resources for beam management, pathloss measurement, BFD, RLM and new beam identification across frequency ranges
maxTotalResourcesForAcrossFreqRanges-r16 SEQUENCE {
maxNumberResWithinSlotAcrossCC-AcrossFR-r16 ENUMERATED {n2, n4, n8, n12, n16, n32, n64, n128} OPTIONAL,
maxNumberResAcrossCC-AcrossFR-r16 ENUMERATED {n2, n4, n8, n12, n16, n32, n40, n48, n64, n72, n80, n96, n128, n256}
@ -10492,6 +10547,12 @@ Phy-ParametersCommon ::= SEQUENCE {
supportRetx-Diff-CoresetPool-Multi-DCI-TRP-r16 ENUMERATED {notSupported} OPTIONAL,
-- R1 22-10: Support of pdcch-MonitoringAnyOccasionsWithSpanGap in case of cross-carrier scheduling with different SCSs
pdcch-MonitoringAnyOccasionsWithSpanGapCrossCarrierSch-r16 ENUMERATED {mode2, mode3} OPTIONAL
]],
[[
-- R1 16-1j-1: Support of 2 port CSI-RS for new beam identification
newBeamIdentifications2PortCSI-RS-r16 ENUMERATED {supported} OPTIONAL,
-- R1 16-1j-2: Support of 2 port CSI-RS for pathloss estimation
pathlossEstimation2PortCSI-RS-r16 ENUMERATED {supported} OPTIONAL
]]
}
@ -10589,7 +10650,7 @@ Phy-ParametersFRX-Diff ::= SEQUENCE {
maxLayersMIMO-Adaptation-r16 ENUMERATED {supported} OPTIONAL,
-- R1 12-5: Configuration of aggregation factor per SPS configuration
aggregationFactorSPS-DL-r16 ENUMERATED {supported} OPTIONAL,
-- R1 16-1g: Resources for beam management, pathloss measurement, BFD, RLM and new beam identification
-- R1 16-1g: Resources for beam management, pathloss measurement, BFD, RLM and new beam identification
maxTotalResourcesForOneFreqRange-r16 SEQUENCE {
maxNumberResWithinSlotAcrossCC-OneFR-r16 ENUMERATED {n2, n4, n8, n12, n16, n32, n64, n128} OPTIONAL,
maxNumberResAcrossCC-OneFR-r16 ENUMERATED {n2, n4, n8, n12, n16, n32, n40, n48, n64, n72, n80, n96, n128, n256}
@ -10600,6 +10661,10 @@ Phy-ParametersFRX-Diff ::= SEQUENCE {
]],
[[
twoTCI-Act-servingCellInCC-List-r16 ENUMERATED {supported} OPTIONAL
]],
[[
-- R1 22-11: Support of ‘cri-RI-CQI’ report without non-PMI-PortIndication
cri-RI-CQI-WithoutNon-PMI-PortInd-r16 ENUMERATED {supported} OPTIONAL
]]
}
@ -10780,6 +10845,10 @@ RF-Parameters ::= SEQUENCE {
[[
supportedBandCombinationList-v1640 BandCombinationList-v1640 OPTIONAL,
supportedBandCombinationList-UplinkTxSwitch-v1640 BandCombinationList-UplinkTxSwitch-v1640 OPTIONAL
]],
[[
supportedBandCombinationList-v1650 BandCombinationList-v1650 OPTIONAL,
supportedBandCombinationList-UplinkTxSwitch-v1650 BandCombinationList-UplinkTxSwitch-v1650 OPTIONAL
]]
}
@ -10939,6 +11008,14 @@ BandNR ::= SEQUENCE {
-- R4 7-4: Report the shorter transient capability supported by the UE: 2, 4 or 7us
enhancedUL-TransientPeriod-r16 ENUMERATED {us2, us4, us7} OPTIONAL,
sharedSpectrumChAccessParamsPerBand-v1640 SharedSpectrumChAccessParamsPerBand-v1640 OPTIONAL
]],
[[
type1-PUSCH-RepetitionMultiSlots-v1650 ENUMERATED {supported} OPTIONAL,
type2-PUSCH-RepetitionMultiSlots-v1650 ENUMERATED {supported} OPTIONAL,
pusch-RepetitionMultiSlots-v1650 ENUMERATED {supported} OPTIONAL,
configuredUL-GrantType1-v1650 ENUMERATED {supported} OPTIONAL,
configuredUL-GrantType2-v1650 ENUMERATED {supported} OPTIONAL,
sharedSpectrumChAccessParamsPerBand-v1650 SharedSpectrumChAccessParamsPerBand-v1650 OPTIONAL
]]
}
@ -11263,9 +11340,18 @@ UE-CapabilityRequestFilterCommon ::= SEQUENCE {
type2-PortSelection-r16 ENUMERATED {true} OPTIONAL -- Need N
} OPTIONAL, -- Need N
uplinkTxSwitchRequest-r16 ENUMERATED {true} OPTIONAL -- Need N
]],
[[
requestedCellGrouping-r16 SEQUENCE (SIZE (1..maxCellGroupings-r16)) OF CellGrouping-r16 OPTIONAL -- Cond NRDC
]]
}
CellGrouping-r16 ::= SEQUENCE {
mcg-r16 SEQUENCE (SIZE (1..maxBands)) OF FreqBandIndicatorNR,
scg-r16 SEQUENCE (SIZE (1..maxBands)) OF FreqBandIndicatorNR,
mode-r16 ENUMERATED {sync, async}
}
-- TAG-UE-CAPABILITYREQUESTFILTERCOMMON-STOP
-- TAG-UE-CAPABILITYREQUESTFILTERNR-START
@ -11431,7 +11517,13 @@ UE-NR-Capability-v1610 ::= SEQUENCE {
UE-NR-Capability-v1640 ::= SEQUENCE {
redirectAtResumeByNAS-r16 ENUMERATED {supported} OPTIONAL,
phy-ParametersSharedSpectrumChAccess-r16 Phy-ParametersSharedSpectrumChAccess-r16 OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
nonCriticalExtension UE-NR-Capability-v1650 OPTIONAL
}
UE-NR-Capability-v1650 ::= SEQUENCE {
mpsPriorityIndication-r16 ENUMERATED {supported} OPTIONAL,
highSpeedParameters-v1650 HighSpeedParameters-v1650 OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
UE-NR-CapabilityAddXDD-Mode ::= SEQUENCE {
@ -11515,11 +11607,11 @@ SharedSpectrumChAccessParamsPerBand-r16 ::= SEQUENCE {
-- R1 10-8: Type B PDSCH length {3, 5, 6, 8, 9, 10, 11, 12, 13} without DMRS shift due to CRS collision
typeB-PDSCH-length-r16 ENUMERATED {supported} OPTIONAL,
-- R1 10-9: Search space set group switching with explicit DCI 2_0 bit field trigger or with implicit PDCCH decoding with DCI 2_0 monitoring
searchSpaceSetGroupSwitchingwithDCI-r16 ENUMERATED {supported} OPTIONAL,
-- R1 10-9b: Search space set group switching with implicit PDCCH decoding without DCI 2_0 monitoring FFS:per band or per UE
searchSpaceSetGroupSwitchingwithoutDCI-r16 ENUMERATED {supported} OPTIONAL,
searchSpaceSwitchWithDCI-r16 ENUMERATED {supported} OPTIONAL,
-- R1 10-9b: Search space set group switching with implicit PDCCH decoding without DCI 2_0 monitoring
searchSpaceSwitchWithoutDCI-r16 ENUMERATED {supported} OPTIONAL,
-- R1 10-9d: Support Search space set group switching capability 2
searchSpaceSetGroupSwitchingcapability2-r16 ENUMERATED {supported} OPTIONAL,
searchSpaceSwitchCapability2-r16 ENUMERATED {supported} OPTIONAL,
-- R1 10-14: Non-numerical PDSCH to HARQ-ACK timing
non-numericalPDSCH-HARQ-timing-r16 ENUMERATED {supported} OPTIONAL,
-- R1 10-15: Enhanced dynamic HARQ codebook
@ -11562,16 +11654,22 @@ SharedSpectrumChAccessParamsPerBand-v1630 ::= SEQUENCE {
SharedSpectrumChAccessParamsPerBand-v1640 ::= SEQUENCE {
-- 10-26b(1-4): CSI-RS based RRM measurement with associated SS-block
csi-RSRP-AndRSRQ-MeasWithSSB-r16 ENUMERATED {supported} OPTIONAL,
csi-RSRP-AndRSRQ-MeasWithSSB-r16 ENUMERATED {supported} OPTIONAL,
-- 10-26c(1-5): CSI-RS based RRM measurement without associated SS-block
csi-RSRP-AndRSRQ-MeasWithoutSSB-r16 ENUMERATED {supported} OPTIONAL,
csi-RSRP-AndRSRQ-MeasWithoutSSB-r16 ENUMERATED {supported} OPTIONAL,
-- 10-26d(1-6): CSI-RS based RS-SINR measurement
csi-SINR-Meas-r16 ENUMERATED {supported} OPTIONAL,
csi-SINR-Meas-r16 ENUMERATED {supported} OPTIONAL,
-- 10-26e(1-8): RLM based on a mix of SS block and CSI-RS signals within active BWP
ssb-AndCSI-RS-RLM-r16 ENUMERATED {supported} OPTIONAL,
ssb-AndCSI-RS-RLM-r16 ENUMERATED {supported} OPTIONAL,
-- 10-26f(1-9): CSI-RS based contention free RA for HO
csi-RS-CFRA-ForHO-r16 ENUMERATED {supported} OPTIONAL
csi-RS-CFRA-ForHO-r16 ENUMERATED {supported} OPTIONAL
}
SharedSpectrumChAccessParamsPerBand-v1650 ::= SEQUENCE {
-- Extension of R1 10-9 capability to configure up to 16 instead of 4 cells or cell groups, respectively
extendedSearchSpaceSwitchWithDCI-r16 ENUMERATED {supported} OPTIONAL
}
-- TAG-SHAREDSPECTRUMCHACCESSPARAMSPERBAND-STOP
-- TAG-ABSOLUTETIMEINFO-START
@ -11990,6 +12088,8 @@ SL-BWP-PoolConfigCommon-r16 ::= SEQUENCE {
SL-CBR-PriorityTxConfigList-r16 ::= SEQUENCE (SIZE (1..8)) OF SL-PriorityTxConfigIndex-r16
SL-CBR-PriorityTxConfigList-v1650 ::= SEQUENCE (SIZE (1..8)) OF SL-PriorityTxConfigIndex-v1650
SL-PriorityTxConfigIndex-r16 ::= SEQUENCE {
sl-PriorityThreshold-r16 INTEGER (1..8) OPTIONAL, -- Need M
sl-DefaultTxConfigIndex-r16 INTEGER (0..maxCBR-Level-1-r16) OPTIONAL, -- Need M
@ -11997,7 +12097,11 @@ SL-PriorityTxConfigIndex-r16 ::= SEQUENCE {
sl-Tx-ConfigIndexList-r16 SEQUENCE (SIZE (1.. maxCBR-Level-r16)) OF SL-TxConfigIndex-r16 OPTIONAL -- Need M
}
SL-TxConfigIndex-r16 ::= INTEGER (0..maxTxConfig-1-r16)
SL-PriorityTxConfigIndex-v1650 ::= SEQUENCE {
sl-MCS-RangeList-r16 SEQUENCE (SIZE (1..maxCBR-Level-r16)) OF SL-MinMaxMCS-List-r16 OPTIONAL -- Need M
}
SL-TxConfigIndex-r16 ::= INTEGER (0..maxTxConfig-1-r16)
-- TAG-SL-CBR-PRIORITYTXCONFIGLIST-STOP
-- TAG-SL-CBR-COMMONTXCONFIGLIST-START
@ -12024,7 +12128,7 @@ SL-ConfigDedicatedNR-r16 ::= SEQUENCE {
sl-RadioBearerToReleaseList-r16 SEQUENCE (SIZE (1..maxNrofSLRB-r16)) OF SLRB-Uu-ConfigIndex-r16 OPTIONAL, -- Need N
sl-RadioBearerToAddModList-r16 SEQUENCE (SIZE (1..maxNrofSLRB-r16)) OF SL-RadioBearerConfig-r16 OPTIONAL, -- Need N
sl-MeasConfigInfoToReleaseList-r16 SEQUENCE (SIZE (1..maxNrofSL-Dest-r16)) OF SL-DestinationIndex-r16 OPTIONAL, -- Need N
sl-MeasConfigInfoToAddModList-r16 SEQUENCE (SIZE (1..maxNrofSL-Dest-r16)) OF SL-MeasConfigInfo-r16 OPTIONAL, -- Need M
sl-MeasConfigInfoToAddModList-r16 SEQUENCE (SIZE (1..maxNrofSL-Dest-r16)) OF SL-MeasConfigInfo-r16 OPTIONAL, -- Need N
t400-r16 ENUMERATED {ms100, ms200, ms300, ms400, ms600, ms1000, ms1500, ms2000} OPTIONAL, -- Need M
...
}
@ -12064,7 +12168,10 @@ SL-ConfiguredGrantConfig-r16 ::= SEQUENCE {
sl-ResourcePoolID-r16 SL-ResourcePoolID-r16 OPTIONAL, -- Need M
sl-TimeReferenceSFN-Type1-r16 ENUMERATED {sfn512} OPTIONAL -- Need S
} OPTIONAL, -- Need M
...
...,
[[
sl-N1PUCCH-AN-Type2-r16 PUCCH-ResourceId OPTIONAL -- Need M
]]
}
SL-ConfigIndexCG-r16 ::= INTEGER (0..maxNrofCG-SL-r16-1)
@ -12241,7 +12348,11 @@ SL-PSSCH-TxConfig-r16 ::= SEQUENCE {
kmph140, kmph160, kmph180, kmph200},
sl-ParametersAboveThres-r16 SL-PSSCH-TxParameters-r16,
sl-ParametersBelowThres-r16 SL-PSSCH-TxParameters-r16,
...
...,
[[
sl-ParametersAboveThres-v1650 SL-MinMaxMCS-List-r16 OPTIONAL, -- Need R
sl-ParametersBelowThres-v1650 SL-MinMaxMCS-List-r16 OPTIONAL -- Need R
]]
}
@ -12465,7 +12576,10 @@ SL-UE-SelectedConfigRP-r16 ::= SEQUENCE {
sl-SelectionWindowList-r16 SL-SelectionWindowList-r16 OPTIONAL, -- Need M
sl-ResourceReservePeriodList-r16 SEQUENCE (SIZE (1..16)) OF SL-ResourceReservePeriod-r16 OPTIONAL, -- Need M
sl-RS-ForSensing-r16 ENUMERATED {pscch, pssch},
...
...,
[[
sl-CBR-PriorityTxConfigList-v1650 SL-CBR-PriorityTxConfigList-v1650 OPTIONAL -- Need M
]]
}
SL-ResourceReservePeriod-r16 ::= CHOICE {
@ -12586,7 +12700,7 @@ SL-SDAP-Config-r16 ::= SEQUENCE {
SL-MappedQoS-FlowsListDedicated-r16 ::= SEQUENCE {
sl-MappedQoS-FlowsToAddList-r16 SEQUENCE (SIZE (1..maxNrofSL-QFIs-r16)) OF SL-QoS-FlowIdentity-r16 OPTIONAL, -- Need N
sl-MappedQoS-FlowsToReleaseList-16 SEQUENCE (SIZE (1..maxNrofSL-QFIs-r16)) OF SL-QoS-FlowIdentity-r16 OPTIONAL -- Need N
sl-MappedQoS-FlowsToReleaseList-r16 SEQUENCE (SIZE (1..maxNrofSL-QFIs-r16)) OF SL-QoS-FlowIdentity-r16 OPTIONAL -- Need N
}
-- TAG-SL-SDAP-CONFIG-STOP
@ -12685,6 +12799,7 @@ maxCBR-Config-1-r16 INTEGER ::= 7 -- Maximum number of
maxCBR-Level-r16 INTEGER ::= 16 -- Maximum nuber of CBR levels
maxCBR-Level-1-r16 INTEGER ::= 15 -- Maximum number of CBR levels minus 1
maxCellBlack INTEGER ::= 16 -- Maximum number of NR blacklisted cell ranges in SIB3, SIB4
maxCellGroupings-r16 INTEGER ::= 32 -- Maximum number of cell groupings for NR-DC
maxCellHistory-r16 INTEGER ::= 16 -- Maximum number of visited cells reported
maxCellInter INTEGER ::= 16 -- Maximum number of inter-Freq cells listed in SIB4
maxCellIntra INTEGER ::= 16 -- Maximum number of intra-Freq cells listed in SIB3
@ -12704,8 +12819,8 @@ maxFreqIdle-r16 INTEGER ::= 8 -- Maximum number of
maxNrofServingCells INTEGER ::= 32 -- Max number of serving cells (SpCells + SCells)
maxNrofServingCells-1 INTEGER ::= 31 -- Max number of serving cells (SpCell + SCells) per cell group
maxNrofAggregatedCellsPerCellGroup INTEGER ::= 16
maxNrofAggregatedCellsPerCellGroupMinus4-r16 INTEGER ::= 12
maxNrofDUCells-r16 INTEGER ::= 512 -- Max number of cells configured on the collocated IAB-DU
maxNrofAssociatedDUCellsPerMT-r16 INTEGER ::= 65535
maxNrofAvailabilityCombinationsPerSet-r16 INTEGER ::= 512 -- Max number of AvailabilityCombinationId used in the DCI format 2_5
maxNrofAvailabilityCombinationsPerSet-r16-1 INTEGER ::= 511 -- Max number of AvailabilityCombinationId used in the DCI format 2_5 minus 1
maxNrofSCells INTEGER ::= 31 -- Max number of secondary serving cells per cell group
@ -12755,8 +12870,8 @@ maxNrofReportConfigPerAperiodicTrigger INTEGER ::= 16 -- Maximum number of
maxNrofNZP-CSI-RS-Resources INTEGER ::= 192 -- Maximum number of Non-Zero-Power (NZP) CSI-RS resources
maxNrofNZP-CSI-RS-Resources-1 INTEGER ::= 191 -- Maximum number of Non-Zero-Power (NZP) CSI-RS resources minus 1
maxNrofNZP-CSI-RS-ResourcesPerSet INTEGER ::= 64 -- Maximum number of NZP CSI-RS resources per resource set
maxNrofNZP-CSI-RS-ResourceSets INTEGER ::= 64 -- Maximum number of NZP CSI-RS resources per cell
maxNrofNZP-CSI-RS-ResourceSets-1 INTEGER ::= 63 -- Maximum number of NZP CSI-RS resources per cell minus 1
maxNrofNZP-CSI-RS-ResourceSets INTEGER ::= 64 -- Maximum number of NZP CSI-RS resource sets per cell
maxNrofNZP-CSI-RS-ResourceSets-1 INTEGER ::= 63 -- Maximum number of NZP CSI-RS resource sets per cell minus 1
maxNrofNZP-CSI-RS-ResourceSetsPerConfig INTEGER ::= 16 -- Maximum number of resource sets per resource configuration
maxNrofNZP-CSI-RS-ResourcesPerConfig INTEGER ::= 128 -- Maximum number of resources per resource configuration
maxNrofZP-CSI-RS-Resources INTEGER ::= 32 -- Maximum number of Zero-Power (ZP) CSI-RS resources
@ -12764,11 +12879,11 @@ maxNrofZP-CSI-RS-Resources-1 INTEGER ::= 31 -- Maximum number of
maxNrofZP-CSI-RS-ResourceSets-1 INTEGER ::= 15
maxNrofZP-CSI-RS-ResourcesPerSet INTEGER ::= 16
maxNrofZP-CSI-RS-ResourceSets INTEGER ::= 16
maxNrofCSI-IM-Resources INTEGER ::= 32 -- Maximum number of CSI-IM resources. See CSI-IM-ResourceMax in 38.214.
maxNrofCSI-IM-Resources-1 INTEGER ::= 31 -- Maximum number of CSI-IM resources minus 1. See CSI-IM-ResourceMax in 38.214.
maxNrofCSI-IM-ResourcesPerSet INTEGER ::= 8 -- Maximum number of CSI-IM resources per set. See CSI-IM-ResourcePerSetMax in 38.214
maxNrofCSI-IM-ResourceSets INTEGER ::= 64 -- Maximum number of NZP CSI-IM resources per cell
maxNrofCSI-IM-ResourceSets-1 INTEGER ::= 63 -- Maximum number of NZP CSI-IM resources per cell minus 1
maxNrofCSI-IM-Resources INTEGER ::= 32 -- Maximum number of CSI-IM resources
maxNrofCSI-IM-Resources-1 INTEGER ::= 31 -- Maximum number of CSI-IM resources minus 1
maxNrofCSI-IM-ResourcesPerSet INTEGER ::= 8 -- Maximum number of CSI-IM resources per set
maxNrofCSI-IM-ResourceSets INTEGER ::= 64 -- Maximum number of NZP CSI-IM resource sets per cell
maxNrofCSI-IM-ResourceSets-1 INTEGER ::= 63 -- Maximum number of NZP CSI-IM resource sets per cell minus 1
maxNrofCSI-IM-ResourceSetsPerConfig INTEGER ::= 16 -- Maximum number of CSI IM resource sets per resource configuration
maxNrofCSI-SSB-ResourcePerSet INTEGER ::= 64 -- Maximum number of SSB resources in a resource set
maxNrofCSI-SSB-ResourceSets INTEGER ::= 64 -- Maximum number of CSI SSB resource sets per cell

3
epan/dissectors/asn1/nr-rrc/NR-Sidelink-Preconf.asn
View File

@ -1,11 +1,10 @@
-- 3GPP TS 38.331 V16.4.1 (2021-03)
-- 3GPP TS 38.331 V16.5.0 (2021-06)
NR-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
IMPORTS
SL-CBR-CommonTxConfigList-r16,
SL-FreqConfigCommon-r16,
SL-RadioBearerConfig-r16,
SL-RLC-BearerConfig-r16,

2
epan/dissectors/asn1/nr-rrc/NR-UE-Variables.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.331 V16.4.1 (2021-03)
-- 3GPP TS 38.331 V16.5.0 (2021-06)
NR-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=

4
epan/dissectors/asn1/nr-rrc/PC5-RRC-Definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.331 V16.4.1 (2021-03)
-- 3GPP TS 38.331 V16.5.0 (2021-06)
PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -226,7 +226,7 @@ UECapabilityEnquirySidelink ::= SEQUENCE {
UECapabilityEnquirySidelink-IEs-r16 ::= SEQUENCE {
frequencyBandListFilterSidelink-r16 FreqBandList OPTIONAL, -- Need N
ue-CapabilityInformationSidelink-r16 OCTET STRING OPTIONAL,
ue-CapabilityInformationSidelink-r16 OCTET STRING OPTIONAL, -- Need N
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension SEQUENCE{} OPTIONAL
}

11
epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
View File

@ -1051,7 +1051,7 @@ RLF-Report-r16/nr-RLF-Report-r16/timeConnFailure-r16 DISPLAY=BASE_CUSTOM STRINGS
TimeSinceFailure-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.TYPE_ATTR
TimeUntilReconnection-16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
TimeUntilReconnection-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.FN_BODY ULInformationTransferIRAT-r16-IEs/ul-DCCH-MessageEUTRA-r16 VAL_PTR = &ul_dcch_msg_eutra_tvb
tvbuff_t *ul_dcch_msg_eutra_tvb = NULL;
@ -2045,15 +2045,6 @@ CA-ParametersEUTRA-v1570/dl-1024QAM-TotalWeightedLayers DISPLAY=BASE_CUSTOM STRI
dissect_lte_rrc_MeasResultSCG_FailureMRDC_r15_PDU(meas_result_scg_fail_mrdc_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY CG-ConfigInfo-v1610-IEs/scgFailureInfoEUTRA-r16/measResultSCG-EUTRA-r16 VAL_PTR = &meas_result_scg_fail_mrdc_tvb
tvbuff_t *meas_result_scg_fail_mrdc_tvb = NULL;
%(DEFAULT_BODY)s
if (meas_result_scg_fail_mrdc_tvb) {
proto_tree *subtree;
subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_measResultSCG_FailureMRDC);
dissect_lte_rrc_MeasResultSCG_FailureMRDC_r15_PDU(meas_result_scg_fail_mrdc_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY SecurityAlgorithmConfig
mac_nr_info *p_mac_nr_info;
pdcp_nr_security_info_t *p_security_algorithms;

2
epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c
View File

@ -1,7 +1,7 @@
/* packet-nr-rrc-template.c
* NR;
* Radio Resource Control (RRC) protocol specification
* (3GPP TS 38.331 V16.4.1 Release 16) packet dissection
* (3GPP TS 38.331 V16.5.0 Release 16) packet dissection
* Copyright 2018-2021, Pascal Quantin
*
* Wireshark - Network traffic analyzer

2408
epan/dissectors/packet-nr-rrc.c
View File

File diff suppressed because it is too large Load Diff