diff options
| -rw-r--r-- | epan/dissectors/asn1/lte-rrc/lte-rrc.cnf | 4 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nr-rrc/NR-InterNodeDefinitions.asn | 9 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nr-rrc/NR-RRC-Definitions.asn | 429 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nr-rrc/NR-Sidelink-Preconf.asn | 2 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nr-rrc/NR-UE-Variables.asn | 6 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nr-rrc/PC5-RRC-Definitions.asn | 35 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nr-rrc/nr-rrc.cnf | 19 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c | 10 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.h | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-lte-rrc.c | 30 | ||||
| -rw-r--r-- | epan/dissectors/packet-lte-rrc.h | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-nr-rrc.c | 4955 | ||||
| -rw-r--r-- | epan/dissectors/packet-nr-rrc.h | 2 |
13 files changed, 3961 insertions, 1544 deletions
diff --git a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf index 83f1f040ca..ca21df4201 100644 --- a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf +++ b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf @@ -635,6 +635,8 @@ SL-Parameters-v1530_PDU SL-Parameters-v1540_PDU SS-RSSI-Measurement-r15_PDU SSB-ToMeasure-r15_PDU +SystemInformationBlockType21-r14_PDU +TDD-Config_PDU ThresholdListNR-r15_PDU UEAssistanceInformation-r11_PDU UECapabilityEnquiry_PDU @@ -681,6 +683,8 @@ SL-Parameters-v1530 SL-Parameters-v1540 SS-RSSI-Measurement-r15 SSB-ToMeasure-r15 +SystemInformationBlockType21-r14 +TDD-Config ThresholdListNR-r15 UEAssistanceInformation-r11 UECapabilityEnquiry diff --git a/epan/dissectors/asn1/nr-rrc/NR-InterNodeDefinitions.asn b/epan/dissectors/asn1/nr-rrc/NR-InterNodeDefinitions.asn index b97573ed77..a0284b6ab8 100644 --- a/epan/dissectors/asn1/nr-rrc/NR-InterNodeDefinitions.asn +++ b/epan/dissectors/asn1/nr-rrc/NR-InterNodeDefinitions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.331 V16.2.0 (2020-09) +-- 3GPP TS 38.331 V16.3.0 (2020-12) NR-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::= @@ -239,6 +239,11 @@ CG-Config-v1610-IEs ::= SEQUENCE { CG-Config-v1620-IEs ::= SEQUENCE { ueAssistanceInformationSCG-r16 OCTET STRING (CONTAINING UEAssistanceInformation) OPTIONAL, + nonCriticalExtension CG-Config-v1630-IEs OPTIONAL +} + +CG-Config-v1630-IEs ::= SEQUENCE { + selectedToffset-r16 T-Offset-r16 OPTIONAL, nonCriticalExtension SEQUENCE {} OPTIONAL } @@ -600,7 +605,7 @@ MeasTiming ::= SEQUENCE { ss-RSSI-Measurement SS-RSSI-Measurement OPTIONAL } OPTIONAL, ..., - [[ + [[ ssb-ToMeasure SSB-ToMeasure OPTIONAL, physCellId PhysCellId OPTIONAL ]] diff --git a/epan/dissectors/asn1/nr-rrc/NR-RRC-Definitions.asn b/epan/dissectors/asn1/nr-rrc/NR-RRC-Definitions.asn index e5df2d68e6..94eb3832a4 100644 --- a/epan/dissectors/asn1/nr-rrc/NR-RRC-Definitions.asn +++ b/epan/dissectors/asn1/nr-rrc/NR-RRC-Definitions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.331 V16.2.0 (2020-09) +-- 3GPP TS 38.331 V16.3.0 (2020-12) NR-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::= @@ -707,7 +707,7 @@ RRCReconfiguration-v1610-IEs ::= SEQUENCE { dedicatedPosSysInfoDelivery-r16 OCTET STRING (CONTAINING PosSystemInformation-r16-IEs) OPTIONAL, -- Need N sl-ConfigDedicatedNR-r16 CHOICE {release NULL, setup SL-ConfigDedicatedNR-r16} OPTIONAL, -- Need M sl-ConfigDedicatedEUTRA-Info-r16 CHOICE {release NULL, setup SL-ConfigDedicatedEUTRA-Info-r16} OPTIONAL, -- Need M - smtc-r16 SSB-MTC OPTIONAL, -- Need S + targetCellSMTC-SCG-r16 SSB-MTC OPTIONAL, -- Need S nonCriticalExtension SEQUENCE {} OPTIONAL } @@ -1296,11 +1296,20 @@ SIB1-v1610-IEs ::= SEQUENCE { idleModeMeasurementsEUTRA-r16 ENUMERATED{true} OPTIONAL, -- Need R idleModeMeasurementsNR-r16 ENUMERATED{true} OPTIONAL, -- Need R posSI-SchedulingInfo-r16 PosSI-SchedulingInfo-r16 OPTIONAL, -- Need R + nonCriticalExtension SIB1-v1630-IEs OPTIONAL +} + +SIB1-v1630-IEs ::= SEQUENCE { + uac-BarringInfo-v1630 SEQUENCE { + uac-AC1-SelectAssistInfo-r16 SEQUENCE (SIZE (2..maxPLMN)) OF UAC-AC1-SelectAssistInfo-r16 + } OPTIONAL, -- Need R nonCriticalExtension SEQUENCE {} OPTIONAL } UAC-AccessCategory1-SelectionAssistanceInfo ::= ENUMERATED {a, b, c} +UAC-AC1-SelectAssistInfo-r16 ::= ENUMERATED {a, b, c, notConfigured} + -- TAG-SIB1-STOP -- TAG-SIDELINKUEINFORMATIONNR-START @@ -1546,7 +1555,7 @@ ReducedMaxCCs-r16 ::= SEQUENCE { SL-UE-AssistanceInformationNR-r16 ::= SEQUENCE (SIZE (1..maxNrofTrafficPattern-r16)) OF SL-TrafficPatternInfo-r16 SL-TrafficPatternInfo-r16::= SEQUENCE { - trafficPeriodicity-r16 ENUMERATED {ms20,ms50, ms100, ms200, ms300, ms400, ms500, ms600, ms700, ms800, ms900, ms1000}, + trafficPeriodicity-r16 ENUMERATED {ms20, ms50, ms100, ms200, ms300, ms400, ms500, ms600, ms700, ms800, ms900, ms1000}, timingOffset-r16 INTEGER (0..10239), messageSize-r16 BIT STRING (SIZE (8)), sl-QoS-FlowIdentity-r16 SL-QoS-FlowIdentity-r16 @@ -1936,7 +1945,7 @@ ULInformationTransferMRDC-IEs::= SEQUENCE { -- TAG-SETUPRELEASE-START -- WS modification: asn2wrs does not support this syntax; replace all occurrences --- CHOICE {release NULL, setup ElementTypeParam } ::= CHOICE { +-- SetupRelease { ElementTypeParam } ::= CHOICE { -- release NULL, -- setup ElementTypeParam -- } @@ -2313,7 +2322,7 @@ SL-EUTRA-AnchorCarrierFreqList-r16 ::= SEQUENCE (SIZE (1..maxFreqSL-EUTRA-r16)) SIB13-r16 ::= SEQUENCE { sl-V2X-ConfigCommon-r16 OCTET STRING, - sl-Bandwidth-r16 OCTET STRING, + dummy OCTET STRING, tdd-Config-r16 OCTET STRING, lateNonCriticalExtension OCTET STRING OPTIONAL, ... @@ -2383,7 +2392,7 @@ PosSI-SchedulingInfo-r16 ::= SEQUENCE { posSchedulingInfoList-r16 SEQUENCE (SIZE (1..maxSI-Message)) OF PosSchedulingInfo-r16, posSI-RequestConfig-r16 SI-RequestConfig OPTIONAL, -- Cond MSG-1 posSI-RequestConfigSUL-r16 SI-RequestConfig OPTIONAL, -- Cond SUL-MSG-1 - ... + ... } PosSchedulingInfo-r16 ::= SEQUENCE { @@ -2520,7 +2529,7 @@ BeamFailureRecoveryConfig ::= SEQUENCE { ]], [[ ra-PrioritizationTwoStep-r16 RA-Prioritization OPTIONAL, -- Need R - candidateBeamRSListExt-v1610 CHOICE {release NULL, setup CandidateBeamRSListExt-r16 } OPTIONAL -- Need M + candidateBeamRSListExt-v1610 CHOICE {release NULL, setup CandidateBeamRSListExt-r16 } OPTIONAL -- Need M ]] } @@ -2575,18 +2584,6 @@ BetaOffsets ::= SEQUENCE { } -- TAG-BETAOFFSETS-STOP --- TAG-BHRLCCHANNELCONFIG-START - -BH-RLC-ChannelConfig-r16::= SEQUENCE { - bh-LogicalChannelIdentity-r16 BH-LogicalChannelIdentity-r16 OPTIONAL, -- Cond LCH-SetupOnly - bh-RLC-ChannelID-r16 BH-RLC-ChannelID-r16, - reestablishRLC-r16 ENUMERATED {true} OPTIONAL, -- Need N - rlc-Config-r16 RLC-Config OPTIONAL, -- Cond LCH-Setup - mac-LogicalChannelConfig-r16 LogicalChannelConfig OPTIONAL, -- Cond LCH-Setup - ... -} - --- TAG-BHRLCCHANNELCONFIG-STOP -- TAG-BHLOGICALCHANNELIDENTITY-START BH-LogicalChannelIdentity-r16 ::= CHOICE { @@ -2600,6 +2597,18 @@ BH-LogicalChannelIdentity-r16 ::= CHOICE { BH-LogicalChannelIdentity-Ext-r16 ::= INTEGER (320.. maxLC-ID-Iab-r16) -- TAG-BHLOGICALCHANNELIDENTITYEXT-STOP +-- TAG-BHRLCCHANNELCONFIG-START + +BH-RLC-ChannelConfig-r16::= SEQUENCE { + bh-LogicalChannelIdentity-r16 BH-LogicalChannelIdentity-r16 OPTIONAL, -- Cond LCH-SetupOnly + bh-RLC-ChannelID-r16 BH-RLC-ChannelID-r16, + reestablishRLC-r16 ENUMERATED {true} OPTIONAL, -- Need N + rlc-Config-r16 RLC-Config OPTIONAL, -- Cond LCH-Setup + mac-LogicalChannelConfig-r16 LogicalChannelConfig OPTIONAL, -- Cond LCH-Setup + ... +} + +-- TAG-BHRLCCHANNELCONFIG-STOP -- TAG-BHRLCCHANNELID-START BH-RLC-ChannelID-r16 ::= BIT STRING (SIZE (16)) @@ -2625,7 +2634,6 @@ BWP ::= SEQUENCE { cyclicPrefix ENUMERATED { extended } OPTIONAL -- Need R } - -- TAG-BWP-STOP -- TAG-BWP-DOWNLINK-START @@ -3120,7 +3128,7 @@ ConfiguredGrantConfig ::= SEQUENCE { configuredGrantTimer INTEGER (1..64) OPTIONAL, -- Need R rrc-ConfiguredUplinkGrant SEQUENCE { timeDomainOffset INTEGER (0..5119), - timeDomainAllocation INTEGER (0..15), + timeDomainAllocation INTEGER (0..15), frequencyDomainAllocation BIT STRING (SIZE(18)), antennaPort INTEGER (0..31), dmrs-SeqInitialization INTEGER (0..1) OPTIONAL, -- Need R @@ -3146,9 +3154,9 @@ ConfiguredGrantConfig ::= SEQUENCE { cg-nrofPUSCH-InSlot-r16 INTEGER (1..7) OPTIONAL, -- Need R cg-nrofSlots-r16 INTEGER (1..40) OPTIONAL, -- Need R cg-StartingOffsets-r16 CG-StartingOffsets-r16 OPTIONAL, -- Need R - cg-UCI-Multiplexing ENUMERATED {enabled} OPTIONAL, -- Need R + cg-UCI-Multiplexing-r16 ENUMERATED {enabled} OPTIONAL, -- Need R cg-COT-SharingOffset-r16 INTEGER (1..39) OPTIONAL, -- Need R - betaOffsetCG-UCI-r16 INTEGER (0.. 31) OPTIONAL, -- Need R + betaOffsetCG-UCI-r16 INTEGER (0..31) OPTIONAL, -- Need R cg-COT-SharingList-r16 SEQUENCE (SIZE (1..1709)) OF CG-COT-Sharing-r16 OPTIONAL, -- Need R harq-ProcID-Offset-r16 INTEGER (0..15) OPTIONAL, -- Need M harq-ProcID-Offset2-r16 INTEGER (0..15) OPTIONAL, -- Need M @@ -3170,8 +3178,8 @@ CG-UCI-OnPUSCH ::= CHOICE { CG-COT-Sharing-r16 ::= CHOICE { noCOT-Sharing-r16 NULL, cot-Sharing-r16 SEQUENCE { - duration-r16 INTEGER (1.. 39), - offset-r16 INTEGER (1.. 39), + duration-r16 INTEGER (1..39), + offset-r16 INTEGER (1..39), channelAccessPriority-r16 INTEGER (1..4) } } @@ -4024,7 +4032,7 @@ LogicalChannelConfig ::= SEQUENCE { bucketSizeDuration ENUMERATED {ms5, ms10, ms20, ms50, ms100, ms150, ms300, ms500, ms1000, spare7, spare6, spare5, spare4, spare3,spare2, spare1}, allowedServingCells SEQUENCE (SIZE (1..maxNrofServingCells-1)) OF ServCellIndex - OPTIONAL, -- PDCP-CADuplication + OPTIONAL, -- Cond PDCP-CADuplication allowedSCS-List SEQUENCE (SIZE (1..maxSCSs)) OF SubcarrierSpacing OPTIONAL, -- Need R maxPUSCH-Duration ENUMERATED {ms0p02, ms0p04, ms0p0625, ms0p125, ms0p25, ms0p5, spare2, spare1} OPTIONAL, -- Need R @@ -4370,7 +4378,6 @@ ReferenceSignalConfig::= SEQUENCE { } SSB-ConfigMobility::= SEQUENCE { - ssb-ToMeasure CHOICE {release NULL, setup SSB-ToMeasure } OPTIONAL, -- Need M deriveSSB-IndexFromCell BOOLEAN, ss-RSSI-Measurement SS-RSSI-Measurement OPTIONAL, -- Need M @@ -4898,7 +4905,7 @@ NPN-Identity-r16 ::= CHOICE { cag-IdentityList-r16 SEQUENCE (SIZE (1..maxNPN-r16)) OF CAG-IdentityInfo-r16 }, snpn-r16 SEQUENCE { - plmn-Identity PLMN-Identity, + plmn-Identity-r16 PLMN-Identity, nid-List-r16 SEQUENCE (SIZE (1..maxNPN-r16)) OF NID-r16 } } @@ -4922,7 +4929,7 @@ NPN-IdentityInfo-r16 ::= SEQUENCE { ranac-r16 RAN-AreaCode OPTIONAL, -- Need R cellIdentity-r16 CellIdentity, cellReservedForOperatorUse-r16 ENUMERATED {reserved, notReserved}, - iab-Support-r16 ENUMERATED {true} OPTIONAL, -- Need R + iab-Support-r16 ENUMERATED {true} OPTIONAL, -- Need S ... } @@ -5240,9 +5247,9 @@ PDSCH-Config ::= SEQUENCE { -- Start of the parameters for DCI format 1_2 introduced in V16.1.0 antennaPortsFieldPresenceDCI-1-2-r16 ENUMERATED {enabled} OPTIONAL, -- Need S - aperiodicZP-CSI-RS-ResourceSetsToAddModListDCI-1-2-r16 SEQUENCE (SIZE (1..maxNrofZP-CSI-RS-ResourceSets)) OF ZP-CSI-RS-ResourceSet + aperiodicZP-CSI-RS-ResourceSetsToAddModListDCI-1-2-r16 SEQUENCE (SIZE (1..maxNrofZP-CSI-RS-ResourceSets)) OF ZP-CSI-RS-ResourceSet OPTIONAL, -- Need N - aperiodicZP-CSI-RS-ResourceSetsToReleaseListDCI-1-2-r16 SEQUENCE (SIZE (1..maxNrofZP-CSI-RS-ResourceSets)) OF ZP-CSI-RS-ResourceSetId + aperiodicZP-CSI-RS-ResourceSetsToReleaseListDCI-1-2-r16 SEQUENCE (SIZE (1..maxNrofZP-CSI-RS-ResourceSets)) OF ZP-CSI-RS-ResourceSetId OPTIONAL, -- Need N dmrs-DownlinkForPDSCH-MappingTypeA-DCI-1-2-r16 CHOICE {release NULL, setup DMRS-DownlinkConfig } OPTIONAL, -- Need M dmrs-DownlinkForPDSCH-MappingTypeB-DCI-1-2-r16 CHOICE {release NULL, setup DMRS-DownlinkConfig } OPTIONAL, -- Need M @@ -5275,6 +5282,9 @@ PDSCH-Config ::= SEQUENCE { dataScramblingIdentityPDSCH2-r16 INTEGER (0..1023) OPTIONAL, -- Need R pdsch-TimeDomainAllocationList-r16 CHOICE {release NULL, setup PDSCH-TimeDomainResourceAllocationList-r16 } OPTIONAL, -- Need M repetitionSchemeConfig-r16 CHOICE {release NULL, setup RepetitionSchemeConfig-r16} OPTIONAL -- Need M + ]], + [[ + repetitionSchemeConfig-v1630 CHOICE {release NULL, setup RepetitionSchemeConfig-v1630} OPTIONAL -- Need M ]] } @@ -5309,7 +5319,7 @@ PDSCH-ServingCellConfig ::= SEQUENCE { processingType2Enabled BOOLEAN OPTIONAL -- Need M ]], [[ - pdsch-CodeBlockGroupTransmissionList-r16 CHOICE {release NULL, setup PDSCH-CodeBlockGroupTransmissionList-r16 } OPTIONAL -- Need M + pdsch-CodeBlockGroupTransmissionList-r16 CHOICE {release NULL, setup PDSCH-CodeBlockGroupTransmissionList-r16 } OPTIONAL -- Need M ]] } @@ -5757,7 +5767,7 @@ PUCCH-SpatialRelationInfoExt-r16 ::= SEQUENCE { ... } -PUCCH-SRS ::= SEQUENCE { +PUCCH-SRS ::= SEQUENCE { resource SRS-ResourceId, uplinkBWP BWP-Id } @@ -5845,7 +5855,7 @@ PUSCH-Config ::= SEQUENCE { -- End of the parameters for DCI format 0_1 introduced in V16.1.0 invalidSymbolPattern-r16 InvalidSymbolPattern-r16 OPTIONAL, -- Need S pusch-PowerControl-v1610 CHOICE {release NULL, setup PUSCH-PowerControl-v1610} OPTIONAL, -- Need M - ul-FullPowerTransmission-r16 ENUMERATED {fullpower, fullpowerMode1, fullpoweMode2} OPTIONAL, -- Need R + ul-FullPowerTransmission-r16 ENUMERATED {fullpower, fullpowerMode1, fullpowerMode2} OPTIONAL, -- Need R pusch-TimeDomainAllocationListForMultiPUSCH-r16 CHOICE {release NULL, setup PUSCH-TimeDomainResourceAllocationList-r16 } OPTIONAL, -- Need M numberOfInvalidSymbolsForDL-UL-Switching-r16 INTEGER (1..4) OPTIONAL -- Cond RepTypeB2 @@ -6012,7 +6022,7 @@ PUSCH-TimeDomainResourceAllocationList-r16 ::= SEQUENCE (SIZE(1..maxNrofUL-Allo PUSCH-TimeDomainResourceAllocation-r16 ::= SEQUENCE { k2-r16 INTEGER(0..32) OPTIONAL, -- Need S puschAllocationList-r16 SEQUENCE (SIZE(1..maxNrofMultiplePUSCHs-r16)) OF PUSCH-Allocation-r16, - ... +... } PUSCH-Allocation-r16 ::= SEQUENCE { @@ -6185,7 +6195,7 @@ GroupB-ConfiguredTwoStepRA-r16 ::= SEQUENCE { ra-MsgA-SizeGroupA ENUMERATED {b56, b144, b208, b256, b282, b480, b640, b800, b1000, b72, spare6, spare5, spare4, spare3, spare2, spare1}, messagePowerOffsetGroupB ENUMERATED {minusinfinity, dB0, dB5, dB8, dB10, dB12, dB15, dB18}, - numberofRA-PreamblesGroupA INTEGER (1..64) + numberOfRA-PreamblesGroupA INTEGER (1..64) } -- TAG-RACH-CONFIGCOMMONTWOSTEPRA-STOP @@ -6244,7 +6254,7 @@ CFRA-SSB-Resource ::= SEQUENCE { ra-PreambleIndex INTEGER (0..63), ..., [[ - msgA-PUSCH-resource-Index-r16 INTEGER (0..3071) OPTIONAL -- Cond 2StepCFRA + msgA-PUSCH-Resource-Index-r16 INTEGER (0..3071) OPTIONAL -- Cond 2StepCFRA ]] } @@ -6337,7 +6347,7 @@ DRB-ToAddMod ::= SEQUENCE { pdcp-Config PDCP-Config OPTIONAL, -- Cond PDCP ..., [[ - daps-Config-r16 ENUMERATED{true} OPTIONAL --Need N + daps-Config-r16 ENUMERATED{true} OPTIONAL -- Cond DAPS ]] } DRB-ToReleaseList ::= SEQUENCE (SIZE (1..maxDRB)) OF DRB-Identity @@ -6464,14 +6474,23 @@ RepetitionSchemeConfig-r16 ::= CHOICE { slotBased-r16 CHOICE {release NULL, setup SlotBased-r16 } } -FDM-TDM-r16 ::= SEQUENCE { +RepetitionSchemeConfig-v1630 ::= SEQUENCE { + slotBased-v1630 CHOICE {release NULL, setup SlotBased-v1630 } +} + +FDM-TDM-r16 ::= SEQUENCE { repetitionScheme-r16 ENUMERATED {fdmSchemeA, fdmSchemeB,tdmSchemeA }, startingSymbolOffsetK-r16 INTEGER (0..7) OPTIONAL -- Need R } -SlotBased-r16 ::= SEQUENCE { - tciMapping-r16 ENUMERATED {cyclicMapping, sequenticalMapping}, - sequenceOffsetforRV-r16 INTEGER (1..3) +SlotBased-r16 ::= SEQUENCE { + tciMapping-r16 ENUMERATED {cyclicMapping, sequentialMapping}, + sequenceOffsetForRV-r16 INTEGER (1..3) +} + +SlotBased-v1630 ::= SEQUENCE { + tciMapping-r16 ENUMERATED {cyclicMapping, sequentialMapping}, + sequenceOffsetForRV-r16 INTEGER (0) } -- TAG-REPETITIONSCHEMECONFIG-STOP @@ -7250,8 +7269,8 @@ CipheringAlgorithm ::= ENUMERATED { -- TAG-SECURITYALGORITHMCONFIG-STOP -- TAG-SEMISTATICCHANNELACCESSCONFIG-START -SemiStaticChannelAccessConfig ::= SEQUENCE { - period ENUMERATED {ms1, ms2, ms2dot5, ms4, ms5, ms10} +SemiStaticChannelAccessConfig-r16 ::= SEQUENCE { + period ENUMERATED {ms1, ms2, ms2dot5, ms4, ms5, ms10} } -- TAG-SEMISTATICCHANNELACCESSCONFIG-STOP @@ -7292,7 +7311,7 @@ ServingCellConfig ::= SEQUENCE { ms840, ms1280, spare2,spare1} OPTIONAL, -- Cond ServingCellWithoutPUCCH crossCarrierSchedulingConfig CrossCarrierSchedulingConfig OPTIONAL, -- Need M tag-Id TAG-Id, - dummy ENUMERATED {enabled} OPTIONAL, -- Need R + dummy1 ENUMERATED {enabled} OPTIONAL, -- Need R pathlossReferenceLinking ENUMERATED {spCell, sCell} OPTIONAL, -- Cond SCellOnly servingCellMO MeasObjectId OPTIONAL, -- Cond MeasObject ..., @@ -7303,7 +7322,7 @@ ServingCellConfig ::= SEQUENCE { downlinkChannelBW-PerSCS-List SEQUENCE (SIZE (1..maxSCSs)) OF SCS-SpecificCarrier OPTIONAL -- Need S ]], [[ - supplementaryUplinkRelease ENUMERATED {true} OPTIONAL, -- Need N + supplementaryUplinkRelease-r16 ENUMERATED {true} OPTIONAL, -- Need N tdd-UL-DL-ConfigurationDedicated-IAB-MT-r16 TDD-UL-DL-ConfigDedicated-IAB-MT-r16 OPTIONAL, -- Cond TDD_IAB dormantBWP-Config-r16 CHOICE {release NULL, setup DormantBWP-Config-r16 } OPTIONAL, -- Need M ca-SlotOffset-r16 CHOICE { @@ -7312,10 +7331,10 @@ ServingCellConfig ::= SEQUENCE { refSCS60KHz INTEGER (-10..10), refSCS120KHz INTEGER (-20..20) } OPTIONAL, -- Cond AsyncCA - channelAccessConfig-r16 CHOICE {release NULL, setup ChannelAccessConfig-r16 } OPTIONAL, -- Need M + dummy2 CHOICE {release NULL, setup DummyJ } OPTIONAL, -- Need M intraCellGuardBandsDL-List-r16 SEQUENCE (SIZE (1..maxSCSs)) OF IntraCellGuardBandsPerSCS-r16 OPTIONAL, -- Need S intraCellGuardBandsUL-List-r16 SEQUENCE (SIZE (1..maxSCSs)) OF IntraCellGuardBandsPerSCS-r16 OPTIONAL, -- Need S - csi-RS-ValidationWith-DCI-r16 ENUMERATED {enabled} OPTIONAL, -- Need R + csi-RS-ValidationWithDCI-r16 ENUMERATED {enabled} OPTIONAL, -- Need R lte-CRS-PatternList1-r16 CHOICE {release NULL, setup LTE-CRS-PatternList-r16 } OPTIONAL, -- Need M lte-CRS-PatternList2-r16 CHOICE {release NULL, setup LTE-CRS-PatternList-r16 } OPTIONAL, -- Need M crs-RateMatch-PerCORESETPoolIndex-r16 ENUMERATED {enabled} OPTIONAL, -- Need R @@ -7324,6 +7343,10 @@ ServingCellConfig ::= SEQUENCE { enableBeamSwitchTiming-r16 ENUMERATED {true} OPTIONAL, -- Need R cbg-TxDiffTBsProcessingType1-r16 ENUMERATED {enabled} OPTIONAL, -- Need R cbg-TxDiffTBsProcessingType2-r16 ENUMERATED {enabled} OPTIONAL -- Need R + ]], + [[ + directionalCollisionHandling-r16 ENUMERATED {enabled} OPTIONAL, -- Need R + channelAccessConfig-r16 CHOICE {release NULL, setup ChannelAccessConfig-r16 } OPTIONAL -- Need M ]] } @@ -7349,11 +7372,20 @@ UplinkConfig ::= SEQUENCE { ]] } -ChannelAccessConfig-r16 ::= SEQUENCE { +DummyJ ::= SEQUENCE { maxEnergyDetectionThreshold-r16 INTEGER(-85..-52), energyDetectionThresholdOffset-r16 INTEGER (-20..-13), - ul-toDL-COT-SharingED-Threshold-r16 INTEGER (-85..-52) OPTIONAL, -- Need R - absenceOfAnyOtherTechnology-r16 ENUMERATED {true} OPTIONAL -- Need R + ul-toDL-COT-SharingED-Threshold-r16 INTEGER (-85..-52) OPTIONAL, -- Need R + absenceOfAnyOtherTechnology-r16 ENUMERATED {true} OPTIONAL -- Need R +} + +ChannelAccessConfig-r16 ::= SEQUENCE { + energyDetectionConfig-r16 CHOICE { + maxEnergyDetectionThreshold-r16 INTEGER (-85..-52), + energyDetectionThresholdOffset-r16 INTEGER (-13..20) + } OPTIONAL, -- Need R + ul-toDL-COT-SharingED-Threshold-r16 INTEGER (-85..-52) OPTIONAL, -- Need R + absenceOfAnyOtherTechnology-r16 ENUMERATED {true} OPTIONAL -- Need R } IntraCellGuardBandsPerSCS-r16 ::= SEQUENCE { @@ -7415,7 +7447,7 @@ ServingCellConfigCommon ::= SEQUENCE { [[ channelAccessMode-r16 CHOICE { dynamic NULL, - semiStatic SemiStaticChannelAccessConfig + semiStatic SemiStaticChannelAccessConfig-r16 } OPTIONAL, -- Cond SharedSpectrum discoveryBurstWindowLength-r16 ENUMERATED {ms0dot5, ms1, ms2, ms3, ms4, ms5} OPTIONAL, -- Need R ssb-PositionQCL-r16 SSB-PositionQCL-Relation-r16 OPTIONAL, -- Cond SharedSpectrum @@ -7442,7 +7474,7 @@ ServingCellConfigCommonSIB ::= SEQUENCE { [[ channelAccessMode-r16 CHOICE { dynamic NULL, - semiStatic SemiStaticChannelAccessConfig + semiStatic SemiStaticChannelAccessConfig-r16 } OPTIONAL, -- Cond SharedSpectrum discoveryBurstWindowLength-r16 ENUMERATED {ms0dot5, ms1, ms2, ms3, ms4, ms5} OPTIONAL, -- Need R highSpeedConfig-r16 HighSpeedConfig-r16 OPTIONAL -- Need R @@ -8358,8 +8390,12 @@ BandCombinationList-v1590 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandComb BandCombinationList-v1610 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-v1610 +BandCombinationList-v1630 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-v1630 + BandCombinationList-UplinkTxSwitch-r16 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-UplinkTxSwitch-r16 +BandCombinationList-UplinkTxSwitch-v1630 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-UplinkTxSwitch-v1630 + BandCombination ::= SEQUENCE { bandList SEQUENCE (SIZE (1..maxSimultaneousBands)) OF BandParameters, featureSetCombination FeatureSetCombinationId, @@ -8378,17 +8414,6 @@ BandCombination-v1540::= SEQUENCE { BandCombination-v1550 ::= SEQUENCE { ca-ParametersNR-v1550 CA-ParametersNR-v1550 } - -BandCombination-v1610 ::= SEQUENCE { - bandList-v1610 SEQUENCE (SIZE (1..maxSimultaneousBands)) OF BandParameters-v1610 OPTIONAL, - ca-ParametersNR-v1610 CA-ParametersNR-v1610 OPTIONAL, - ca-ParametersNRDC-v1610 CA-ParametersNRDC-v1610 OPTIONAL, - powerClass-v1610 ENUMERATED {pc1dot5} OPTIONAL, - powerClassNRPart-r16 ENUMERATED {pc1, pc2, pc3, pc5} OPTIONAL, - featureSetCombinationDAPS-r16 FeatureSetCombinationId OPTIONAL, - mrdc-Parameters-v1620 MRDC-Parameters-v1620 OPTIONAL -} - BandCombination-v1560::= SEQUENCE { ne-DC-BC ENUMERATED {supported} OPTIONAL, ca-ParametersNRDC CA-ParametersNRDC OPTIONAL, @@ -8409,6 +8434,26 @@ BandCombination-v1590::= SEQUENCE { mrdc-Parameters-v1590 MRDC-Parameters-v1590 } +BandCombination-v1610 ::= SEQUENCE { + bandList-v1610 SEQUENCE (SIZE (1..maxSimultaneousBands)) OF BandParameters-v1610 OPTIONAL, + ca-ParametersNR-v1610 CA-ParametersNR-v1610 OPTIONAL, + ca-ParametersNRDC-v1610 CA-ParametersNRDC-v1610 OPTIONAL, + powerClass-v1610 ENUMERATED {pc1dot5} OPTIONAL, + powerClassNRPart-r16 ENUMERATED {pc1, pc2, pc3, pc5} OPTIONAL, + featureSetCombinationDAPS-r16 FeatureSetCombinationId OPTIONAL, + mrdc-Parameters-v1620 MRDC-Parameters-v1620 OPTIONAL +} + +BandCombination-v1630 ::= SEQUENCE { + ca-ParametersNR-v1630 CA-ParametersNR-v1630 OPTIONAL, + ca-ParametersNRDC-v1630 CA-ParametersNRDC-v1630 OPTIONAL, + mrdc-Parameters-v1630 MRDC-Parameters-v1630 OPTIONAL, + supportedTxBandCombListPerBC-Sidelink-r16 BIT STRING (SIZE (1..maxBandComb)) OPTIONAL, + supportedRxBandCombListPerBC-Sidelink-r16 BIT STRING (SIZE (1..maxBandComb)) OPTIONAL, + scalingFactorTxSidelink-r16 SEQUENCE (SIZE (1..maxBandComb)) OF ScalingFactorSidelink-r16 OPTIONAL, + scalingFactorRxSidelink-r16 SEQUENCE (SIZE (1..maxBandComb)) OF ScalingFactorSidelink-r16 OPTIONAL +} + BandCombination-UplinkTxSwitch-r16 ::= SEQUENCE { bandCombination-r16 BandCombination, bandCombination-v1540 BandCombination-v1540 OPTIONAL, @@ -8423,6 +8468,10 @@ BandCombination-UplinkTxSwitch-r16 ::= SEQUENCE { ... } +BandCombination-UplinkTxSwitch-v1630 ::= SEQUENCE { + bandCombination-v1630 BandCombination-v1630 OPTIONAL +} + ULTxSwitchingBandPair-r16 ::= SEQUENCE { bandIndexUL1-r16 INTEGER(1..maxSimultaneousBands), bandIndexUL2-r16 INTEGER(1..maxSimultaneousBands), @@ -8466,17 +8515,19 @@ BandParameters-v1610 ::= SEQUENCE { } OPTIONAL } --- TAG-BANDCOMBINATIONLIST-STOP --- TAG-BANDCOMBINATIONLISTSIDELINK-START +ScalingFactorSidelink-r16 ::= ENUMERATED {f0p4, f0p75, f0p8, f1} -BandParametersSidelink-r16 ::= SEQUENCE { - freqBandSidelink-r16 FreqBandIndicatorNR -} +-- TAG-BANDCOMBINATIONLIST-STOP +-- TAG-BANDCOMBINATIONLISTSIDELINKEUTRANR-START BandCombinationListSidelinkEUTRA-NR-r16 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombinationParametersSidelinkEUTRA-NR-r16 +BandCombinationListSidelinkEUTRA-NR-v1630 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombinationParametersSidelinkEUTRA-NR-v1630 + BandCombinationParametersSidelinkEUTRA-NR-r16 ::= SEQUENCE (SIZE (1..maxSimultaneousBands)) OF BandParametersSidelinkEUTRA-NR-r16 +BandCombinationParametersSidelinkEUTRA-NR-v1630 ::= SEQUENCE (SIZE (1..maxSimultaneousBands)) OF BandParametersSidelinkEUTRA-NR-v1630 + BandParametersSidelinkEUTRA-NR-r16 ::= CHOICE { eutra SEQUENCE { bandParametersSidelinkEUTRA1-r16 OCTET STRING OPTIONAL, @@ -8487,7 +8538,20 @@ BandParametersSidelinkEUTRA-NR-r16 ::= CHOICE { } } --- TAG-BANDCOMBINATIONLISTSIDELINK-STOP +BandParametersSidelinkEUTRA-NR-v1630 ::= CHOICE { + eutra NULL, + nr SEQUENCE { + tx-Sidelink-r16 ENUMERATED {supported} OPTIONAL, + rx-Sidelink-r16 ENUMERATED {supported} OPTIONAL, + sl-CrossCarrierScheduling-r16 ENUMERATED {supported} OPTIONAL + } +} + +BandParametersSidelink-r16 ::= SEQUENCE { + freqBandSidelink-r16 FreqBandIndicatorNR +} + +-- TAG-BANDCOMBINATIONLISTSIDELINKEUTRANR-STOP -- TAG-CA-BANDWIDTHCLASSEUTRA-START CA-BandwidthClassEUTRA ::= ENUMERATED {a, b, c, d, e, f, ...} @@ -8624,6 +8688,24 @@ CA-ParametersNR-v1610 ::= SEQUENCE { codebookComboParametersAdditionPerBC-r16 CodebookComboParametersAdditionPerBC-r16 OPTIONAL } +CA-ParametersNR-v1630 ::= SEQUENCE { + -- R1 22-5b: Simultaneous transmission of SRS for antenna switching and SRS for CB/NCB /BM for inter-band UL CA + -- R1 22-5d: Simultaneous transmission of SRS for antenna switching for inter-band UL CA + simulTX-SRS-AntSwitchingInterBandUL-CA-r16 SimulSRS-ForAntennaSwitching-r16 OPTIONAL, + -- R4 8-5: supported beam management type for inter-band CA + beamManagementType-r16 ENUMERATED {ibm, cbm} OPTIONAL, + -- R4 7-3a: UL frequency separation class with aggregate BW and Gap BW + intraBandFreqSeparationUL-AggBW-GapBW-r16 ENUMERATED {classI, classII, classIII} OPTIONAL, + -- RAN 89: Case B in case of Inter-band CA with non-aligned frame boundaries + interCA-NonAlignedFrame-B-r16 ENUMERATED {supported} OPTIONAL +} + +SimulSRS-ForAntennaSwitching-r16 ::= SEQUENCE { + supportSRS-xTyR-xLessThanY-r16 ENUMERATED {supported} OPTIONAL, + supportSRS-xTyR-xEqualToY-r16 ENUMERATED {supported} OPTIONAL, + supportSRS-AntennaSwitching-r16 ENUMERATED {supported} OPTIONAL +} + -- TAG-CA-PARAMETERSNR-STOP -- TAG-CA-PARAMETERS-NRDC-START @@ -8645,6 +8727,11 @@ CA-ParametersNRDC-v1610 ::= SEQUENCE { asyncNRDC-r16 ENUMERATED {supported} OPTIONAL } +CA-ParametersNRDC-v1630 ::= SEQUENCE { + ca-ParametersNR-ForDC-v1610 CA-ParametersNR-v1610 OPTIONAL, + ca-ParametersNR-ForDC-v1630 CA-ParametersNR-v1630 OPTIONAL +} + -- TAG-CA-PARAMETERS-NRDC-STOP -- TAG-CARRIERAGGREGATIONVARIANT-START @@ -8716,7 +8803,7 @@ CodebookParametersAddition-r16 ::= SEQUENCE { -- R1 16-3a-3: Support of rank 3,4 rank3-4-r16 ENUMERATED {supported} OPTIONAL, -- R1 16-3a-4: CBSR with soft amplitude restriction - softAmpRestriction-r16 ENUMERATED {supported} OPTIONAL + amplitudeSubsetRestriction-r16 ENUMERATED {supported} OPTIONAL } OPTIONAL, etype2-PS-r16 SEQUENCE { -- R1 16-3b Regular eType 2 R=1 PortSelection @@ -8866,7 +8953,7 @@ FeatureSetDownlink ::= SEQUENCE { intraBandFreqSeparationDL FreqSeparationClass OPTIONAL, scalingFactor ENUMERATED {f0p4, f0p75, f0p8} OPTIONAL, - crossCarrierScheduling-OtherSCS ENUMERATED {supported} OPTIONAL, + dummy8 ENUMERATED {supported} OPTIONAL, scellWithoutSSB ENUMERATED {supported} OPTIONAL, csi-RS-MeasSCellWithoutSSB ENUMERATED {supported} OPTIONAL, dummy1 ENUMERATED {supported} OPTIONAL, @@ -8921,19 +9008,19 @@ FeatureSetDownlink-v15a0 ::= SEQUENCE { FeatureSetDownlink-v1610 ::= SEQUENCE { -- R1 22-4e/4f/4g/4h: CBG based reception for DL with unicast PDSCH(s) per slot per CC with UE processing time Capability 1 - cbgPDSCH-ProcessingType1-NumberOfTB-PerSlot SEQUENCE { - scs-15kHz ENUMERATED {one, upto2, upto4, upto7} OPTIONAL, - scs-30kHz ENUMERATED {one, upto2, upto4, upto7} OPTIONAL, - scs-60kHz ENUMERATED {one, upto2, upto4, upto7} OPTIONAL, - scs-120kHz ENUMERATED {one, upto2, upto4, upto7} OPTIONAL + cbgPDSCH-ProcessingType1-NumberOfTB-PerSlot-r16 SEQUENCE { + scs-15kHz-r16 ENUMERATED {one, upto2, upto4, upto7} OPTIONAL, + scs-30kHz-r16 ENUMERATED {one, upto2, upto4, upto7} OPTIONAL, + scs-60kHz-r16 ENUMERATED {one, upto2, upto4, upto7} OPTIONAL, + scs-120kHz-r16 ENUMERATED {one, upto2, upto4, upto7} OPTIONAL } OPTIONAL, -- R1 22-3e/3f/3g/3h: CBG based reception for DL with unicast PDSCH(s) per slot per CC with UE processing time Capability 2 - cbgPDSCH-ProcessingType2-NumberOfTB-PerSlot SEQUENCE { - scs-15kHz ENUMERATED {one, upto2, upto4, upto7} OPTIONAL, - scs-30kHz ENUMERATED {one, upto2, upto4, upto7} OPTIONAL, - scs-60kHz ENUMERATED {one, upto2, upto4, upto7} OPTIONAL, - scs-120kHz ENUMERATED {one, upto2, upto4, upto7} OPTIONAL + cbgPDSCH-ProcessingType2-NumberOfTB-PerSlot-r16 SEQUENCE { + scs-15kHz-r16 ENUMERATED {one, upto2, upto4, upto7} OPTIONAL, + scs-30kHz-r16 ENUMERATED {one, upto2, upto4, upto7} OPTIONAL, + scs-60kHz-r16 ENUMERATED {one, upto2, upto4, upto7} OPTIONAL, + scs-120kHz-r16 ENUMERATED {one, upto2, upto4, upto7} OPTIONAL } OPTIONAL, intraFreqDAPS-r16 SEQUENCE { intraFreqDiffSCS-DAPS-r16 ENUMERATED {supported} OPTIONAL, @@ -9092,6 +9179,9 @@ FeatureSets ::= SEQUENCE { featureSetsDownlink-v1610 SEQUENCE (SIZE (1..maxDownlinkFeatureSets)) OF FeatureSetDownlink-v1610 OPTIONAL, featureSetsUplink-v1610 SEQUENCE (SIZE (1..maxUplinkFeatureSets)) OF FeatureSetUplink-v1610 OPTIONAL, featureSetDownlinkPerCC-v1620 SEQUENCE (SIZE (1..maxPerCC-FeatureSets)) OF FeatureSetDownlinkPerCC-v1620 OPTIONAL + ]], + [[ + featureSetsUplink-v1630 SEQUENCE (SIZE (1..maxUplinkFeatureSets)) OF FeatureSetUplink-v1630 OPTIONAL ]] } @@ -9101,7 +9191,7 @@ FeatureSets ::= SEQUENCE { FeatureSetUplink ::= SEQUENCE { featureSetListPerUplinkCC SEQUENCE (SIZE (1.. maxNrofServingCells)) OF FeatureSetUplinkPerCC-Id, scalingFactor ENUMERATED {f0p4, f0p75, f0p8} OPTIONAL, - crossCarrierScheduling-OtherSCS ENUMERATED {supported} OPTIONAL, + dummy3 ENUMERATED {supported} OPTIONAL, intraBandFreqSeparationUL FreqSeparationClass OPTIONAL, searchSpaceSharingCA-UL ENUMERATED {supported} OPTIONAL, dummy1 DummyI OPTIONAL, @@ -9141,22 +9231,22 @@ FeatureSetUplink-v1610 ::= SEQUENCE { -- R1 11-7a: UL cancelation scheme for cross-carrier ul-CancellationCrossCarrier-r16 ENUMERATED {supported} OPTIONAL, -- R1 16-5c: The maximum number of SRS resources in one SRS resource set with usage set to 'codebook' for Mode 2 - ul-FullPwrMode2-MaxSRS-ResInSet ENUMERATED {n1, n2, n4} OPTIONAL, + ul-FullPwrMode2-MaxSRS-ResInSet-r16 ENUMERATED {n1, n2, n4} OPTIONAL, -- R1 22-4a/4b/4c/4d: CBG based transmission for UL with unicast PUSCH(s) per slot per CC with UE processing time Capability 1 - cbgPUSCH-ProcessingType1-DifferentTB-PerSlot SEQUENCE { - scs-15kHz ENUMERATED {one-pusch, upto2, upto4, upto7} OPTIONAL, - scs-30kHz ENUMERATED {one-pusch, upto2, upto4, upto7} OPTIONAL, - scs-60kHz ENUMERATED {one-pusch, upto2, upto4, upto7} OPTIONAL, - scs-120kHz ENUMERATED {one-pusch, upto2, upto4, upto7} OPTIONAL + cbgPUSCH-ProcessingType1-DifferentTB-PerSlot-r16 SEQUENCE { + scs-15kHz-r16 ENUMERATED {one-pusch, upto2, upto4, upto7} OPTIONAL, + scs-30kHz-r16 ENUMERATED {one-pusch, upto2, upto4, upto7} OPTIONAL, + scs-60kHz-r16 ENUMERATED {one-pusch, upto2, upto4, upto7} OPTIONAL, + scs-120kHz-r16 ENUMERATED {one-pusch, upto2, upto4, upto7} OPTIONAL } OPTIONAL, -- R1 22-3a/3b/3c/3d: CBG based transmission for UL with unicast PUSCH(s) per slot per CC with UE processing time Capability 2 - cbgPUSCH-ProcessingType2-DifferentTB-PerSlot SEQUENCE { - scs-15kHz ENUMERATED {one-pusch, upto2, upto4, upto7} OPTIONAL, - scs-30kHz ENUMERATED {one-pusch, upto2, upto4, upto7} OPTIONAL, - scs-60kHz ENUMERATED {one-pusch, upto2, upto4, upto7} OPTIONAL, - scs-120kHz ENUMERATED {one-pusch, upto2, upto4, upto7} OPTIONAL + cbgPUSCH-ProcessingType2-DifferentTB-PerSlot-r16 SEQUENCE { + scs-15kHz-r16 ENUMERATED {one-pusch, upto2, upto4, upto7} OPTIONAL, + scs-30kHz-r16 ENUMERATED {one-pusch, upto2, upto4, upto7} OPTIONAL, + scs-60kHz-r16 ENUMERATED {one-pusch, upto2, upto4, upto7} OPTIONAL, + scs-120kHz-r16 ENUMERATED {one-pusch, upto2, upto4, upto7} OPTIONAL } OPTIONAL, supportedSRS-PosResources-r16 SRS-AllPosResources-r16 OPTIONAL, intraFreqDAPS-UL-r16 SEQUENCE { @@ -9182,7 +9272,7 @@ FeatureSetUplink-v1610 ::= SEQUENCE { -- R1 11-3f: 2 PUCCH transmissions in the same subslot for a single 2*7-symbol HARQ-ACK codebooks which are not covered by 11-3d and -- 11-3e twoPUCCH-Type4-r16 ENUMERATED {supported} OPTIONAL, - -- R1 11-3g: SR/HARQ-ACK multiplexing at most once per subslot using a PUCCH (or HARQ-ACK piggybacked on a PUSCH) when SR/HARQ-ACK + -- R1 11-3g: SR/HARQ-ACK multiplexing once per subslot using a PUCCH (or HARQ-ACK piggybacked on a PUSCH) when SR/HARQ-ACK -- are supposed to be sent with different starting symbols in a subslot mux-SR-HARQ-ACK-r16 ENUMERATED {supported} OPTIONAL, -- R1 11-4: Two HARQ-ACK codebooks with up to one sub-slot based HARQ-ACK codebook (i.e. slot-based + slot-based, or slot-based + @@ -9237,6 +9327,25 @@ FeatureSetUplink-v1610 ::= SEQUENCE { } OPTIONAL } +FeatureSetUplink-v1630 ::= SEQUENCE { + -- R1 22-8: For SRS for CB PUSCH and antenna switching on FR1 with symbol level offset for aperiodic SRS transmission + offsetSRS-CB-PUSCH-Ant-Switch-fr1-r16 ENUMERATED {supported} OPTIONAL, + -- R1 22-8a: PDCCH monitoring on any span of up to 3 consecutive OFDM symbols of a slot and constrained timeline for SRS for CB + -- PUSCH and antenna switching on FR1 + offsetSRS-CB-PUSCH-PDCCH-MonitorSingleOcc-fr1-r16 ENUMERATED {supported} OPTIONAL, + -- R1 22-8b: For type 1 CSS with dedicated RRC configuration, type 3 CSS, and UE-SS, monitoring occasion can be any OFDM symbol(s) + -- of a slot for Case 2 and constrained timeline for SRS for CB PUSCH and antenna switching on FR1 + offsetSRS-CB-PUSCH-PDCCH-MonitorAnyOccWithoutGap-fr1-r16 ENUMERATED {supported} OPTIONAL, + -- R1 22-8c: For type 1 CSS with dedicated RRC configuration, type 3 CSS, and UE-SS, monitoring occasion can be any OFDM symbol(s) + -- of a slot for Case 2 with a DCI gap and constrained timeline for SRS for CB PUSCH and antenna switching on FR1 + offsetSRS-CB-PUSCH-PDCCH-MonitorAnyOccWithGap-fr1-r16 ENUMERATED {supported} OPTIONAL, + -- R1 22-8d: All PDCCH monitoring occasion can be any OFDM symbol(s) of a slot for Case 2 with a span gap and constrained timeline + -- for SRS for CB PUSCH and antenna switching on FR1 + offsetSRS-CB-PUSCH-PDCCH-MonitorAnyOccWithSpanGap-fr1-r16 ENUMERATED {supported} OPTIONAL, + -- R1 22-9: Cancellation of PUCCH, PUSCH or PRACH with a DCI scheduling a PDSCH or CSI-RS or a DCI format 2_0 for SFI + partialCancellationPUCCH-PUSCH-PRACH-TX-r16 ENUMERATED {supported} OPTIONAL +} + SRS-AllPosResources-r16 ::= SEQUENCE { srs-PosResources-r16 SRS-PosResources-r16, srs-PosResourceAP-r16 SRS-PosResourceAP-r16 OPTIONAL, @@ -9557,7 +9666,7 @@ MeasAndMobParametersCommon ::= SEQUENCE { maxNumberCLI-SRS-RSRP-r16 ENUMERATED {n4, n8, n16, n32} OPTIONAL, maxNumberPerSlotCLI-SRS-RSRP-r16 ENUMERATED {n2, n4, n8} OPTIONAL, mfbi-IAB-r16 ENUMERATED {supported} OPTIONAL, - multipleNS-And-Pmax-IAB-r16 ENUMERATED {supported} OPTIONAL, + dummy ENUMERATED {supported} OPTIONAL, nr-CGI-Reporting-NPN-r16 ENUMERATED {supported} OPTIONAL, idleInactiveEUTRA-MeasReport-r16 ENUMERATED {supported} OPTIONAL, idleInactive-ValidityArea-r16 ENUMERATED {supported} OPTIONAL, @@ -9618,6 +9727,9 @@ MeasAndMobParametersFRX-Diff ::= SEQUENCE { idleInactiveNR-MeasReport-r16 ENUMERATED {supported} OPTIONAL, -- R4 6-2: Support of beam level Early Measurement Reporting idleInactiveNR-MeasBeamReport-r16 ENUMERATED {supported} OPTIONAL + ]], + [[ + increasedNumberofCSIRSPerMO-r16 ENUMERATED {supported} OPTIONAL ]] } @@ -9804,7 +9916,7 @@ MIMO-ParametersPerBand ::= SEQUENCE { supportFDM-SchemeA-r16 ENUMERATED {supported} OPTIONAL, -- R1 16-2b-3a: Single-DCI based FDMSchemeB CW soft combining supportCodeWordSoftCombining-r16 ENUMERATED {supported} OPTIONAL, - -- R1 16-2b-4: Single-DCI based TDMSchemeA + -- R1 16-2b-4: Single-DCI based TDMSchemeA supportTDM-SchemeA-r16 ENUMERATED {kb3, kb5, kb10, kb20, noRestriction} OPTIONAL, -- R1 16-2b-5: Single-DCI based inter-slot TDM supportInter-slotTDM-r16 SEQUENCE { @@ -9834,9 +9946,16 @@ MIMO-ParametersPerBand ::= SEQUENCE { scs-60kHz-r16 ENUMERATED {sym224, sym336} OPTIONAL, scs-120kHz-r16 ENUMERATED {sym224, sym336} OPTIONAL } OPTIONAL + ]], + [[ + -- R1 16-1a-4: Semi-persistent L1-SINR report on PUCCH + semi-PersistentL1-SINR-Report-PUCCH-r16 SEQUENCE { + supportReportFormat1-2OFDM-syms-r16 ENUMERATED {supported} OPTIONAL, + supportReportFormat4-14OFDM-syms-r16 ENUMERATED {supported} OPTIONAL + } OPTIONAL, + -- R1 16-1a-5: Semi-persistent L1-SINR report on PUSCH + semi-PersistentL1-SINR-Report-PUSCH-r16 ENUMERATED {supported} OPTIONAL ]] - - } DummyG ::= SEQUENCE { @@ -9982,6 +10101,17 @@ MRDC-Parameters-v1620 ::= SEQUENCE { tdm-restrictionDualTX-FDD-endc-r16 ENUMERATED {supported} OPTIONAL } +MRDC-Parameters-v1630 ::= SEQUENCE { + -- R4 2-20 Maximum uplink duty cycle for FDD+TDD EN-DC power class 2 + maxUplinkDutyCycle-interBandENDC-FDD-TDD-PC2-r16 SEQUENCE { + maxUplinkDutyCycle-FDD-TDD-EN-DC1-r16 ENUMERATED {n30, n40, n50, n60, n70, n80, n90, n100} OPTIONAL, + maxUplinkDutyCycle-FDD-TDD-EN-DC2-r16 ENUMERATED {n30, n40, n50, n60, n70, n80, n90, n100} OPTIONAL + } OPTIONAL, + + -- R4 2-19 FDD-FDD or TDD-TDD inter-band MR-DC with overlapping or partially overlapping DL spectrum + interBandMRDC-WithOverlapDL-Bands-r16 ENUMERATED {supported} OPTIONAL +} + -- TAG-MRDC-PARAMETERS-STOP -- TAG-NRDC-PARAMETERS-START @@ -9992,7 +10122,7 @@ NRDC-Parameters ::= SEQUENCE { tdd-Add-UE-NRDC-Capabilities UE-MRDC-CapabilityAddXDD-Mode OPTIONAL, fr1-Add-UE-NRDC-Capabilities UE-MRDC-CapabilityAddFRX-Mode OPTIONAL, fr2-Add-UE-NRDC-Capabilities UE-MRDC-CapabilityAddFRX-Mode OPTIONAL, - lateNonCriticalExtension OCTET STRING OPTIONAL, + dummy2 OCTET STRING OPTIONAL, dummy SEQUENCE {} OPTIONAL } @@ -10000,6 +10130,11 @@ NRDC-Parameters-v1570 ::= SEQUENCE { sfn-SyncNRDC ENUMERATED {supported} OPTIONAL } +NRDC-Parameters-v15c0 ::= SEQUENCE { + pdcp-DuplicationSplitSRB ENUMERATED {supported} OPTIONAL, + pdcp-DuplicationSplitDRB ENUMERATED {supported} OPTIONAL +} + NRDC-Parameters-v1610 ::= SEQUENCE { measAndMobParametersNRDC-v1610 MeasAndMobParametersMRDC-v1610 OPTIONAL } @@ -10197,6 +10332,12 @@ Phy-ParametersCommon ::= SEQUENCE { type1-r16 ENUMERATED {us100, us200}, type2-r16 ENUMERATED {us200, us400, us800, us1000} } OPTIONAL + ]], + [[ + targetSMTC-SCG-r16 ENUMERATED {supported} OPTIONAL, + supportRepetitionZeroOffsetRV-r16 ENUMERATED {supported} OPTIONAL, + -- R1 11-12: in-order CBG-based re-transmission + cbg-TransInOrderPUSCH-UL-r16 ENUMERATED {supported} OPTIONAL ]] } @@ -10302,6 +10443,9 @@ Phy-ParametersFRX-Diff ::= SEQUENCE { } OPTIONAL, -- R1 16-7: Extension of the maximum number of configured aperiodic CSI report settings csi-ReportFrameworkExt-r16 CSI-ReportFrameworkExt-r16 OPTIONAL + ]], + [[ + twoTCI-Act-servingCellInCC-List-r16 ENUMERATED {supported} OPTIONAL ]] } @@ -10425,6 +10569,11 @@ RF-Parameters ::= SEQUENCE { supportedBandCombinationList-v1610 BandCombinationList-v1610 OPTIONAL, supportedBandCombinationListSidelinkEUTRA-NR-r16 BandCombinationListSidelinkEUTRA-NR-r16 OPTIONAL, supportedBandCombinationList-UplinkTxSwitch-r16 BandCombinationList-UplinkTxSwitch-r16 OPTIONAL + ]], + [[ + supportedBandCombinationList-v1630 BandCombinationList-v1630 OPTIONAL, + supportedBandCombinationListSidelinkEUTRA-NR-v1630 BandCombinationListSidelinkEUTRA-NR-v1630 OPTIONAL, + supportedBandCombinationList-UplinkTxSwitch-v1630 BandCombinationList-UplinkTxSwitch-v1630 OPTIONAL ]] } @@ -10570,7 +10719,15 @@ BandNR ::= SEQUENCE { simulSRS-TransWithinBand-r16 ENUMERATED {n2} OPTIONAL, trs-AdditionalBandwidth-r16 ENUMERATED {trs-AddBW-Set1, trs-AddBW-Set2} OPTIONAL, handoverIntraF-IAB-r16 ENUMERATED {supported} OPTIONAL + ]], + [[ + -- R1 22-5a: Simultaneous transmission of SRS for antenna switching and SRS for CB/NCB /BM for intra-band UL CA + -- R1 22-5c: Simultaneous transmission of SRS for antenna switching and SRS for antenna switching for intra-band UL CA + simulTX-SRS-AntSwitchingIntraBandUL-CA-r16 SimulSRS-ForAntennaSwitching-r16 OPTIONAL, + -- R1 10: NR-unlicensed + sharedSpectrumChAccessParamsPerBand-v1630 SharedSpectrumChAccessParamsPerBand-v1630 OPTIONAL ]] + } -- TAG-RF-PARAMETERS-STOP @@ -10613,6 +10770,11 @@ RF-ParametersMRDC ::= SEQUENCE { supportedBandCombinationList-v1610 BandCombinationList-v1610 OPTIONAL, supportedBandCombinationListNEDC-Only-v1610 BandCombinationList-v1610 OPTIONAL, supportedBandCombinationList-UplinkTxSwitch-r16 BandCombinationList-UplinkTxSwitch-r16 OPTIONAL + ]], + [[ + supportedBandCombinationList-v1630 BandCombinationList-v1630 OPTIONAL, + supportedBandCombinationListNEDC-Only-v1630 BandCombinationList-v1630 OPTIONAL, + supportedBandCombinationList-UplinkTxSwitch-v1630 BandCombinationList-UplinkTxSwitch-v1630 OPTIONAL ]] } @@ -10761,7 +10923,26 @@ BandSidelink-r16 ::= SEQUENCE { lowSE-64QAM-MCS-TableSidelink-r16 ENUMERATED {supported} OPTIONAL, --15-15 enb-sync-Sidelink-r16 ENUMERATED {supported} OPTIONAL, - ... + ..., + [[ + --15-3 + sl-TransmissionMode2-r16 SEQUENCE { + harq-TxProcessModeTwoSidelink-r16 ENUMERATED {n8, n16}, + scs-CP-PatternTxSidelinkModeTwo-r16 ENUMERATED {supported} OPTIONAL, + dl-openLoopPC-Sidelink-r16 ENUMERATED {supported} OPTIONAL + } OPTIONAL, + --15-5 + congestionControlSidelink-r16 SEQUENCE { + cbr-ReportSidelink-r16 ENUMERATED {supported} OPTIONAL, + cbr-CR-TimeLimitSidelink-r16 ENUMERATED {time1, time2} + } OPTIONAL, + --15-22 + fewerSymbolSlotSidelink-r16 ENUMERATED {supported} OPTIONAL, + --15-23 + sl-openLoopPC-RSRP-ReportSidelink-r16 ENUMERATED {supported} OPTIONAL, + --13-1 + sl-Rx-256QAM-r16 ENUMERATED {supported} OPTIONAL + ]] } -- TAG-SIDELINKPARAMETERS-STOP @@ -10957,11 +11138,11 @@ UE-NR-Capability ::= SEQUENCE { fr2-Add-UE-NR-Capabilities UE-NR-CapabilityAddFRX-Mode OPTIONAL, featureSets FeatureSets OPTIONAL, featureSetCombinations SEQUENCE (SIZE (1..maxFeatureSetCombinations)) OF FeatureSetCombination OPTIONAL, - - lateNonCriticalExtension OCTET STRING OPTIONAL, + lateNonCriticalExtension OCTET STRING (CONTAINING UE-NR-Capability-v15c0) OPTIONAL, nonCriticalExtension UE-NR-Capability-v1530 OPTIONAL } +-- Regular non-critical extensions: UE-NR-Capability-v1530 ::= SEQUENCE { fdd-Add-UE-NR-Capabilities-v1530 UE-NR-CapabilityAddXDD-Mode-v1530 OPTIONAL, tdd-Add-UE-NR-Capabilities-v1530 UE-NR-CapabilityAddXDD-Mode-v1530 OPTIONAL, @@ -10998,6 +11179,14 @@ UE-NR-Capability-v1570 ::= SEQUENCE { nonCriticalExtension UE-NR-Capability-v1610 OPTIONAL } +-- Late non-critical extensions: +UE-NR-Capability-v15c0 ::= SEQUENCE { + nrdc-Parameters-v15c0 NRDC-Parameters-v15c0 OPTIONAL, + partialFR2-FallbackRX-Req ENUMERATED {true} OPTIONAL, + nonCriticalExtension SEQUENCE {} OPTIONAL +} + +-- Regular non-critical extensions: UE-NR-Capability-v1610 ::= SEQUENCE { inDeviceCoexInd-r16 ENUMERATED {supported} OPTIONAL, dl-DedicatedMessageSegmentation-r16 ENUMERATED {supported} OPTIONAL, @@ -11073,7 +11262,7 @@ SharedSpectrumChAccessParamsPerBand-r16 ::= SEQUENCE { -- R1 10-2e: SIB1 reception on unlicensed cell sib1-Acquisition-r16 ENUMERATED {supported} OPTIONAL, -- R1 10-2f: Support monitoring of extended RAR window - extendedRAR-Window-r16 ENUMERATED {supported} OPTIONAL, + extRA-ResponseWindow-r16 ENUMERATED {supported} OPTIONAL, -- R1 10-2g: SSB-based BFD/CBD for dynamic channel access mode ssb-BFD-CBD-dynamicChannelAccess-r16 ENUMERATED {supported} OPTIONAL, -- R1 10-2h: SSB-based BFD/CBD for semi-static channel access mode @@ -11142,6 +11331,13 @@ SharedSpectrumChAccessParamsPerBand-r16 ::= SEQUENCE { cg-resourceConfig-r16 ENUMERATED {supported} OPTIONAL } +SharedSpectrumChAccessParamsPerBand-v1630 ::= SEQUENCE { + -- R4 4-1: DL reception in intra-carrier guardband + dl-ReceptionIntraCellGuardband-r16 ENUMERATED {supported} OPTIONAL, + -- R4 4-2: DL reception when gNB does not transmit on all RB sets of a carrier as a result of LBT + dl-ReceptionLBT-subsetRB-r16 ENUMERATED {supported} OPTIONAL +} + -- TAG-SHAREDSPECTRUMCHACCESSPARAMSPERBAND-STOP -- TAG-ABSOLUTETIMEINFO-START @@ -11275,7 +11471,7 @@ IAB-IP-AddressIndex-r16 ::= INTEGER (1..maxIAB-IP-Address-r16) -- TAG-IABIPADDRESSINDEX-STOP -- TAG-IAB-IP-USAGE-START -IAB-IP-Usage-r16 ::= ENUMERATED {f1-c, f1-U, non-F1, spare} +IAB-IP-Usage-r16 ::= ENUMERATED {f1-C, f1-U, non-F1, spare} -- TAG-IAB-IP-USAGE-STOP -- TAG-LOGGINGDURATION-START @@ -11950,7 +12146,7 @@ SL-ResourcePool-r16 ::= SEQUENCE { sl-PSFCH-Config-r16 CHOICE {release NULL, setup SL-PSFCH-Config-r16 } OPTIONAL, -- Need M sl-SyncAllowed-r16 SL-SyncAllowed-r16 OPTIONAL, -- Need M sl-SubchannelSize-r16 ENUMERATED {n10, n12, n15, n20, n25, n50, n75, n100} OPTIONAL, -- Need M - sl-TimeResource-r16 INTEGER (10..160) OPTIONAL, -- Need M + dummy INTEGER (10..160) OPTIONAL, -- Need M sl-StartRB-Subchannel-r16 INTEGER (0..265) OPTIONAL, -- Need M sl-NumSubchannel-r16 INTEGER (1..27) OPTIONAL, -- Need M sl-Additional-MCS-Table-r16 ENUMERATED {qam256, qam64LowSE, qam256-qam64LowSE } OPTIONAL, -- Need M @@ -11973,7 +12169,10 @@ SL-ResourcePool-r16 ::= SEQUENCE { sl-PowerControl-r16 SL-PowerControl-r16 OPTIONAL, -- Need M sl-TxPercentageList-r16 SL-TxPercentageList-r16 OPTIONAL, -- Need M sl-MinMaxMCS-List-r16 SL-MinMaxMCS-List-r16 OPTIONAL, -- Need M - ... + ..., + [[ + sl-TimeResource-r16 BIT STRING (SIZE (10..160)) OPTIONAL -- Need M + ]] } SL-ZoneConfigMCR-r16 ::= SEQUENCE { @@ -12119,15 +12318,17 @@ SL-ScheduledConfig-r16 ::= SEQUENCE { sl-CS-RNTI-r16 RNTI-Value OPTIONAL, -- Need M sl-PSFCH-ToPUCCH-r16 SEQUENCE (SIZE (1..8)) OF INTEGER (0..15) OPTIONAL, -- Need M sl-ConfiguredGrantConfigList-r16 SL-ConfiguredGrantConfigList-r16 OPTIONAL, -- Need M - ... + ..., + [[ + sl-DCI-ToSL-Trans-r16 SEQUENCE (SIZE (1..8)) OF INTEGER (1..32) OPTIONAL -- Need M + ]] } MAC-MainConfigSL-r16 ::= SEQUENCE { sl-BSR-Config-r16 BSR-Config OPTIONAL, -- Need M - ul-PrioritizationThres-r16 INTEGER (1..16) OPTIONAL, -- Cond SLThreshold - sl-PrioritizationThres-r16 INTEGER (1..8) OPTIONAL, -- Cond ULThreshold + ul-PrioritizationThres-r16 INTEGER (1..16) OPTIONAL, -- Need M + sl-PrioritizationThres-r16 INTEGER (1..8) OPTIONAL, -- Need M ... - } SL-ConfiguredGrantConfigList-r16 ::= SEQUENCE { @@ -12354,8 +12555,8 @@ maxNrofObjectId INTEGER ::= 64 -- Maximum number of maxNrofPageRec INTEGER ::= 32 -- Maximum number of page records maxNrofPCI-Ranges INTEGER ::= 8 -- Maximum number of PCI ranges maxPLMN INTEGER ::= 12 -- Maximum number of PLMNs broadcast and reported by UE at establisghment -maxNrofCSI-RS-ResourcesRRM INTEGER ::= 96 -- Maximum number of CSI-RS resources for an RRM measurement object -maxNrofCSI-RS-ResourcesRRM-1 INTEGER ::= 95 -- Maximum number of CSI-RS resources for an RRM measurement object minus 1 +maxNrofCSI-RS-ResourcesRRM INTEGER ::= 96 -- Maximum number of CSI-RS resources per cell for an RRM measurement object +maxNrofCSI-RS-ResourcesRRM-1 INTEGER ::= 95 -- Maximum number of CSI-RS resources per cell for an RRM measurement object minus 1 maxNrofMeasId INTEGER ::= 64 -- Maximum number of configured measurements maxNrofQuantityConfig INTEGER ::= 2 -- Maximum number of quantity configurations maxNrofCSI-RS-CellsRRM INTEGER ::= 96 -- Maximum number of cells with CSI-RS resources for an RRM measurement object @@ -12374,7 +12575,7 @@ maxNrofSRS-ResourceSets-1 INTEGER ::= 15 -- Maximum number of maxNrofSRS-PosResourceSets-r16 INTEGER ::= 16 -- Maximum number of SRS Positioning resource sets in a BWP. maxNrofSRS-PosResourceSets-1-r16 INTEGER ::= 15 -- Maximum number of SRS Positioning resource sets in a BWP minus 1. maxNrofSRS-Resources INTEGER ::= 64 -- Maximum number of SRS resources. -maxNrofSRS-Resources-1 INTEGER ::= 63 -- Maximum number of SRS resources in an SRS resource set minus 1. +maxNrofSRS-Resources-1 INTEGER ::= 63 -- Maximum number of SRS resources minus 1. maxNrofSRS-PosResources-r16 INTEGER ::= 64 -- Maximum number of SRS Positioning resources. maxNrofSRS-PosResources-1-r16 INTEGER ::= 63 -- Maximum number of SRS Positioning resources in an SRS Positioning -- resource set minus 1. diff --git a/epan/dissectors/asn1/nr-rrc/NR-Sidelink-Preconf.asn b/epan/dissectors/asn1/nr-rrc/NR-Sidelink-Preconf.asn index 2b4d625d8c..13acef1944 100644 --- a/epan/dissectors/asn1/nr-rrc/NR-Sidelink-Preconf.asn +++ b/epan/dissectors/asn1/nr-rrc/NR-Sidelink-Preconf.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.331 V16.2.0 (2020-09) +-- 3GPP TS 38.331 V16.3.0 (2020-12) NR-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::= diff --git a/epan/dissectors/asn1/nr-rrc/NR-UE-Variables.asn b/epan/dissectors/asn1/nr-rrc/NR-UE-Variables.asn index 8df3f04077..1356bf8f03 100644 --- a/epan/dissectors/asn1/nr-rrc/NR-UE-Variables.asn +++ b/epan/dissectors/asn1/nr-rrc/NR-UE-Variables.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.331 V16.2.0 (2020-09) +-- 3GPP TS 38.331 V16.3.0 (2020-12) NR-UE-Variables DEFINITIONS AUTOMATIC TAGS ::= @@ -92,7 +92,7 @@ VarLogMeasConfig-r16-IEs ::= SEQUENCE { } } -- TAG-VARLOGMEASCONFIG-STOP --- TAG-VARLOGMEAREPORT-START +-- TAG-VARLOGMEASREPORT-START VarLogMeasReport-r16 ::= SEQUENCE { absoluteTimeInfo-r16 AbsoluteTimeInfo-r16, @@ -103,7 +103,7 @@ VarLogMeasReport-r16 ::= SEQUENCE { plmn-IdentityList-r16 PLMN-IdentityList2-r16 } --- TAG-VARLOGMEAREPORT-STOP +-- TAG-VARLOGMEASREPORT-STOP -- TAG-VARMEASCONFIG-START VarMeasConfig ::= SEQUENCE { diff --git a/epan/dissectors/asn1/nr-rrc/PC5-RRC-Definitions.asn b/epan/dissectors/asn1/nr-rrc/PC5-RRC-Definitions.asn index 03fd46a5e6..ed43638e21 100644 --- a/epan/dissectors/asn1/nr-rrc/PC5-RRC-Definitions.asn +++ b/epan/dissectors/asn1/nr-rrc/PC5-RRC-Definitions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.331 V16.2.0 (2020-09) +-- 3GPP TS 38.331 V16.3.0 (2020-12) PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::= @@ -21,7 +21,8 @@ IMPORTS maxSimultaneousBands, maxBandComb, maxBands, - BandParametersSidelink-r16 + BandParametersSidelink-r16, + RLC-ParametersSidelink-r16 FROM NR-RRC-Definitions; @@ -244,11 +245,9 @@ UECapabilityInformationSidelink ::= SEQUENCE { UECapabilityInformationSidelink-IEs-r16 ::= SEQUENCE { accessStratumReleaseSidelink-r16 AccessStratumReleaseSidelink-r16, pdcp-ParametersSidelink-r16 PDCP-ParametersSidelink-r16 OPTIONAL, --- WS modification: rename to avoid conflict with NR-RRC-Definitions.asn - rlc-ParametersSidelink-r16 PC5-RLC-ParametersSidelink-r16 OPTIONAL, + rlc-ParametersSidelink-r16 RLC-ParametersSidelink-r16 OPTIONAL, supportedBandCombinationListSidelinkNR-r16 BandCombinationListSidelinkNR-r16 OPTIONAL, --- WS modification: rename to avoid conflict with NR-RRC-Definitions.asn - supportedBandListSidelink-r16 SEQUENCE (SIZE (1..maxBands)) OF PC5-BandSidelink-r16 OPTIONAL, + supportedBandListSidelink-r16 SEQUENCE (SIZE (1..maxBands)) OF BandSidelinkPC5-r16 OPTIONAL, appliedFreqBandListFilter-r16 FreqBandList OPTIONAL, lateNonCriticalExtension OCTET STRING OPTIONAL, nonCriticalExtension SEQUENCE{} OPTIONAL @@ -261,19 +260,11 @@ PDCP-ParametersSidelink-r16 ::= SEQUENCE { ... } --- WS modification: rename to avoid conflict with NR-RRC-Definitions.asn -PC5-RLC-ParametersSidelink-r16 ::= SEQUENCE { - am-WithLongSN-Sidelink-r16 ENUMERATED {supported} OPTIONAL, - um-WithLongSN-Sidelink-r16 ENUMERATED {supported} OPTIONAL, - ... -} - BandCombinationListSidelinkNR-r16 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombinationParametersSidelinkNR-r16 BandCombinationParametersSidelinkNR-r16 ::= SEQUENCE (SIZE (1..maxSimultaneousBands)) OF BandParametersSidelink-r16 --- WS modification: rename to avoid conflict with NR-RRC-Definitions.asn -PC5-BandSidelink-r16 ::= SEQUENCE { +BandSidelinkPC5-r16 ::= SEQUENCE { freqBandSidelink-r16 FreqBandIndicatorNR, --15-1 sl-Reception-r16 SEQUENCE { @@ -296,7 +287,19 @@ PC5-BandSidelink-r16 ::= SEQUENCE { sl-Tx-256QAM-r16 ENUMERATED {supported} OPTIONAL, --15-12 lowSE-64QAM-MCS-TableSidelink-r16 ENUMERATED {supported} OPTIONAL, - ... + ..., + [[ + --15-14 + csi-ReportSidelink-r16 SEQUENCE { + csi-RS-PortsSidelink-r16 ENUMERATED {p1, p2} + } OPTIONAL, + --15-19 + rankTwoReception-r16 ENUMERATED {supported} OPTIONAL, + --15-23 + sl-openLoopPC-RSRP-ReportSidelink-r16 ENUMERATED {supported} OPTIONAL, + --13-1 + sl-Rx-256QAM-r16 ENUMERATED {supported} OPTIONAL + ]] } -- TAG-UECAPABILITYINFORMATIONSIDELINK-STOP diff --git a/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf b/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf index 957005ee46..ee390b5c3e 100644 --- a/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf +++ b/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf @@ -1,6 +1,6 @@ # nr-rrc.cnf # nr-rrc conformation file -# Copyright 2018-2020 Pascal Quantin +# Copyright 2018-2021 Pascal Quantin #.OPT PER @@ -1751,6 +1751,23 @@ CA-ParametersEUTRA-v1570/dl-1024QAM-TotalWeightedLayers DISPLAY=BASE_CUSTOM STRI p_security_algorithms = &(nr_rrc_get_private_data(actx)->pdcp_security); p_security_algorithms->integrity = (enum nr_security_integrity_algorithm_e)value; +#.FN_BODY SIB13-r16/sl-V2X-ConfigCommon-r16 VAL_PTR = &sl_v2x_configcommon_tvb + tvbuff_t *sl_v2x_configcommon_tvb = NULL; +%(DEFAULT_BODY)s + if (sl_v2x_configcommon_tvb) { + proto_tree *subtree; + subtree = proto_item_add_subtree(actx->created_item, ett_nr_sl_V2X_ConfigCommon_r16); + dissect_lte_rrc_SystemInformationBlockType21_r14_PDU(sl_v2x_configcommon_tvb, actx->pinfo, subtree, NULL); + } + +#.FN_BODY SIB13-r16/tdd-Config-r16 VAL_PTR = &tdd_config_tvb + tvbuff_t *tdd_config_tvb = NULL; +%(DEFAULT_BODY)s + if (tdd_config_tvb) { + proto_tree *subtree; + subtree = proto_item_add_subtree(actx->created_item, ett_nr_tdd_Config_r16); + dissect_lte_rrc_TDD_Config_PDU(tdd_config_tvb, actx->pinfo, subtree, NULL); + } #.FN_HDR SBCCH-SL-BCH-Message proto_item *ti; diff --git a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c index cdb855492d..17030b8aeb 100644 --- a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c +++ b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c @@ -1,8 +1,8 @@ /* packet-nr-rrc-template.c * NR; * Radio Resource Control (RRC) protocol specification - * (3GPP TS 38.331 V16.2.0 Release 16) packet dissection - * Copyright 2018-2020, Pascal Quantin + * (3GPP TS 38.331 V16.3.0 Release 16) packet dissection + * Copyright 2018-2021, Pascal Quantin * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -149,6 +149,8 @@ static gint ett_nr_rrc_sl_ParametersEUTRA2_r16 = -1; static gint ett_nr_rrc_sl_ParametersEUTRA3_r16 = -1; static gint ett_nr_rrc_absTimeInfo = -1; static gint ett_nr_rrc_assistanceDataSIB_Element_r16 = -1; +static gint ett_nr_sl_V2X_ConfigCommon_r16 = -1; +static gint ett_nr_tdd_Config_r16 = -1; static expert_field ei_nr_rrc_number_pages_le15 = EI_INIT; @@ -732,7 +734,9 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_sl_ParametersEUTRA2_r16, &ett_nr_rrc_sl_ParametersEUTRA3_r16, &ett_nr_rrc_absTimeInfo, - &ett_nr_rrc_assistanceDataSIB_Element_r16 + &ett_nr_rrc_assistanceDataSIB_Element_r16, + &ett_nr_sl_V2X_ConfigCommon_r16, + &ett_nr_tdd_Config_r16 }; static ei_register_info ei[] = { diff --git a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.h b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.h index 0a9eaf7207..fa5e1200a4 100644 --- a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.h +++ b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.h @@ -1,5 +1,5 @@ /* packet-nr-rrc-template.h - * Copyright 2018-2019, Pascal Quantin + * Copyright 2018-2021, Pascal Quantin * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index 53883a0349..81760687e3 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -349,6 +349,8 @@ static int hf_lte_rrc_lte_rrc_UECapabilityEnquiry_PDU = -1; /* UECapabilityEnqu static int hf_lte_rrc_UECapabilityInformation_PDU = -1; /* UECapabilityInformation */ static int hf_lte_rrc_lte_rrc_RLF_Report_r9_PDU = -1; /* RLF_Report_r9 */ static int hf_lte_rrc_lte_rrc_RLF_Report_v9e0_PDU = -1; /* RLF_Report_v9e0 */ +static int hf_lte_rrc_lte_rrc_SystemInformationBlockType21_r14_PDU = -1; /* SystemInformationBlockType21_r14 */ +static int hf_lte_rrc_lte_rrc_TDD_Config_PDU = -1; /* TDD_Config */ static int hf_lte_rrc_lte_rrc_ThresholdListNR_r15_PDU = -1; /* ThresholdListNR_r15 */ static int hf_lte_rrc_lte_rrc_CellsToAddModListNR_r15_PDU = -1; /* CellsToAddModListNR_r15 */ static int hf_lte_rrc_lte_rrc_MeasResultSCG_FailureMRDC_r15_PDU = -1; /* MeasResultSCG_FailureMRDC_r15 */ @@ -127043,6 +127045,26 @@ int dissect_lte_rrc_RLF_Report_v9e0_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U offset += 7; offset >>= 3; return offset; } +int dissect_lte_rrc_SystemInformationBlockType21_r14_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); + proto_item_set_hidden(prot_ti); + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); + offset = dissect_lte_rrc_SystemInformationBlockType21_r14(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_SystemInformationBlockType21_r14_PDU); + offset += 7; offset >>= 3; + return offset; +} +int dissect_lte_rrc_TDD_Config_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); + proto_item_set_hidden(prot_ti); + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); + offset = dissect_lte_rrc_TDD_Config(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_TDD_Config_PDU); + offset += 7; offset >>= 3; + return offset; +} int dissect_lte_rrc_ThresholdListNR_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); proto_item_set_hidden(prot_ti); @@ -128196,6 +128218,14 @@ void proto_register_lte_rrc(void) { { "RLF-Report-v9e0", "lte-rrc.RLF_Report_v9e0_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_lte_rrc_lte_rrc_SystemInformationBlockType21_r14_PDU, + { "SystemInformationBlockType21-r14", "lte-rrc.SystemInformationBlockType21_r14_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_lte_rrc_lte_rrc_TDD_Config_PDU, + { "TDD-Config", "lte-rrc.TDD_Config_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_lte_rrc_lte_rrc_ThresholdListNR_r15_PDU, { "ThresholdListNR-r15", "lte-rrc.ThresholdListNR_r15_element", FT_NONE, BASE_NONE, NULL, 0, diff --git a/epan/dissectors/packet-lte-rrc.h b/epan/dissectors/packet-lte-rrc.h index 78c24fabb3..11404d00a1 100644 --- a/epan/dissectors/packet-lte-rrc.h +++ b/epan/dissectors/packet-lte-rrc.h @@ -40,6 +40,8 @@ int dissect_lte_rrc_UEAssistanceInformation_r11_PDU(tvbuff_t *tvb _U_, packet_in int dissect_lte_rrc_UECapabilityEnquiry_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_lte_rrc_RLF_Report_r9_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_lte_rrc_RLF_Report_v9e0_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); +int dissect_lte_rrc_SystemInformationBlockType21_r14_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); +int dissect_lte_rrc_TDD_Config_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_lte_rrc_ThresholdListNR_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_lte_rrc_CellsToAddModListNR_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_lte_rrc_MeasResultSCG_FailureMRDC_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); diff --git a/epan/dissectors/packet-nr-rrc.c b/epan/dissectors/packet-nr-rrc.c index f8b78c896b..4331088c9f 100644 --- a/epan/dissectors/packet-nr-rrc.c +++ b/epan/dissectors/packet-nr-rrc.c @@ -9,8 +9,8 @@ /* packet-nr-rrc-template.c * NR; * Radio Resource Control (RRC) protocol specification - * (3GPP TS 38.331 V16.2.0 Release 16) packet dissection - * Copyright 2018-2020, Pascal Quantin + * (3GPP TS 38.331 V16.3.0 Release 16) packet dissection + * Copyright 2018-2021, Pascal Quantin * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -445,6 +445,7 @@ static int hf_nr_rrc_OverheatingAssistance_PDU = -1; /* OverheatingAssistance * static int hf_nr_rrc_SystemInformation_PDU = -1; /* SystemInformation */ static int hf_nr_rrc_PosSystemInformation_r16_IEs_PDU = -1; /* PosSystemInformation_r16_IEs */ static int hf_nr_rrc_UECapabilityEnquiry_v1560_IEs_PDU = -1; /* UECapabilityEnquiry_v1560_IEs */ +static int hf_nr_rrc_UE_NR_Capability_v15c0_PDU = -1; /* UE_NR_Capability_v15c0 */ static int hf_nr_rrc_criticalExtensions = -1; /* T_criticalExtensions */ static int hf_nr_rrc_c1 = -1; /* T_c1 */ static int hf_nr_rrc_handoverCommand = -1; /* HandoverCommand_IEs */ @@ -533,7 +534,9 @@ static int hf_nr_rrc_nonCriticalExtension_05 = -1; /* CG_Config_v1610_IEs */ static int hf_nr_rrc_drx_InfoSCG2 = -1; /* DRX_Info2 */ static int hf_nr_rrc_nonCriticalExtension_06 = -1; /* CG_Config_v1620_IEs */ static int hf_nr_rrc_ueAssistanceInformationSCG_r16_01 = -1; /* T_ueAssistanceInformationSCG_r16_01 */ -static int hf_nr_rrc_nonCriticalExtension_07 = -1; /* T_nonCriticalExtension_02 */ +static int hf_nr_rrc_nonCriticalExtension_07 = -1; /* CG_Config_v1630_IEs */ +static int hf_nr_rrc_selectedToffset_r16 = -1; /* T_Offset_r16 */ +static int hf_nr_rrc_nonCriticalExtension_08 = -1; /* T_nonCriticalExtension_02 */ static int hf_nr_rrc_PH_TypeListSCG_item = -1; /* PH_InfoSCG */ static int hf_nr_rrc_servCellIndex = -1; /* ServCellIndex */ static int hf_nr_rrc_ph_Uplink = -1; /* PH_UplinkCarrierSCG */ @@ -573,11 +576,11 @@ static int hf_nr_rrc_sourceConfigSCG = -1; /* T_sourceConfigSCG */ static int hf_nr_rrc_scg_RB_Config_01 = -1; /* T_scg_RB_Config_01 */ static int hf_nr_rrc_mcg_RB_Config = -1; /* T_mcg_RB_Config */ static int hf_nr_rrc_mrdc_AssistanceInfo = -1; /* MRDC_AssistanceInfo */ -static int hf_nr_rrc_nonCriticalExtension_08 = -1; /* CG_ConfigInfo_v1540_IEs */ +static int hf_nr_rrc_nonCriticalExtension_09 = -1; /* CG_ConfigInfo_v1540_IEs */ static int hf_nr_rrc_ph_InfoMCG = -1; /* PH_TypeListMCG */ static int hf_nr_rrc_measResultReportCGI = -1; /* T_measResultReportCGI */ static int hf_nr_rrc_cgi_Info = -1; /* CGI_InfoNR */ -static int hf_nr_rrc_nonCriticalExtension_09 = -1; /* CG_ConfigInfo_v1560_IEs */ +static int hf_nr_rrc_nonCriticalExtension_10 = -1; /* CG_ConfigInfo_v1560_IEs */ static int hf_nr_rrc_candidateCellInfoListMN_EUTRA = -1; /* T_candidateCellInfoListMN_EUTRA */ static int hf_nr_rrc_candidateCellInfoListSN_EUTRA_02 = -1; /* T_candidateCellInfoListSN_EUTRA_01 */ static int hf_nr_rrc_sourceConfigSCG_EUTRA = -1; /* T_sourceConfigSCG_EUTRA */ @@ -589,13 +592,13 @@ static int hf_nr_rrc_measResultReportCGI_EUTRA = -1; /* T_measResultReportCGI_E static int hf_nr_rrc_cgi_InfoEUTRA = -1; /* CGI_InfoEUTRA */ static int hf_nr_rrc_measResultCellListSFTD_EUTRA = -1; /* MeasResultCellListSFTD_EUTRA */ static int hf_nr_rrc_fr_InfoListMCG = -1; /* FR_InfoList */ -static int hf_nr_rrc_nonCriticalExtension_10 = -1; /* CG_ConfigInfo_v1570_IEs */ +static int hf_nr_rrc_nonCriticalExtension_11 = -1; /* CG_ConfigInfo_v1570_IEs */ static int hf_nr_rrc_sftdFrequencyList_NR = -1; /* SFTD_FrequencyList_NR */ static int hf_nr_rrc_sftdFrequencyList_EUTRA = -1; /* SFTD_FrequencyList_EUTRA */ -static int hf_nr_rrc_nonCriticalExtension_11 = -1; /* CG_ConfigInfo_v1590_IEs */ +static int hf_nr_rrc_nonCriticalExtension_12 = -1; /* CG_ConfigInfo_v1590_IEs */ static int hf_nr_rrc_servFrequenciesMN_NR = -1; /* SEQUENCE_SIZE_1_maxNrofServingCells_1_OF_ARFCN_ValueNR */ static int hf_nr_rrc_servFrequenciesMN_NR_item = -1; /* ARFCN_ValueNR */ -static int hf_nr_rrc_nonCriticalExtension_12 = -1; /* CG_ConfigInfo_v1610_IEs */ +static int hf_nr_rrc_nonCriticalExtension_13 = -1; /* CG_ConfigInfo_v1610_IEs */ static int hf_nr_rrc_drx_InfoMCG2 = -1; /* DRX_Info2 */ static int hf_nr_rrc_alignedDRX_Indication = -1; /* T_alignedDRX_Indication */ static int hf_nr_rrc_scgFailureInfo_r16 = -1; /* T_scgFailureInfo_r16 */ @@ -606,9 +609,9 @@ static int hf_nr_rrc_failureTypeEUTRA_r16 = -1; /* T_failureTypeEUTRA_r16 */ static int hf_nr_rrc_measResultSCG_EUTRA_r16 = -1; /* T_measResultSCG_EUTRA_r16 */ static int hf_nr_rrc_sidelinkUEInformationNR_r16_01 = -1; /* T_sidelinkUEInformationNR_r16_01 */ static int hf_nr_rrc_sidelinkUEInformationEUTRA_r16_01 = -1; /* OCTET_STRING */ -static int hf_nr_rrc_nonCriticalExtension_13 = -1; /* CG_ConfigInfo_v1620_IEs */ +static int hf_nr_rrc_nonCriticalExtension_14 = -1; /* CG_ConfigInfo_v1620_IEs */ static int hf_nr_rrc_ueAssistanceInformationSourceSCG_r16 = -1; /* T_ueAssistanceInformationSourceSCG_r16 */ -static int hf_nr_rrc_nonCriticalExtension_14 = -1; /* T_nonCriticalExtension_03 */ +static int hf_nr_rrc_nonCriticalExtension_15 = -1; /* T_nonCriticalExtension_03 */ static int hf_nr_rrc_SFTD_FrequencyList_NR_item = -1; /* ARFCN_ValueNR */ static int hf_nr_rrc_SFTD_FrequencyList_EUTRA_item = -1; /* ARFCN_ValueEUTRA */ static int hf_nr_rrc_allowedBC_ListMRDC = -1; /* BandCombinationInfoList */ @@ -702,15 +705,15 @@ static int hf_nr_rrc_c1_04 = -1; /* T_c1_04 */ static int hf_nr_rrc_measTimingConf = -1; /* MeasurementTimingConfiguration_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_04 = -1; /* T_criticalExtensionsFuture_04 */ static int hf_nr_rrc_measTiming = -1; /* MeasTimingList */ -static int hf_nr_rrc_nonCriticalExtension_15 = -1; /* MeasurementTimingConfiguration_v1550_IEs */ +static int hf_nr_rrc_nonCriticalExtension_16 = -1; /* MeasurementTimingConfiguration_v1550_IEs */ static int hf_nr_rrc_campOnFirstSSB = -1; /* BOOLEAN */ static int hf_nr_rrc_psCellOnlyOnFirstSSB = -1; /* BOOLEAN */ -static int hf_nr_rrc_nonCriticalExtension_16 = -1; /* MeasurementTimingConfiguration_v1610_IEs */ +static int hf_nr_rrc_nonCriticalExtension_17 = -1; /* MeasurementTimingConfiguration_v1610_IEs */ static int hf_nr_rrc_csi_RS_Config_r16 = -1; /* T_csi_RS_Config_r16 */ static int hf_nr_rrc_csi_RS_SubcarrierSpacing_r16 = -1; /* SubcarrierSpacing */ static int hf_nr_rrc_csi_RS_CellMobility_r16 = -1; /* CSI_RS_CellMobility */ static int hf_nr_rrc_refSSBFreq_r16 = -1; /* ARFCN_ValueNR */ -static int hf_nr_rrc_nonCriticalExtension_17 = -1; /* T_nonCriticalExtension_04 */ +static int hf_nr_rrc_nonCriticalExtension_18 = -1; /* T_nonCriticalExtension_04 */ static int hf_nr_rrc_MeasTimingList_item = -1; /* MeasTiming */ static int hf_nr_rrc_frequencyAndTiming = -1; /* T_frequencyAndTiming */ static int hf_nr_rrc_carrierFreq = -1; /* ARFCN_ValueNR */ @@ -729,13 +732,13 @@ static int hf_nr_rrc_spare4 = -1; /* NULL */ static int hf_nr_rrc_criticalExtensionsFuture_05 = -1; /* T_criticalExtensionsFuture_05 */ static int hf_nr_rrc_supportedBandListNRForPaging = -1; /* SEQUENCE_SIZE_1_maxBands_OF_FreqBandIndicatorNR */ static int hf_nr_rrc_supportedBandListNRForPaging_item = -1; /* FreqBandIndicatorNR */ -static int hf_nr_rrc_nonCriticalExtension_18 = -1; /* T_nonCriticalExtension_05 */ +static int hf_nr_rrc_nonCriticalExtension_19 = -1; /* T_nonCriticalExtension_05 */ static int hf_nr_rrc_criticalExtensions_06 = -1; /* T_criticalExtensions_06 */ static int hf_nr_rrc_c1_06 = -1; /* T_c1_06 */ static int hf_nr_rrc_ueRadioAccessCapabilityInformation = -1; /* UERadioAccessCapabilityInformation_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_06 = -1; /* T_criticalExtensionsFuture_06 */ static int hf_nr_rrc_ue_RadioAccessCapabilityInfo = -1; /* T_ue_RadioAccessCapabilityInfo */ -static int hf_nr_rrc_nonCriticalExtension_19 = -1; /* T_nonCriticalExtension_06 */ +static int hf_nr_rrc_nonCriticalExtension_20 = -1; /* T_nonCriticalExtension_06 */ static int hf_nr_rrc_message = -1; /* BCCH_BCH_MessageType */ static int hf_nr_rrc_mib = -1; /* MIB */ static int hf_nr_rrc_messageClassExtension = -1; /* T_messageClassExtension */ @@ -816,7 +819,7 @@ static int hf_nr_rrc_counterCheck_01 = -1; /* CounterCheck_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_07 = -1; /* T_criticalExtensionsFuture_07 */ static int hf_nr_rrc_drb_CountMSB_InfoList = -1; /* DRB_CountMSB_InfoList */ static int hf_nr_rrc_lateNonCriticalExtension = -1; /* OCTET_STRING */ -static int hf_nr_rrc_nonCriticalExtension_20 = -1; /* T_nonCriticalExtension_07 */ +static int hf_nr_rrc_nonCriticalExtension_21 = -1; /* T_nonCriticalExtension_07 */ static int hf_nr_rrc_DRB_CountMSB_InfoList_item = -1; /* DRB_CountMSB_Info */ static int hf_nr_rrc_drb_Identity = -1; /* DRB_Identity */ static int hf_nr_rrc_countMSB_Uplink = -1; /* INTEGER_0_33554431 */ @@ -825,7 +828,7 @@ static int hf_nr_rrc_criticalExtensions_08 = -1; /* T_criticalExtensions_08 */ static int hf_nr_rrc_counterCheckResponse_01 = -1; /* CounterCheckResponse_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_08 = -1; /* T_criticalExtensionsFuture_08 */ static int hf_nr_rrc_drb_CountInfoList = -1; /* DRB_CountInfoList */ -static int hf_nr_rrc_nonCriticalExtension_21 = -1; /* T_nonCriticalExtension_08 */ +static int hf_nr_rrc_nonCriticalExtension_22 = -1; /* T_nonCriticalExtension_08 */ static int hf_nr_rrc_DRB_CountInfoList_item = -1; /* DRB_CountInfo */ static int hf_nr_rrc_count_Uplink = -1; /* INTEGER_0_4294967295 */ static int hf_nr_rrc_count_Downlink = -1; /* INTEGER_0_4294967295 */ @@ -837,7 +840,7 @@ static int hf_nr_rrc_requestedSIB_List_r16 = -1; /* SEQUENCE_SIZE_1_maxOnDemand static int hf_nr_rrc_requestedSIB_List_r16_item = -1; /* SIB_ReqInfo_r16 */ static int hf_nr_rrc_requestedPosSIB_List_r16 = -1; /* SEQUENCE_SIZE_1_maxOnDemandPosSIB_r16_OF_PosSIB_ReqInfo_r16 */ static int hf_nr_rrc_requestedPosSIB_List_r16_item = -1; /* PosSIB_ReqInfo_r16 */ -static int hf_nr_rrc_nonCriticalExtension_22 = -1; /* T_nonCriticalExtension_09 */ +static int hf_nr_rrc_nonCriticalExtension_23 = -1; /* T_nonCriticalExtension_09 */ static int hf_nr_rrc_gnss_id_r16 = -1; /* GNSS_ID_r16 */ static int hf_nr_rrc_sbas_id_r16 = -1; /* SBAS_ID_r16 */ static int hf_nr_rrc_posSibType_r16 = -1; /* T_posSibType_r16 */ @@ -847,31 +850,31 @@ static int hf_nr_rrc_criticalExtensionsFuture_10 = -1; /* T_criticalExtensionsF static int hf_nr_rrc_segmentNumber_r16 = -1; /* INTEGER_0_4 */ static int hf_nr_rrc_rrc_MessageSegmentContainer_r16 = -1; /* OCTET_STRING */ static int hf_nr_rrc_rrc_MessageSegmentType_r16 = -1; /* T_rrc_MessageSegmentType_r16 */ -static int hf_nr_rrc_nonCriticalExtension_23 = -1; /* T_nonCriticalExtension_10 */ +static int hf_nr_rrc_nonCriticalExtension_24 = -1; /* T_nonCriticalExtension_10 */ static int hf_nr_rrc_criticalExtensions_11 = -1; /* T_criticalExtensions_11 */ static int hf_nr_rrc_dlInformationTransfer_01 = -1; /* DLInformationTransfer_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_11 = -1; /* T_criticalExtensionsFuture_11 */ static int hf_nr_rrc_dedicatedNAS_Message = -1; /* DedicatedNAS_Message */ -static int hf_nr_rrc_nonCriticalExtension_24 = -1; /* DLInformationTransfer_v1610_IEs */ +static int hf_nr_rrc_nonCriticalExtension_25 = -1; /* DLInformationTransfer_v1610_IEs */ static int hf_nr_rrc_referenceTimeInfo_r16 = -1; /* ReferenceTimeInfo_r16 */ -static int hf_nr_rrc_nonCriticalExtension_25 = -1; /* T_nonCriticalExtension_11 */ +static int hf_nr_rrc_nonCriticalExtension_26 = -1; /* T_nonCriticalExtension_11 */ static int hf_nr_rrc_criticalExtensions_12 = -1; /* T_criticalExtensions_12 */ static int hf_nr_rrc_c1_14 = -1; /* T_c1_14 */ static int hf_nr_rrc_dlInformationTransferMRDC_r16_01 = -1; /* DLInformationTransferMRDC_r16_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_12 = -1; /* T_criticalExtensionsFuture_12 */ static int hf_nr_rrc_dl_DCCH_MessageNR_r16 = -1; /* T_dl_DCCH_MessageNR_r16 */ static int hf_nr_rrc_dl_DCCH_MessageEUTRA_r16 = -1; /* T_dl_DCCH_MessageEUTRA_r16 */ -static int hf_nr_rrc_nonCriticalExtension_26 = -1; /* T_nonCriticalExtension_12 */ +static int hf_nr_rrc_nonCriticalExtension_27 = -1; /* T_nonCriticalExtension_12 */ static int hf_nr_rrc_criticalExtensions_13 = -1; /* T_criticalExtensions_13 */ static int hf_nr_rrc_failureInformation_01 = -1; /* FailureInformation_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_13 = -1; /* T_criticalExtensionsFuture_13 */ static int hf_nr_rrc_failureInfoRLC_Bearer = -1; /* FailureInfoRLC_Bearer */ -static int hf_nr_rrc_nonCriticalExtension_27 = -1; /* FailureInformation_v1610_IEs */ +static int hf_nr_rrc_nonCriticalExtension_28 = -1; /* FailureInformation_v1610_IEs */ static int hf_nr_rrc_cellGroupId = -1; /* CellGroupId */ static int hf_nr_rrc_logicalChannelIdentity = -1; /* LogicalChannelIdentity */ static int hf_nr_rrc_failureType_01 = -1; /* T_failureType_01 */ static int hf_nr_rrc_failureInfoDAPS_r16 = -1; /* FailureInfoDAPS_r16 */ -static int hf_nr_rrc_nonCriticalExtension_28 = -1; /* T_nonCriticalExtension_13 */ +static int hf_nr_rrc_nonCriticalExtension_29 = -1; /* T_nonCriticalExtension_13 */ static int hf_nr_rrc_failureType_r16_01 = -1; /* T_failureType_r16_01 */ static int hf_nr_rrc_criticalExtensions_14 = -1; /* T_criticalExtensions_14 */ static int hf_nr_rrc_iabOtherInformation_r16_01 = -1; /* IABOtherInformation_r16_IEs */ @@ -887,7 +890,7 @@ static int hf_nr_rrc_iab_IPv4_AddressReport_r16 = -1; /* IAB_IP_AddressAndTraff static int hf_nr_rrc_iab_IPv6_Report_r16 = -1; /* T_iab_IPv6_Report_r16 */ static int hf_nr_rrc_iab_IPv6_AddressReport_r16 = -1; /* IAB_IP_AddressAndTraffic_r16 */ static int hf_nr_rrc_iab_IPv6_PrefixReport_r16 = -1; /* IAB_IP_PrefixAndTraffic_r16 */ -static int hf_nr_rrc_nonCriticalExtension_29 = -1; /* T_nonCriticalExtension_14 */ +static int hf_nr_rrc_nonCriticalExtension_30 = -1; /* T_nonCriticalExtension_14 */ static int hf_nr_rrc_all_Traffic_NumReq_r16 = -1; /* INTEGER_1_8 */ static int hf_nr_rrc_f1_C_Traffic_NumReq_r16 = -1; /* INTEGER_1_8 */ static int hf_nr_rrc_f1_U_Traffic_NumReq_r16 = -1; /* INTEGER_1_8 */ @@ -913,7 +916,7 @@ static int hf_nr_rrc_locationMeasurementIndication_01 = -1; /* LocationMeasurem static int hf_nr_rrc_criticalExtensionsFuture_15 = -1; /* T_criticalExtensionsFuture_15 */ static int hf_nr_rrc_measurementIndication = -1; /* T_measurementIndication */ static int hf_nr_rrc_setup_01 = -1; /* LocationMeasurementInfo */ -static int hf_nr_rrc_nonCriticalExtension_30 = -1; /* T_nonCriticalExtension_15 */ +static int hf_nr_rrc_nonCriticalExtension_31 = -1; /* T_nonCriticalExtension_15 */ static int hf_nr_rrc_criticalExtensions_16 = -1; /* T_criticalExtensions_16 */ static int hf_nr_rrc_loggedMeasurementConfiguration_r16_01 = -1; /* LoggedMeasurementConfiguration_r16_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_16 = -1; /* T_criticalExtensionsFuture_16 */ @@ -933,7 +936,7 @@ static int hf_nr_rrc_loggingDuration_r16 = -1; /* LoggingDuration_r16 */ static int hf_nr_rrc_reportType = -1; /* T_reportType */ static int hf_nr_rrc_periodical = -1; /* LoggedPeriodicalReportConfig_r16 */ static int hf_nr_rrc_eventTriggered = -1; /* LoggedEventTriggerConfig_r16 */ -static int hf_nr_rrc_nonCriticalExtension_31 = -1; /* T_nonCriticalExtension_16 */ +static int hf_nr_rrc_nonCriticalExtension_32 = -1; /* T_nonCriticalExtension_16 */ static int hf_nr_rrc_loggingInterval_r16 = -1; /* LoggingInterval_r16 */ static int hf_nr_rrc_eventType_r16 = -1; /* EventType_r16 */ static int hf_nr_rrc_outOfCoverage = -1; /* NULL */ @@ -945,7 +948,7 @@ static int hf_nr_rrc_criticalExtensions_17 = -1; /* T_criticalExtensions_17 */ static int hf_nr_rrc_mcgFailureInformation_r16_01 = -1; /* MCGFailureInformation_r16_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_17 = -1; /* T_criticalExtensionsFuture_17 */ static int hf_nr_rrc_failureReportMCG_r16 = -1; /* FailureReportMCG_r16 */ -static int hf_nr_rrc_nonCriticalExtension_32 = -1; /* T_nonCriticalExtension_17 */ +static int hf_nr_rrc_nonCriticalExtension_33 = -1; /* T_nonCriticalExtension_17 */ static int hf_nr_rrc_failureType_r16_02 = -1; /* T_failureType_r16_02 */ static int hf_nr_rrc_measResultFreqList_r16 = -1; /* MeasResultList2NR */ static int hf_nr_rrc_measResultFreqListEUTRA_r16 = -1; /* MeasResultList2EUTRA */ @@ -960,7 +963,7 @@ static int hf_nr_rrc_criticalExtensions_18 = -1; /* T_criticalExtensions_18 */ static int hf_nr_rrc_measurementReport_01 = -1; /* MeasurementReport_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_18 = -1; /* T_criticalExtensionsFuture_18 */ static int hf_nr_rrc_measResults = -1; /* MeasResults */ -static int hf_nr_rrc_nonCriticalExtension_33 = -1; /* T_nonCriticalExtension_18 */ +static int hf_nr_rrc_nonCriticalExtension_34 = -1; /* T_nonCriticalExtension_18 */ static int hf_nr_rrc_systemFrameNumber = -1; /* BIT_STRING_SIZE_6 */ static int hf_nr_rrc_subCarrierSpacingCommon = -1; /* T_subCarrierSpacingCommon */ static int hf_nr_rrc_ssb_SubcarrierOffset = -1; /* INTEGER_0_15 */ @@ -975,11 +978,11 @@ static int hf_nr_rrc_criticalExtensionsFuture_19 = -1; /* T_criticalExtensionsF static int hf_nr_rrc_targetRAT_Type = -1; /* T_targetRAT_Type */ static int hf_nr_rrc_targetRAT_MessageContainer = -1; /* T_targetRAT_MessageContainer */ static int hf_nr_rrc_nas_SecurityParamFromNR = -1; /* T_nas_SecurityParamFromNR */ -static int hf_nr_rrc_nonCriticalExtension_34 = -1; /* MobilityFromNRCommand_v1610_IEs */ +static int hf_nr_rrc_nonCriticalExtension_35 = -1; /* MobilityFromNRCommand_v1610_IEs */ static int hf_nr_rrc_voiceFallbackIndication_r16 = -1; /* T_voiceFallbackIndication_r16 */ -static int hf_nr_rrc_nonCriticalExtension_35 = -1; /* T_nonCriticalExtension_19 */ +static int hf_nr_rrc_nonCriticalExtension_36 = -1; /* T_nonCriticalExtension_19 */ static int hf_nr_rrc_pagingRecordList = -1; /* PagingRecordList */ -static int hf_nr_rrc_nonCriticalExtension_36 = -1; /* T_nonCriticalExtension_20 */ +static int hf_nr_rrc_nonCriticalExtension_37 = -1; /* T_nonCriticalExtension_20 */ static int hf_nr_rrc_PagingRecordList_item = -1; /* PagingRecord */ static int hf_nr_rrc_ue_Identity = -1; /* PagingUE_Identity */ static int hf_nr_rrc_accessType = -1; /* T_accessType */ @@ -989,13 +992,13 @@ static int hf_nr_rrc_criticalExtensions_20 = -1; /* T_criticalExtensions_20 */ static int hf_nr_rrc_rrcReestablishment_01 = -1; /* RRCReestablishment_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_20 = -1; /* T_criticalExtensionsFuture_20 */ static int hf_nr_rrc_nextHopChainingCount = -1; /* NextHopChainingCount */ -static int hf_nr_rrc_nonCriticalExtension_37 = -1; /* T_nonCriticalExtension_21 */ +static int hf_nr_rrc_nonCriticalExtension_38 = -1; /* T_nonCriticalExtension_21 */ static int hf_nr_rrc_criticalExtensions_21 = -1; /* T_criticalExtensions_21 */ static int hf_nr_rrc_rrcReestablishmentComplete_01 = -1; /* RRCReestablishmentComplete_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_21 = -1; /* T_criticalExtensionsFuture_21 */ -static int hf_nr_rrc_nonCriticalExtension_38 = -1; /* RRCReestablishmentComplete_v1610_IEs */ +static int hf_nr_rrc_nonCriticalExtension_39 = -1; /* RRCReestablishmentComplete_v1610_IEs */ static int hf_nr_rrc_ue_MeasurementsAvailable_r16 = -1; /* UE_MeasurementsAvailable_r16 */ -static int hf_nr_rrc_nonCriticalExtension_39 = -1; /* T_nonCriticalExtension_22 */ +static int hf_nr_rrc_nonCriticalExtension_40 = -1; /* T_nonCriticalExtension_22 */ static int hf_nr_rrc_rrcReestablishmentRequest_01 = -1; /* RRCReestablishmentRequest_IEs */ static int hf_nr_rrc_ue_Identity_01 = -1; /* ReestabUE_Identity */ static int hf_nr_rrc_reestablishmentCause = -1; /* ReestablishmentCause */ @@ -1006,7 +1009,7 @@ static int hf_nr_rrc_criticalExtensionsFuture_22 = -1; /* T_criticalExtensionsF static int hf_nr_rrc_radioBearerConfig = -1; /* RadioBearerConfig */ static int hf_nr_rrc_secondaryCellGroup = -1; /* T_secondaryCellGroup */ static int hf_nr_rrc_measConfig = -1; /* MeasConfig */ -static int hf_nr_rrc_nonCriticalExtension_40 = -1; /* RRCReconfiguration_v1530_IEs */ +static int hf_nr_rrc_nonCriticalExtension_41 = -1; /* RRCReconfiguration_v1530_IEs */ static int hf_nr_rrc_masterCellGroup = -1; /* T_masterCellGroup */ static int hf_nr_rrc_fullConfig = -1; /* T_fullConfig */ static int hf_nr_rrc_dedicatedNAS_MessageList = -1; /* SEQUENCE_SIZE_1_maxDRB_OF_DedicatedNAS_Message */ @@ -1015,14 +1018,14 @@ static int hf_nr_rrc_masterKeyUpdate = -1; /* MasterKeyUpdate */ static int hf_nr_rrc_dedicatedSIB1_Delivery = -1; /* T_dedicatedSIB1_Delivery */ static int hf_nr_rrc_dedicatedSystemInformationDelivery = -1; /* T_dedicatedSystemInformationDelivery */ static int hf_nr_rrc_otherConfig = -1; /* OtherConfig */ -static int hf_nr_rrc_nonCriticalExtension_41 = -1; /* RRCReconfiguration_v1540_IEs */ +static int hf_nr_rrc_nonCriticalExtension_42 = -1; /* RRCReconfiguration_v1540_IEs */ static int hf_nr_rrc_otherConfig_v1540 = -1; /* OtherConfig_v1540 */ -static int hf_nr_rrc_nonCriticalExtension_42 = -1; /* RRCReconfiguration_v1560_IEs */ +static int hf_nr_rrc_nonCriticalExtension_43 = -1; /* RRCReconfiguration_v1560_IEs */ static int hf_nr_rrc_mrdc_SecondaryCellGroupConfig = -1; /* T_mrdc_SecondaryCellGroupConfig */ static int hf_nr_rrc_setup_05 = -1; /* MRDC_SecondaryCellGroupConfig */ static int hf_nr_rrc_radioBearerConfig2 = -1; /* T_radioBearerConfig2 */ static int hf_nr_rrc_sk_Counter = -1; /* SK_Counter */ -static int hf_nr_rrc_nonCriticalExtension_43 = -1; /* RRCReconfiguration_v1610_IEs */ +static int hf_nr_rrc_nonCriticalExtension_44 = -1; /* RRCReconfiguration_v1610_IEs */ static int hf_nr_rrc_otherConfig_v1610 = -1; /* OtherConfig_v1610 */ static int hf_nr_rrc_bap_Config_r16 = -1; /* T_bap_Config_r16 */ static int hf_nr_rrc_setup_06 = -1; /* BAP_Config_r16 */ @@ -1040,8 +1043,8 @@ static int hf_nr_rrc_sl_ConfigDedicatedNR_r16 = -1; /* T_sl_ConfigDedicatedNR_r static int hf_nr_rrc_setup_10 = -1; /* SL_ConfigDedicatedNR_r16 */ static int hf_nr_rrc_sl_ConfigDedicatedEUTRA_Info_r16 = -1; /* T_sl_ConfigDedicatedEUTRA_Info_r16 */ static int hf_nr_rrc_setup_11 = -1; /* SL_ConfigDedicatedEUTRA_Info_r16 */ -static int hf_nr_rrc_smtc_r16 = -1; /* SSB_MTC */ -static int hf_nr_rrc_nonCriticalExtension_44 = -1; /* T_nonCriticalExtension_23 */ +static int hf_nr_rrc_targetCellSMTC_SCG_r16 = -1; /* SSB_MTC */ +static int hf_nr_rrc_nonCriticalExtension_45 = -1; /* T_nonCriticalExtension_23 */ static int hf_nr_rrc_mrdc_ReleaseAndAdd = -1; /* T_mrdc_ReleaseAndAdd */ static int hf_nr_rrc_mrdc_SecondaryCellGroup = -1; /* T_mrdc_SecondaryCellGroup */ static int hf_nr_rrc_nr_SCG = -1; /* T_nr_SCG */ @@ -1067,19 +1070,19 @@ static int hf_nr_rrc_sl_TimeOffsetEUTRA_List_r16_item = -1; /* SL_TimeOffsetEUT static int hf_nr_rrc_criticalExtensions_23 = -1; /* T_criticalExtensions_23 */ static int hf_nr_rrc_rrcReconfigurationComplete_01 = -1; /* RRCReconfigurationComplete_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_23 = -1; /* T_criticalExtensionsFuture_23 */ -static int hf_nr_rrc_nonCriticalExtension_45 = -1; /* RRCReconfigurationComplete_v1530_IEs */ +static int hf_nr_rrc_nonCriticalExtension_46 = -1; /* RRCReconfigurationComplete_v1530_IEs */ static int hf_nr_rrc_uplinkTxDirectCurrentList = -1; /* UplinkTxDirectCurrentList */ -static int hf_nr_rrc_nonCriticalExtension_46 = -1; /* RRCReconfigurationComplete_v1560_IEs */ +static int hf_nr_rrc_nonCriticalExtension_47 = -1; /* RRCReconfigurationComplete_v1560_IEs */ static int hf_nr_rrc_scg_Response = -1; /* T_scg_Response */ static int hf_nr_rrc_nr_SCG_Response = -1; /* T_nr_SCG_Response */ static int hf_nr_rrc_eutra_SCG_Response = -1; /* T_eutra_SCG_Response */ -static int hf_nr_rrc_nonCriticalExtension_47 = -1; /* RRCReconfigurationComplete_v1610_IEs */ -static int hf_nr_rrc_nonCriticalExtension_48 = -1; /* T_nonCriticalExtension_24 */ +static int hf_nr_rrc_nonCriticalExtension_48 = -1; /* RRCReconfigurationComplete_v1610_IEs */ +static int hf_nr_rrc_nonCriticalExtension_49 = -1; /* T_nonCriticalExtension_24 */ static int hf_nr_rrc_criticalExtensions_24 = -1; /* T_criticalExtensions_24 */ static int hf_nr_rrc_rrcReject_01 = -1; /* RRCReject_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_24 = -1; /* T_criticalExtensionsFuture_24 */ static int hf_nr_rrc_waitTime = -1; /* RejectWaitTime */ -static int hf_nr_rrc_nonCriticalExtension_49 = -1; /* T_nonCriticalExtension_25 */ +static int hf_nr_rrc_nonCriticalExtension_50 = -1; /* T_nonCriticalExtension_25 */ static int hf_nr_rrc_criticalExtensions_25 = -1; /* T_criticalExtensions_25 */ static int hf_nr_rrc_rrcRelease_01 = -1; /* RRCRelease_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_25 = -1; /* T_criticalExtensionsFuture_25 */ @@ -1089,12 +1092,12 @@ static int hf_nr_rrc_suspendConfig = -1; /* SuspendConfig */ static int hf_nr_rrc_deprioritisationReq = -1; /* T_deprioritisationReq */ static int hf_nr_rrc_deprioritisationType = -1; /* T_deprioritisationType */ static int hf_nr_rrc_deprioritisationTimer = -1; /* T_deprioritisationTimer */ -static int hf_nr_rrc_nonCriticalExtension_50 = -1; /* RRCRelease_v1540_IEs */ -static int hf_nr_rrc_nonCriticalExtension_51 = -1; /* RRCRelease_v1610_IEs */ +static int hf_nr_rrc_nonCriticalExtension_51 = -1; /* RRCRelease_v1540_IEs */ +static int hf_nr_rrc_nonCriticalExtension_52 = -1; /* RRCRelease_v1610_IEs */ static int hf_nr_rrc_voiceFallbackIndication_r16_01 = -1; /* T_voiceFallbackIndication_r16_01 */ static int hf_nr_rrc_measIdleConfig_r16 = -1; /* T_measIdleConfig_r16 */ static int hf_nr_rrc_setup_12 = -1; /* MeasIdleConfigDedicated_r16 */ -static int hf_nr_rrc_nonCriticalExtension_52 = -1; /* T_nonCriticalExtension_26 */ +static int hf_nr_rrc_nonCriticalExtension_53 = -1; /* T_nonCriticalExtension_26 */ static int hf_nr_rrc_nr = -1; /* CarrierInfoNR */ static int hf_nr_rrc_eutra = -1; /* RedirectedCarrierInfo_EUTRA */ static int hf_nr_rrc_cnType = -1; /* T_cnType */ @@ -1127,9 +1130,9 @@ static int hf_nr_rrc_rrcResume_01 = -1; /* RRCResume_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_26 = -1; /* T_criticalExtensionsFuture_26 */ static int hf_nr_rrc_masterCellGroup_01 = -1; /* T_masterCellGroup_01 */ static int hf_nr_rrc_fullConfig_01 = -1; /* T_fullConfig_01 */ -static int hf_nr_rrc_nonCriticalExtension_53 = -1; /* RRCResume_v1560_IEs */ +static int hf_nr_rrc_nonCriticalExtension_54 = -1; /* RRCResume_v1560_IEs */ static int hf_nr_rrc_radioBearerConfig2_01 = -1; /* T_radioBearerConfig2_01 */ -static int hf_nr_rrc_nonCriticalExtension_54 = -1; /* RRCResume_v1610_IEs */ +static int hf_nr_rrc_nonCriticalExtension_55 = -1; /* RRCResume_v1610_IEs */ static int hf_nr_rrc_idleModeMeasurementReq_r16 = -1; /* T_idleModeMeasurementReq_r16 */ static int hf_nr_rrc_restoreMCG_SCells_r16 = -1; /* T_restoreMCG_SCells_r16 */ static int hf_nr_rrc_restoreSCG_r16 = -1; /* T_restoreSCG_r16 */ @@ -1137,12 +1140,12 @@ static int hf_nr_rrc_mrdc_SecondaryCellGroup_r16 = -1; /* T_mrdc_SecondaryCellG static int hf_nr_rrc_nr_SCG_r16 = -1; /* T_nr_SCG_r16 */ static int hf_nr_rrc_eutra_SCG_r16 = -1; /* T_eutra_SCG_r16 */ static int hf_nr_rrc_needForGapsConfigNR_r16_01 = -1; /* T_needForGapsConfigNR_r16_01 */ -static int hf_nr_rrc_nonCriticalExtension_55 = -1; /* T_nonCriticalExtension_27 */ +static int hf_nr_rrc_nonCriticalExtension_56 = -1; /* T_nonCriticalExtension_27 */ static int hf_nr_rrc_criticalExtensions_27 = -1; /* T_criticalExtensions_27 */ static int hf_nr_rrc_rrcResumeComplete_01 = -1; /* RRCResumeComplete_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_27 = -1; /* T_criticalExtensionsFuture_27 */ static int hf_nr_rrc_selectedPLMN_Identity = -1; /* INTEGER_1_maxPLMN */ -static int hf_nr_rrc_nonCriticalExtension_56 = -1; /* RRCResumeComplete_v1610_IEs */ +static int hf_nr_rrc_nonCriticalExtension_57 = -1; /* RRCResumeComplete_v1610_IEs */ static int hf_nr_rrc_idleMeasAvailable_r16 = -1; /* T_idleMeasAvailable_r16 */ static int hf_nr_rrc_measResultIdleEUTRA_r16 = -1; /* MeasResultIdleEUTRA_r16 */ static int hf_nr_rrc_measResultIdleNR_r16 = -1; /* MeasResultIdleNR_r16 */ @@ -1151,7 +1154,7 @@ static int hf_nr_rrc_nr_SCG_Response_01 = -1; /* T_nr_SCG_Response_01 */ static int hf_nr_rrc_eutra_SCG_Response_01 = -1; /* T_eutra_SCG_Response_01 */ static int hf_nr_rrc_mobilityHistoryAvail_r16 = -1; /* T_mobilityHistoryAvail_r16 */ static int hf_nr_rrc_mobilityState_r16 = -1; /* T_mobilityState_r16 */ -static int hf_nr_rrc_nonCriticalExtension_57 = -1; /* T_nonCriticalExtension_28 */ +static int hf_nr_rrc_nonCriticalExtension_58 = -1; /* T_nonCriticalExtension_28 */ static int hf_nr_rrc_rrcResumeRequest_01 = -1; /* RRCResumeRequest_IEs */ static int hf_nr_rrc_resumeIdentity = -1; /* ShortI_RNTI_Value */ static int hf_nr_rrc_resumeMAC_I = -1; /* BIT_STRING_SIZE_16 */ @@ -1162,7 +1165,7 @@ static int hf_nr_rrc_criticalExtensions_28 = -1; /* T_criticalExtensions_28 */ static int hf_nr_rrc_rrcSetup_01 = -1; /* RRCSetup_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_28 = -1; /* T_criticalExtensionsFuture_28 */ static int hf_nr_rrc_masterCellGroup_02 = -1; /* T_masterCellGroup_02 */ -static int hf_nr_rrc_nonCriticalExtension_58 = -1; /* T_nonCriticalExtension_29 */ +static int hf_nr_rrc_nonCriticalExtension_59 = -1; /* T_nonCriticalExtension_29 */ static int hf_nr_rrc_criticalExtensions_29 = -1; /* T_criticalExtensions_29 */ static int hf_nr_rrc_rrcSetupComplete_01 = -1; /* RRCSetupComplete_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_29 = -1; /* T_criticalExtensionsFuture_29 */ @@ -1172,12 +1175,12 @@ static int hf_nr_rrc_s_NSSAI_List = -1; /* SEQUENCE_SIZE_1_maxNrofS_NS static int hf_nr_rrc_s_NSSAI_List_item = -1; /* S_NSSAI */ static int hf_nr_rrc_ng_5G_S_TMSI_Value = -1; /* T_ng_5G_S_TMSI_Value */ static int hf_nr_rrc_ng_5G_S_TMSI_Part2 = -1; /* BIT_STRING_SIZE_9 */ -static int hf_nr_rrc_nonCriticalExtension_59 = -1; /* RRCSetupComplete_v1610_IEs */ +static int hf_nr_rrc_nonCriticalExtension_60 = -1; /* RRCSetupComplete_v1610_IEs */ static int hf_nr_rrc_iab_NodeIndication_r16 = -1; /* T_iab_NodeIndication_r16 */ static int hf_nr_rrc_idleMeasAvailable_r16_01 = -1; /* T_idleMeasAvailable_r16_01 */ static int hf_nr_rrc_mobilityHistoryAvail_r16_01 = -1; /* T_mobilityHistoryAvail_r16_01 */ static int hf_nr_rrc_mobilityState_r16_01 = -1; /* T_mobilityState_r16_01 */ -static int hf_nr_rrc_nonCriticalExtension_60 = -1; /* T_nonCriticalExtension_30 */ +static int hf_nr_rrc_nonCriticalExtension_61 = -1; /* T_nonCriticalExtension_30 */ static int hf_nr_rrc_amf_Identifier = -1; /* AMF_Identifier */ static int hf_nr_rrc_rrcSetupRequest_01 = -1; /* RRCSetupRequest_IEs */ static int hf_nr_rrc_ue_Identity_02 = -1; /* InitialUE_Identity */ @@ -1197,8 +1200,8 @@ static int hf_nr_rrc_criticalExtensions_31 = -1; /* T_criticalExtensions_31 */ static int hf_nr_rrc_scgFailureInformation_01 = -1; /* SCGFailureInformation_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_31 = -1; /* T_criticalExtensionsFuture_31 */ static int hf_nr_rrc_failureReportSCG = -1; /* FailureReportSCG */ -static int hf_nr_rrc_nonCriticalExtension_61 = -1; /* SCGFailureInformation_v1590_IEs */ -static int hf_nr_rrc_nonCriticalExtension_62 = -1; /* T_nonCriticalExtension_31 */ +static int hf_nr_rrc_nonCriticalExtension_62 = -1; /* SCGFailureInformation_v1590_IEs */ +static int hf_nr_rrc_nonCriticalExtension_63 = -1; /* T_nonCriticalExtension_31 */ static int hf_nr_rrc_failureType_02 = -1; /* T_failureType_02 */ static int hf_nr_rrc_measResultFreqList = -1; /* MeasResultFreqList */ static int hf_nr_rrc_measResultSCG_Failure = -1; /* T_measResultSCG_Failure */ @@ -1209,8 +1212,8 @@ static int hf_nr_rrc_criticalExtensions_32 = -1; /* T_criticalExtensions_32 */ static int hf_nr_rrc_scgFailureInformationEUTRA_01 = -1; /* SCGFailureInformationEUTRA_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_32 = -1; /* T_criticalExtensionsFuture_32 */ static int hf_nr_rrc_failureReportSCG_EUTRA = -1; /* FailureReportSCG_EUTRA */ -static int hf_nr_rrc_nonCriticalExtension_63 = -1; /* SCGFailureInformationEUTRA_v1590_IEs */ -static int hf_nr_rrc_nonCriticalExtension_64 = -1; /* T_nonCriticalExtension_32 */ +static int hf_nr_rrc_nonCriticalExtension_64 = -1; /* SCGFailureInformationEUTRA_v1590_IEs */ +static int hf_nr_rrc_nonCriticalExtension_65 = -1; /* T_nonCriticalExtension_32 */ static int hf_nr_rrc_failureType_03 = -1; /* T_failureType_03 */ static int hf_nr_rrc_measResultFreqListMRDC = -1; /* MeasResultFreqListFailMRDC */ static int hf_nr_rrc_measResultSCG_FailureMRDC = -1; /* T_measResultSCG_FailureMRDC */ @@ -1219,16 +1222,16 @@ static int hf_nr_rrc_criticalExtensions_33 = -1; /* T_criticalExtensions_33 */ static int hf_nr_rrc_securityModeCommand_01 = -1; /* SecurityModeCommand_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_33 = -1; /* T_criticalExtensionsFuture_33 */ static int hf_nr_rrc_securityConfigSMC = -1; /* SecurityConfigSMC */ -static int hf_nr_rrc_nonCriticalExtension_65 = -1; /* T_nonCriticalExtension_33 */ +static int hf_nr_rrc_nonCriticalExtension_66 = -1; /* T_nonCriticalExtension_33 */ static int hf_nr_rrc_securityAlgorithmConfig = -1; /* SecurityAlgorithmConfig */ static int hf_nr_rrc_criticalExtensions_34 = -1; /* T_criticalExtensions_34 */ static int hf_nr_rrc_securityModeComplete_01 = -1; /* SecurityModeComplete_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_34 = -1; /* T_criticalExtensionsFuture_34 */ -static int hf_nr_rrc_nonCriticalExtension_66 = -1; /* T_nonCriticalExtension_34 */ +static int hf_nr_rrc_nonCriticalExtension_67 = -1; /* T_nonCriticalExtension_34 */ static int hf_nr_rrc_criticalExtensions_35 = -1; /* T_criticalExtensions_35 */ static int hf_nr_rrc_securityModeFailure_01 = -1; /* SecurityModeFailure_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_35 = -1; /* T_criticalExtensionsFuture_35 */ -static int hf_nr_rrc_nonCriticalExtension_67 = -1; /* T_nonCriticalExtension_35 */ +static int hf_nr_rrc_nonCriticalExtension_68 = -1; /* T_nonCriticalExtension_35 */ static int hf_nr_rrc_cellSelectionInfo = -1; /* T_cellSelectionInfo */ static int hf_nr_rrc_q_RxLevMin = -1; /* Q_RxLevMin */ static int hf_nr_rrc_q_RxLevMinOffset = -1; /* INTEGER_1_8 */ @@ -1251,18 +1254,22 @@ static int hf_nr_rrc_plmnCommon = -1; /* UAC_AccessCategory1_Selecti static int hf_nr_rrc_individualPLMNList = -1; /* SEQUENCE_SIZE_2_maxPLMN_OF_UAC_AccessCategory1_SelectionAssistanceInfo */ static int hf_nr_rrc_individualPLMNList_item = -1; /* UAC_AccessCategory1_SelectionAssistanceInfo */ static int hf_nr_rrc_useFullResumeID = -1; /* T_useFullResumeID */ -static int hf_nr_rrc_nonCriticalExtension_68 = -1; /* SIB1_v1610_IEs */ +static int hf_nr_rrc_nonCriticalExtension_69 = -1; /* SIB1_v1610_IEs */ static int hf_nr_rrc_idleModeMeasurementsEUTRA_r16 = -1; /* T_idleModeMeasurementsEUTRA_r16 */ static int hf_nr_rrc_idleModeMeasurementsNR_r16 = -1; /* T_idleModeMeasurementsNR_r16 */ static int hf_nr_rrc_posSI_SchedulingInfo_r16 = -1; /* PosSI_SchedulingInfo_r16 */ -static int hf_nr_rrc_nonCriticalExtension_69 = -1; /* T_nonCriticalExtension_36 */ +static int hf_nr_rrc_nonCriticalExtension_70 = -1; /* SIB1_v1630_IEs */ +static int hf_nr_rrc_uac_BarringInfo_v1630 = -1; /* T_uac_BarringInfo_v1630 */ +static int hf_nr_rrc_uac_AC1_SelectAssistInfo_r16 = -1; /* SEQUENCE_SIZE_2_maxPLMN_OF_UAC_AC1_SelectAssistInfo_r16 */ +static int hf_nr_rrc_uac_AC1_SelectAssistInfo_r16_item = -1; /* UAC_AC1_SelectAssistInfo_r16 */ +static int hf_nr_rrc_nonCriticalExtension_71 = -1; /* T_nonCriticalExtension_36 */ static int hf_nr_rrc_criticalExtensions_36 = -1; /* T_criticalExtensions_36 */ static int hf_nr_rrc_sidelinkUEInformationNR_r16_03 = -1; /* SidelinkUEInformationNR_r16_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_36 = -1; /* T_criticalExtensionsFuture_36 */ static int hf_nr_rrc_sl_RxInterestedFreqList_r16 = -1; /* SL_InterestedFreqList_r16 */ static int hf_nr_rrc_sl_TxResourceReqList_r16 = -1; /* SL_TxResourceReqList_r16 */ static int hf_nr_rrc_sl_FailureList_r16 = -1; /* SL_FailureList_r16 */ -static int hf_nr_rrc_nonCriticalExtension_70 = -1; /* T_nonCriticalExtension_37 */ +static int hf_nr_rrc_nonCriticalExtension_72 = -1; /* T_nonCriticalExtension_37 */ static int hf_nr_rrc_SL_InterestedFreqList_r16_item = -1; /* INTEGER_1_maxNrofFreqSL_r16 */ static int hf_nr_rrc_SL_TxResourceReqList_r16_item = -1; /* SL_TxResourceReq_r16 */ static int hf_nr_rrc_sl_DestinationIdentity_r16 = -1; /* SL_DestinationIdentity_r16 */ @@ -1303,15 +1310,15 @@ static int hf_nr_rrc_sib11_v1610 = -1; /* SIB11_r16 */ static int hf_nr_rrc_sib12_v1610 = -1; /* SIB12_r16 */ static int hf_nr_rrc_sib13_v1610 = -1; /* SIB13_r16 */ static int hf_nr_rrc_sib14_v1610 = -1; /* SIB14_r16 */ -static int hf_nr_rrc_nonCriticalExtension_71 = -1; /* T_nonCriticalExtension_38 */ +static int hf_nr_rrc_nonCriticalExtension_73 = -1; /* T_nonCriticalExtension_38 */ static int hf_nr_rrc_criticalExtensions_38 = -1; /* T_criticalExtensions_38 */ static int hf_nr_rrc_ueAssistanceInformation_02 = -1; /* UEAssistanceInformation_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_38 = -1; /* T_criticalExtensionsFuture_38 */ static int hf_nr_rrc_delayBudgetReport = -1; /* DelayBudgetReport */ -static int hf_nr_rrc_nonCriticalExtension_72 = -1; /* UEAssistanceInformation_v1540_IEs */ +static int hf_nr_rrc_nonCriticalExtension_74 = -1; /* UEAssistanceInformation_v1540_IEs */ static int hf_nr_rrc_type1 = -1; /* T_type1 */ static int hf_nr_rrc_overheatingAssistance = -1; /* OverheatingAssistance */ -static int hf_nr_rrc_nonCriticalExtension_73 = -1; /* UEAssistanceInformation_v1610_IEs */ +static int hf_nr_rrc_nonCriticalExtension_75 = -1; /* UEAssistanceInformation_v1610_IEs */ static int hf_nr_rrc_reducedMaxCCs = -1; /* ReducedMaxCCs_r16 */ static int hf_nr_rrc_reducedMaxBW_FR1 = -1; /* ReducedMaxBW_FRx_r16 */ static int hf_nr_rrc_reducedMaxBW_FR2 = -1; /* ReducedMaxBW_FRx_r16 */ @@ -1330,7 +1337,7 @@ static int hf_nr_rrc_minSchedulingOffsetPreference_r16 = -1; /* MinSchedulingOf static int hf_nr_rrc_releasePreference_r16 = -1; /* ReleasePreference_r16 */ static int hf_nr_rrc_sl_UE_AssistanceInformationNR_r16 = -1; /* SL_UE_AssistanceInformationNR_r16 */ static int hf_nr_rrc_referenceTimeInfoPreference_r16 = -1; /* BOOLEAN */ -static int hf_nr_rrc_nonCriticalExtension_74 = -1; /* T_nonCriticalExtension_39 */ +static int hf_nr_rrc_nonCriticalExtension_76 = -1; /* T_nonCriticalExtension_39 */ static int hf_nr_rrc_affectedCarrierFreqList_r16 = -1; /* AffectedCarrierFreqList_r16 */ static int hf_nr_rrc_affectedCarrierFreqCombList_r16 = -1; /* AffectedCarrierFreqCombList_r16 */ static int hf_nr_rrc_AffectedCarrierFreqList_r16_item = -1; /* AffectedCarrierFreq_r16 */ @@ -1385,14 +1392,14 @@ static int hf_nr_rrc_criticalExtensionsFuture_39 = -1; /* T_criticalExtensionsF static int hf_nr_rrc_ue_CapabilityRAT_RequestList = -1; /* UE_CapabilityRAT_RequestList */ static int hf_nr_rrc_ue_CapabilityEnquiryExt = -1; /* T_ue_CapabilityEnquiryExt */ static int hf_nr_rrc_capabilityRequestFilterCommon = -1; /* UE_CapabilityRequestFilterCommon */ -static int hf_nr_rrc_nonCriticalExtension_75 = -1; /* UECapabilityEnquiry_v1610_IEs */ +static int hf_nr_rrc_nonCriticalExtension_77 = -1; /* UECapabilityEnquiry_v1610_IEs */ static int hf_nr_rrc_rrc_SegAllowed_r16 = -1; /* T_rrc_SegAllowed_r16 */ -static int hf_nr_rrc_nonCriticalExtension_76 = -1; /* T_nonCriticalExtension_40 */ +static int hf_nr_rrc_nonCriticalExtension_78 = -1; /* T_nonCriticalExtension_40 */ static int hf_nr_rrc_criticalExtensions_40 = -1; /* T_criticalExtensions_40 */ static int hf_nr_rrc_ueCapabilityInformation_01 = -1; /* UECapabilityInformation_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_40 = -1; /* T_criticalExtensionsFuture_40 */ static int hf_nr_rrc_ue_CapabilityRAT_ContainerList = -1; /* UE_CapabilityRAT_ContainerList */ -static int hf_nr_rrc_nonCriticalExtension_77 = -1; /* T_nonCriticalExtension_41 */ +static int hf_nr_rrc_nonCriticalExtension_79 = -1; /* T_nonCriticalExtension_41 */ static int hf_nr_rrc_criticalExtensions_41 = -1; /* T_criticalExtensions_41 */ static int hf_nr_rrc_ueInformationRequest_r16_01 = -1; /* UEInformationRequest_r16_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_41 = -1; /* T_criticalExtensionsFuture_41 */ @@ -1402,7 +1409,7 @@ static int hf_nr_rrc_connEstFailReportReq_r16 = -1; /* T_connEstFailReportReq_r static int hf_nr_rrc_ra_ReportReq_r16 = -1; /* T_ra_ReportReq_r16 */ static int hf_nr_rrc_rlf_ReportReq_r16 = -1; /* T_rlf_ReportReq_r16 */ static int hf_nr_rrc_mobilityHistoryReportReq_r16 = -1; /* T_mobilityHistoryReportReq_r16 */ -static int hf_nr_rrc_nonCriticalExtension_78 = -1; /* T_nonCriticalExtension_42 */ +static int hf_nr_rrc_nonCriticalExtension_80 = -1; /* T_nonCriticalExtension_42 */ static int hf_nr_rrc_criticalExtensions_42 = -1; /* T_criticalExtensions_42 */ static int hf_nr_rrc_ueInformationResponse_r16_01 = -1; /* UEInformationResponse_r16_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_42 = -1; /* T_criticalExtensionsFuture_42 */ @@ -1411,7 +1418,7 @@ static int hf_nr_rrc_connEstFailReport_r16 = -1; /* ConnEstFailReport_r16 */ static int hf_nr_rrc_ra_ReportList_r16 = -1; /* RA_ReportList_r16 */ static int hf_nr_rrc_rlf_Report_r16 = -1; /* RLF_Report_r16 */ static int hf_nr_rrc_mobilityHistoryReport_r16 = -1; /* MobilityHistoryReport_r16 */ -static int hf_nr_rrc_nonCriticalExtension_79 = -1; /* T_nonCriticalExtension_43 */ +static int hf_nr_rrc_nonCriticalExtension_81 = -1; /* T_nonCriticalExtension_43 */ static int hf_nr_rrc_absoluteTimeStamp_r16 = -1; /* AbsoluteTimeInfo_r16 */ static int hf_nr_rrc_logMeasInfoList_r16 = -1; /* LogMeasInfoList_r16 */ static int hf_nr_rrc_logMeasAvailable_r16 = -1; /* T_logMeasAvailable_r16 */ @@ -1520,24 +1527,24 @@ static int hf_nr_rrc_ulDedicatedMessageSegment_r16_01 = -1; /* ULDedicatedMessa static int hf_nr_rrc_criticalExtensionsFuture_43 = -1; /* T_criticalExtensionsFuture_43 */ static int hf_nr_rrc_segmentNumber_r16_01 = -1; /* INTEGER_0_15 */ static int hf_nr_rrc_rrc_MessageSegmentType_r16_01 = -1; /* T_rrc_MessageSegmentType_r16_01 */ -static int hf_nr_rrc_nonCriticalExtension_80 = -1; /* T_nonCriticalExtension_44 */ +static int hf_nr_rrc_nonCriticalExtension_82 = -1; /* T_nonCriticalExtension_44 */ static int hf_nr_rrc_criticalExtensions_44 = -1; /* T_criticalExtensions_44 */ static int hf_nr_rrc_ulInformationTransfer_01 = -1; /* ULInformationTransfer_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_44 = -1; /* T_criticalExtensionsFuture_44 */ -static int hf_nr_rrc_nonCriticalExtension_81 = -1; /* T_nonCriticalExtension_45 */ +static int hf_nr_rrc_nonCriticalExtension_83 = -1; /* T_nonCriticalExtension_45 */ static int hf_nr_rrc_criticalExtensions_45 = -1; /* T_criticalExtensions_45 */ static int hf_nr_rrc_c1_15 = -1; /* T_c1_15 */ static int hf_nr_rrc_ulInformationTransferIRAT_r16_01 = -1; /* ULInformationTransferIRAT_r16_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_45 = -1; /* T_criticalExtensionsFuture_45 */ static int hf_nr_rrc_ul_DCCH_MessageEUTRA_r16 = -1; /* T_ul_DCCH_MessageEUTRA_r16 */ -static int hf_nr_rrc_nonCriticalExtension_82 = -1; /* T_nonCriticalExtension_46 */ +static int hf_nr_rrc_nonCriticalExtension_84 = -1; /* T_nonCriticalExtension_46 */ static int hf_nr_rrc_criticalExtensions_46 = -1; /* T_criticalExtensions_46 */ static int hf_nr_rrc_c1_16 = -1; /* T_c1_16 */ static int hf_nr_rrc_ulInformationTransferMRDC_01 = -1; /* ULInformationTransferMRDC_IEs */ static int hf_nr_rrc_criticalExtensionsFuture_46 = -1; /* T_criticalExtensionsFuture_46 */ static int hf_nr_rrc_ul_DCCH_MessageNR = -1; /* T_ul_DCCH_MessageNR */ static int hf_nr_rrc_ul_DCCH_MessageEUTRA = -1; /* T_ul_DCCH_MessageEUTRA */ -static int hf_nr_rrc_nonCriticalExtension_83 = -1; /* T_nonCriticalExtension_47 */ +static int hf_nr_rrc_nonCriticalExtension_85 = -1; /* T_nonCriticalExtension_47 */ static int hf_nr_rrc_cellReselectionInfoCommon = -1; /* T_cellReselectionInfoCommon */ static int hf_nr_rrc_nrofSS_BlocksToAverage = -1; /* INTEGER_2_maxNrofSS_BlocksToAverage */ static int hf_nr_rrc_absThreshSS_BlocksConsolidation = -1; /* ThresholdNR */ @@ -1662,9 +1669,9 @@ static int hf_nr_rrc_measIdleConfigSIB_r16 = -1; /* MeasIdleConfigSIB_r16 */ static int hf_nr_rrc_segmentNumber_r16_02 = -1; /* INTEGER_0_63 */ static int hf_nr_rrc_segmentType_r16 = -1; /* T_segmentType_r16 */ static int hf_nr_rrc_segmentContainer_r16 = -1; /* OCTET_STRING */ -static int hf_nr_rrc_sl_V2X_ConfigCommon_r16 = -1; /* OCTET_STRING */ -static int hf_nr_rrc_sl_Bandwidth_r16 = -1; /* OCTET_STRING */ -static int hf_nr_rrc_tdd_Config_r16 = -1; /* OCTET_STRING */ +static int hf_nr_rrc_sl_V2X_ConfigCommon_r16 = -1; /* T_sl_V2X_ConfigCommon_r16 */ +static int hf_nr_rrc_dummy_02 = -1; /* OCTET_STRING */ +static int hf_nr_rrc_tdd_Config_r16 = -1; /* T_tdd_Config_r16 */ static int hf_nr_rrc_sl_V2X_ConfigCommonExt_r16 = -1; /* OCTET_STRING */ static int hf_nr_rrc_posSIB_TypeAndInfo_r16 = -1; /* T_posSIB_TypeAndInfo_r16 */ static int hf_nr_rrc_posSIB_TypeAndInfo_r16_item = -1; /* T_posSIB_TypeAndInfo_r16_item */ @@ -1705,7 +1712,7 @@ static int hf_nr_rrc_posSib5_1_r16 = -1; /* T_posSib5_1_r16 */ static int hf_nr_rrc_posSib6_1_r16 = -1; /* T_posSib6_1_r16 */ static int hf_nr_rrc_posSib6_2_r16 = -1; /* T_posSib6_2_r16 */ static int hf_nr_rrc_posSib6_3_r16 = -1; /* T_posSib6_3_r16 */ -static int hf_nr_rrc_nonCriticalExtension_84 = -1; /* T_nonCriticalExtension_48 */ +static int hf_nr_rrc_nonCriticalExtension_86 = -1; /* T_nonCriticalExtension_48 */ static int hf_nr_rrc_posSchedulingInfoList_r16 = -1; /* SEQUENCE_SIZE_1_maxSI_Message_OF_PosSchedulingInfo_r16 */ static int hf_nr_rrc_posSchedulingInfoList_r16_item = -1; /* PosSchedulingInfo_r16 */ static int hf_nr_rrc_posSI_RequestConfig_r16 = -1; /* SI_RequestConfig */ @@ -1772,13 +1779,13 @@ static int hf_nr_rrc_betaOffsetCSI_Part1_Index1 = -1; /* INTEGER_0_31 */ static int hf_nr_rrc_betaOffsetCSI_Part1_Index2 = -1; /* INTEGER_0_31 */ static int hf_nr_rrc_betaOffsetCSI_Part2_Index1 = -1; /* INTEGER_0_31 */ static int hf_nr_rrc_betaOffsetCSI_Part2_Index2 = -1; /* INTEGER_0_31 */ -static int hf_nr_rrc_bh_LogicalChannelIdentity_r16 = -1; /* BH_LogicalChannelIdentity_r16 */ +static int hf_nr_rrc_bh_LogicalChannelIdentity_r16 = -1; /* LogicalChannelIdentity */ +static int hf_nr_rrc_bh_LogicalChannelIdentityExt_r16 = -1; /* BH_LogicalChannelIdentity_Ext_r16 */ +static int hf_nr_rrc_bh_LogicalChannelIdentity_r16_01 = -1; /* BH_LogicalChannelIdentity_r16 */ static int hf_nr_rrc_bh_RLC_ChannelID_r16 = -1; /* BH_RLC_ChannelID_r16 */ static int hf_nr_rrc_reestablishRLC_r16 = -1; /* T_reestablishRLC_r16 */ static int hf_nr_rrc_rlc_Config_r16 = -1; /* RLC_Config */ static int hf_nr_rrc_mac_LogicalChannelConfig_r16 = -1; /* LogicalChannelConfig */ -static int hf_nr_rrc_bh_LogicalChannelIdentity_r16_01 = -1; /* LogicalChannelIdentity */ -static int hf_nr_rrc_bh_LogicalChannelIdentityExt_r16 = -1; /* BH_LogicalChannelIdentity_Ext_r16 */ static int hf_nr_rrc_periodicBSR_Timer = -1; /* T_periodicBSR_Timer */ static int hf_nr_rrc_retxBSR_Timer = -1; /* T_retxBSR_Timer */ static int hf_nr_rrc_logicalChannelSR_DelayTimer = -1; /* T_logicalChannelSR_DelayTimer */ @@ -2050,7 +2057,7 @@ static int hf_nr_rrc_cg_minDFI_Delay_r16 = -1; /* T_cg_minDFI_Delay_r16 */ static int hf_nr_rrc_cg_nrofPUSCH_InSlot_r16 = -1; /* INTEGER_1_7 */ static int hf_nr_rrc_cg_nrofSlots_r16 = -1; /* INTEGER_1_40 */ static int hf_nr_rrc_cg_StartingOffsets_r16 = -1; /* CG_StartingOffsets_r16 */ -static int hf_nr_rrc_cg_UCI_Multiplexing = -1; /* T_cg_UCI_Multiplexing */ +static int hf_nr_rrc_cg_UCI_Multiplexing_r16 = -1; /* T_cg_UCI_Multiplexing_r16 */ static int hf_nr_rrc_cg_COT_SharingOffset_r16 = -1; /* INTEGER_1_39 */ static int hf_nr_rrc_betaOffsetCG_UCI_r16 = -1; /* INTEGER_0_31 */ static int hf_nr_rrc_cg_COT_SharingList_r16 = -1; /* SEQUENCE_SIZE_1_1709_OF_CG_COT_Sharing_r16 */ @@ -2222,7 +2229,7 @@ static int hf_nr_rrc_subbands19_v1530 = -1; /* BIT_STRING_SIZE_19 */ static int hf_nr_rrc_timeRestrictionForChannelMeasurements = -1; /* T_timeRestrictionForChannelMeasurements */ static int hf_nr_rrc_timeRestrictionForInterferenceMeasurements = -1; /* T_timeRestrictionForInterferenceMeasurements */ static int hf_nr_rrc_codebookConfig = -1; /* CodebookConfig */ -static int hf_nr_rrc_dummy_02 = -1; /* T_dummy */ +static int hf_nr_rrc_dummy_03 = -1; /* T_dummy */ static int hf_nr_rrc_groupBasedBeamReporting = -1; /* T_groupBasedBeamReporting */ static int hf_nr_rrc_enabled = -1; /* NULL */ static int hf_nr_rrc_disabled = -1; /* T_disabled */ @@ -2539,6 +2546,7 @@ static int hf_nr_rrc_idleRSRQ_Threshold_NR_r16 = -1; /* RSRQ_Range */ static int hf_nr_rrc_ssb_MeasConfig_r16 = -1; /* T_ssb_MeasConfig_r16 */ static int hf_nr_rrc_nrofSS_BlocksToAverage_r16 = -1; /* INTEGER_2_maxNrofSS_BlocksToAverage */ static int hf_nr_rrc_absThreshSS_BlocksConsolidation_r16 = -1; /* ThresholdNR */ +static int hf_nr_rrc_smtc_r16 = -1; /* SSB_MTC */ static int hf_nr_rrc_ssb_ToMeasure_r16 = -1; /* SSB_ToMeasure */ static int hf_nr_rrc_deriveSSB_IndexFromCell_r16 = -1; /* BOOLEAN */ static int hf_nr_rrc_ss_RSSI_Measurement_r16 = -1; /* SS_RSSI_Measurement */ @@ -3021,20 +3029,22 @@ static int hf_nr_rrc_dataScramblingIdentityPDSCH2_r16 = -1; /* INTEGER_0_1023 * static int hf_nr_rrc_pdsch_TimeDomainAllocationList_r16 = -1; /* T_pdsch_TimeDomainAllocationList_r16 */ static int hf_nr_rrc_repetitionSchemeConfig_r16 = -1; /* T_repetitionSchemeConfig_r16 */ static int hf_nr_rrc_setup_65 = -1; /* RepetitionSchemeConfig_r16 */ +static int hf_nr_rrc_repetitionSchemeConfig_v1630 = -1; /* T_repetitionSchemeConfig_v1630 */ +static int hf_nr_rrc_setup_66 = -1; /* RepetitionSchemeConfig_v1630 */ static int hf_nr_rrc_RateMatchPatternGroup_item = -1; /* RateMatchPatternGroup_item */ static int hf_nr_rrc_cellLevel = -1; /* RateMatchPatternId */ static int hf_nr_rrc_bwpLevel = -1; /* RateMatchPatternId */ static int hf_nr_rrc_MinSchedulingOffsetK0_Values_r16_item = -1; /* INTEGER_0_maxK0_SchedulingOffset_r16 */ static int hf_nr_rrc_pdsch_TimeDomainAllocationList_01 = -1; /* PDSCH_TimeDomainResourceAllocationList */ static int hf_nr_rrc_codeBlockGroupTransmission = -1; /* T_codeBlockGroupTransmission */ -static int hf_nr_rrc_setup_66 = -1; /* PDSCH_CodeBlockGroupTransmission */ +static int hf_nr_rrc_setup_67 = -1; /* PDSCH_CodeBlockGroupTransmission */ static int hf_nr_rrc_xOverhead = -1; /* T_xOverhead */ static int hf_nr_rrc_nrofHARQ_ProcessesForPDSCH = -1; /* T_nrofHARQ_ProcessesForPDSCH */ static int hf_nr_rrc_pucch_Cell = -1; /* ServCellIndex */ static int hf_nr_rrc_maxMIMO_Layers = -1; /* INTEGER_1_8 */ static int hf_nr_rrc_processingType2Enabled = -1; /* BOOLEAN */ static int hf_nr_rrc_pdsch_CodeBlockGroupTransmissionList_r16 = -1; /* T_pdsch_CodeBlockGroupTransmissionList_r16 */ -static int hf_nr_rrc_setup_67 = -1; /* PDSCH_CodeBlockGroupTransmissionList_r16 */ +static int hf_nr_rrc_setup_68 = -1; /* PDSCH_CodeBlockGroupTransmissionList_r16 */ static int hf_nr_rrc_maxCodeBlockGroupsPerTransportBlock = -1; /* T_maxCodeBlockGroupsPerTransportBlock */ static int hf_nr_rrc_codeBlockGroupFlushIndicator = -1; /* BOOLEAN */ static int hf_nr_rrc_PDSCH_CodeBlockGroupTransmissionList_r16_item = -1; /* PDSCH_CodeBlockGroupTransmission */ @@ -3051,11 +3061,11 @@ static int hf_nr_rrc_phr_PeriodicTimer = -1; /* T_phr_PeriodicTimer */ static int hf_nr_rrc_phr_ProhibitTimer = -1; /* T_phr_ProhibitTimer */ static int hf_nr_rrc_phr_Tx_PowerFactorChange = -1; /* T_phr_Tx_PowerFactorChange */ static int hf_nr_rrc_multiplePHR = -1; /* BOOLEAN */ -static int hf_nr_rrc_dummy_03 = -1; /* BOOLEAN */ +static int hf_nr_rrc_dummy_04 = -1; /* BOOLEAN */ static int hf_nr_rrc_phr_Type2OtherCell = -1; /* BOOLEAN */ static int hf_nr_rrc_phr_ModeOtherCG = -1; /* T_phr_ModeOtherCG */ static int hf_nr_rrc_mpe_Reporting_FR2_r16 = -1; /* T_mpe_Reporting_FR2_r16 */ -static int hf_nr_rrc_setup_68 = -1; /* MPE_Config_FR2_r16 */ +static int hf_nr_rrc_setup_69 = -1; /* MPE_Config_FR2_r16 */ static int hf_nr_rrc_mpe_ProhibitTimer_r16 = -1; /* T_mpe_ProhibitTimer_r16 */ static int hf_nr_rrc_mpe_Threshold_r16 = -1; /* T_mpe_Threshold_r16 */ static int hf_nr_rrc_harq_ACK_SpatialBundlingPUCCH = -1; /* T_harq_ACK_SpatialBundlingPUCCH */ @@ -3067,14 +3077,14 @@ static int hf_nr_rrc_tpc_PUCCH_RNTI = -1; /* RNTI_Value */ static int hf_nr_rrc_tpc_PUSCH_RNTI = -1; /* RNTI_Value */ static int hf_nr_rrc_sp_CSI_RNTI = -1; /* RNTI_Value */ static int hf_nr_rrc_cs_RNTI = -1; /* T_cs_RNTI */ -static int hf_nr_rrc_setup_69 = -1; /* RNTI_Value */ +static int hf_nr_rrc_setup_70 = -1; /* RNTI_Value */ static int hf_nr_rrc_mcs_C_RNTI = -1; /* RNTI_Value */ static int hf_nr_rrc_p_UE_FR1 = -1; /* P_Max */ static int hf_nr_rrc_xScale = -1; /* T_xScale */ static int hf_nr_rrc_pdcch_BlindDetection = -1; /* T_pdcch_BlindDetection */ -static int hf_nr_rrc_setup_70 = -1; /* PDCCH_BlindDetection */ +static int hf_nr_rrc_setup_71 = -1; /* PDCCH_BlindDetection */ static int hf_nr_rrc_dcp_Config_r16 = -1; /* T_dcp_Config_r16 */ -static int hf_nr_rrc_setup_71 = -1; /* DCP_Config_r16 */ +static int hf_nr_rrc_setup_72 = -1; /* DCP_Config_r16 */ static int hf_nr_rrc_harq_ACK_SpatialBundlingPUCCH_secondaryPUCCHgroup_r16 = -1; /* T_harq_ACK_SpatialBundlingPUCCH_secondaryPUCCHgroup_r16 */ static int hf_nr_rrc_harq_ACK_SpatialBundlingPUSCH_secondaryPUCCHgroup_r16 = -1; /* T_harq_ACK_SpatialBundlingPUSCH_secondaryPUCCHgroup_r16 */ static int hf_nr_rrc_pdsch_HARQ_ACK_Codebook_secondaryPUCCHgroup_r16 = -1; /* T_pdsch_HARQ_ACK_Codebook_secondaryPUCCHgroup_r16 */ @@ -3091,14 +3101,14 @@ static int hf_nr_rrc_pdsch_HARQ_ACK_OneShotFeedbackCBG_r16 = -1; /* T_pdsch_HAR static int hf_nr_rrc_downlinkAssignmentIndexDCI_0_2_r16 = -1; /* T_downlinkAssignmentIndexDCI_0_2_r16 */ static int hf_nr_rrc_downlinkAssignmentIndexDCI_1_2_r16 = -1; /* T_downlinkAssignmentIndexDCI_1_2_r16 */ static int hf_nr_rrc_pdsch_HARQ_ACK_CodebookList_r16 = -1; /* T_pdsch_HARQ_ACK_CodebookList_r16 */ -static int hf_nr_rrc_setup_72 = -1; /* PDSCH_HARQ_ACK_CodebookList_r16 */ +static int hf_nr_rrc_setup_73 = -1; /* PDSCH_HARQ_ACK_CodebookList_r16 */ static int hf_nr_rrc_ackNackFeedbackMode_r16 = -1; /* T_ackNackFeedbackMode_r16 */ static int hf_nr_rrc_pdcch_BlindDetectionCA_CombIndicator_r16 = -1; /* T_pdcch_BlindDetectionCA_CombIndicator_r16 */ -static int hf_nr_rrc_setup_73 = -1; /* PDCCH_BlindDetectionCA_CombIndicator_r16 */ +static int hf_nr_rrc_setup_74 = -1; /* PDCCH_BlindDetectionCA_CombIndicator_r16 */ static int hf_nr_rrc_pdcch_BlindDetection2_r16 = -1; /* T_pdcch_BlindDetection2_r16 */ -static int hf_nr_rrc_setup_74 = -1; /* PDCCH_BlindDetection2_r16 */ +static int hf_nr_rrc_setup_75 = -1; /* PDCCH_BlindDetection2_r16 */ static int hf_nr_rrc_pdcch_BlindDetection3_r16 = -1; /* T_pdcch_BlindDetection3_r16 */ -static int hf_nr_rrc_setup_75 = -1; /* PDCCH_BlindDetection3_r16 */ +static int hf_nr_rrc_setup_76 = -1; /* PDCCH_BlindDetection3_r16 */ static int hf_nr_rrc_bdFactorR_r16 = -1; /* T_bdFactorR_r16 */ static int hf_nr_rrc_ps_RNTI_r16 = -1; /* RNTI_Value */ static int hf_nr_rrc_ps_Offset_r16 = -1; /* INTEGER_1_120 */ @@ -3147,7 +3157,7 @@ static int hf_nr_rrc_resourceToAddModList_item = -1; /* PUCCH_Resource */ static int hf_nr_rrc_resourceToReleaseList = -1; /* SEQUENCE_SIZE_1_maxNrofPUCCH_Resources_OF_PUCCH_ResourceId */ static int hf_nr_rrc_resourceToReleaseList_item = -1; /* PUCCH_ResourceId */ static int hf_nr_rrc_format1 = -1; /* T_format1 */ -static int hf_nr_rrc_setup_76 = -1; /* PUCCH_FormatConfig */ +static int hf_nr_rrc_setup_77 = -1; /* PUCCH_FormatConfig */ static int hf_nr_rrc_format2 = -1; /* T_format2 */ static int hf_nr_rrc_format3 = -1; /* T_format3 */ static int hf_nr_rrc_format4 = -1; /* T_format4 */ @@ -3167,14 +3177,14 @@ static int hf_nr_rrc_pucch_PowerControl = -1; /* PUCCH_PowerControl */ static int hf_nr_rrc_resourceToAddModListExt_r16 = -1; /* SEQUENCE_SIZE_1_maxNrofPUCCH_Resources_OF_PUCCH_ResourceExt_r16 */ static int hf_nr_rrc_resourceToAddModListExt_r16_item = -1; /* PUCCH_ResourceExt_r16 */ static int hf_nr_rrc_dl_DataToUL_ACK_r16 = -1; /* T_dl_DataToUL_ACK_r16 */ -static int hf_nr_rrc_setup_77 = -1; /* DL_DataToUL_ACK_r16 */ +static int hf_nr_rrc_setup_78 = -1; /* DL_DataToUL_ACK_r16 */ static int hf_nr_rrc_ul_AccessConfigListDCI_1_1_r16 = -1; /* T_ul_AccessConfigListDCI_1_1_r16 */ -static int hf_nr_rrc_setup_78 = -1; /* UL_AccessConfigListDCI_1_1_r16 */ +static int hf_nr_rrc_setup_79 = -1; /* UL_AccessConfigListDCI_1_1_r16 */ static int hf_nr_rrc_subslotLengthForPUCCH_r16 = -1; /* T_subslotLengthForPUCCH_r16 */ static int hf_nr_rrc_normalCP_r16 = -1; /* T_normalCP_r16 */ static int hf_nr_rrc_extendedCP_r16 = -1; /* T_extendedCP_r16 */ static int hf_nr_rrc_dl_DataToUL_ACK_DCI_1_2_r16 = -1; /* T_dl_DataToUL_ACK_DCI_1_2_r16 */ -static int hf_nr_rrc_setup_79 = -1; /* DL_DataToUL_ACK_DCI_1_2_r16 */ +static int hf_nr_rrc_setup_80 = -1; /* DL_DataToUL_ACK_DCI_1_2_r16 */ static int hf_nr_rrc_numberOfBitsForPUCCH_ResourceIndicatorDCI_1_2_r16 = -1; /* INTEGER_0_3 */ static int hf_nr_rrc_dmrs_UplinkTransformPrecodingPUCCH_r16 = -1; /* T_dmrs_UplinkTransformPrecodingPUCCH_r16 */ static int hf_nr_rrc_spatialRelationInfoToAddModList2_r16 = -1; /* SEQUENCE_SIZE_1_maxNrofSpatialRelationInfosDiff_r16_OF_PUCCH_SpatialRelationInfo */ @@ -3190,7 +3200,7 @@ static int hf_nr_rrc_resourceGroupToAddModList_r16_item = -1; /* PUCCH_Resource static int hf_nr_rrc_resourceGroupToReleaseList_r16 = -1; /* SEQUENCE_SIZE_1_maxNrofPUCCH_ResourceGroups_r16_OF_PUCCH_ResourceGroupId_r16 */ static int hf_nr_rrc_resourceGroupToReleaseList_r16_item = -1; /* PUCCH_ResourceGroupId_r16 */ static int hf_nr_rrc_sps_PUCCH_AN_List_r16 = -1; /* T_sps_PUCCH_AN_List_r16 */ -static int hf_nr_rrc_setup_80 = -1; /* SPS_PUCCH_AN_List_r16 */ +static int hf_nr_rrc_setup_81 = -1; /* SPS_PUCCH_AN_List_r16 */ static int hf_nr_rrc_schedulingRequestResourceToAddModList_v1610 = -1; /* SEQUENCE_SIZE_1_maxNrofSR_Resources_OF_SchedulingRequestResourceConfig_v1610 */ static int hf_nr_rrc_schedulingRequestResourceToAddModList_v1610_item = -1; /* SchedulingRequestResourceConfig_v1610 */ static int hf_nr_rrc_interslotFrequencyHopping = -1; /* T_interslotFrequencyHopping */ @@ -3254,7 +3264,7 @@ static int hf_nr_rrc_pathlossReferenceRSs = -1; /* SEQUENCE_SIZE_1_maxNrofPUCC static int hf_nr_rrc_pathlossReferenceRSs_item = -1; /* PUCCH_PathlossReferenceRS */ static int hf_nr_rrc_twoPUCCH_PC_AdjustmentStates = -1; /* T_twoPUCCH_PC_AdjustmentStates */ static int hf_nr_rrc_pathlossReferenceRSs_v1610 = -1; /* T_pathlossReferenceRSs_v1610 */ -static int hf_nr_rrc_setup_81 = -1; /* PathlossReferenceRSs_v1610 */ +static int hf_nr_rrc_setup_82 = -1; /* PathlossReferenceRSs_v1610 */ static int hf_nr_rrc_p0_PUCCH_Id = -1; /* P0_PUCCH_Id */ static int hf_nr_rrc_p0_PUCCH_Value = -1; /* INTEGER_M16_15 */ static int hf_nr_rrc_PathlossReferenceRSs_v1610_item = -1; /* PUCCH_PathlossReferenceRS_r16 */ @@ -3277,7 +3287,7 @@ static int hf_nr_rrc_tpc_IndexPUCCH_SCell = -1; /* INTEGER_1_15 */ static int hf_nr_rrc_dataScramblingIdentityPUSCH = -1; /* INTEGER_0_1023 */ static int hf_nr_rrc_txConfig = -1; /* T_txConfig */ static int hf_nr_rrc_dmrs_UplinkForPUSCH_MappingTypeA = -1; /* T_dmrs_UplinkForPUSCH_MappingTypeA */ -static int hf_nr_rrc_setup_82 = -1; /* DMRS_UplinkConfig */ +static int hf_nr_rrc_setup_83 = -1; /* DMRS_UplinkConfig */ static int hf_nr_rrc_dmrs_UplinkForPUSCH_MappingTypeB = -1; /* T_dmrs_UplinkForPUSCH_MappingTypeB */ static int hf_nr_rrc_pusch_PowerControl = -1; /* PUSCH_PowerControl */ static int hf_nr_rrc_frequencyHopping_01 = -1; /* T_frequencyHopping_01 */ @@ -3285,7 +3295,7 @@ static int hf_nr_rrc_frequencyHoppingOffsetLists = -1; /* T_frequencyHoppingOff static int hf_nr_rrc_frequencyHoppingOffsetLists_item = -1; /* INTEGER_1_maxNrofPhysicalResourceBlocks_1 */ static int hf_nr_rrc_resourceAllocation_02 = -1; /* T_resourceAllocation_02 */ static int hf_nr_rrc_pusch_TimeDomainAllocationList = -1; /* T_pusch_TimeDomainAllocationList */ -static int hf_nr_rrc_setup_83 = -1; /* PUSCH_TimeDomainResourceAllocationList */ +static int hf_nr_rrc_setup_84 = -1; /* PUSCH_TimeDomainResourceAllocationList */ static int hf_nr_rrc_pusch_AggregationFactor = -1; /* T_pusch_AggregationFactor */ static int hf_nr_rrc_mcs_Table_02 = -1; /* T_mcs_Table_02 */ static int hf_nr_rrc_mcs_TableTransformPrecoder_01 = -1; /* T_mcs_TableTransformPrecoder_01 */ @@ -3294,12 +3304,12 @@ static int hf_nr_rrc_codebookSubset = -1; /* T_codebookSubset */ static int hf_nr_rrc_maxRank = -1; /* INTEGER_1_4 */ static int hf_nr_rrc_rbg_Size_02 = -1; /* T_rbg_Size_02 */ static int hf_nr_rrc_uci_OnPUSCH_01 = -1; /* T_uci_OnPUSCH_01 */ -static int hf_nr_rrc_setup_84 = -1; /* UCI_OnPUSCH */ +static int hf_nr_rrc_setup_85 = -1; /* UCI_OnPUSCH */ static int hf_nr_rrc_tp_pi2BPSK = -1; /* T_tp_pi2BPSK */ static int hf_nr_rrc_minimumSchedulingOffsetK2_r16 = -1; /* T_minimumSchedulingOffsetK2_r16 */ -static int hf_nr_rrc_setup_85 = -1; /* MinSchedulingOffsetK2_Values_r16 */ +static int hf_nr_rrc_setup_86 = -1; /* MinSchedulingOffsetK2_Values_r16 */ static int hf_nr_rrc_ul_AccessConfigListDCI_0_1_r16 = -1; /* T_ul_AccessConfigListDCI_0_1_r16 */ -static int hf_nr_rrc_setup_86 = -1; /* UL_AccessConfigListDCI_0_1_r16 */ +static int hf_nr_rrc_setup_87 = -1; /* UL_AccessConfigListDCI_0_1_r16 */ static int hf_nr_rrc_harq_ProcessNumberSizeDCI_0_2_r16 = -1; /* INTEGER_0_4 */ static int hf_nr_rrc_dmrs_SequenceInitializationDCI_0_2_r16 = -1; /* T_dmrs_SequenceInitializationDCI_0_2_r16 */ static int hf_nr_rrc_numberOfBitsForRV_DCI_0_2_r16 = -1; /* INTEGER_0_2 */ @@ -3310,7 +3320,7 @@ static int hf_nr_rrc_frequencyHoppingDCI_0_2_r16 = -1; /* T_frequencyHoppingDCI static int hf_nr_rrc_pusch_RepTypeA = -1; /* T_pusch_RepTypeA */ static int hf_nr_rrc_pusch_RepTypeB = -1; /* T_pusch_RepTypeB */ static int hf_nr_rrc_frequencyHoppingOffsetListsDCI_0_2_r16 = -1; /* T_frequencyHoppingOffsetListsDCI_0_2_r16 */ -static int hf_nr_rrc_setup_87 = -1; /* FrequencyHoppingOffsetListsDCI_0_2_r16 */ +static int hf_nr_rrc_setup_88 = -1; /* FrequencyHoppingOffsetListsDCI_0_2_r16 */ static int hf_nr_rrc_codebookSubsetDCI_0_2_r16 = -1; /* T_codebookSubsetDCI_0_2_r16 */ static int hf_nr_rrc_invalidSymbolPatternIndicatorDCI_0_2_r16 = -1; /* T_invalidSymbolPatternIndicatorDCI_0_2_r16 */ static int hf_nr_rrc_maxRankDCI_0_2_r16 = -1; /* INTEGER_1_4 */ @@ -3321,19 +3331,19 @@ static int hf_nr_rrc_pusch_RepTypeIndicatorDCI_0_2_r16 = -1; /* T_pusch_RepType static int hf_nr_rrc_resourceAllocationDCI_0_2_r16 = -1; /* T_resourceAllocationDCI_0_2_r16 */ static int hf_nr_rrc_resourceAllocationType1GranularityDCI_0_2_r16 = -1; /* T_resourceAllocationType1GranularityDCI_0_2_r16 */ static int hf_nr_rrc_uci_OnPUSCH_ListDCI_0_2_r16 = -1; /* T_uci_OnPUSCH_ListDCI_0_2_r16 */ -static int hf_nr_rrc_setup_88 = -1; /* UCI_OnPUSCH_ListDCI_0_2_r16 */ +static int hf_nr_rrc_setup_89 = -1; /* UCI_OnPUSCH_ListDCI_0_2_r16 */ static int hf_nr_rrc_pusch_TimeDomainAllocationListDCI_0_2_r16 = -1; /* T_pusch_TimeDomainAllocationListDCI_0_2_r16 */ -static int hf_nr_rrc_setup_89 = -1; /* PUSCH_TimeDomainResourceAllocationList_r16 */ +static int hf_nr_rrc_setup_90 = -1; /* PUSCH_TimeDomainResourceAllocationList_r16 */ static int hf_nr_rrc_pusch_TimeDomainAllocationListDCI_0_1_r16 = -1; /* T_pusch_TimeDomainAllocationListDCI_0_1_r16 */ static int hf_nr_rrc_invalidSymbolPatternIndicatorDCI_0_1_r16 = -1; /* T_invalidSymbolPatternIndicatorDCI_0_1_r16 */ static int hf_nr_rrc_priorityIndicatorDCI_0_1_r16 = -1; /* T_priorityIndicatorDCI_0_1_r16 */ static int hf_nr_rrc_pusch_RepTypeIndicatorDCI_0_1_r16 = -1; /* T_pusch_RepTypeIndicatorDCI_0_1_r16 */ static int hf_nr_rrc_frequencyHoppingDCI_0_1_r16 = -1; /* T_frequencyHoppingDCI_0_1_r16 */ static int hf_nr_rrc_uci_OnPUSCH_ListDCI_0_1_r16 = -1; /* T_uci_OnPUSCH_ListDCI_0_1_r16 */ -static int hf_nr_rrc_setup_90 = -1; /* UCI_OnPUSCH_ListDCI_0_1_r16 */ +static int hf_nr_rrc_setup_91 = -1; /* UCI_OnPUSCH_ListDCI_0_1_r16 */ static int hf_nr_rrc_invalidSymbolPattern_r16 = -1; /* InvalidSymbolPattern_r16 */ static int hf_nr_rrc_pusch_PowerControl_v1610 = -1; /* T_pusch_PowerControl_v1610 */ -static int hf_nr_rrc_setup_91 = -1; /* PUSCH_PowerControl_v1610 */ +static int hf_nr_rrc_setup_92 = -1; /* PUSCH_PowerControl_v1610 */ static int hf_nr_rrc_ul_FullPowerTransmission_r16 = -1; /* T_ul_FullPowerTransmission_r16 */ static int hf_nr_rrc_pusch_TimeDomainAllocationListForMultiPUSCH_r16 = -1; /* T_pusch_TimeDomainAllocationListForMultiPUSCH_r16 */ static int hf_nr_rrc_numberOfInvalidSymbolsForDL_UL_Switching_r16 = -1; /* INTEGER_1_4 */ @@ -3396,12 +3406,12 @@ static int hf_nr_rrc_p0_PUSCH_SetId_r16 = -1; /* P0_PUSCH_SetId_r16 */ static int hf_nr_rrc_p0_List_r16 = -1; /* SEQUENCE_SIZE_1_maxNrofP0_PUSCH_Set_r16_OF_P0_PUSCH_r16 */ static int hf_nr_rrc_p0_List_r16_item = -1; /* P0_PUSCH_r16 */ static int hf_nr_rrc_codeBlockGroupTransmission_01 = -1; /* T_codeBlockGroupTransmission_01 */ -static int hf_nr_rrc_setup_92 = -1; /* PUSCH_CodeBlockGroupTransmission */ +static int hf_nr_rrc_setup_93 = -1; /* PUSCH_CodeBlockGroupTransmission */ static int hf_nr_rrc_rateMatching = -1; /* T_rateMatching */ static int hf_nr_rrc_xOverhead_01 = -1; /* T_xOverhead_01 */ static int hf_nr_rrc_maxMIMO_Layers_01 = -1; /* INTEGER_1_4 */ static int hf_nr_rrc_maxMIMO_LayersDCI_0_2_r16 = -1; /* T_maxMIMO_LayersDCI_0_2_r16 */ -static int hf_nr_rrc_setup_93 = -1; /* MaxMIMO_LayersDCI_0_2_r16 */ +static int hf_nr_rrc_setup_94 = -1; /* MaxMIMO_LayersDCI_0_2_r16 */ static int hf_nr_rrc_maxCodeBlockGroupsPerTransportBlock_01 = -1; /* T_maxCodeBlockGroupsPerTransportBlock_01 */ static int hf_nr_rrc_PUSCH_TimeDomainResourceAllocationList_item = -1; /* PUSCH_TimeDomainResourceAllocation */ static int hf_nr_rrc_k2 = -1; /* INTEGER_0_32 */ @@ -3482,7 +3492,6 @@ static int hf_nr_rrc_ra_PrioritizationForAccessIdentityTwoStep_r16 = -1; /* T_r static int hf_nr_rrc_ra_ContentionResolutionTimer_r16 = -1; /* T_ra_ContentionResolutionTimer_r16 */ static int hf_nr_rrc_ra_MsgA_SizeGroupA = -1; /* T_ra_MsgA_SizeGroupA */ static int hf_nr_rrc_messagePowerOffsetGroupB_01 = -1; /* T_messagePowerOffsetGroupB_01 */ -static int hf_nr_rrc_numberofRA_PreamblesGroupA = -1; /* INTEGER_1_64 */ static int hf_nr_rrc_cfra = -1; /* CFRA */ static int hf_nr_rrc_cfra_TwoStep_r16 = -1; /* CFRA_TwoStep_r16 */ static int hf_nr_rrc_occasions = -1; /* T_occasions */ @@ -3500,7 +3509,7 @@ static int hf_nr_rrc_ssb_PerRACH_OccasionTwoStepRA_r16 = -1; /* T_ssb_PerRACH_O static int hf_nr_rrc_msgA_CFRA_PUSCH_r16 = -1; /* MsgA_PUSCH_Resource_r16 */ static int hf_nr_rrc_msgA_TransMax_r16_01 = -1; /* T_msgA_TransMax_r16_01 */ static int hf_nr_rrc_resourcesTwoStep_r16 = -1; /* T_resourcesTwoStep_r16 */ -static int hf_nr_rrc_msgA_PUSCH_resource_Index_r16 = -1; /* INTEGER_0_3071 */ +static int hf_nr_rrc_msgA_PUSCH_Resource_Index_r16 = -1; /* INTEGER_0_3071 */ static int hf_nr_rrc_csi_RS_02 = -1; /* CSI_RS_Index */ static int hf_nr_rrc_ra_OccasionList_01 = -1; /* T_ra_OccasionList_01 */ static int hf_nr_rrc_prach_ConfigurationIndex = -1; /* INTEGER_0_255 */ @@ -3561,7 +3570,7 @@ static int hf_nr_rrc_resourceBlocks = -1; /* BIT_STRING_SIZE_275 */ static int hf_nr_rrc_symbolsInResourceBlock = -1; /* T_symbolsInResourceBlock */ static int hf_nr_rrc_periodicityAndPattern = -1; /* T_periodicityAndPattern */ static int hf_nr_rrc_controlResourceSet = -1; /* ControlResourceSetId */ -static int hf_nr_rrc_dummy_04 = -1; /* T_dummy_01 */ +static int hf_nr_rrc_dummy_05 = -1; /* T_dummy_01 */ static int hf_nr_rrc_controlResourceSet_r16 = -1; /* ControlResourceSetId_r16 */ static int hf_nr_rrc_carrierFreqDL = -1; /* INTEGER_0_16383 */ static int hf_nr_rrc_carrierBandwidthDL = -1; /* T_carrierBandwidthDL */ @@ -3578,13 +3587,17 @@ static int hf_nr_rrc_refSeconds_r16 = -1; /* INTEGER_0_86399 */ static int hf_nr_rrc_refMilliSeconds_r16 = -1; /* INTEGER_0_999 */ static int hf_nr_rrc_refTenNanoSeconds_r16 = -1; /* INTEGER_0_99999 */ static int hf_nr_rrc_fdm_TDM_r16 = -1; /* T_fdm_TDM_r16 */ -static int hf_nr_rrc_setup_94 = -1; /* FDM_TDM_r16 */ +static int hf_nr_rrc_setup_95 = -1; /* FDM_TDM_r16 */ static int hf_nr_rrc_slotBased_r16 = -1; /* T_slotBased_r16 */ -static int hf_nr_rrc_setup_95 = -1; /* SlotBased_r16 */ +static int hf_nr_rrc_setup_96 = -1; /* SlotBased_r16 */ +static int hf_nr_rrc_slotBased_v1630 = -1; /* T_slotBased_v1630 */ +static int hf_nr_rrc_setup_97 = -1; /* SlotBased_v1630 */ static int hf_nr_rrc_repetitionScheme_r16 = -1; /* T_repetitionScheme_r16 */ static int hf_nr_rrc_startingSymbolOffsetK_r16 = -1; /* INTEGER_0_7 */ static int hf_nr_rrc_tciMapping_r16 = -1; /* T_tciMapping_r16 */ -static int hf_nr_rrc_sequenceOffsetforRV_r16 = -1; /* INTEGER_1_3 */ +static int hf_nr_rrc_sequenceOffsetForRV_r16 = -1; /* INTEGER_1_3 */ +static int hf_nr_rrc_tciMapping_r16_01 = -1; /* T_tciMapping_r16_01 */ +static int hf_nr_rrc_sequenceOffsetForRV_r16_01 = -1; /* INTEGER_0 */ static int hf_nr_rrc_reportType_01 = -1; /* T_reportType_01 */ static int hf_nr_rrc_periodical_01 = -1; /* PeriodicalReportConfigInterRAT */ static int hf_nr_rrc_eventTriggered_01 = -1; /* EventTriggerConfigInterRAT */ @@ -3670,7 +3683,7 @@ static int hf_nr_rrc_includeBT_Meas_r16_01 = -1; /* T_includeBT_Meas_r16_01 */ static int hf_nr_rrc_includeWLAN_Meas_r16_01 = -1; /* T_includeWLAN_Meas_r16_01 */ static int hf_nr_rrc_includeSensor_Meas_r16_01 = -1; /* T_includeSensor_Meas_r16_01 */ static int hf_nr_rrc_ul_DelayValueConfig_r16 = -1; /* T_ul_DelayValueConfig_r16 */ -static int hf_nr_rrc_setup_96 = -1; /* UL_DelayValueConfig_r16 */ +static int hf_nr_rrc_setup_98 = -1; /* UL_DelayValueConfig_r16 */ static int hf_nr_rrc_reportAddNeighMeas_r16 = -1; /* T_reportAddNeighMeas_r16 */ static int hf_nr_rrc_rsrp_02 = -1; /* INTEGER_M30_30 */ static int hf_nr_rrc_rsrq_02 = -1; /* INTEGER_M30_30 */ @@ -3834,39 +3847,39 @@ static int hf_nr_rrc_defaultDownlinkBWP_Id = -1; /* BWP_Id */ static int hf_nr_rrc_uplinkConfig = -1; /* UplinkConfig */ static int hf_nr_rrc_supplementaryUplink_01 = -1; /* UplinkConfig */ static int hf_nr_rrc_pdcch_ServingCellConfig = -1; /* T_pdcch_ServingCellConfig */ -static int hf_nr_rrc_setup_97 = -1; /* PDCCH_ServingCellConfig */ +static int hf_nr_rrc_setup_99 = -1; /* PDCCH_ServingCellConfig */ static int hf_nr_rrc_pdsch_ServingCellConfig = -1; /* T_pdsch_ServingCellConfig */ -static int hf_nr_rrc_setup_98 = -1; /* PDSCH_ServingCellConfig */ +static int hf_nr_rrc_setup_100 = -1; /* PDSCH_ServingCellConfig */ static int hf_nr_rrc_csi_MeasConfig = -1; /* T_csi_MeasConfig */ -static int hf_nr_rrc_setup_99 = -1; /* CSI_MeasConfig */ +static int hf_nr_rrc_setup_101 = -1; /* CSI_MeasConfig */ static int hf_nr_rrc_sCellDeactivationTimer = -1; /* T_sCellDeactivationTimer */ static int hf_nr_rrc_crossCarrierSchedulingConfig = -1; /* CrossCarrierSchedulingConfig */ static int hf_nr_rrc_tag_Id = -1; /* TAG_Id */ -static int hf_nr_rrc_dummy_05 = -1; /* T_dummy_02 */ +static int hf_nr_rrc_dummy1_01 = -1; /* T_dummy1_01 */ static int hf_nr_rrc_pathlossReferenceLinking = -1; /* T_pathlossReferenceLinking */ static int hf_nr_rrc_servingCellMO = -1; /* MeasObjectId */ static int hf_nr_rrc_lte_CRS_ToMatchAround = -1; /* T_lte_CRS_ToMatchAround */ -static int hf_nr_rrc_setup_100 = -1; /* RateMatchPatternLTE_CRS */ +static int hf_nr_rrc_setup_102 = -1; /* RateMatchPatternLTE_CRS */ static int hf_nr_rrc_downlinkChannelBW_PerSCS_List = -1; /* SEQUENCE_SIZE_1_maxSCSs_OF_SCS_SpecificCarrier */ static int hf_nr_rrc_downlinkChannelBW_PerSCS_List_item = -1; /* SCS_SpecificCarrier */ -static int hf_nr_rrc_supplementaryUplinkRelease = -1; /* T_supplementaryUplinkRelease */ +static int hf_nr_rrc_supplementaryUplinkRelease_r16 = -1; /* T_supplementaryUplinkRelease_r16 */ static int hf_nr_rrc_tdd_UL_DL_ConfigurationDedicated_IAB_MT_r16 = -1; /* TDD_UL_DL_ConfigDedicated_IAB_MT_r16 */ static int hf_nr_rrc_dormantBWP_Config_r16 = -1; /* T_dormantBWP_Config_r16 */ -static int hf_nr_rrc_setup_101 = -1; /* DormantBWP_Config_r16 */ +static int hf_nr_rrc_setup_103 = -1; /* DormantBWP_Config_r16 */ static int hf_nr_rrc_ca_SlotOffset_r16 = -1; /* T_ca_SlotOffset_r16 */ static int hf_nr_rrc_refSCS15kHz = -1; /* INTEGER_M2_2 */ static int hf_nr_rrc_refSCS30KHz = -1; /* INTEGER_M5_5 */ static int hf_nr_rrc_refSCS60KHz = -1; /* INTEGER_M10_10 */ static int hf_nr_rrc_refSCS120KHz = -1; /* INTEGER_M20_20 */ -static int hf_nr_rrc_channelAccessConfig_r16 = -1; /* T_channelAccessConfig_r16 */ -static int hf_nr_rrc_setup_102 = -1; /* ChannelAccessConfig_r16 */ +static int hf_nr_rrc_dummy2_01 = -1; /* T_dummy2_01 */ +static int hf_nr_rrc_setup_104 = -1; /* DummyJ */ static int hf_nr_rrc_intraCellGuardBandsDL_List_r16 = -1; /* SEQUENCE_SIZE_1_maxSCSs_OF_IntraCellGuardBandsPerSCS_r16 */ static int hf_nr_rrc_intraCellGuardBandsDL_List_r16_item = -1; /* IntraCellGuardBandsPerSCS_r16 */ static int hf_nr_rrc_intraCellGuardBandsUL_List_r16 = -1; /* SEQUENCE_SIZE_1_maxSCSs_OF_IntraCellGuardBandsPerSCS_r16 */ static int hf_nr_rrc_intraCellGuardBandsUL_List_r16_item = -1; /* IntraCellGuardBandsPerSCS_r16 */ -static int hf_nr_rrc_csi_RS_ValidationWith_DCI_r16 = -1; /* T_csi_RS_ValidationWith_DCI_r16 */ +static int hf_nr_rrc_csi_RS_ValidationWithDCI_r16 = -1; /* T_csi_RS_ValidationWithDCI_r16 */ static int hf_nr_rrc_lte_CRS_PatternList1_r16 = -1; /* T_lte_CRS_PatternList1_r16 */ -static int hf_nr_rrc_setup_103 = -1; /* LTE_CRS_PatternList_r16 */ +static int hf_nr_rrc_setup_105 = -1; /* LTE_CRS_PatternList_r16 */ static int hf_nr_rrc_lte_CRS_PatternList2_r16 = -1; /* T_lte_CRS_PatternList2_r16 */ static int hf_nr_rrc_crs_RateMatch_PerCORESETPoolIndex_r16 = -1; /* T_crs_RateMatch_PerCORESETPoolIndex_r16 */ static int hf_nr_rrc_enableTwoDefaultTCI_States_r16 = -1; /* T_enableTwoDefaultTCI_States_r16 */ @@ -3874,6 +3887,9 @@ static int hf_nr_rrc_enableDefaultTCI_StatePerCoresetPoolIndex_r16 = -1; /* T_e static int hf_nr_rrc_enableBeamSwitchTiming_r16 = -1; /* T_enableBeamSwitchTiming_r16 */ static int hf_nr_rrc_cbg_TxDiffTBsProcessingType1_r16 = -1; /* T_cbg_TxDiffTBsProcessingType1_r16 */ static int hf_nr_rrc_cbg_TxDiffTBsProcessingType2_r16 = -1; /* T_cbg_TxDiffTBsProcessingType2_r16 */ +static int hf_nr_rrc_directionalCollisionHandling_r16 = -1; /* T_directionalCollisionHandling_r16 */ +static int hf_nr_rrc_channelAccessConfig_r16 = -1; /* T_channelAccessConfig_r16 */ +static int hf_nr_rrc_setup_106 = -1; /* ChannelAccessConfig_r16 */ static int hf_nr_rrc_initialUplinkBWP = -1; /* BWP_UplinkDedicated */ static int hf_nr_rrc_uplinkBWP_ToReleaseList = -1; /* SEQUENCE_SIZE_1_maxNrofBWPs_OF_BWP_Id */ static int hf_nr_rrc_uplinkBWP_ToReleaseList_item = -1; /* BWP_Id */ @@ -3881,9 +3897,9 @@ static int hf_nr_rrc_uplinkBWP_ToAddModList = -1; /* SEQUENCE_SIZE_1_maxNrofBWP static int hf_nr_rrc_uplinkBWP_ToAddModList_item = -1; /* BWP_Uplink */ static int hf_nr_rrc_firstActiveUplinkBWP_Id = -1; /* BWP_Id */ static int hf_nr_rrc_pusch_ServingCellConfig = -1; /* T_pusch_ServingCellConfig */ -static int hf_nr_rrc_setup_104 = -1; /* PUSCH_ServingCellConfig */ +static int hf_nr_rrc_setup_107 = -1; /* PUSCH_ServingCellConfig */ static int hf_nr_rrc_carrierSwitching = -1; /* T_carrierSwitching */ -static int hf_nr_rrc_setup_105 = -1; /* SRS_CarrierSwitching */ +static int hf_nr_rrc_setup_108 = -1; /* SRS_CarrierSwitching */ static int hf_nr_rrc_powerBoostPi2BPSK = -1; /* BOOLEAN */ static int hf_nr_rrc_uplinkChannelBW_PerSCS_List = -1; /* SEQUENCE_SIZE_1_maxSCSs_OF_SCS_SpecificCarrier */ static int hf_nr_rrc_uplinkChannelBW_PerSCS_List_item = -1; /* SCS_SpecificCarrier */ @@ -3892,12 +3908,15 @@ static int hf_nr_rrc_enableDefaultBeamPL_ForPUSCH0_0_r16 = -1; /* T_enableDefau static int hf_nr_rrc_enableDefaultBeamPL_ForPUCCH_r16 = -1; /* T_enableDefaultBeamPL_ForPUCCH_r16 */ static int hf_nr_rrc_enableDefaultBeamPL_ForSRS_r16 = -1; /* T_enableDefaultBeamPL_ForSRS_r16 */ static int hf_nr_rrc_uplinkTxSwitching_r16 = -1; /* T_uplinkTxSwitching_r16 */ -static int hf_nr_rrc_setup_106 = -1; /* UplinkTxSwitching_r16 */ +static int hf_nr_rrc_setup_109 = -1; /* UplinkTxSwitching_r16 */ static int hf_nr_rrc_mpr_PowerBoost_FR2_r16 = -1; /* T_mpr_PowerBoost_FR2_r16 */ static int hf_nr_rrc_maxEnergyDetectionThreshold_r16 = -1; /* INTEGER_M85_M52 */ static int hf_nr_rrc_energyDetectionThresholdOffset_r16 = -1; /* INTEGER_M20_M13 */ static int hf_nr_rrc_ul_toDL_COT_SharingED_Threshold_r16 = -1; /* INTEGER_M85_M52 */ static int hf_nr_rrc_absenceOfAnyOtherTechnology_r16 = -1; /* T_absenceOfAnyOtherTechnology_r16 */ +static int hf_nr_rrc_energyDetectionConfig_r16 = -1; /* T_energyDetectionConfig_r16 */ +static int hf_nr_rrc_energyDetectionThresholdOffset_r16_01 = -1; /* INTEGER_M13_20 */ +static int hf_nr_rrc_absenceOfAnyOtherTechnology_r16_01 = -1; /* T_absenceOfAnyOtherTechnology_r16_01 */ static int hf_nr_rrc_guardBandSCS_r16 = -1; /* SubcarrierSpacing */ static int hf_nr_rrc_intraCellGuardBands_r16 = -1; /* SEQUENCE_SIZE_1_4_OF_GuardBand_r16 */ static int hf_nr_rrc_intraCellGuardBands_r16_item = -1; /* GuardBand_r16 */ @@ -3905,9 +3924,9 @@ static int hf_nr_rrc_startCRB_r16 = -1; /* INTEGER_0_274 */ static int hf_nr_rrc_nrofCRBs_r16 = -1; /* INTEGER_0_15 */ static int hf_nr_rrc_dormantBWP_Id_r16 = -1; /* BWP_Id */ static int hf_nr_rrc_withinActiveTimeConfig_r16 = -1; /* T_withinActiveTimeConfig_r16 */ -static int hf_nr_rrc_setup_107 = -1; /* WithinActiveTimeConfig_r16 */ +static int hf_nr_rrc_setup_110 = -1; /* WithinActiveTimeConfig_r16 */ static int hf_nr_rrc_outsideActiveTimeConfig_r16 = -1; /* T_outsideActiveTimeConfig_r16 */ -static int hf_nr_rrc_setup_108 = -1; /* OutsideActiveTimeConfig_r16 */ +static int hf_nr_rrc_setup_111 = -1; /* OutsideActiveTimeConfig_r16 */ static int hf_nr_rrc_firstWithinActiveTimeBWP_Id_r16 = -1; /* BWP_Id */ static int hf_nr_rrc_dormancyGroupWithinActiveTime_r16 = -1; /* DormancyGroupID_r16 */ static int hf_nr_rrc_firstOutsideActiveTimeBWP_Id_r16 = -1; /* BWP_Id */ @@ -3929,7 +3948,7 @@ static int hf_nr_rrc_tdd_UL_DL_ConfigurationCommon = -1; /* TDD_UL_DL_ConfigCom static int hf_nr_rrc_ss_PBCH_BlockPower = -1; /* INTEGER_M60_50 */ static int hf_nr_rrc_channelAccessMode_r16 = -1; /* T_channelAccessMode_r16 */ static int hf_nr_rrc_dynamic_02 = -1; /* NULL */ -static int hf_nr_rrc_semiStatic_01 = -1; /* SemiStaticChannelAccessConfig */ +static int hf_nr_rrc_semiStatic_01 = -1; /* SemiStaticChannelAccessConfig_r16 */ static int hf_nr_rrc_discoveryBurstWindowLength_r16 = -1; /* T_discoveryBurstWindowLength_r16 */ static int hf_nr_rrc_highSpeedConfig_r16 = -1; /* HighSpeedConfig_r16 */ static int hf_nr_rrc_downlinkConfigCommon_01 = -1; /* DownlinkConfigCommonSIB */ @@ -4059,7 +4078,7 @@ static int hf_nr_rrc_p0_01 = -1; /* INTEGER_M202_24 */ static int hf_nr_rrc_pathlossReferenceRS = -1; /* PathlossReferenceRS_Config */ static int hf_nr_rrc_srs_PowerControlAdjustmentStates = -1; /* T_srs_PowerControlAdjustmentStates */ static int hf_nr_rrc_pathlossReferenceRSList_r16 = -1; /* T_pathlossReferenceRSList_r16 */ -static int hf_nr_rrc_setup_109 = -1; /* PathlossReferenceRSList_r16 */ +static int hf_nr_rrc_setup_112 = -1; /* PathlossReferenceRSList_r16 */ static int hf_nr_rrc_PathlossReferenceRSList_r16_item = -1; /* PathlossReferenceRS_r16 */ static int hf_nr_rrc_srs_PathlossReferenceRS_Id_r16 = -1; /* SRS_PathlossReferenceRS_Id_r16 */ static int hf_nr_rrc_pathlossReferenceRS_r16 = -1; /* PathlossReferenceRS_Config */ @@ -4299,7 +4318,9 @@ static int hf_nr_rrc_BandCombinationList_v1570_item = -1; /* BandCombination_v1 static int hf_nr_rrc_BandCombinationList_v1580_item = -1; /* BandCombination_v1580 */ static int hf_nr_rrc_BandCombinationList_v1590_item = -1; /* BandCombination_v1590 */ static int hf_nr_rrc_BandCombinationList_v1610_item = -1; /* BandCombination_v1610 */ +static int hf_nr_rrc_BandCombinationList_v1630_item = -1; /* BandCombination_v1630 */ static int hf_nr_rrc_BandCombinationList_UplinkTxSwitch_r16_item = -1; /* BandCombination_UplinkTxSwitch_r16 */ +static int hf_nr_rrc_BandCombinationList_UplinkTxSwitch_v1630_item = -1; /* BandCombination_UplinkTxSwitch_v1630 */ static int hf_nr_rrc_bandList = -1; /* SEQUENCE_SIZE_1_maxSimultaneousBands_OF_BandParameters */ static int hf_nr_rrc_bandList_item = -1; /* BandParameters */ static int hf_nr_rrc_featureSetCombination = -1; /* FeatureSetCombinationId */ @@ -4312,14 +4333,6 @@ static int hf_nr_rrc_bandList_v1540 = -1; /* SEQUENCE_SIZE_1_maxSimultan static int hf_nr_rrc_bandList_v1540_item = -1; /* BandParameters_v1540 */ static int hf_nr_rrc_ca_ParametersNR_v1540 = -1; /* CA_ParametersNR_v1540 */ static int hf_nr_rrc_ca_ParametersNR_v1550 = -1; /* CA_ParametersNR_v1550 */ -static int hf_nr_rrc_bandList_v1610 = -1; /* SEQUENCE_SIZE_1_maxSimultaneousBands_OF_BandParameters_v1610 */ -static int hf_nr_rrc_bandList_v1610_item = -1; /* BandParameters_v1610 */ -static int hf_nr_rrc_ca_ParametersNR_v1610 = -1; /* CA_ParametersNR_v1610 */ -static int hf_nr_rrc_ca_ParametersNRDC_v1610 = -1; /* CA_ParametersNRDC_v1610 */ -static int hf_nr_rrc_powerClass_v1610 = -1; /* T_powerClass_v1610 */ -static int hf_nr_rrc_powerClassNRPart_r16 = -1; /* T_powerClassNRPart_r16 */ -static int hf_nr_rrc_featureSetCombinationDAPS_r16 = -1; /* FeatureSetCombinationId */ -static int hf_nr_rrc_mrdc_Parameters_v1620 = -1; /* MRDC_Parameters_v1620 */ static int hf_nr_rrc_ne_DC_BC = -1; /* T_ne_DC_BC */ static int hf_nr_rrc_ca_ParametersNRDC = -1; /* CA_ParametersNRDC */ static int hf_nr_rrc_ca_ParametersEUTRA_v1560 = -1; /* CA_ParametersEUTRA_v1560 */ @@ -4328,6 +4341,23 @@ static int hf_nr_rrc_ca_ParametersEUTRA_v1570 = -1; /* CA_ParametersEUTRA_v1570 static int hf_nr_rrc_mrdc_Parameters_v1580 = -1; /* MRDC_Parameters_v1580 */ static int hf_nr_rrc_supportedBandwidthCombinationSetIntraENDC = -1; /* BIT_STRING_SIZE_1_32 */ static int hf_nr_rrc_mrdc_Parameters_v1590 = -1; /* MRDC_Parameters_v1590 */ +static int hf_nr_rrc_bandList_v1610 = -1; /* SEQUENCE_SIZE_1_maxSimultaneousBands_OF_BandParameters_v1610 */ +static int hf_nr_rrc_bandList_v1610_item = -1; /* BandParameters_v1610 */ +static int hf_nr_rrc_ca_ParametersNR_v1610 = -1; /* CA_ParametersNR_v1610 */ +static int hf_nr_rrc_ca_ParametersNRDC_v1610 = -1; /* CA_ParametersNRDC_v1610 */ +static int hf_nr_rrc_powerClass_v1610 = -1; /* T_powerClass_v1610 */ +static int hf_nr_rrc_powerClassNRPart_r16 = -1; /* T_powerClassNRPart_r16 */ +static int hf_nr_rrc_featureSetCombinationDAPS_r16 = -1; /* FeatureSetCombinationId */ +static int hf_nr_rrc_mrdc_Parameters_v1620 = -1; /* MRDC_Parameters_v1620 */ +static int hf_nr_rrc_ca_ParametersNR_v1630 = -1; /* CA_ParametersNR_v1630 */ +static int hf_nr_rrc_ca_ParametersNRDC_v1630 = -1; /* CA_ParametersNRDC_v1630 */ +static int hf_nr_rrc_mrdc_Parameters_v1630 = -1; /* MRDC_Parameters_v1630 */ +static int hf_nr_rrc_supportedTxBandCombListPerBC_Sidelink_r16 = -1; /* BIT_STRING_SIZE_1_maxBandComb */ +static int hf_nr_rrc_supportedRxBandCombListPerBC_Sidelink_r16 = -1; /* BIT_STRING_SIZE_1_maxBandComb */ +static int hf_nr_rrc_scalingFactorTxSidelink_r16 = -1; /* SEQUENCE_SIZE_1_maxBandComb_OF_ScalingFactorSidelink_r16 */ +static int hf_nr_rrc_scalingFactorTxSidelink_r16_item = -1; /* ScalingFactorSidelink_r16 */ +static int hf_nr_rrc_scalingFactorRxSidelink_r16 = -1; /* SEQUENCE_SIZE_1_maxBandComb_OF_ScalingFactorSidelink_r16 */ +static int hf_nr_rrc_scalingFactorRxSidelink_r16_item = -1; /* ScalingFactorSidelink_r16 */ static int hf_nr_rrc_bandCombination_r16 = -1; /* BandCombination */ static int hf_nr_rrc_bandCombination_v1540 = -1; /* BandCombination_v1540 */ static int hf_nr_rrc_bandCombination_v1560 = -1; /* BandCombination_v1560 */ @@ -4339,6 +4369,7 @@ static int hf_nr_rrc_supportedBandPairListNR_r16 = -1; /* SEQUENCE_SIZE_1_maxUL static int hf_nr_rrc_supportedBandPairListNR_r16_item = -1; /* ULTxSwitchingBandPair_r16 */ static int hf_nr_rrc_uplinkTxSwitching_OptionSupport_r16 = -1; /* T_uplinkTxSwitching_OptionSupport_r16 */ static int hf_nr_rrc_uplinkTxSwitching_PowerBoosting_r16 = -1; /* T_uplinkTxSwitching_PowerBoosting_r16 */ +static int hf_nr_rrc_bandCombination_v1630 = -1; /* BandCombination_v1630 */ static int hf_nr_rrc_bandIndexUL1_r16 = -1; /* INTEGER_1_maxSimultaneousBands */ static int hf_nr_rrc_bandIndexUL2_r16 = -1; /* INTEGER_1_maxSimultaneousBands */ static int hf_nr_rrc_uplinkTxSwitchingPeriod_r16 = -1; /* T_uplinkTxSwitchingPeriod_r16 */ @@ -4364,14 +4395,21 @@ static int hf_nr_rrc_txSwitchImpactToRx = -1; /* INTEGER_1_32 */ static int hf_nr_rrc_txSwitchWithAnotherBand = -1; /* INTEGER_1_32 */ static int hf_nr_rrc_srs_TxSwitch_v1610 = -1; /* T_srs_TxSwitch_v1610 */ static int hf_nr_rrc_supportedSRS_TxPortSwitch_v1610 = -1; /* T_supportedSRS_TxPortSwitch_v1610 */ -static int hf_nr_rrc_freqBandSidelink_r16 = -1; /* FreqBandIndicatorNR */ static int hf_nr_rrc_BandCombinationListSidelinkEUTRA_NR_r16_item = -1; /* BandCombinationParametersSidelinkEUTRA_NR_r16 */ +static int hf_nr_rrc_BandCombinationListSidelinkEUTRA_NR_v1630_item = -1; /* BandCombinationParametersSidelinkEUTRA_NR_v1630 */ static int hf_nr_rrc_BandCombinationParametersSidelinkEUTRA_NR_r16_item = -1; /* BandParametersSidelinkEUTRA_NR_r16 */ +static int hf_nr_rrc_BandCombinationParametersSidelinkEUTRA_NR_v1630_item = -1; /* BandParametersSidelinkEUTRA_NR_v1630 */ static int hf_nr_rrc_eutra_03 = -1; /* T_eutra_02 */ static int hf_nr_rrc_bandParametersSidelinkEUTRA1_r16 = -1; /* T_bandParametersSidelinkEUTRA1_r16 */ static int hf_nr_rrc_bandParametersSidelinkEUTRA2_r16 = -1; /* T_bandParametersSidelinkEUTRA2_r16 */ static int hf_nr_rrc_nr_03 = -1; /* T_nr_02 */ static int hf_nr_rrc_bandParametersSidelinkNR_r16 = -1; /* BandParametersSidelink_r16 */ +static int hf_nr_rrc_eutra_04 = -1; /* NULL */ +static int hf_nr_rrc_nr_04 = -1; /* T_nr_03 */ +static int hf_nr_rrc_tx_Sidelink_r16 = -1; /* T_tx_Sidelink_r16 */ +static int hf_nr_rrc_rx_Sidelink_r16 = -1; /* T_rx_Sidelink_r16 */ +static int hf_nr_rrc_sl_CrossCarrierScheduling_r16 = -1; /* T_sl_CrossCarrierScheduling_r16 */ +static int hf_nr_rrc_freqBandSidelink_r16 = -1; /* FreqBandIndicatorNR */ static int hf_nr_rrc_multipleTimingAdvance = -1; /* T_multipleTimingAdvance */ static int hf_nr_rrc_simultaneousRx_Tx = -1; /* T_simultaneousRx_Tx */ static int hf_nr_rrc_supportedNAICS_2CRS_AP = -1; /* BIT_STRING_SIZE_1_8 */ @@ -4380,7 +4418,7 @@ static int hf_nr_rrc_ue_CA_PowerClass_N = -1; /* T_ue_CA_PowerClass_N */ static int hf_nr_rrc_supportedBandwidthCombinationSetEUTRA_v1530 = -1; /* BIT_STRING_SIZE_1_32 */ static int hf_nr_rrc_fd_MIMO_TotalWeightedLayers = -1; /* INTEGER_2_128 */ static int hf_nr_rrc_dl_1024QAM_TotalWeightedLayers = -1; /* INTEGER_0_10 */ -static int hf_nr_rrc_dummy_07 = -1; /* T_dummy_03 */ +static int hf_nr_rrc_dummy_07 = -1; /* T_dummy_02 */ static int hf_nr_rrc_parallelTxSRS_PUCCH_PUSCH = -1; /* T_parallelTxSRS_PUCCH_PUSCH */ static int hf_nr_rrc_parallelTxPRACH_SRS_PUCCH_PUSCH = -1; /* T_parallelTxPRACH_SRS_PUCCH_PUSCH */ static int hf_nr_rrc_simultaneousRxTxInterBandCA = -1; /* T_simultaneousRxTxInterBandCA */ @@ -4394,7 +4432,7 @@ static int hf_nr_rrc_maxNumberSimultaneousNZP_CSI_RS_ActBWP_AllCC = -1; /* INTE static int hf_nr_rrc_totalNumberPortsSimultaneousNZP_CSI_RS_ActBWP_AllCC = -1; /* INTEGER_2_256 */ static int hf_nr_rrc_simultaneousCSI_ReportsAllCC = -1; /* INTEGER_5_32 */ static int hf_nr_rrc_dualPA_Architecture = -1; /* T_dualPA_Architecture */ -static int hf_nr_rrc_dummy_08 = -1; /* T_dummy_04 */ +static int hf_nr_rrc_dummy_08 = -1; /* T_dummy_03 */ static int hf_nr_rrc_diffNumerologyWithinPUCCH_GroupLargerSCS = -1; /* T_diffNumerologyWithinPUCCH_GroupLargerSCS */ static int hf_nr_rrc_parallelTxMsgA_SRS_PUCCH_PUSCH_r16 = -1; /* T_parallelTxMsgA_SRS_PUCCH_PUSCH_r16 */ static int hf_nr_rrc_msgA_SUL_r16 = -1; /* T_msgA_SUL_r16 */ @@ -4435,6 +4473,13 @@ static int hf_nr_rrc_crossCarrierSchedulingUL_DiffSCS_r16 = -1; /* T_crossCarri static int hf_nr_rrc_simul_SRS_MIMO_Trans_BC_r16 = -1; /* T_simul_SRS_MIMO_Trans_BC_r16 */ static int hf_nr_rrc_codebookParametersAdditionPerBC_r16 = -1; /* CodebookParametersAdditionPerBC_r16 */ static int hf_nr_rrc_codebookComboParametersAdditionPerBC_r16 = -1; /* CodebookComboParametersAdditionPerBC_r16 */ +static int hf_nr_rrc_simulTX_SRS_AntSwitchingInterBandUL_CA_r16 = -1; /* SimulSRS_ForAntennaSwitching_r16 */ +static int hf_nr_rrc_beamManagementType_r16 = -1; /* T_beamManagementType_r16 */ +static int hf_nr_rrc_intraBandFreqSeparationUL_AggBW_GapBW_r16 = -1; /* T_intraBandFreqSeparationUL_AggBW_GapBW_r16 */ +static int hf_nr_rrc_interCA_NonAlignedFrame_B_r16 = -1; /* T_interCA_NonAlignedFrame_B_r16 */ +static int hf_nr_rrc_supportSRS_xTyR_xLessThanY_r16 = -1; /* T_supportSRS_xTyR_xLessThanY_r16 */ +static int hf_nr_rrc_supportSRS_xTyR_xEqualToY_r16 = -1; /* T_supportSRS_xTyR_xEqualToY_r16 */ +static int hf_nr_rrc_supportSRS_AntennaSwitching_r16 = -1; /* T_supportSRS_AntennaSwitching_r16 */ static int hf_nr_rrc_ca_ParametersNR_ForDC = -1; /* CA_ParametersNR */ static int hf_nr_rrc_ca_ParametersNR_ForDC_v1540 = -1; /* CA_ParametersNR_v1540 */ static int hf_nr_rrc_ca_ParametersNR_ForDC_v1550 = -1; /* CA_ParametersNR_v1550 */ @@ -4444,6 +4489,8 @@ static int hf_nr_rrc_intraFR_NR_DC_PwrSharingMode1_r16 = -1; /* T_intraFR_NR_DC static int hf_nr_rrc_intraFR_NR_DC_PwrSharingMode2_r16 = -1; /* T_intraFR_NR_DC_PwrSharingMode2_r16 */ static int hf_nr_rrc_intraFR_NR_DC_DynamicPwrSharing_r16 = -1; /* T_intraFR_NR_DC_DynamicPwrSharing_r16 */ static int hf_nr_rrc_asyncNRDC_r16 = -1; /* T_asyncNRDC_r16 */ +static int hf_nr_rrc_ca_ParametersNR_ForDC_v1610 = -1; /* CA_ParametersNR_v1610 */ +static int hf_nr_rrc_ca_ParametersNR_ForDC_v1630 = -1; /* CA_ParametersNR_v1630 */ static int hf_nr_rrc_fr1fdd_FR1TDD_CA_SpCellOnFR1FDD = -1; /* T_fr1fdd_FR1TDD_CA_SpCellOnFR1FDD */ static int hf_nr_rrc_fr1fdd_FR1TDD_CA_SpCellOnFR1TDD = -1; /* T_fr1fdd_FR1TDD_CA_SpCellOnFR1TDD */ static int hf_nr_rrc_fr1fdd_FR2TDD_CA_SpCellOnFR1FDD = -1; /* T_fr1fdd_FR2TDD_CA_SpCellOnFR1FDD */ @@ -4485,7 +4532,7 @@ static int hf_nr_rrc_etype2R2_r16 = -1; /* T_etype2R2_r16 */ static int hf_nr_rrc_supportedCSI_RS_ResourceListAdd_r16_01 = -1; /* T_supportedCSI_RS_ResourceListAdd_r16_01 */ static int hf_nr_rrc_paramComb7_8_r16 = -1; /* T_paramComb7_8_r16 */ static int hf_nr_rrc_rank3_4_r16 = -1; /* T_rank3_4_r16 */ -static int hf_nr_rrc_softAmpRestriction_r16 = -1; /* T_softAmpRestriction_r16 */ +static int hf_nr_rrc_amplitudeSubsetRestriction_r16 = -1; /* T_amplitudeSubsetRestriction_r16 */ static int hf_nr_rrc_etype2_PS_r16 = -1; /* T_etype2_PS_r16 */ static int hf_nr_rrc_etype2R1_PortSelection_r16 = -1; /* T_etype2R1_PortSelection_r16 */ static int hf_nr_rrc_supportedCSI_RS_ResourceListAdd_r16_02 = -1; /* T_supportedCSI_RS_ResourceListAdd_r16_02 */ @@ -4562,23 +4609,23 @@ static int hf_nr_rrc_maxNumberResourcesPerBand = -1; /* INTEGER_1_64 */ static int hf_nr_rrc_totalNumberTxPortsPerBand = -1; /* INTEGER_2_256 */ static int hf_nr_rrc_FeatureSetCombination_item = -1; /* FeatureSetsPerBand */ static int hf_nr_rrc_FeatureSetsPerBand_item = -1; /* FeatureSet */ -static int hf_nr_rrc_eutra_04 = -1; /* T_eutra_03 */ +static int hf_nr_rrc_eutra_05 = -1; /* T_eutra_03 */ static int hf_nr_rrc_downlinkSetEUTRA = -1; /* FeatureSetEUTRA_DownlinkId */ static int hf_nr_rrc_uplinkSetEUTRA = -1; /* FeatureSetEUTRA_UplinkId */ -static int hf_nr_rrc_nr_04 = -1; /* T_nr_03 */ +static int hf_nr_rrc_nr_05 = -1; /* T_nr_04 */ static int hf_nr_rrc_downlinkSetNR = -1; /* FeatureSetDownlinkId */ static int hf_nr_rrc_uplinkSetNR = -1; /* FeatureSetUplinkId */ static int hf_nr_rrc_featureSetListPerDownlinkCC = -1; /* SEQUENCE_SIZE_1_maxNrofServingCells_OF_FeatureSetDownlinkPerCC_Id */ static int hf_nr_rrc_featureSetListPerDownlinkCC_item = -1; /* FeatureSetDownlinkPerCC_Id */ static int hf_nr_rrc_intraBandFreqSeparationDL = -1; /* FreqSeparationClass */ static int hf_nr_rrc_scalingFactor = -1; /* T_scalingFactor */ -static int hf_nr_rrc_crossCarrierScheduling_OtherSCS = -1; /* T_crossCarrierScheduling_OtherSCS */ +static int hf_nr_rrc_dummy8 = -1; /* T_dummy8 */ static int hf_nr_rrc_scellWithoutSSB = -1; /* T_scellWithoutSSB */ static int hf_nr_rrc_csi_RS_MeasSCellWithoutSSB = -1; /* T_csi_RS_MeasSCellWithoutSSB */ -static int hf_nr_rrc_dummy1_01 = -1; /* T_dummy1_01 */ +static int hf_nr_rrc_dummy1_02 = -1; /* T_dummy1_02 */ static int hf_nr_rrc_type1_3_CSS = -1; /* T_type1_3_CSS */ static int hf_nr_rrc_pdcch_MonitoringAnyOccasions = -1; /* T_pdcch_MonitoringAnyOccasions */ -static int hf_nr_rrc_dummy2_01 = -1; /* T_dummy2_01 */ +static int hf_nr_rrc_dummy2_02 = -1; /* T_dummy2_02 */ static int hf_nr_rrc_ue_SpecificUL_DL_Assignment = -1; /* T_ue_SpecificUL_DL_Assignment */ static int hf_nr_rrc_searchSpaceSharingCA_DL = -1; /* T_searchSpaceSharingCA_DL */ static int hf_nr_rrc_timeDurationForQCL = -1; /* T_timeDurationForQCL */ @@ -4616,16 +4663,16 @@ static int hf_nr_rrc_pdsch_ProcessingType2_Limited = -1; /* T_pdsch_ProcessingT static int hf_nr_rrc_differentTB_PerSlot_SCS_30kHz = -1; /* T_differentTB_PerSlot_SCS_30kHz */ static int hf_nr_rrc_dl_MCS_TableAlt_DynamicIndication = -1; /* T_dl_MCS_TableAlt_DynamicIndication */ static int hf_nr_rrc_supportedSRS_Resources = -1; /* SRS_Resources */ -static int hf_nr_rrc_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot = -1; /* T_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot */ -static int hf_nr_rrc_scs_15kHz_03 = -1; /* T_scs_15kHz_02 */ -static int hf_nr_rrc_scs_30kHz_03 = -1; /* T_scs_30kHz_02 */ -static int hf_nr_rrc_scs_60kHz_04 = -1; /* T_scs_60kHz_03 */ -static int hf_nr_rrc_scs_120kHz_03 = -1; /* T_scs_120kHz_03 */ -static int hf_nr_rrc_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot = -1; /* T_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot */ -static int hf_nr_rrc_scs_15kHz_04 = -1; /* T_scs_15kHz_03 */ -static int hf_nr_rrc_scs_30kHz_04 = -1; /* T_scs_30kHz_03 */ -static int hf_nr_rrc_scs_60kHz_05 = -1; /* T_scs_60kHz_04 */ -static int hf_nr_rrc_scs_120kHz_04 = -1; /* T_scs_120kHz_04 */ +static int hf_nr_rrc_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16 = -1; /* T_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16 */ +static int hf_nr_rrc_scs_15kHz_r16 = -1; /* T_scs_15kHz_r16 */ +static int hf_nr_rrc_scs_30kHz_r16 = -1; /* T_scs_30kHz_r16 */ +static int hf_nr_rrc_scs_60kHz_r16 = -1; /* T_scs_60kHz_r16 */ +static int hf_nr_rrc_scs_120kHz_r16 = -1; /* T_scs_120kHz_r16 */ +static int hf_nr_rrc_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16 = -1; /* T_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16 */ +static int hf_nr_rrc_scs_15kHz_r16_01 = -1; /* T_scs_15kHz_r16_01 */ +static int hf_nr_rrc_scs_30kHz_r16_01 = -1; /* T_scs_30kHz_r16_01 */ +static int hf_nr_rrc_scs_60kHz_r16_01 = -1; /* T_scs_60kHz_r16_01 */ +static int hf_nr_rrc_scs_120kHz_r16_01 = -1; /* T_scs_120kHz_r16_01 */ static int hf_nr_rrc_intraFreqDAPS_r16 = -1; /* T_intraFreqDAPS_r16 */ static int hf_nr_rrc_intraFreqDiffSCS_DAPS_r16 = -1; /* T_intraFreqDiffSCS_DAPS_r16 */ static int hf_nr_rrc_intraFreqAsyncDAPS_r16 = -1; /* T_intraFreqAsyncDAPS_r16 */ @@ -4633,8 +4680,8 @@ static int hf_nr_rrc_intraBandFreqSeparationDL_v1620 = -1; /* FreqSeparationCla static int hf_nr_rrc_intraBandFreqSeparationDL_Only_r16 = -1; /* FreqSeparationClassDL_Only_r16 */ static int hf_nr_rrc_pdcch_Monitoring_r16 = -1; /* T_pdcch_Monitoring_r16 */ static int hf_nr_rrc_pdsch_ProcessingType1_r16 = -1; /* T_pdsch_ProcessingType1_r16 */ -static int hf_nr_rrc_scs_15kHz_r16 = -1; /* PDCCH_MonitoringOccasions_r16 */ -static int hf_nr_rrc_scs_30kHz_r16 = -1; /* PDCCH_MonitoringOccasions_r16 */ +static int hf_nr_rrc_scs_15kHz_r16_02 = -1; /* PDCCH_MonitoringOccasions_r16 */ +static int hf_nr_rrc_scs_30kHz_r16_02 = -1; /* PDCCH_MonitoringOccasions_r16 */ static int hf_nr_rrc_pdsch_ProcessingType2_r16 = -1; /* T_pdsch_ProcessingType2_r16 */ static int hf_nr_rrc_pdcch_MonitoringMixed_r16 = -1; /* T_pdcch_MonitoringMixed_r16 */ static int hf_nr_rrc_crossCarrierSchedulingProcessing_DiffSCS_r16 = -1; /* T_crossCarrierSchedulingProcessing_DiffSCS_r16 */ @@ -4697,22 +4744,24 @@ static int hf_nr_rrc_featureSetsUplink_v1610 = -1; /* SEQUENCE_SIZE_1_maxUplink static int hf_nr_rrc_featureSetsUplink_v1610_item = -1; /* FeatureSetUplink_v1610 */ static int hf_nr_rrc_featureSetDownlinkPerCC_v1620 = -1; /* SEQUENCE_SIZE_1_maxPerCC_FeatureSets_OF_FeatureSetDownlinkPerCC_v1620 */ static int hf_nr_rrc_featureSetDownlinkPerCC_v1620_item = -1; /* FeatureSetDownlinkPerCC_v1620 */ +static int hf_nr_rrc_featureSetsUplink_v1630 = -1; /* SEQUENCE_SIZE_1_maxUplinkFeatureSets_OF_FeatureSetUplink_v1630 */ +static int hf_nr_rrc_featureSetsUplink_v1630_item = -1; /* FeatureSetUplink_v1630 */ static int hf_nr_rrc_featureSetListPerUplinkCC = -1; /* SEQUENCE_SIZE_1_maxNrofServingCells_OF_FeatureSetUplinkPerCC_Id */ static int hf_nr_rrc_featureSetListPerUplinkCC_item = -1; /* FeatureSetUplinkPerCC_Id */ static int hf_nr_rrc_scalingFactor_01 = -1; /* T_scalingFactor_01 */ -static int hf_nr_rrc_crossCarrierScheduling_OtherSCS_01 = -1; /* T_crossCarrierScheduling_OtherSCS_01 */ +static int hf_nr_rrc_dummy3_01 = -1; /* T_dummy3 */ static int hf_nr_rrc_intraBandFreqSeparationUL = -1; /* FreqSeparationClass */ static int hf_nr_rrc_searchSpaceSharingCA_UL = -1; /* T_searchSpaceSharingCA_UL */ -static int hf_nr_rrc_dummy1_02 = -1; /* DummyI */ +static int hf_nr_rrc_dummy1_03 = -1; /* DummyI */ static int hf_nr_rrc_twoPUCCH_Group = -1; /* T_twoPUCCH_Group */ static int hf_nr_rrc_dynamicSwitchSUL = -1; /* T_dynamicSwitchSUL */ static int hf_nr_rrc_simultaneousTxSUL_NonSUL = -1; /* T_simultaneousTxSUL_NonSUL */ static int hf_nr_rrc_pusch_ProcessingType1_DifferentTB_PerSlot = -1; /* T_pusch_ProcessingType1_DifferentTB_PerSlot */ -static int hf_nr_rrc_scs_15kHz_05 = -1; /* T_scs_15kHz_04 */ -static int hf_nr_rrc_scs_30kHz_05 = -1; /* T_scs_30kHz_04 */ -static int hf_nr_rrc_scs_60kHz_06 = -1; /* T_scs_60kHz_05 */ -static int hf_nr_rrc_scs_120kHz_05 = -1; /* T_scs_120kHz_05 */ -static int hf_nr_rrc_dummy2_02 = -1; /* DummyF */ +static int hf_nr_rrc_scs_15kHz_03 = -1; /* T_scs_15kHz_02 */ +static int hf_nr_rrc_scs_30kHz_03 = -1; /* T_scs_30kHz_02 */ +static int hf_nr_rrc_scs_60kHz_04 = -1; /* T_scs_60kHz_03 */ +static int hf_nr_rrc_scs_120kHz_03 = -1; /* T_scs_120kHz_03 */ +static int hf_nr_rrc_dummy2_03 = -1; /* DummyF */ static int hf_nr_rrc_zeroSlotOffsetAperiodicSRS = -1; /* T_zeroSlotOffsetAperiodicSRS */ static int hf_nr_rrc_pa_PhaseDiscontinuityImpacts = -1; /* T_pa_PhaseDiscontinuityImpacts */ static int hf_nr_rrc_pusch_SeparationWithGap = -1; /* T_pusch_SeparationWithGap */ @@ -4723,17 +4772,17 @@ static int hf_nr_rrc_maxNumberPUSCH_Tx_r16 = -1; /* T_maxNumberPUSCH_Tx_r16 */ static int hf_nr_rrc_hoppingScheme_r16 = -1; /* T_hoppingScheme_r16 */ static int hf_nr_rrc_ul_CancellationSelfCarrier_r16 = -1; /* T_ul_CancellationSelfCarrier_r16 */ static int hf_nr_rrc_ul_CancellationCrossCarrier_r16 = -1; /* T_ul_CancellationCrossCarrier_r16 */ -static int hf_nr_rrc_ul_FullPwrMode2_MaxSRS_ResInSet = -1; /* T_ul_FullPwrMode2_MaxSRS_ResInSet */ -static int hf_nr_rrc_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot = -1; /* T_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot */ -static int hf_nr_rrc_scs_15kHz_06 = -1; /* T_scs_15kHz_05 */ -static int hf_nr_rrc_scs_30kHz_06 = -1; /* T_scs_30kHz_05 */ -static int hf_nr_rrc_scs_60kHz_07 = -1; /* T_scs_60kHz_06 */ -static int hf_nr_rrc_scs_120kHz_06 = -1; /* T_scs_120kHz_06 */ -static int hf_nr_rrc_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot = -1; /* T_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot */ -static int hf_nr_rrc_scs_15kHz_07 = -1; /* T_scs_15kHz_06 */ -static int hf_nr_rrc_scs_30kHz_07 = -1; /* T_scs_30kHz_06 */ -static int hf_nr_rrc_scs_60kHz_08 = -1; /* T_scs_60kHz_07 */ -static int hf_nr_rrc_scs_120kHz_07 = -1; /* T_scs_120kHz_07 */ +static int hf_nr_rrc_ul_FullPwrMode2_MaxSRS_ResInSet_r16 = -1; /* T_ul_FullPwrMode2_MaxSRS_ResInSet_r16 */ +static int hf_nr_rrc_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16 = -1; /* T_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16 */ +static int hf_nr_rrc_scs_15kHz_r16_03 = -1; /* T_scs_15kHz_r16_02 */ +static int hf_nr_rrc_scs_30kHz_r16_03 = -1; /* T_scs_30kHz_r16_02 */ +static int hf_nr_rrc_scs_60kHz_r16_02 = -1; /* T_scs_60kHz_r16_02 */ +static int hf_nr_rrc_scs_120kHz_r16_02 = -1; /* T_scs_120kHz_r16_02 */ +static int hf_nr_rrc_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16 = -1; /* T_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16 */ +static int hf_nr_rrc_scs_15kHz_r16_04 = -1; /* T_scs_15kHz_r16_03 */ +static int hf_nr_rrc_scs_30kHz_r16_04 = -1; /* T_scs_30kHz_r16_03 */ +static int hf_nr_rrc_scs_60kHz_r16_03 = -1; /* T_scs_60kHz_r16_03 */ +static int hf_nr_rrc_scs_120kHz_r16_03 = -1; /* T_scs_120kHz_r16_03 */ static int hf_nr_rrc_supportedSRS_PosResources_r16 = -1; /* SRS_AllPosResources_r16 */ static int hf_nr_rrc_intraFreqDAPS_UL_r16 = -1; /* T_intraFreqDAPS_UL_r16 */ static int hf_nr_rrc_intraFreqMultiUL_TransmissionDAPS_r16 = -1; /* T_intraFreqMultiUL_TransmissionDAPS_r16 */ @@ -4776,6 +4825,12 @@ static int hf_nr_rrc_ul_FullPwrMode2_TPMIGroup_r16 = -1; /* T_ul_FullPwrMode2_T static int hf_nr_rrc_twoPorts_r16 = -1; /* BIT_STRING_SIZE_2 */ static int hf_nr_rrc_fourPortsNonCoherent_r16 = -1; /* T_fourPortsNonCoherent_r16 */ static int hf_nr_rrc_fourPortsPartialCoherent_r16 = -1; /* T_fourPortsPartialCoherent_r16 */ +static int hf_nr_rrc_offsetSRS_CB_PUSCH_Ant_Switch_fr1_r16 = -1; /* T_offsetSRS_CB_PUSCH_Ant_Switch_fr1_r16 */ +static int hf_nr_rrc_offsetSRS_CB_PUSCH_PDCCH_MonitorSingleOcc_fr1_r16 = -1; /* T_offsetSRS_CB_PUSCH_PDCCH_MonitorSingleOcc_fr1_r16 */ +static int hf_nr_rrc_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithoutGap_fr1_r16 = -1; /* T_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithoutGap_fr1_r16 */ +static int hf_nr_rrc_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithGap_fr1_r16 = -1; /* T_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithGap_fr1_r16 */ +static int hf_nr_rrc_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithSpanGap_fr1_r16 = -1; /* T_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithSpanGap_fr1_r16 */ +static int hf_nr_rrc_partialCancellationPUCCH_PUSCH_PRACH_TX_r16 = -1; /* T_partialCancellationPUCCH_PUSCH_PRACH_TX_r16 */ static int hf_nr_rrc_srs_PosResources_r16 = -1; /* SRS_PosResources_r16 */ static int hf_nr_rrc_srs_PosResourceAP_r16 = -1; /* SRS_PosResourceAP_r16 */ static int hf_nr_rrc_srs_PosResourceSP_r16 = -1; /* SRS_PosResourceSP_r16 */ @@ -4824,7 +4879,7 @@ static int hf_nr_rrc_voiceOverEUTRA_5GC = -1; /* T_voiceOverEUTRA_5GC */ static int hf_nr_rrc_voiceOverSCG_BearerEUTRA_5GC = -1; /* T_voiceOverSCG_BearerEUTRA_5GC */ static int hf_nr_rrc_voiceFallbackIndicationEPS_r16 = -1; /* T_voiceFallbackIndicationEPS_r16 */ static int hf_nr_rrc_voiceOverNR = -1; /* T_voiceOverNR */ -static int hf_nr_rrc_eutra_05 = -1; /* EUTRA_Parameters */ +static int hf_nr_rrc_eutra_06 = -1; /* EUTRA_Parameters */ static int hf_nr_rrc_utra_FDD_r16 = -1; /* UTRA_FDD_Parameters_r16 */ static int hf_nr_rrc_supportedBandListEUTRA = -1; /* SEQUENCE_SIZE_1_maxBandsEUTRA_OF_FreqBandIndicatorEUTRA */ static int hf_nr_rrc_supportedBandListEUTRA_item = -1; /* FreqBandIndicatorEUTRA */ @@ -4843,7 +4898,7 @@ static int hf_nr_rrc_mac_ParametersCommon = -1; /* MAC_ParametersCommon */ static int hf_nr_rrc_mac_ParametersXDD_Diff = -1; /* MAC_ParametersXDD_Diff */ static int hf_nr_rrc_mac_ParametersFRX_Diff_r16 = -1; /* MAC_ParametersFRX_Diff_r16 */ static int hf_nr_rrc_lcp_Restriction = -1; /* T_lcp_Restriction */ -static int hf_nr_rrc_dummy_09 = -1; /* T_dummy_05 */ +static int hf_nr_rrc_dummy_09 = -1; /* T_dummy_04 */ static int hf_nr_rrc_lch_ToSCellRestriction = -1; /* T_lch_ToSCellRestriction */ static int hf_nr_rrc_recommendedBitRate = -1; /* T_recommendedBitRate */ static int hf_nr_rrc_recommendedBitRateQuery = -1; /* T_recommendedBitRateQuery */ @@ -4871,10 +4926,10 @@ static int hf_nr_rrc_shortDRX_Cycle = -1; /* T_shortDRX_Cycle */ static int hf_nr_rrc_multipleSR_Configurations = -1; /* T_multipleSR_Configurations */ static int hf_nr_rrc_multipleConfiguredGrants = -1; /* T_multipleConfiguredGrants */ static int hf_nr_rrc_secondaryDRX_Group_r16 = -1; /* T_secondaryDRX_Group_r16 */ -static int hf_nr_rrc_scs_15kHz_r16_01 = -1; /* T_scs_15kHz_r16 */ -static int hf_nr_rrc_scs_30kHz_r16_01 = -1; /* T_scs_30kHz_r16 */ -static int hf_nr_rrc_scs_60kHz_r16 = -1; /* T_scs_60kHz_r16 */ -static int hf_nr_rrc_scs_120kHz_r16 = -1; /* T_scs_120kHz_r16 */ +static int hf_nr_rrc_scs_15kHz_r16_05 = -1; /* T_scs_15kHz_r16_04 */ +static int hf_nr_rrc_scs_30kHz_r16_05 = -1; /* T_scs_30kHz_r16_04 */ +static int hf_nr_rrc_scs_60kHz_r16_04 = -1; /* T_scs_60kHz_r16_04 */ +static int hf_nr_rrc_scs_120kHz_r16_04 = -1; /* T_scs_120kHz_r16_04 */ static int hf_nr_rrc_measAndMobParametersCommon = -1; /* MeasAndMobParametersCommon */ static int hf_nr_rrc_measAndMobParametersXDD_Diff = -1; /* MeasAndMobParametersXDD_Diff */ static int hf_nr_rrc_measAndMobParametersFRX_Diff = -1; /* MeasAndMobParametersFRX_Diff */ @@ -4905,7 +4960,7 @@ static int hf_nr_rrc_maxNumberCLI_RSSI_r16 = -1; /* T_maxNumberCLI_RSSI_r16 */ static int hf_nr_rrc_maxNumberCLI_SRS_RSRP_r16 = -1; /* T_maxNumberCLI_SRS_RSRP_r16 */ static int hf_nr_rrc_maxNumberPerSlotCLI_SRS_RSRP_r16 = -1; /* T_maxNumberPerSlotCLI_SRS_RSRP_r16 */ static int hf_nr_rrc_mfbi_IAB_r16 = -1; /* T_mfbi_IAB_r16 */ -static int hf_nr_rrc_multipleNS_And_Pmax_IAB_r16 = -1; /* T_multipleNS_And_Pmax_IAB_r16 */ +static int hf_nr_rrc_dummy_10 = -1; /* T_dummy_05 */ static int hf_nr_rrc_nr_CGI_Reporting_NPN_r16 = -1; /* T_nr_CGI_Reporting_NPN_r16 */ static int hf_nr_rrc_idleInactiveEUTRA_MeasReport_r16 = -1; /* T_idleInactiveEUTRA_MeasReport_r16 */ static int hf_nr_rrc_idleInactive_ValidityArea_r16 = -1; /* T_idleInactive_ValidityArea_r16 */ @@ -4943,6 +4998,7 @@ static int hf_nr_rrc_interFrequencyMeas_Nogap_r16 = -1; /* T_interFrequencyMeas static int hf_nr_rrc_simultaneousRxDataSSB_DiffNumerology_Inter_r16 = -1; /* T_simultaneousRxDataSSB_DiffNumerology_Inter_r16 */ static int hf_nr_rrc_idleInactiveNR_MeasReport_r16 = -1; /* T_idleInactiveNR_MeasReport_r16 */ static int hf_nr_rrc_idleInactiveNR_MeasBeamReport_r16 = -1; /* T_idleInactiveNR_MeasBeamReport_r16 */ +static int hf_nr_rrc_increasedNumberofCSIRSPerMO_r16 = -1; /* T_increasedNumberofCSIRSPerMO_r16 */ static int hf_nr_rrc_measAndMobParametersMRDC_Common = -1; /* MeasAndMobParametersMRDC_Common */ static int hf_nr_rrc_measAndMobParametersMRDC_XDD_Diff = -1; /* MeasAndMobParametersMRDC_XDD_Diff */ static int hf_nr_rrc_measAndMobParametersMRDC_FRX_Diff = -1; /* MeasAndMobParametersMRDC_FRX_Diff */ @@ -4968,13 +5024,13 @@ static int hf_nr_rrc_periodicBeamReport = -1; /* T_periodicBeamReport */ static int hf_nr_rrc_aperiodicBeamReport = -1; /* T_aperiodicBeamReport */ static int hf_nr_rrc_sp_BeamReportPUCCH = -1; /* T_sp_BeamReportPUCCH */ static int hf_nr_rrc_sp_BeamReportPUSCH = -1; /* T_sp_BeamReportPUSCH */ -static int hf_nr_rrc_dummy1_03 = -1; /* DummyG */ +static int hf_nr_rrc_dummy1_04 = -1; /* DummyG */ static int hf_nr_rrc_maxNumberRxBeam = -1; /* INTEGER_2_8 */ static int hf_nr_rrc_maxNumberRxTxBeamSwitchDL = -1; /* T_maxNumberRxTxBeamSwitchDL */ -static int hf_nr_rrc_scs_15kHz_08 = -1; /* T_scs_15kHz_07 */ -static int hf_nr_rrc_scs_30kHz_08 = -1; /* T_scs_30kHz_07 */ -static int hf_nr_rrc_scs_60kHz_09 = -1; /* T_scs_60kHz_08 */ -static int hf_nr_rrc_scs_120kHz_08 = -1; /* T_scs_120kHz_08 */ +static int hf_nr_rrc_scs_15kHz_04 = -1; /* T_scs_15kHz_03 */ +static int hf_nr_rrc_scs_30kHz_04 = -1; /* T_scs_30kHz_03 */ +static int hf_nr_rrc_scs_60kHz_05 = -1; /* T_scs_60kHz_04 */ +static int hf_nr_rrc_scs_120kHz_04 = -1; /* T_scs_120kHz_04 */ static int hf_nr_rrc_scs_240kHz = -1; /* T_scs_240kHz */ static int hf_nr_rrc_maxNumberNonGroupBeamReporting = -1; /* T_maxNumberNonGroupBeamReporting */ static int hf_nr_rrc_groupBeamReporting = -1; /* T_groupBeamReporting */ @@ -4984,32 +5040,32 @@ static int hf_nr_rrc_maxNumberSRS_ResourceSet = -1; /* INTEGER_1_8 */ static int hf_nr_rrc_maxNumberCSI_RS_BFD = -1; /* INTEGER_1_64 */ static int hf_nr_rrc_maxNumberSSB_BFD = -1; /* INTEGER_1_64 */ static int hf_nr_rrc_maxNumberCSI_RS_SSB_CBD = -1; /* INTEGER_1_256 */ -static int hf_nr_rrc_dummy2_03 = -1; /* T_dummy2_02 */ +static int hf_nr_rrc_dummy2_04 = -1; /* T_dummy2_03 */ static int hf_nr_rrc_twoPortsPTRS_UL = -1; /* T_twoPortsPTRS_UL */ static int hf_nr_rrc_dummy5_01 = -1; /* SRS_Resources */ -static int hf_nr_rrc_dummy3_01 = -1; /* INTEGER_1_4 */ +static int hf_nr_rrc_dummy3_02 = -1; /* INTEGER_1_4 */ static int hf_nr_rrc_beamReportTiming = -1; /* T_beamReportTiming */ -static int hf_nr_rrc_scs_15kHz_09 = -1; /* T_scs_15kHz_08 */ -static int hf_nr_rrc_scs_30kHz_09 = -1; /* T_scs_30kHz_08 */ -static int hf_nr_rrc_scs_60kHz_10 = -1; /* T_scs_60kHz_09 */ -static int hf_nr_rrc_scs_120kHz_09 = -1; /* T_scs_120kHz_09 */ +static int hf_nr_rrc_scs_15kHz_05 = -1; /* T_scs_15kHz_04 */ +static int hf_nr_rrc_scs_30kHz_05 = -1; /* T_scs_30kHz_04 */ +static int hf_nr_rrc_scs_60kHz_06 = -1; /* T_scs_60kHz_05 */ +static int hf_nr_rrc_scs_120kHz_05 = -1; /* T_scs_120kHz_05 */ static int hf_nr_rrc_ptrs_DensityRecommendationSetDL = -1; /* T_ptrs_DensityRecommendationSetDL */ -static int hf_nr_rrc_scs_15kHz_10 = -1; /* PTRS_DensityRecommendationDL */ -static int hf_nr_rrc_scs_30kHz_10 = -1; /* PTRS_DensityRecommendationDL */ -static int hf_nr_rrc_scs_60kHz_11 = -1; /* PTRS_DensityRecommendationDL */ -static int hf_nr_rrc_scs_120kHz_10 = -1; /* PTRS_DensityRecommendationDL */ +static int hf_nr_rrc_scs_15kHz_06 = -1; /* PTRS_DensityRecommendationDL */ +static int hf_nr_rrc_scs_30kHz_06 = -1; /* PTRS_DensityRecommendationDL */ +static int hf_nr_rrc_scs_60kHz_07 = -1; /* PTRS_DensityRecommendationDL */ +static int hf_nr_rrc_scs_120kHz_06 = -1; /* PTRS_DensityRecommendationDL */ static int hf_nr_rrc_ptrs_DensityRecommendationSetUL = -1; /* T_ptrs_DensityRecommendationSetUL */ -static int hf_nr_rrc_scs_15kHz_11 = -1; /* PTRS_DensityRecommendationUL */ -static int hf_nr_rrc_scs_30kHz_11 = -1; /* PTRS_DensityRecommendationUL */ -static int hf_nr_rrc_scs_60kHz_12 = -1; /* PTRS_DensityRecommendationUL */ -static int hf_nr_rrc_scs_120kHz_11 = -1; /* PTRS_DensityRecommendationUL */ +static int hf_nr_rrc_scs_15kHz_07 = -1; /* PTRS_DensityRecommendationUL */ +static int hf_nr_rrc_scs_30kHz_07 = -1; /* PTRS_DensityRecommendationUL */ +static int hf_nr_rrc_scs_60kHz_08 = -1; /* PTRS_DensityRecommendationUL */ +static int hf_nr_rrc_scs_120kHz_07 = -1; /* PTRS_DensityRecommendationUL */ static int hf_nr_rrc_dummy4_01 = -1; /* DummyH */ static int hf_nr_rrc_aperiodicTRS = -1; /* T_aperiodicTRS */ static int hf_nr_rrc_dummy6_01 = -1; /* T_dummy6 */ static int hf_nr_rrc_beamManagementSSB_CSI_RS = -1; /* BeamManagementSSB_CSI_RS */ static int hf_nr_rrc_beamSwitchTiming = -1; /* T_beamSwitchTiming */ -static int hf_nr_rrc_scs_60kHz_13 = -1; /* T_scs_60kHz_10 */ -static int hf_nr_rrc_scs_120kHz_12 = -1; /* T_scs_120kHz_10 */ +static int hf_nr_rrc_scs_60kHz_09 = -1; /* T_scs_60kHz_06 */ +static int hf_nr_rrc_scs_120kHz_08 = -1; /* T_scs_120kHz_06 */ static int hf_nr_rrc_codebookParameters = -1; /* CodebookParameters */ static int hf_nr_rrc_csi_RS_IM_ReceptionForFeedback = -1; /* CSI_RS_IM_ReceptionForFeedback */ static int hf_nr_rrc_csi_RS_ProcFrameworkForSRS = -1; /* CSI_RS_ProcFrameworkForSRS */ @@ -5066,8 +5122,12 @@ static int hf_nr_rrc_codebookComboParametersAddition_r16 = -1; /* CodebookCombo static int hf_nr_rrc_beamCorrespondenceSSB_based_r16 = -1; /* T_beamCorrespondenceSSB_based_r16 */ static int hf_nr_rrc_beamCorrespondenceCSI_RS_based_r16 = -1; /* T_beamCorrespondenceCSI_RS_based_r16 */ static int hf_nr_rrc_beamSwitchTiming_r16 = -1; /* T_beamSwitchTiming_r16 */ -static int hf_nr_rrc_scs_60kHz_r16_01 = -1; /* T_scs_60kHz_r16_01 */ -static int hf_nr_rrc_scs_120kHz_r16_01 = -1; /* T_scs_120kHz_r16_01 */ +static int hf_nr_rrc_scs_60kHz_r16_05 = -1; /* T_scs_60kHz_r16_05 */ +static int hf_nr_rrc_scs_120kHz_r16_05 = -1; /* T_scs_120kHz_r16_05 */ +static int hf_nr_rrc_semi_PersistentL1_SINR_Report_PUCCH_r16 = -1; /* T_semi_PersistentL1_SINR_Report_PUCCH_r16 */ +static int hf_nr_rrc_supportReportFormat1_2OFDM_syms_r16 = -1; /* T_supportReportFormat1_2OFDM_syms_r16 */ +static int hf_nr_rrc_supportReportFormat4_14OFDM_syms_r16 = -1; /* T_supportReportFormat4_14OFDM_syms_r16 */ +static int hf_nr_rrc_semi_PersistentL1_SINR_Report_PUSCH_r16 = -1; /* T_semi_PersistentL1_SINR_Report_PUSCH_r16 */ static int hf_nr_rrc_maxNumberSSB_CSI_RS_ResourceOneTx = -1; /* T_maxNumberSSB_CSI_RS_ResourceOneTx */ static int hf_nr_rrc_maxNumberSSB_CSI_RS_ResourceTwoTx = -1; /* T_maxNumberSSB_CSI_RS_ResourceTwoTx */ static int hf_nr_rrc_supportedCSI_RS_Density = -1; /* T_supportedCSI_RS_Density */ @@ -5140,14 +5200,21 @@ static int hf_nr_rrc_tdm_restrictionTDD_endc_r16 = -1; /* T_tdm_restrictionTDD_ static int hf_nr_rrc_tdm_restrictionFDD_endc_r16 = -1; /* T_tdm_restrictionFDD_endc_r16 */ static int hf_nr_rrc_singleUL_HARQ_offsetTDD_PCell_r16 = -1; /* T_singleUL_HARQ_offsetTDD_PCell_r16 */ static int hf_nr_rrc_tdm_restrictionDualTX_FDD_endc_r16 = -1; /* T_tdm_restrictionDualTX_FDD_endc_r16 */ +static int hf_nr_rrc_maxUplinkDutyCycle_interBandENDC_FDD_TDD_PC2_r16 = -1; /* T_maxUplinkDutyCycle_interBandENDC_FDD_TDD_PC2_r16 */ +static int hf_nr_rrc_maxUplinkDutyCycle_FDD_TDD_EN_DC1_r16 = -1; /* T_maxUplinkDutyCycle_FDD_TDD_EN_DC1_r16 */ +static int hf_nr_rrc_maxUplinkDutyCycle_FDD_TDD_EN_DC2_r16 = -1; /* T_maxUplinkDutyCycle_FDD_TDD_EN_DC2_r16 */ +static int hf_nr_rrc_interBandMRDC_WithOverlapDL_Bands_r16 = -1; /* T_interBandMRDC_WithOverlapDL_Bands_r16 */ static int hf_nr_rrc_measAndMobParametersNRDC = -1; /* MeasAndMobParametersMRDC */ static int hf_nr_rrc_generalParametersNRDC = -1; /* GeneralParametersMRDC_XDD_Diff */ static int hf_nr_rrc_fdd_Add_UE_NRDC_Capabilities = -1; /* UE_MRDC_CapabilityAddXDD_Mode */ static int hf_nr_rrc_tdd_Add_UE_NRDC_Capabilities = -1; /* UE_MRDC_CapabilityAddXDD_Mode */ static int hf_nr_rrc_fr1_Add_UE_NRDC_Capabilities = -1; /* UE_MRDC_CapabilityAddFRX_Mode */ static int hf_nr_rrc_fr2_Add_UE_NRDC_Capabilities = -1; /* UE_MRDC_CapabilityAddFRX_Mode */ -static int hf_nr_rrc_dummy_10 = -1; /* T_dummy_06 */ +static int hf_nr_rrc_dummy2_05 = -1; /* OCTET_STRING */ +static int hf_nr_rrc_dummy_11 = -1; /* T_dummy_06 */ static int hf_nr_rrc_sfn_SyncNRDC = -1; /* T_sfn_SyncNRDC */ +static int hf_nr_rrc_pdcp_DuplicationSplitSRB = -1; /* T_pdcp_DuplicationSplitSRB */ +static int hf_nr_rrc_pdcp_DuplicationSplitDRB = -1; /* T_pdcp_DuplicationSplitDRB */ static int hf_nr_rrc_measAndMobParametersNRDC_v1610 = -1; /* MeasAndMobParametersMRDC_v1610 */ static int hf_nr_rrc_olpc_SRS_PosBasedOnPRS_Serving_r16 = -1; /* T_olpc_SRS_PosBasedOnPRS_Serving_r16 */ static int hf_nr_rrc_olpc_SRS_PosBasedOnSSB_Neigh_r16 = -1; /* T_olpc_SRS_PosBasedOnSSB_Neigh_r16 */ @@ -5170,8 +5237,8 @@ static int hf_nr_rrc_ehc_r16 = -1; /* T_ehc_r16 */ static int hf_nr_rrc_maxNumberEHC_Contexts_r16 = -1; /* T_maxNumberEHC_Contexts_r16 */ static int hf_nr_rrc_jointEHC_ROHC_Config_r16 = -1; /* T_jointEHC_ROHC_Config_r16 */ static int hf_nr_rrc_pdcp_DuplicationMoreThanTwoRLC_r16 = -1; /* T_pdcp_DuplicationMoreThanTwoRLC_r16 */ -static int hf_nr_rrc_pdcp_DuplicationSplitSRB = -1; /* T_pdcp_DuplicationSplitSRB */ -static int hf_nr_rrc_pdcp_DuplicationSplitDRB = -1; /* T_pdcp_DuplicationSplitDRB */ +static int hf_nr_rrc_pdcp_DuplicationSplitSRB_01 = -1; /* T_pdcp_DuplicationSplitSRB_01 */ +static int hf_nr_rrc_pdcp_DuplicationSplitDRB_01 = -1; /* T_pdcp_DuplicationSplitDRB_01 */ static int hf_nr_rrc_scg_DRB_NR_IAB_r16 = -1; /* T_scg_DRB_NR_IAB_r16 */ static int hf_nr_rrc_phy_ParametersCommon = -1; /* Phy_ParametersCommon */ static int hf_nr_rrc_phy_ParametersXDD_Diff = -1; /* Phy_ParametersXDD_Diff */ @@ -5212,7 +5279,7 @@ static int hf_nr_rrc_dynamicHARQ_ACK_CodeB_CBG_Retx_DL = -1; /* T_dynamicHARQ_A static int hf_nr_rrc_rateMatchingResrcSetSemi_Static = -1; /* T_rateMatchingResrcSetSemi_Static */ static int hf_nr_rrc_rateMatchingResrcSetDynamic = -1; /* T_rateMatchingResrcSetDynamic */ static int hf_nr_rrc_bwp_SwitchingDelay = -1; /* T_bwp_SwitchingDelay */ -static int hf_nr_rrc_dummy_11 = -1; /* T_dummy_07 */ +static int hf_nr_rrc_dummy_12 = -1; /* T_dummy_07 */ static int hf_nr_rrc_maxNumberSearchSpaces = -1; /* T_maxNumberSearchSpaces */ static int hf_nr_rrc_rateMatchingCtrlResrcSetDynamic = -1; /* T_rateMatchingCtrlResrcSetDynamic */ static int hf_nr_rrc_maxLayersMIMO_Indication = -1; /* T_maxLayersMIMO_Indication */ @@ -5257,6 +5324,9 @@ static int hf_nr_rrc_harqACK_jointMultiDCI_MultiTRP_r16 = -1; /* T_harqACK_join static int hf_nr_rrc_bwp_SwitchingMultiCCs_r16 = -1; /* T_bwp_SwitchingMultiCCs_r16 */ static int hf_nr_rrc_type1_r16 = -1; /* T_type1_r16 */ static int hf_nr_rrc_type2_r16_01 = -1; /* T_type2_r16_01 */ +static int hf_nr_rrc_targetSMTC_SCG_r16 = -1; /* T_targetSMTC_SCG_r16 */ +static int hf_nr_rrc_supportRepetitionZeroOffsetRV_r16 = -1; /* T_supportRepetitionZeroOffsetRV_r16 */ +static int hf_nr_rrc_cbg_TransInOrderPUSCH_UL_r16 = -1; /* T_cbg_TransInOrderPUSCH_UL_r16 */ static int hf_nr_rrc_dynamicSFI = -1; /* T_dynamicSFI */ static int hf_nr_rrc_twoPUCCH_F0_2_ConsecSymbols = -1; /* T_twoPUCCH_F0_2_ConsecSymbols */ static int hf_nr_rrc_twoDifferentTPC_Loop_PUSCH = -1; /* T_twoDifferentTPC_Loop_PUSCH */ @@ -5265,10 +5335,10 @@ static int hf_nr_rrc_dl_SchedulingOffset_PDSCH_TypeA = -1; /* T_dl_SchedulingOf static int hf_nr_rrc_dl_SchedulingOffset_PDSCH_TypeB = -1; /* T_dl_SchedulingOffset_PDSCH_TypeB */ static int hf_nr_rrc_ul_SchedulingOffset = -1; /* T_ul_SchedulingOffset */ static int hf_nr_rrc_dynamicSFI_01 = -1; /* T_dynamicSFI_01 */ -static int hf_nr_rrc_dummy1_04 = -1; /* BIT_STRING_SIZE_2 */ +static int hf_nr_rrc_dummy1_05 = -1; /* BIT_STRING_SIZE_2 */ static int hf_nr_rrc_twoFL_DMRS = -1; /* BIT_STRING_SIZE_2 */ -static int hf_nr_rrc_dummy2_04 = -1; /* BIT_STRING_SIZE_2 */ -static int hf_nr_rrc_dummy3_02 = -1; /* BIT_STRING_SIZE_2 */ +static int hf_nr_rrc_dummy2_06 = -1; /* BIT_STRING_SIZE_2 */ +static int hf_nr_rrc_dummy3_03 = -1; /* BIT_STRING_SIZE_2 */ static int hf_nr_rrc_supportedDMRS_TypeDL = -1; /* T_supportedDMRS_TypeDL */ static int hf_nr_rrc_supportedDMRS_TypeUL = -1; /* T_supportedDMRS_TypeUL */ static int hf_nr_rrc_semiOpenLoopCSI = -1; /* T_semiOpenLoopCSI */ @@ -5330,12 +5400,13 @@ static int hf_nr_rrc_aggregationFactorSPS_DL_r16 = -1; /* T_aggregationFactorSP static int hf_nr_rrc_maxTotalResourcesForOneFreqRange_r16 = -1; /* T_maxTotalResourcesForOneFreqRange_r16 */ static int hf_nr_rrc_maxNumberResWithinSlotAcrossCC_OneFR_r16 = -1; /* T_maxNumberResWithinSlotAcrossCC_OneFR_r16 */ static int hf_nr_rrc_maxNumberResAcrossCC_OneFR_r16 = -1; /* T_maxNumberResAcrossCC_OneFR_r16 */ +static int hf_nr_rrc_twoTCI_Act_servingCellInCC_List_r16 = -1; /* T_twoTCI_Act_servingCellInCC_List_r16 */ static int hf_nr_rrc_pdcch_MonitoringSingleOccasion = -1; /* T_pdcch_MonitoringSingleOccasion */ -static int hf_nr_rrc_scs_60kHz_14 = -1; /* T_scs_60kHz_11 */ +static int hf_nr_rrc_scs_60kHz_10 = -1; /* T_scs_60kHz_07 */ static int hf_nr_rrc_pdsch_256QAM_FR1 = -1; /* T_pdsch_256QAM_FR1 */ static int hf_nr_rrc_pdsch_RE_MappingFR1_PerSymbol = -1; /* T_pdsch_RE_MappingFR1_PerSymbol */ static int hf_nr_rrc_pdsch_RE_MappingFR1_PerSlot = -1; /* T_pdsch_RE_MappingFR1_PerSlot */ -static int hf_nr_rrc_dummy_12 = -1; /* T_dummy_08 */ +static int hf_nr_rrc_dummy_13 = -1; /* T_dummy_08 */ static int hf_nr_rrc_pdsch_RE_MappingFR2_PerSymbol = -1; /* T_pdsch_RE_MappingFR2_PerSymbol */ static int hf_nr_rrc_pCell_FR2 = -1; /* T_pCell_FR2 */ static int hf_nr_rrc_pdsch_RE_MappingFR2_PerSlot = -1; /* T_pdsch_RE_MappingFR2_PerSlot */ @@ -5373,6 +5444,9 @@ static int hf_nr_rrc_supportedBandCombinationList_v1560 = -1; /* BandCombinatio static int hf_nr_rrc_supportedBandCombinationList_v1610 = -1; /* BandCombinationList_v1610 */ static int hf_nr_rrc_supportedBandCombinationListSidelinkEUTRA_NR_r16 = -1; /* BandCombinationListSidelinkEUTRA_NR_r16 */ static int hf_nr_rrc_supportedBandCombinationList_UplinkTxSwitch_r16 = -1; /* BandCombinationList_UplinkTxSwitch_r16 */ +static int hf_nr_rrc_supportedBandCombinationList_v1630 = -1; /* BandCombinationList_v1630 */ +static int hf_nr_rrc_supportedBandCombinationListSidelinkEUTRA_NR_v1630 = -1; /* BandCombinationListSidelinkEUTRA_NR_v1630 */ +static int hf_nr_rrc_supportedBandCombinationList_UplinkTxSwitch_v1630 = -1; /* BandCombinationList_UplinkTxSwitch_v1630 */ static int hf_nr_rrc_modifiedMPR_Behaviour = -1; /* BIT_STRING_SIZE_8 */ static int hf_nr_rrc_mimo_ParametersPerBand = -1; /* MIMO_ParametersPerBand */ static int hf_nr_rrc_extendedCP = -1; /* T_extendedCP */ @@ -5387,12 +5461,12 @@ static int hf_nr_rrc_ue_PowerClass = -1; /* T_ue_PowerClass */ static int hf_nr_rrc_rateMatchingLTE_CRS = -1; /* T_rateMatchingLTE_CRS */ static int hf_nr_rrc_channelBWs_DL = -1; /* T_channelBWs_DL */ static int hf_nr_rrc_fr1 = -1; /* T_fr1 */ -static int hf_nr_rrc_scs_15kHz_12 = -1; /* BIT_STRING_SIZE_10 */ -static int hf_nr_rrc_scs_30kHz_12 = -1; /* BIT_STRING_SIZE_10 */ -static int hf_nr_rrc_scs_60kHz_15 = -1; /* BIT_STRING_SIZE_10 */ +static int hf_nr_rrc_scs_15kHz_08 = -1; /* BIT_STRING_SIZE_10 */ +static int hf_nr_rrc_scs_30kHz_08 = -1; /* BIT_STRING_SIZE_10 */ +static int hf_nr_rrc_scs_60kHz_11 = -1; /* BIT_STRING_SIZE_10 */ static int hf_nr_rrc_fr2 = -1; /* T_fr2 */ -static int hf_nr_rrc_scs_60kHz_16 = -1; /* BIT_STRING_SIZE_3 */ -static int hf_nr_rrc_scs_120kHz_13 = -1; /* BIT_STRING_SIZE_3 */ +static int hf_nr_rrc_scs_60kHz_12 = -1; /* BIT_STRING_SIZE_3 */ +static int hf_nr_rrc_scs_120kHz_09 = -1; /* BIT_STRING_SIZE_3 */ static int hf_nr_rrc_channelBWs_UL = -1; /* T_channelBWs_UL */ static int hf_nr_rrc_fr1_01 = -1; /* T_fr1_01 */ static int hf_nr_rrc_fr2_01 = -1; /* T_fr2_01 */ @@ -5402,12 +5476,12 @@ static int hf_nr_rrc_powerBoosting_pi2BPSK = -1; /* T_powerBoosting_pi2BPSK */ static int hf_nr_rrc_maxUplinkDutyCycle_FR2 = -1; /* T_maxUplinkDutyCycle_FR2 */ static int hf_nr_rrc_channelBWs_DL_v1590 = -1; /* T_channelBWs_DL_v1590 */ static int hf_nr_rrc_fr1_02 = -1; /* T_fr1_02 */ -static int hf_nr_rrc_scs_15kHz_13 = -1; /* BIT_STRING_SIZE_16 */ -static int hf_nr_rrc_scs_30kHz_13 = -1; /* BIT_STRING_SIZE_16 */ -static int hf_nr_rrc_scs_60kHz_17 = -1; /* BIT_STRING_SIZE_16 */ +static int hf_nr_rrc_scs_15kHz_09 = -1; /* BIT_STRING_SIZE_16 */ +static int hf_nr_rrc_scs_30kHz_09 = -1; /* BIT_STRING_SIZE_16 */ +static int hf_nr_rrc_scs_60kHz_13 = -1; /* BIT_STRING_SIZE_16 */ static int hf_nr_rrc_fr2_02 = -1; /* T_fr2_02 */ -static int hf_nr_rrc_scs_60kHz_18 = -1; /* BIT_STRING_SIZE_8 */ -static int hf_nr_rrc_scs_120kHz_14 = -1; /* BIT_STRING_SIZE_8 */ +static int hf_nr_rrc_scs_60kHz_14 = -1; /* BIT_STRING_SIZE_8 */ +static int hf_nr_rrc_scs_120kHz_10 = -1; /* BIT_STRING_SIZE_8 */ static int hf_nr_rrc_channelBWs_UL_v1590 = -1; /* T_channelBWs_UL_v1590 */ static int hf_nr_rrc_fr1_03 = -1; /* T_fr1_03 */ static int hf_nr_rrc_fr2_03 = -1; /* T_fr2_03 */ @@ -5425,20 +5499,20 @@ static int hf_nr_rrc_spatialRelationsSRS_Pos_r16 = -1; /* SpatialRelationsSRS_P static int hf_nr_rrc_simulSRS_MIMO_TransWithinBand_r16 = -1; /* T_simulSRS_MIMO_TransWithinBand_r16 */ static int hf_nr_rrc_channelBW_DL_IAB_r16 = -1; /* T_channelBW_DL_IAB_r16 */ static int hf_nr_rrc_fr1_100mhz = -1; /* T_fr1_100mhz */ -static int hf_nr_rrc_scs_15kHz_14 = -1; /* T_scs_15kHz_09 */ -static int hf_nr_rrc_scs_30kHz_14 = -1; /* T_scs_30kHz_09 */ -static int hf_nr_rrc_scs_60kHz_19 = -1; /* T_scs_60kHz_12 */ +static int hf_nr_rrc_scs_15kHz_10 = -1; /* T_scs_15kHz_05 */ +static int hf_nr_rrc_scs_30kHz_10 = -1; /* T_scs_30kHz_05 */ +static int hf_nr_rrc_scs_60kHz_15 = -1; /* T_scs_60kHz_08 */ static int hf_nr_rrc_fr2_200mhz = -1; /* T_fr2_200mhz */ -static int hf_nr_rrc_scs_60kHz_20 = -1; /* T_scs_60kHz_13 */ -static int hf_nr_rrc_scs_120kHz_15 = -1; /* T_scs_120kHz_11 */ +static int hf_nr_rrc_scs_60kHz_16 = -1; /* T_scs_60kHz_09 */ +static int hf_nr_rrc_scs_120kHz_11 = -1; /* T_scs_120kHz_07 */ static int hf_nr_rrc_channelBW_UL_IAB_r16 = -1; /* T_channelBW_UL_IAB_r16 */ static int hf_nr_rrc_fr1_100mhz_01 = -1; /* T_fr1_100mhz_01 */ -static int hf_nr_rrc_scs_15kHz_15 = -1; /* T_scs_15kHz_10 */ -static int hf_nr_rrc_scs_30kHz_15 = -1; /* T_scs_30kHz_10 */ -static int hf_nr_rrc_scs_60kHz_21 = -1; /* T_scs_60kHz_14 */ +static int hf_nr_rrc_scs_15kHz_11 = -1; /* T_scs_15kHz_06 */ +static int hf_nr_rrc_scs_30kHz_11 = -1; /* T_scs_30kHz_06 */ +static int hf_nr_rrc_scs_60kHz_17 = -1; /* T_scs_60kHz_10 */ static int hf_nr_rrc_fr2_200mhz_01 = -1; /* T_fr2_200mhz_01 */ -static int hf_nr_rrc_scs_60kHz_22 = -1; /* T_scs_60kHz_15 */ -static int hf_nr_rrc_scs_120kHz_16 = -1; /* T_scs_120kHz_12 */ +static int hf_nr_rrc_scs_60kHz_18 = -1; /* T_scs_60kHz_11 */ +static int hf_nr_rrc_scs_120kHz_12 = -1; /* T_scs_120kHz_08 */ static int hf_nr_rrc_rasterShift7dot5_IAB_r16 = -1; /* T_rasterShift7dot5_IAB_r16 */ static int hf_nr_rrc_ue_PowerClass_v1610 = -1; /* T_ue_PowerClass_v1610 */ static int hf_nr_rrc_condHandover_r16 = -1; /* T_condHandover_r16 */ @@ -5457,6 +5531,8 @@ static int hf_nr_rrc_jointReleaseSPS_r16 = -1; /* T_jointReleaseSPS_r16 */ static int hf_nr_rrc_simulSRS_TransWithinBand_r16 = -1; /* T_simulSRS_TransWithinBand_r16 */ static int hf_nr_rrc_trs_AdditionalBandwidth_r16 = -1; /* T_trs_AdditionalBandwidth_r16 */ static int hf_nr_rrc_handoverIntraF_IAB_r16 = -1; /* T_handoverIntraF_IAB_r16 */ +static int hf_nr_rrc_simulTX_SRS_AntSwitchingIntraBandUL_CA_r16 = -1; /* SimulSRS_ForAntennaSwitching_r16 */ +static int hf_nr_rrc_sharedSpectrumChAccessParamsPerBand_v1630 = -1; /* SharedSpectrumChAccessParamsPerBand_v1630 */ static int hf_nr_rrc_srs_SwitchingTimeRequested_01 = -1; /* T_srs_SwitchingTimeRequested_01 */ static int hf_nr_rrc_supportedBandCombinationListNEDC_Only = -1; /* BandCombinationList */ static int hf_nr_rrc_supportedBandCombinationList_v1570 = -1; /* BandCombinationList_v1570 */ @@ -5464,6 +5540,7 @@ static int hf_nr_rrc_supportedBandCombinationList_v1580 = -1; /* BandCombinatio static int hf_nr_rrc_supportedBandCombinationList_v1590 = -1; /* BandCombinationList_v1590 */ static int hf_nr_rrc_supportedBandCombinationListNEDC_Only_v15a0 = -1; /* T_supportedBandCombinationListNEDC_Only_v15a0 */ static int hf_nr_rrc_supportedBandCombinationListNEDC_Only_v1610 = -1; /* BandCombinationList_v1610 */ +static int hf_nr_rrc_supportedBandCombinationListNEDC_Only_v1630 = -1; /* BandCombinationList_v1630 */ static int hf_nr_rrc_am_WithShortSN = -1; /* T_am_WithShortSN */ static int hf_nr_rrc_um_WithShortSN = -1; /* T_um_WithShortSN */ static int hf_nr_rrc_um_WithLongSN = -1; /* T_um_WithLongSN */ @@ -5502,11 +5579,11 @@ static int hf_nr_rrc_harq_RxProcessSidelink_r16 = -1; /* T_harq_RxProcessSideli static int hf_nr_rrc_pscch_RxSidelink_r16 = -1; /* T_pscch_RxSidelink_r16 */ static int hf_nr_rrc_scs_CP_PatternRxSidelink_r16 = -1; /* T_scs_CP_PatternRxSidelink_r16 */ static int hf_nr_rrc_fr1_r16 = -1; /* T_fr1_r16 */ -static int hf_nr_rrc_scs_15kHz_r16_02 = -1; /* BIT_STRING_SIZE_16 */ -static int hf_nr_rrc_scs_30kHz_r16_02 = -1; /* BIT_STRING_SIZE_16 */ -static int hf_nr_rrc_scs_60kHz_r16_02 = -1; /* BIT_STRING_SIZE_16 */ +static int hf_nr_rrc_scs_15kHz_r16_06 = -1; /* BIT_STRING_SIZE_16 */ +static int hf_nr_rrc_scs_30kHz_r16_06 = -1; /* BIT_STRING_SIZE_16 */ +static int hf_nr_rrc_scs_60kHz_r16_06 = -1; /* BIT_STRING_SIZE_16 */ static int hf_nr_rrc_fr2_r16 = -1; /* T_fr2_r16 */ -static int hf_nr_rrc_scs_120kHz_r16_02 = -1; /* BIT_STRING_SIZE_16 */ +static int hf_nr_rrc_scs_120kHz_r16_06 = -1; /* BIT_STRING_SIZE_16 */ static int hf_nr_rrc_extendedCP_RxSidelink_r16 = -1; /* T_extendedCP_RxSidelink_r16 */ static int hf_nr_rrc_sl_TransmissionMode1_r16 = -1; /* T_sl_TransmissionMode1_r16 */ static int hf_nr_rrc_harq_TxProcessModeOneSidelink_r16 = -1; /* T_harq_TxProcessModeOneSidelink_r16 */ @@ -5525,6 +5602,16 @@ static int hf_nr_rrc_psfch_RxNumber = -1; /* T_psfch_RxNumber */ static int hf_nr_rrc_psfch_TxNumber = -1; /* T_psfch_TxNumber */ static int hf_nr_rrc_lowSE_64QAM_MCS_TableSidelink_r16 = -1; /* T_lowSE_64QAM_MCS_TableSidelink_r16 */ static int hf_nr_rrc_enb_sync_Sidelink_r16 = -1; /* T_enb_sync_Sidelink_r16 */ +static int hf_nr_rrc_sl_TransmissionMode2_r16 = -1; /* T_sl_TransmissionMode2_r16 */ +static int hf_nr_rrc_harq_TxProcessModeTwoSidelink_r16 = -1; /* T_harq_TxProcessModeTwoSidelink_r16 */ +static int hf_nr_rrc_scs_CP_PatternTxSidelinkModeTwo_r16 = -1; /* T_scs_CP_PatternTxSidelinkModeTwo_r16 */ +static int hf_nr_rrc_dl_openLoopPC_Sidelink_r16 = -1; /* T_dl_openLoopPC_Sidelink_r16 */ +static int hf_nr_rrc_congestionControlSidelink_r16 = -1; /* T_congestionControlSidelink_r16 */ +static int hf_nr_rrc_cbr_ReportSidelink_r16 = -1; /* T_cbr_ReportSidelink_r16 */ +static int hf_nr_rrc_cbr_CR_TimeLimitSidelink_r16 = -1; /* T_cbr_CR_TimeLimitSidelink_r16 */ +static int hf_nr_rrc_fewerSymbolSlotSidelink_r16 = -1; /* T_fewerSymbolSlotSidelink_r16 */ +static int hf_nr_rrc_sl_openLoopPC_RSRP_ReportSidelink_r16 = -1; /* T_sl_openLoopPC_RSRP_ReportSidelink_r16 */ +static int hf_nr_rrc_sl_Rx_256QAM_r16 = -1; /* T_sl_Rx_256QAM_r16 */ static int hf_nr_rrc_rach_Report_r16 = -1; /* T_rach_Report_r16 */ static int hf_nr_rrc_spatialRelation_SRS_PosBasedOnSSB_Serving_r16 = -1; /* T_spatialRelation_SRS_PosBasedOnSSB_Serving_r16 */ static int hf_nr_rrc_spatialRelation_SRS_PosBasedOnCSI_RS_Serving_r16 = -1; /* T_spatialRelation_SRS_PosBasedOnCSI_RS_Serving_r16 */ @@ -5564,9 +5651,9 @@ static int hf_nr_rrc_type2_r16_02 = -1; /* T_type2_r16_02 */ static int hf_nr_rrc_type2_PortSelection_r16_01 = -1; /* T_type2_PortSelection_r16_01 */ static int hf_nr_rrc_uplinkTxSwitchRequest_r16 = -1; /* T_uplinkTxSwitchRequest_r16 */ static int hf_nr_rrc_frequencyBandListFilter = -1; /* FreqBandList */ -static int hf_nr_rrc_nonCriticalExtension_85 = -1; /* UE_CapabilityRequestFilterNR_v1540 */ +static int hf_nr_rrc_nonCriticalExtension_87 = -1; /* UE_CapabilityRequestFilterNR_v1540 */ static int hf_nr_rrc_srs_SwitchingTimeRequest = -1; /* T_srs_SwitchingTimeRequest */ -static int hf_nr_rrc_nonCriticalExtension_86 = -1; /* T_nonCriticalExtension_49 */ +static int hf_nr_rrc_nonCriticalExtension_88 = -1; /* T_nonCriticalExtension_49 */ static int hf_nr_rrc_measAndMobParametersMRDC = -1; /* MeasAndMobParametersMRDC */ static int hf_nr_rrc_phy_ParametersMRDC_v1530 = -1; /* Phy_ParametersMRDC */ static int hf_nr_rrc_rf_ParametersMRDC = -1; /* RF_ParametersMRDC */ @@ -5578,16 +5665,16 @@ static int hf_nr_rrc_fr2_Add_UE_MRDC_Capabilities = -1; /* UE_MRDC_CapabilityAd static int hf_nr_rrc_featureSetCombinations = -1; /* SEQUENCE_SIZE_1_maxFeatureSetCombinations_OF_FeatureSetCombination */ static int hf_nr_rrc_featureSetCombinations_item = -1; /* FeatureSetCombination */ static int hf_nr_rrc_pdcp_ParametersMRDC_v1530 = -1; /* PDCP_ParametersMRDC */ -static int hf_nr_rrc_nonCriticalExtension_87 = -1; /* UE_MRDC_Capability_v1560 */ +static int hf_nr_rrc_nonCriticalExtension_89 = -1; /* UE_MRDC_Capability_v1560 */ static int hf_nr_rrc_receivedFilters = -1; /* T_receivedFilters */ static int hf_nr_rrc_measAndMobParametersMRDC_v1560 = -1; /* MeasAndMobParametersMRDC_v1560 */ static int hf_nr_rrc_fdd_Add_UE_MRDC_Capabilities_v1560 = -1; /* UE_MRDC_CapabilityAddXDD_Mode_v1560 */ static int hf_nr_rrc_tdd_Add_UE_MRDC_Capabilities_v1560 = -1; /* UE_MRDC_CapabilityAddXDD_Mode_v1560 */ -static int hf_nr_rrc_nonCriticalExtension_88 = -1; /* UE_MRDC_Capability_v1610 */ +static int hf_nr_rrc_nonCriticalExtension_90 = -1; /* UE_MRDC_Capability_v1610 */ static int hf_nr_rrc_measAndMobParametersMRDC_v1610 = -1; /* MeasAndMobParametersMRDC_v1610 */ static int hf_nr_rrc_generalParametersMRDC_v1610 = -1; /* GeneralParametersMRDC_v1610 */ static int hf_nr_rrc_pdcp_ParametersMRDC_v1610 = -1; /* PDCP_ParametersMRDC_v1610 */ -static int hf_nr_rrc_nonCriticalExtension_89 = -1; /* T_nonCriticalExtension_50 */ +static int hf_nr_rrc_nonCriticalExtension_91 = -1; /* T_nonCriticalExtension_50 */ static int hf_nr_rrc_generalParametersMRDC_XDD_Diff = -1; /* GeneralParametersMRDC_XDD_Diff */ static int hf_nr_rrc_splitSRB_WithOneUL_Path = -1; /* T_splitSRB_WithOneUL_Path */ static int hf_nr_rrc_splitDRB_withUL_Both_MCG_SCG = -1; /* T_splitDRB_withUL_Both_MCG_SCG */ @@ -5606,28 +5693,32 @@ static int hf_nr_rrc_tdd_Add_UE_NR_Capabilities = -1; /* UE_NR_CapabilityAddXDD static int hf_nr_rrc_fr1_Add_UE_NR_Capabilities = -1; /* UE_NR_CapabilityAddFRX_Mode */ static int hf_nr_rrc_fr2_Add_UE_NR_Capabilities = -1; /* UE_NR_CapabilityAddFRX_Mode */ static int hf_nr_rrc_featureSets = -1; /* FeatureSets */ -static int hf_nr_rrc_nonCriticalExtension_90 = -1; /* UE_NR_Capability_v1530 */ +static int hf_nr_rrc_lateNonCriticalExtension_01 = -1; /* T_lateNonCriticalExtension */ +static int hf_nr_rrc_nonCriticalExtension_92 = -1; /* UE_NR_Capability_v1530 */ static int hf_nr_rrc_fdd_Add_UE_NR_Capabilities_v1530 = -1; /* UE_NR_CapabilityAddXDD_Mode_v1530 */ static int hf_nr_rrc_tdd_Add_UE_NR_Capabilities_v1530 = -1; /* UE_NR_CapabilityAddXDD_Mode_v1530 */ -static int hf_nr_rrc_dummy_13 = -1; /* T_dummy_09 */ +static int hf_nr_rrc_dummy_14 = -1; /* T_dummy_09 */ static int hf_nr_rrc_interRAT_Parameters = -1; /* InterRAT_Parameters */ static int hf_nr_rrc_inactiveState = -1; /* T_inactiveState */ static int hf_nr_rrc_delayBudgetReporting = -1; /* T_delayBudgetReporting */ -static int hf_nr_rrc_nonCriticalExtension_91 = -1; /* UE_NR_Capability_v1540 */ +static int hf_nr_rrc_nonCriticalExtension_93 = -1; /* UE_NR_Capability_v1540 */ static int hf_nr_rrc_sdap_Parameters = -1; /* SDAP_Parameters */ static int hf_nr_rrc_overheatingInd = -1; /* T_overheatingInd */ static int hf_nr_rrc_ims_Parameters = -1; /* IMS_Parameters */ static int hf_nr_rrc_fr1_Add_UE_NR_Capabilities_v1540 = -1; /* UE_NR_CapabilityAddFRX_Mode_v1540 */ static int hf_nr_rrc_fr2_Add_UE_NR_Capabilities_v1540 = -1; /* UE_NR_CapabilityAddFRX_Mode_v1540 */ static int hf_nr_rrc_fr1_fr2_Add_UE_NR_Capabilities = -1; /* UE_NR_CapabilityAddFRX_Mode */ -static int hf_nr_rrc_nonCriticalExtension_92 = -1; /* UE_NR_Capability_v1550 */ +static int hf_nr_rrc_nonCriticalExtension_94 = -1; /* UE_NR_Capability_v1550 */ static int hf_nr_rrc_reducedCP_Latency = -1; /* T_reducedCP_Latency */ -static int hf_nr_rrc_nonCriticalExtension_93 = -1; /* UE_NR_Capability_v1560 */ +static int hf_nr_rrc_nonCriticalExtension_95 = -1; /* UE_NR_Capability_v1560 */ static int hf_nr_rrc_nrdc_Parameters = -1; /* NRDC_Parameters */ static int hf_nr_rrc_receivedFilters_01 = -1; /* T_receivedFilters_01 */ -static int hf_nr_rrc_nonCriticalExtension_94 = -1; /* UE_NR_Capability_v1570 */ +static int hf_nr_rrc_nonCriticalExtension_96 = -1; /* UE_NR_Capability_v1570 */ static int hf_nr_rrc_nrdc_Parameters_v1570 = -1; /* NRDC_Parameters_v1570 */ -static int hf_nr_rrc_nonCriticalExtension_95 = -1; /* UE_NR_Capability_v1610 */ +static int hf_nr_rrc_nonCriticalExtension_97 = -1; /* UE_NR_Capability_v1610 */ +static int hf_nr_rrc_nrdc_Parameters_v15c0 = -1; /* NRDC_Parameters_v15c0 */ +static int hf_nr_rrc_partialFR2_FallbackRX_Req = -1; /* T_partialFR2_FallbackRX_Req */ +static int hf_nr_rrc_nonCriticalExtension_98 = -1; /* T_nonCriticalExtension_51 */ static int hf_nr_rrc_inDeviceCoexInd_r16 = -1; /* T_inDeviceCoexInd_r16 */ static int hf_nr_rrc_dl_DedicatedMessageSegmentation_r16 = -1; /* T_dl_DedicatedMessageSegmentation_r16 */ static int hf_nr_rrc_nrdc_Parameters_v1610 = -1; /* NRDC_Parameters_v1610 */ @@ -5648,7 +5739,7 @@ static int hf_nr_rrc_resumeWithSCG_Config_r16 = -1; /* T_resumeWithSCG_Config_r static int hf_nr_rrc_ue_BasedPerfMeas_Parameters_r16 = -1; /* UE_BasedPerfMeas_Parameters_r16 */ static int hf_nr_rrc_son_Parameters_r16 = -1; /* SON_Parameters_r16 */ static int hf_nr_rrc_onDemandSIB_Connected_r16 = -1; /* T_onDemandSIB_Connected_r16 */ -static int hf_nr_rrc_nonCriticalExtension_96 = -1; /* T_nonCriticalExtension_51 */ +static int hf_nr_rrc_nonCriticalExtension_99 = -1; /* T_nonCriticalExtension_52 */ static int hf_nr_rrc_flowControlBH_RLC_ChannelBased_r16 = -1; /* T_flowControlBH_RLC_ChannelBased_r16 */ static int hf_nr_rrc_flowControlRouting_ID_Based_r16 = -1; /* T_flowControlRouting_ID_Based_r16 */ static int hf_nr_rrc_ul_DynamicChAccess_r16 = -1; /* T_ul_DynamicChAccess_r16 */ @@ -5659,7 +5750,7 @@ static int hf_nr_rrc_mib_Acquisition_r16 = -1; /* T_mib_Acquisition_r16 */ static int hf_nr_rrc_ssb_RLM_DynamicChAccess_r16 = -1; /* T_ssb_RLM_DynamicChAccess_r16 */ static int hf_nr_rrc_ssb_RLM_Semi_StaticChAccess_r16 = -1; /* T_ssb_RLM_Semi_StaticChAccess_r16 */ static int hf_nr_rrc_sib1_Acquisition_r16 = -1; /* T_sib1_Acquisition_r16 */ -static int hf_nr_rrc_extendedRAR_Window_r16 = -1; /* T_extendedRAR_Window_r16 */ +static int hf_nr_rrc_extRA_ResponseWindow_r16 = -1; /* T_extRA_ResponseWindow_r16 */ static int hf_nr_rrc_ssb_BFD_CBD_dynamicChannelAccess_r16 = -1; /* T_ssb_BFD_CBD_dynamicChannelAccess_r16 */ static int hf_nr_rrc_ssb_BFD_CBD_semi_staticChannelAccess_r16 = -1; /* T_ssb_BFD_CBD_semi_staticChannelAccess_r16 */ static int hf_nr_rrc_csi_RS_BFD_CBD_r16 = -1; /* T_csi_RS_BFD_CBD_r16 */ @@ -5693,6 +5784,8 @@ static int hf_nr_rrc_ed_Threshold_r16 = -1; /* T_ed_Threshold_r16 */ static int hf_nr_rrc_ul_DL_COT_Sharing_r16 = -1; /* T_ul_DL_COT_Sharing_r16 */ static int hf_nr_rrc_mux_CG_UCI_HARQ_ACK_r16 = -1; /* T_mux_CG_UCI_HARQ_ACK_r16 */ static int hf_nr_rrc_cg_resourceConfig_r16 = -1; /* T_cg_resourceConfig_r16 */ +static int hf_nr_rrc_dl_ReceptionIntraCellGuardband_r16 = -1; /* T_dl_ReceptionIntraCellGuardband_r16 */ +static int hf_nr_rrc_dl_ReceptionLBT_subsetRB_r16 = -1; /* T_dl_ReceptionLBT_subsetRB_r16 */ static int hf_nr_rrc_areaConfig_r16 = -1; /* AreaConfig_r16 */ static int hf_nr_rrc_interFreqTargetList_r16 = -1; /* SEQUENCE_SIZE_1_maxFreq_OF_InterFreqTargetInfo_r16 */ static int hf_nr_rrc_interFreqTargetList_r16_item = -1; /* InterFreqTargetInfo_r16 */ @@ -5739,25 +5832,25 @@ static int hf_nr_rrc_rttValue_r16 = -1; /* INTEGER_0_16777215 */ static int hf_nr_rrc_rttUnits_r16 = -1; /* T_rttUnits_r16 */ static int hf_nr_rrc_rttAccuracy_r16 = -1; /* INTEGER_0_255 */ static int hf_nr_rrc_delayBudgetReportingConfig = -1; /* T_delayBudgetReportingConfig */ -static int hf_nr_rrc_setup_110 = -1; /* T_setup */ +static int hf_nr_rrc_setup_113 = -1; /* T_setup */ static int hf_nr_rrc_delayBudgetReportingProhibitTimer = -1; /* T_delayBudgetReportingProhibitTimer */ static int hf_nr_rrc_overheatingAssistanceConfig = -1; /* T_overheatingAssistanceConfig */ -static int hf_nr_rrc_setup_111 = -1; /* OverheatingAssistanceConfig */ +static int hf_nr_rrc_setup_114 = -1; /* OverheatingAssistanceConfig */ static int hf_nr_rrc_CandidateServingFreqListNR_r16_item = -1; /* ARFCN_ValueNR */ static int hf_nr_rrc_idc_AssistanceConfig_r16 = -1; /* T_idc_AssistanceConfig_r16 */ -static int hf_nr_rrc_setup_112 = -1; /* IDC_AssistanceConfig_r16 */ +static int hf_nr_rrc_setup_115 = -1; /* IDC_AssistanceConfig_r16 */ static int hf_nr_rrc_drx_PreferenceConfig_r16 = -1; /* T_drx_PreferenceConfig_r16 */ -static int hf_nr_rrc_setup_113 = -1; /* DRX_PreferenceConfig_r16 */ +static int hf_nr_rrc_setup_116 = -1; /* DRX_PreferenceConfig_r16 */ static int hf_nr_rrc_maxBW_PreferenceConfig_r16 = -1; /* T_maxBW_PreferenceConfig_r16 */ -static int hf_nr_rrc_setup_114 = -1; /* MaxBW_PreferenceConfig_r16 */ +static int hf_nr_rrc_setup_117 = -1; /* MaxBW_PreferenceConfig_r16 */ static int hf_nr_rrc_maxCC_PreferenceConfig_r16 = -1; /* T_maxCC_PreferenceConfig_r16 */ -static int hf_nr_rrc_setup_115 = -1; /* MaxCC_PreferenceConfig_r16 */ +static int hf_nr_rrc_setup_118 = -1; /* MaxCC_PreferenceConfig_r16 */ static int hf_nr_rrc_maxMIMO_LayerPreferenceConfig_r16 = -1; /* T_maxMIMO_LayerPreferenceConfig_r16 */ -static int hf_nr_rrc_setup_116 = -1; /* MaxMIMO_LayerPreferenceConfig_r16 */ +static int hf_nr_rrc_setup_119 = -1; /* MaxMIMO_LayerPreferenceConfig_r16 */ static int hf_nr_rrc_minSchedulingOffsetPreferenceConfig_r16 = -1; /* T_minSchedulingOffsetPreferenceConfig_r16 */ -static int hf_nr_rrc_setup_117 = -1; /* MinSchedulingOffsetPreferenceConfig_r16 */ +static int hf_nr_rrc_setup_120 = -1; /* MinSchedulingOffsetPreferenceConfig_r16 */ static int hf_nr_rrc_releasePreferenceConfig_r16 = -1; /* T_releasePreferenceConfig_r16 */ -static int hf_nr_rrc_setup_118 = -1; /* ReleasePreferenceConfig_r16 */ +static int hf_nr_rrc_setup_121 = -1; /* ReleasePreferenceConfig_r16 */ static int hf_nr_rrc_referenceTimePreferenceReporting_r16 = -1; /* T_referenceTimePreferenceReporting_r16 */ static int hf_nr_rrc_btNameList_r16 = -1; /* T_btNameList_r16 */ static int hf_nr_rrc_wlanNameList_r16 = -1; /* T_wlanNameList_r16 */ @@ -5798,7 +5891,7 @@ static int hf_nr_rrc_sl_BWP_r16 = -1; /* BWP */ static int hf_nr_rrc_sl_LengthSymbols_r16 = -1; /* T_sl_LengthSymbols_r16 */ static int hf_nr_rrc_sl_StartSymbol_r16 = -1; /* T_sl_StartSymbol_r16 */ static int hf_nr_rrc_sl_PSBCH_Config_r16 = -1; /* T_sl_PSBCH_Config_r16 */ -static int hf_nr_rrc_setup_119 = -1; /* SL_PSBCH_Config_r16 */ +static int hf_nr_rrc_setup_122 = -1; /* SL_PSBCH_Config_r16 */ static int hf_nr_rrc_sl_TxDirectCurrentLocation_r16 = -1; /* INTEGER_0_3301 */ static int hf_nr_rrc_sl_RxPool_r16 = -1; /* SEQUENCE_SIZE_1_maxNrofRXPool_r16_OF_SL_ResourcePool_r16 */ static int hf_nr_rrc_sl_RxPool_r16_item = -1; /* SL_ResourcePool_r16 */ @@ -5835,9 +5928,9 @@ static int hf_nr_rrc_sl_MeasConfigInfoToAddModList_r16 = -1; /* SEQUENCE_SIZE_1 static int hf_nr_rrc_sl_MeasConfigInfoToAddModList_r16_item = -1; /* SL_MeasConfigInfo_r16 */ static int hf_nr_rrc_t400_r16 = -1; /* T_t400_r16 */ static int hf_nr_rrc_sl_ScheduledConfig_r16 = -1; /* T_sl_ScheduledConfig_r16 */ -static int hf_nr_rrc_setup_120 = -1; /* SL_ScheduledConfig_r16 */ +static int hf_nr_rrc_setup_123 = -1; /* SL_ScheduledConfig_r16 */ static int hf_nr_rrc_sl_UE_SelectedConfig_r16 = -1; /* T_sl_UE_SelectedConfig_r16 */ -static int hf_nr_rrc_setup_121 = -1; /* SL_UE_SelectedConfig_r16 */ +static int hf_nr_rrc_setup_124 = -1; /* SL_UE_SelectedConfig_r16 */ static int hf_nr_rrc_sl_FreqInfoToReleaseList_r16 = -1; /* SEQUENCE_SIZE_1_maxNrofFreqSL_r16_OF_SL_Freq_Id_r16 */ static int hf_nr_rrc_sl_FreqInfoToReleaseList_r16_item = -1; /* SL_Freq_Id_r16 */ static int hf_nr_rrc_sl_FreqInfoToAddModList_r16 = -1; /* SEQUENCE_SIZE_1_maxNrofFreqSL_r16_OF_SL_FreqConfig_r16 */ @@ -5849,7 +5942,7 @@ static int hf_nr_rrc_sl_RLC_BearerToAddModList_r16_item = -1; /* SL_RLC_BearerC static int hf_nr_rrc_sl_MaxNumConsecutiveDTX_r16 = -1; /* T_sl_MaxNumConsecutiveDTX_r16 */ static int hf_nr_rrc_sl_CSI_Acquisition_r16 = -1; /* T_sl_CSI_Acquisition_r16 */ static int hf_nr_rrc_sl_CSI_SchedulingRequestId_r16 = -1; /* T_sl_CSI_SchedulingRequestId_r16 */ -static int hf_nr_rrc_setup_122 = -1; /* SchedulingRequestId */ +static int hf_nr_rrc_setup_125 = -1; /* SchedulingRequestId */ static int hf_nr_rrc_sl_SSB_PriorityNR_r16 = -1; /* INTEGER_1_8 */ static int hf_nr_rrc_networkControlledSyncTx_r16 = -1; /* T_networkControlledSyncTx_r16 */ static int hf_nr_rrc_sl_ConfigIndexCG_r16 = -1; /* SL_ConfigIndexCG_r16 */ @@ -5968,14 +6061,14 @@ static int hf_nr_rrc_sl_ReportAmount_r16_01 = -1; /* T_sl_ReportAmount_r16_01 * static int hf_nr_rrc_sl_RSRP_r16 = -1; /* BOOLEAN */ static int hf_nr_rrc_sl_RSRP_r16_01 = -1; /* RSRP_Range */ static int hf_nr_rrc_sl_PSCCH_Config_r16 = -1; /* T_sl_PSCCH_Config_r16 */ -static int hf_nr_rrc_setup_123 = -1; /* SL_PSCCH_Config_r16 */ +static int hf_nr_rrc_setup_126 = -1; /* SL_PSCCH_Config_r16 */ static int hf_nr_rrc_sl_PSSCH_Config_r16 = -1; /* T_sl_PSSCH_Config_r16 */ -static int hf_nr_rrc_setup_124 = -1; /* SL_PSSCH_Config_r16 */ +static int hf_nr_rrc_setup_127 = -1; /* SL_PSSCH_Config_r16 */ static int hf_nr_rrc_sl_PSFCH_Config_r16 = -1; /* T_sl_PSFCH_Config_r16 */ -static int hf_nr_rrc_setup_125 = -1; /* SL_PSFCH_Config_r16 */ +static int hf_nr_rrc_setup_128 = -1; /* SL_PSFCH_Config_r16 */ static int hf_nr_rrc_sl_SyncAllowed_r16 = -1; /* SL_SyncAllowed_r16 */ static int hf_nr_rrc_sl_SubchannelSize_r16 = -1; /* T_sl_SubchannelSize_r16 */ -static int hf_nr_rrc_sl_TimeResource_r16 = -1; /* INTEGER_10_160 */ +static int hf_nr_rrc_dummy_15 = -1; /* INTEGER_10_160 */ static int hf_nr_rrc_sl_StartRB_Subchannel_r16 = -1; /* INTEGER_0_265 */ static int hf_nr_rrc_sl_NumSubchannel_r16 = -1; /* INTEGER_1_27 */ static int hf_nr_rrc_sl_Additional_MCS_Table_r16 = -1; /* T_sl_Additional_MCS_Table_r16 */ @@ -5998,6 +6091,7 @@ static int hf_nr_rrc_sl_X_Overhead_r16 = -1; /* T_sl_X_Overhead_r16 */ static int hf_nr_rrc_sl_PowerControl_r16 = -1; /* SL_PowerControl_r16 */ static int hf_nr_rrc_sl_TxPercentageList_r16 = -1; /* SL_TxPercentageList_r16 */ static int hf_nr_rrc_sl_MinMaxMCS_List_r16 = -1; /* SL_MinMaxMCS_List_r16 */ +static int hf_nr_rrc_sl_TimeResource_r16 = -1; /* BIT_STRING_SIZE_10_160 */ static int hf_nr_rrc_sl_ZoneConfigMCR_Index_r16 = -1; /* INTEGER_0_15 */ static int hf_nr_rrc_sl_TransRange_r16_01 = -1; /* T_sl_TransRange_r16_01 */ static int hf_nr_rrc_sl_ZoneConfig_r16 = -1; /* SL_ZoneConfig_r16 */ @@ -6066,6 +6160,8 @@ static int hf_nr_rrc_sl_CS_RNTI_r16 = -1; /* RNTI_Value */ static int hf_nr_rrc_sl_PSFCH_ToPUCCH_r16 = -1; /* T_sl_PSFCH_ToPUCCH_r16 */ static int hf_nr_rrc_sl_PSFCH_ToPUCCH_r16_item = -1; /* INTEGER_0_15 */ static int hf_nr_rrc_sl_ConfiguredGrantConfigList_r16 = -1; /* SL_ConfiguredGrantConfigList_r16 */ +static int hf_nr_rrc_sl_DCI_ToSL_Trans_r16 = -1; /* T_sl_DCI_ToSL_Trans_r16 */ +static int hf_nr_rrc_sl_DCI_ToSL_Trans_r16_item = -1; /* INTEGER_1_32 */ static int hf_nr_rrc_sl_BSR_Config_r16 = -1; /* BSR_Config */ static int hf_nr_rrc_ul_PrioritizationThres_r16 = -1; /* INTEGER_1_16 */ static int hf_nr_rrc_sl_PrioritizationThres_r16 = -1; /* INTEGER_1_8 */ @@ -6130,7 +6226,7 @@ static int hf_nr_rrc_criticalExtensions_47 = -1; /* T_criticalExtensions_47 */ static int hf_nr_rrc_measurementReportSidelink_r16 = -1; /* MeasurementReportSidelink_IEs_r16 */ static int hf_nr_rrc_criticalExtensionsFuture_47 = -1; /* T_criticalExtensionsFuture_47 */ static int hf_nr_rrc_sl_measResults_r16 = -1; /* SL_MeasResults_r16 */ -static int hf_nr_rrc_nonCriticalExtension_97 = -1; /* T_nonCriticalExtension_52 */ +static int hf_nr_rrc_nonCriticalExtension_100 = -1; /* T_nonCriticalExtension_53 */ static int hf_nr_rrc_sl_MeasResult_r16 = -1; /* SL_MeasResult_r16 */ static int hf_nr_rrc_sl_ResultDMRS_r16 = -1; /* SL_MeasQuantityResult_r16 */ static int hf_nr_rrc_rrc_TransactionIdentifier_r16 = -1; /* RRC_TransactionIdentifier */ @@ -6142,12 +6238,12 @@ static int hf_nr_rrc_slrb_ConfigToAddModList_r16_item = -1; /* SLRB_Config_r16 static int hf_nr_rrc_slrb_ConfigToReleaseList_r16 = -1; /* SEQUENCE_SIZE_1_maxNrofSLRB_r16_OF_SLRB_PC5_ConfigIndex_r16 */ static int hf_nr_rrc_slrb_ConfigToReleaseList_r16_item = -1; /* SLRB_PC5_ConfigIndex_r16 */ static int hf_nr_rrc_sl_MeasConfig_r16_01 = -1; /* T_sl_MeasConfig_r16 */ -static int hf_nr_rrc_setup_126 = -1; /* SL_MeasConfig_r16 */ +static int hf_nr_rrc_setup_129 = -1; /* SL_MeasConfig_r16 */ static int hf_nr_rrc_sl_CSI_RS_Config_r16 = -1; /* T_sl_CSI_RS_Config_r16 */ -static int hf_nr_rrc_setup_127 = -1; /* SL_CSI_RS_Config_r16 */ +static int hf_nr_rrc_setup_130 = -1; /* SL_CSI_RS_Config_r16 */ static int hf_nr_rrc_sl_ResetConfig_r16 = -1; /* T_sl_ResetConfig_r16 */ static int hf_nr_rrc_sl_LatencyBoundCSI_Report_r16 = -1; /* INTEGER_3_160 */ -static int hf_nr_rrc_nonCriticalExtension_98 = -1; /* T_nonCriticalExtension_53 */ +static int hf_nr_rrc_nonCriticalExtension_101 = -1; /* T_nonCriticalExtension_54 */ static int hf_nr_rrc_slrb_PC5_ConfigIndex_r16 = -1; /* SLRB_PC5_ConfigIndex_r16 */ static int hf_nr_rrc_sl_SDAP_ConfigPC5_r16 = -1; /* SL_SDAP_ConfigPC5_r16 */ static int hf_nr_rrc_sl_PDCP_ConfigPC5_r16 = -1; /* SL_PDCP_ConfigPC5_r16 */ @@ -6171,31 +6267,28 @@ static int hf_nr_rrc_sl_CSI_RS_FirstSymbol_r16 = -1; /* INTEGER_3_12 */ static int hf_nr_rrc_criticalExtensions_49 = -1; /* T_criticalExtensions_49 */ static int hf_nr_rrc_rrcReconfigurationCompleteSidelink_r16 = -1; /* RRCReconfigurationCompleteSidelink_IEs_r16 */ static int hf_nr_rrc_criticalExtensionsFuture_49 = -1; /* T_criticalExtensionsFuture_49 */ -static int hf_nr_rrc_nonCriticalExtension_99 = -1; /* T_nonCriticalExtension_54 */ +static int hf_nr_rrc_nonCriticalExtension_102 = -1; /* T_nonCriticalExtension_55 */ static int hf_nr_rrc_criticalExtensions_50 = -1; /* T_criticalExtensions_50 */ static int hf_nr_rrc_rrcReconfigurationFailureSidelink_r16 = -1; /* RRCReconfigurationFailureSidelink_IEs_r16 */ static int hf_nr_rrc_criticalExtensionsFuture_50 = -1; /* T_criticalExtensionsFuture_50 */ -static int hf_nr_rrc_nonCriticalExtension_100 = -1; /* T_nonCriticalExtension_55 */ +static int hf_nr_rrc_nonCriticalExtension_103 = -1; /* T_nonCriticalExtension_56 */ static int hf_nr_rrc_criticalExtensions_51 = -1; /* T_criticalExtensions_51 */ static int hf_nr_rrc_ueCapabilityEnquirySidelink_r16 = -1; /* UECapabilityEnquirySidelink_IEs_r16 */ static int hf_nr_rrc_criticalExtensionsFuture_51 = -1; /* T_criticalExtensionsFuture_51 */ static int hf_nr_rrc_frequencyBandListFilterSidelink_r16 = -1; /* FreqBandList */ static int hf_nr_rrc_ue_CapabilityInformationSidelink_r16 = -1; /* OCTET_STRING */ -static int hf_nr_rrc_nonCriticalExtension_101 = -1; /* T_nonCriticalExtension_56 */ +static int hf_nr_rrc_nonCriticalExtension_104 = -1; /* T_nonCriticalExtension_57 */ static int hf_nr_rrc_criticalExtensions_52 = -1; /* T_criticalExtensions_52 */ static int hf_nr_rrc_ueCapabilityInformationSidelink_r16 = -1; /* UECapabilityInformationSidelink_IEs_r16 */ static int hf_nr_rrc_criticalExtensionsFuture_52 = -1; /* T_criticalExtensionsFuture_52 */ static int hf_nr_rrc_accessStratumReleaseSidelink_r16 = -1; /* AccessStratumReleaseSidelink_r16 */ static int hf_nr_rrc_pdcp_ParametersSidelink_r16 = -1; /* PDCP_ParametersSidelink_r16 */ -static int hf_nr_rrc_rlc_ParametersSidelink_r16_01 = -1; /* PC5_RLC_ParametersSidelink_r16 */ static int hf_nr_rrc_supportedBandCombinationListSidelinkNR_r16 = -1; /* BandCombinationListSidelinkNR_r16 */ -static int hf_nr_rrc_supportedBandListSidelink_r16_01 = -1; /* SEQUENCE_SIZE_1_maxBands_OF_PC5_BandSidelink_r16 */ -static int hf_nr_rrc_supportedBandListSidelink_r16_item_01 = -1; /* PC5_BandSidelink_r16 */ +static int hf_nr_rrc_supportedBandListSidelink_r16_01 = -1; /* SEQUENCE_SIZE_1_maxBands_OF_BandSidelinkPC5_r16 */ +static int hf_nr_rrc_supportedBandListSidelink_r16_item_01 = -1; /* BandSidelinkPC5_r16 */ static int hf_nr_rrc_appliedFreqBandListFilter_r16 = -1; /* FreqBandList */ -static int hf_nr_rrc_nonCriticalExtension_102 = -1; /* T_nonCriticalExtension_57 */ +static int hf_nr_rrc_nonCriticalExtension_105 = -1; /* T_nonCriticalExtension_58 */ static int hf_nr_rrc_outOfOrderDeliverySidelink_r16 = -1; /* T_outOfOrderDeliverySidelink_r16 */ -static int hf_nr_rrc_am_WithLongSN_Sidelink_r16_01 = -1; /* T_am_WithLongSN_Sidelink_r16_01 */ -static int hf_nr_rrc_um_WithLongSN_Sidelink_r16_01 = -1; /* T_um_WithLongSN_Sidelink_r16_01 */ static int hf_nr_rrc_BandCombinationListSidelinkNR_r16_item = -1; /* BandCombinationParametersSidelinkNR_r16 */ static int hf_nr_rrc_BandCombinationParametersSidelinkNR_r16_item = -1; /* BandParametersSidelink_r16 */ static int hf_nr_rrc_sl_Reception_r16_01 = -1; /* T_sl_Reception_r16_01 */ @@ -6207,6 +6300,11 @@ static int hf_nr_rrc_fr2_r16_02 = -1; /* T_fr2_r16_02 */ static int hf_nr_rrc_extendedCP_RxSidelink_r16_01 = -1; /* T_extendedCP_RxSidelink_r16_01 */ static int hf_nr_rrc_sl_Tx_256QAM_r16_01 = -1; /* T_sl_Tx_256QAM_r16_01 */ static int hf_nr_rrc_lowSE_64QAM_MCS_TableSidelink_r16_01 = -1; /* T_lowSE_64QAM_MCS_TableSidelink_r16_01 */ +static int hf_nr_rrc_csi_ReportSidelink_r16 = -1; /* T_csi_ReportSidelink_r16 */ +static int hf_nr_rrc_csi_RS_PortsSidelink_r16 = -1; /* T_csi_RS_PortsSidelink_r16 */ +static int hf_nr_rrc_rankTwoReception_r16 = -1; /* T_rankTwoReception_r16 */ +static int hf_nr_rrc_sl_openLoopPC_RSRP_ReportSidelink_r16_01 = -1; /* T_sl_openLoopPC_RSRP_ReportSidelink_r16_01 */ +static int hf_nr_rrc_sl_Rx_256QAM_r16_01 = -1; /* T_sl_Rx_256QAM_r16_01 */ static int dummy_hf_nr_rrc_eag_field = -1; /* never registered */ /*--- End of included file: packet-nr-rrc-hf.c ---*/ @@ -6286,6 +6384,7 @@ static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxNrofServingCells_1_OF_ARFCN_ValueNR = static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxNrofServingCells_1_OF_ARFCN_ValueEUTRA = -1; static gint ett_nr_rrc_CG_Config_v1610_IEs = -1; static gint ett_nr_rrc_CG_Config_v1620_IEs = -1; +static gint ett_nr_rrc_CG_Config_v1630_IEs = -1; static gint ett_nr_rrc_T_nonCriticalExtension_02 = -1; static gint ett_nr_rrc_PH_TypeListSCG = -1; static gint ett_nr_rrc_PH_InfoSCG = -1; @@ -6677,6 +6776,9 @@ static gint ett_nr_rrc_T_uac_BarringInfo = -1; static gint ett_nr_rrc_T_uac_AccessCategory1_SelectionAssistanceInfo = -1; static gint ett_nr_rrc_SEQUENCE_SIZE_2_maxPLMN_OF_UAC_AccessCategory1_SelectionAssistanceInfo = -1; static gint ett_nr_rrc_SIB1_v1610_IEs = -1; +static gint ett_nr_rrc_SIB1_v1630_IEs = -1; +static gint ett_nr_rrc_T_uac_BarringInfo_v1630 = -1; +static gint ett_nr_rrc_SEQUENCE_SIZE_2_maxPLMN_OF_UAC_AC1_SelectAssistInfo_r16 = -1; static gint ett_nr_rrc_T_nonCriticalExtension_36 = -1; static gint ett_nr_rrc_SidelinkUEInformationNR_r16 = -1; static gint ett_nr_rrc_T_criticalExtensions_36 = -1; @@ -6912,8 +7014,8 @@ static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxNrofCandidateBeams_r16_OF_CandidateBea static gint ett_nr_rrc_CandidateBeamRS_r16 = -1; static gint ett_nr_rrc_T_candidateBeamConfig_r16 = -1; static gint ett_nr_rrc_BetaOffsets = -1; -static gint ett_nr_rrc_BH_RLC_ChannelConfig_r16 = -1; static gint ett_nr_rrc_BH_LogicalChannelIdentity_r16 = -1; +static gint ett_nr_rrc_BH_RLC_ChannelConfig_r16 = -1; static gint ett_nr_rrc_BSR_Config = -1; static gint ett_nr_rrc_BWP = -1; static gint ett_nr_rrc_BWP_Downlink = -1; @@ -7423,6 +7525,7 @@ static gint ett_nr_rrc_T_staticBundling_r16 = -1; static gint ett_nr_rrc_T_dynamicBundling_r16 = -1; static gint ett_nr_rrc_T_pdsch_TimeDomainAllocationList_r16 = -1; static gint ett_nr_rrc_T_repetitionSchemeConfig_r16 = -1; +static gint ett_nr_rrc_T_repetitionSchemeConfig_v1630 = -1; static gint ett_nr_rrc_RateMatchPatternGroup = -1; static gint ett_nr_rrc_RateMatchPatternGroup_item = -1; static gint ett_nr_rrc_MinSchedulingOffsetK0_Values_r16 = -1; @@ -7652,8 +7755,11 @@ static gint ett_nr_rrc_ReferenceTime_r16 = -1; static gint ett_nr_rrc_RepetitionSchemeConfig_r16 = -1; static gint ett_nr_rrc_T_fdm_TDM_r16 = -1; static gint ett_nr_rrc_T_slotBased_r16 = -1; +static gint ett_nr_rrc_RepetitionSchemeConfig_v1630 = -1; +static gint ett_nr_rrc_T_slotBased_v1630 = -1; static gint ett_nr_rrc_FDM_TDM_r16 = -1; static gint ett_nr_rrc_SlotBased_r16 = -1; +static gint ett_nr_rrc_SlotBased_v1630 = -1; static gint ett_nr_rrc_ReportConfigInterRAT = -1; static gint ett_nr_rrc_T_reportType_01 = -1; static gint ett_nr_rrc_ReportCGI_EUTRA = -1; @@ -7758,7 +7864,7 @@ static gint ett_nr_rrc_T_nrofCandidates_IAB_r16 = -1; static gint ett_nr_rrc_T_dci_Format2_6_r16 = -1; static gint ett_nr_rrc_T_searchSpaceGroupIdList_r16 = -1; static gint ett_nr_rrc_SecurityAlgorithmConfig = -1; -static gint ett_nr_rrc_SemiStaticChannelAccessConfig = -1; +static gint ett_nr_rrc_SemiStaticChannelAccessConfig_r16 = -1; static gint ett_nr_rrc_Sensor_LocationInfo_r16 = -1; static gint ett_nr_rrc_ServingCellConfig = -1; static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxNrofBWPs_OF_BWP_Id = -1; @@ -7769,16 +7875,19 @@ static gint ett_nr_rrc_T_csi_MeasConfig = -1; static gint ett_nr_rrc_T_lte_CRS_ToMatchAround = -1; static gint ett_nr_rrc_T_dormantBWP_Config_r16 = -1; static gint ett_nr_rrc_T_ca_SlotOffset_r16 = -1; -static gint ett_nr_rrc_T_channelAccessConfig_r16 = -1; +static gint ett_nr_rrc_T_dummy2_01 = -1; static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxSCSs_OF_IntraCellGuardBandsPerSCS_r16 = -1; static gint ett_nr_rrc_T_lte_CRS_PatternList1_r16 = -1; static gint ett_nr_rrc_T_lte_CRS_PatternList2_r16 = -1; +static gint ett_nr_rrc_T_channelAccessConfig_r16 = -1; static gint ett_nr_rrc_UplinkConfig = -1; static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxNrofBWPs_OF_BWP_Uplink = -1; static gint ett_nr_rrc_T_pusch_ServingCellConfig = -1; static gint ett_nr_rrc_T_carrierSwitching = -1; static gint ett_nr_rrc_T_uplinkTxSwitching_r16 = -1; +static gint ett_nr_rrc_DummyJ = -1; static gint ett_nr_rrc_ChannelAccessConfig_r16 = -1; +static gint ett_nr_rrc_T_energyDetectionConfig_r16 = -1; static gint ett_nr_rrc_IntraCellGuardBandsPerSCS_r16 = -1; static gint ett_nr_rrc_SEQUENCE_SIZE_1_4_OF_GuardBand_r16 = -1; static gint ett_nr_rrc_GuardBand_r16 = -1; @@ -7959,20 +8068,25 @@ static gint ett_nr_rrc_BandCombinationList_v1570 = -1; static gint ett_nr_rrc_BandCombinationList_v1580 = -1; static gint ett_nr_rrc_BandCombinationList_v1590 = -1; static gint ett_nr_rrc_BandCombinationList_v1610 = -1; +static gint ett_nr_rrc_BandCombinationList_v1630 = -1; static gint ett_nr_rrc_BandCombinationList_UplinkTxSwitch_r16 = -1; +static gint ett_nr_rrc_BandCombinationList_UplinkTxSwitch_v1630 = -1; static gint ett_nr_rrc_BandCombination = -1; static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxSimultaneousBands_OF_BandParameters = -1; static gint ett_nr_rrc_BandCombination_v1540 = -1; static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxSimultaneousBands_OF_BandParameters_v1540 = -1; static gint ett_nr_rrc_BandCombination_v1550 = -1; -static gint ett_nr_rrc_BandCombination_v1610 = -1; -static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxSimultaneousBands_OF_BandParameters_v1610 = -1; static gint ett_nr_rrc_BandCombination_v1560 = -1; static gint ett_nr_rrc_BandCombination_v1570 = -1; static gint ett_nr_rrc_BandCombination_v1580 = -1; static gint ett_nr_rrc_BandCombination_v1590 = -1; +static gint ett_nr_rrc_BandCombination_v1610 = -1; +static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxSimultaneousBands_OF_BandParameters_v1610 = -1; +static gint ett_nr_rrc_BandCombination_v1630 = -1; +static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxBandComb_OF_ScalingFactorSidelink_r16 = -1; static gint ett_nr_rrc_BandCombination_UplinkTxSwitch_r16 = -1; static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxULTxSwitchingBandPairs_OF_ULTxSwitchingBandPair_r16 = -1; +static gint ett_nr_rrc_BandCombination_UplinkTxSwitch_v1630 = -1; static gint ett_nr_rrc_ULTxSwitchingBandPair_r16 = -1; static gint ett_nr_rrc_BandParameters = -1; static gint ett_nr_rrc_T_eutra = -1; @@ -7986,12 +8100,16 @@ static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxSimultaneousBands_OF_SRS_SwitchingTime static gint ett_nr_rrc_T_srs_TxSwitch = -1; static gint ett_nr_rrc_BandParameters_v1610 = -1; static gint ett_nr_rrc_T_srs_TxSwitch_v1610 = -1; -static gint ett_nr_rrc_BandParametersSidelink_r16 = -1; static gint ett_nr_rrc_BandCombinationListSidelinkEUTRA_NR_r16 = -1; +static gint ett_nr_rrc_BandCombinationListSidelinkEUTRA_NR_v1630 = -1; static gint ett_nr_rrc_BandCombinationParametersSidelinkEUTRA_NR_r16 = -1; +static gint ett_nr_rrc_BandCombinationParametersSidelinkEUTRA_NR_v1630 = -1; static gint ett_nr_rrc_BandParametersSidelinkEUTRA_NR_r16 = -1; static gint ett_nr_rrc_T_eutra_02 = -1; static gint ett_nr_rrc_T_nr_02 = -1; +static gint ett_nr_rrc_BandParametersSidelinkEUTRA_NR_v1630 = -1; +static gint ett_nr_rrc_T_nr_03 = -1; +static gint ett_nr_rrc_BandParametersSidelink_r16 = -1; static gint ett_nr_rrc_CA_ParametersEUTRA = -1; static gint ett_nr_rrc_CA_ParametersEUTRA_v1560 = -1; static gint ett_nr_rrc_CA_ParametersEUTRA_v1570 = -1; @@ -8006,8 +8124,11 @@ static gint ett_nr_rrc_T_pdcch_MonitoringCA_r16 = -1; static gint ett_nr_rrc_T_pdcch_BlindDetectionCA_Mixed_r16 = -1; static gint ett_nr_rrc_T_pdcch_BlindDetectionMCG_UE_Mixed_r16 = -1; static gint ett_nr_rrc_T_pdcch_BlindDetectionSCG_UE_Mixed_r16 = -1; +static gint ett_nr_rrc_CA_ParametersNR_v1630 = -1; +static gint ett_nr_rrc_SimulSRS_ForAntennaSwitching_r16 = -1; static gint ett_nr_rrc_CA_ParametersNRDC = -1; static gint ett_nr_rrc_CA_ParametersNRDC_v1610 = -1; +static gint ett_nr_rrc_CA_ParametersNRDC_v1630 = -1; static gint ett_nr_rrc_CarrierAggregationVariant = -1; static gint ett_nr_rrc_CodebookParameters = -1; static gint ett_nr_rrc_T_type1_02 = -1; @@ -8088,7 +8209,7 @@ static gint ett_nr_rrc_FeatureSetCombination = -1; static gint ett_nr_rrc_FeatureSetsPerBand = -1; static gint ett_nr_rrc_FeatureSet = -1; static gint ett_nr_rrc_T_eutra_03 = -1; -static gint ett_nr_rrc_T_nr_03 = -1; +static gint ett_nr_rrc_T_nr_04 = -1; static gint ett_nr_rrc_FeatureSetDownlink = -1; static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxNrofServingCells_OF_FeatureSetDownlinkPerCC_Id = -1; static gint ett_nr_rrc_T_timeDurationForQCL = -1; @@ -8103,8 +8224,8 @@ static gint ett_nr_rrc_T_pdsch_ProcessingType2 = -1; static gint ett_nr_rrc_T_pdsch_ProcessingType2_Limited = -1; static gint ett_nr_rrc_FeatureSetDownlink_v15a0 = -1; static gint ett_nr_rrc_FeatureSetDownlink_v1610 = -1; -static gint ett_nr_rrc_T_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot = -1; -static gint ett_nr_rrc_T_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot = -1; +static gint ett_nr_rrc_T_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16 = -1; +static gint ett_nr_rrc_T_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16 = -1; static gint ett_nr_rrc_T_intraFreqDAPS_r16 = -1; static gint ett_nr_rrc_T_pdcch_Monitoring_r16 = -1; static gint ett_nr_rrc_T_pdsch_ProcessingType1_r16 = -1; @@ -8131,6 +8252,7 @@ static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxDownlinkFeatureSets_OF_FeatureSetDownl static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxDownlinkFeatureSets_OF_FeatureSetDownlink_v1610 = -1; static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxUplinkFeatureSets_OF_FeatureSetUplink_v1610 = -1; static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxPerCC_FeatureSets_OF_FeatureSetDownlinkPerCC_v1620 = -1; +static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxUplinkFeatureSets_OF_FeatureSetUplink_v1630 = -1; static gint ett_nr_rrc_FeatureSetUplink = -1; static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxNrofServingCells_OF_FeatureSetUplinkPerCC_Id = -1; static gint ett_nr_rrc_T_pusch_ProcessingType1_DifferentTB_PerSlot = -1; @@ -8138,13 +8260,14 @@ static gint ett_nr_rrc_FeatureSetUplink_v1540 = -1; static gint ett_nr_rrc_T_pusch_ProcessingType2 = -1; static gint ett_nr_rrc_FeatureSetUplink_v1610 = -1; static gint ett_nr_rrc_T_pusch_RepetitionTypeB_r16 = -1; -static gint ett_nr_rrc_T_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot = -1; -static gint ett_nr_rrc_T_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot = -1; +static gint ett_nr_rrc_T_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16 = -1; +static gint ett_nr_rrc_T_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16 = -1; static gint ett_nr_rrc_T_intraFreqDAPS_UL_r16 = -1; static gint ett_nr_rrc_T_multiPUCCH_r16 = -1; static gint ett_nr_rrc_T_ul_IntraUE_Mux_r16 = -1; static gint ett_nr_rrc_T_crossCarrierSchedulingProcessing_DiffSCS_r16_01 = -1; static gint ett_nr_rrc_T_ul_FullPwrMode2_TPMIGroup_r16 = -1; +static gint ett_nr_rrc_FeatureSetUplink_v1630 = -1; static gint ett_nr_rrc_SRS_AllPosResources_r16 = -1; static gint ett_nr_rrc_SRS_PosResources_r16 = -1; static gint ett_nr_rrc_SRS_PosResourceAP_r16 = -1; @@ -8206,6 +8329,7 @@ static gint ett_nr_rrc_T_maxNumberActivatedTCI_States_r16 = -1; static gint ett_nr_rrc_T_singleDCI_SDM_scheme_Parameters_r16 = -1; static gint ett_nr_rrc_T_supportInter_slotTDM_r16 = -1; static gint ett_nr_rrc_T_beamSwitchTiming_r16 = -1; +static gint ett_nr_rrc_T_semi_PersistentL1_SINR_Report_PUCCH_r16 = -1; static gint ett_nr_rrc_DummyG = -1; static gint ett_nr_rrc_BeamManagementSSB_CSI_RS = -1; static gint ett_nr_rrc_DummyH = -1; @@ -8223,9 +8347,12 @@ static gint ett_nr_rrc_MRDC_Parameters_v1580 = -1; static gint ett_nr_rrc_MRDC_Parameters_v1590 = -1; static gint ett_nr_rrc_MRDC_Parameters_v1620 = -1; static gint ett_nr_rrc_T_maxUplinkDutyCycle_interBandENDC_TDD_PC2_r16 = -1; +static gint ett_nr_rrc_MRDC_Parameters_v1630 = -1; +static gint ett_nr_rrc_T_maxUplinkDutyCycle_interBandENDC_FDD_TDD_PC2_r16 = -1; static gint ett_nr_rrc_NRDC_Parameters = -1; static gint ett_nr_rrc_T_dummy_06 = -1; static gint ett_nr_rrc_NRDC_Parameters_v1570 = -1; +static gint ett_nr_rrc_NRDC_Parameters_v15c0 = -1; static gint ett_nr_rrc_NRDC_Parameters_v1610 = -1; static gint ett_nr_rrc_OLPC_SRS_Pos_r16 = -1; static gint ett_nr_rrc_PDCP_Parameters = -1; @@ -8305,6 +8432,8 @@ static gint ett_nr_rrc_T_fr1_r16_01 = -1; static gint ett_nr_rrc_T_fr2_r16_01 = -1; static gint ett_nr_rrc_T_sync_Sidelink_r16 = -1; static gint ett_nr_rrc_T_psfch_FormatZeroSidelink_r16 = -1; +static gint ett_nr_rrc_T_sl_TransmissionMode2_r16 = -1; +static gint ett_nr_rrc_T_congestionControlSidelink_r16 = -1; static gint ett_nr_rrc_SON_Parameters_r16 = -1; static gint ett_nr_rrc_SpatialRelationsSRS_Pos_r16 = -1; static gint ett_nr_rrc_SRS_SwitchingTimeNR = -1; @@ -8337,8 +8466,10 @@ static gint ett_nr_rrc_UE_NR_Capability_v1540 = -1; static gint ett_nr_rrc_UE_NR_Capability_v1550 = -1; static gint ett_nr_rrc_UE_NR_Capability_v1560 = -1; static gint ett_nr_rrc_UE_NR_Capability_v1570 = -1; -static gint ett_nr_rrc_UE_NR_Capability_v1610 = -1; +static gint ett_nr_rrc_UE_NR_Capability_v15c0 = -1; static gint ett_nr_rrc_T_nonCriticalExtension_51 = -1; +static gint ett_nr_rrc_UE_NR_Capability_v1610 = -1; +static gint ett_nr_rrc_T_nonCriticalExtension_52 = -1; static gint ett_nr_rrc_UE_NR_CapabilityAddXDD_Mode = -1; static gint ett_nr_rrc_UE_NR_CapabilityAddXDD_Mode_v1530 = -1; static gint ett_nr_rrc_UE_NR_CapabilityAddFRX_Mode = -1; @@ -8346,6 +8477,7 @@ static gint ett_nr_rrc_UE_NR_CapabilityAddFRX_Mode_v1540 = -1; static gint ett_nr_rrc_UE_NR_CapabilityAddFRX_Mode_v1610 = -1; static gint ett_nr_rrc_BAP_Parameters_r16 = -1; static gint ett_nr_rrc_SharedSpectrumChAccessParamsPerBand_r16 = -1; +static gint ett_nr_rrc_SharedSpectrumChAccessParamsPerBand_v1630 = -1; static gint ett_nr_rrc_AreaConfiguration_r16 = -1; static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxFreq_OF_InterFreqTargetInfo_r16 = -1; static gint ett_nr_rrc_AreaConfig_r16 = -1; @@ -8511,6 +8643,7 @@ static gint ett_nr_rrc_T_sl_AM_RLC_r16 = -1; static gint ett_nr_rrc_T_sl_UM_RLC_r16 = -1; static gint ett_nr_rrc_SL_ScheduledConfig_r16 = -1; static gint ett_nr_rrc_T_sl_PSFCH_ToPUCCH_r16 = -1; +static gint ett_nr_rrc_T_sl_DCI_ToSL_Trans_r16 = -1; static gint ett_nr_rrc_MAC_MainConfigSL_r16 = -1; static gint ett_nr_rrc_SL_ConfiguredGrantConfigList_r16 = -1; static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxNrofCG_SL_r16_OF_SL_ConfigIndexCG_r16 = -1; @@ -8541,7 +8674,7 @@ static gint ett_nr_rrc_MeasurementReportSidelink = -1; static gint ett_nr_rrc_T_criticalExtensions_47 = -1; static gint ett_nr_rrc_T_criticalExtensionsFuture_47 = -1; static gint ett_nr_rrc_MeasurementReportSidelink_IEs_r16 = -1; -static gint ett_nr_rrc_T_nonCriticalExtension_52 = -1; +static gint ett_nr_rrc_T_nonCriticalExtension_53 = -1; static gint ett_nr_rrc_SL_MeasResults_r16 = -1; static gint ett_nr_rrc_SL_MeasResult_r16 = -1; static gint ett_nr_rrc_SL_MeasQuantityResult_r16 = -1; @@ -8553,7 +8686,7 @@ static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxNrofSLRB_r16_OF_SLRB_Config_r16 = -1; static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxNrofSLRB_r16_OF_SLRB_PC5_ConfigIndex_r16 = -1; static gint ett_nr_rrc_T_sl_MeasConfig_r16 = -1; static gint ett_nr_rrc_T_sl_CSI_RS_Config_r16 = -1; -static gint ett_nr_rrc_T_nonCriticalExtension_53 = -1; +static gint ett_nr_rrc_T_nonCriticalExtension_54 = -1; static gint ett_nr_rrc_SLRB_Config_r16 = -1; static gint ett_nr_rrc_SL_SDAP_ConfigPC5_r16 = -1; static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxNrofSL_QFIsPerDest_r16_OF_SL_PQFI_r16 = -1; @@ -8569,32 +8702,32 @@ static gint ett_nr_rrc_RRCReconfigurationCompleteSidelink = -1; static gint ett_nr_rrc_T_criticalExtensions_49 = -1; static gint ett_nr_rrc_T_criticalExtensionsFuture_49 = -1; static gint ett_nr_rrc_RRCReconfigurationCompleteSidelink_IEs_r16 = -1; -static gint ett_nr_rrc_T_nonCriticalExtension_54 = -1; +static gint ett_nr_rrc_T_nonCriticalExtension_55 = -1; static gint ett_nr_rrc_RRCReconfigurationFailureSidelink = -1; static gint ett_nr_rrc_T_criticalExtensions_50 = -1; static gint ett_nr_rrc_T_criticalExtensionsFuture_50 = -1; static gint ett_nr_rrc_RRCReconfigurationFailureSidelink_IEs_r16 = -1; -static gint ett_nr_rrc_T_nonCriticalExtension_55 = -1; +static gint ett_nr_rrc_T_nonCriticalExtension_56 = -1; static gint ett_nr_rrc_UECapabilityEnquirySidelink = -1; static gint ett_nr_rrc_T_criticalExtensions_51 = -1; static gint ett_nr_rrc_T_criticalExtensionsFuture_51 = -1; static gint ett_nr_rrc_UECapabilityEnquirySidelink_IEs_r16 = -1; -static gint ett_nr_rrc_T_nonCriticalExtension_56 = -1; +static gint ett_nr_rrc_T_nonCriticalExtension_57 = -1; static gint ett_nr_rrc_UECapabilityInformationSidelink = -1; static gint ett_nr_rrc_T_criticalExtensions_52 = -1; static gint ett_nr_rrc_T_criticalExtensionsFuture_52 = -1; static gint ett_nr_rrc_UECapabilityInformationSidelink_IEs_r16 = -1; -static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxBands_OF_PC5_BandSidelink_r16 = -1; -static gint ett_nr_rrc_T_nonCriticalExtension_57 = -1; +static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxBands_OF_BandSidelinkPC5_r16 = -1; +static gint ett_nr_rrc_T_nonCriticalExtension_58 = -1; static gint ett_nr_rrc_PDCP_ParametersSidelink_r16 = -1; -static gint ett_nr_rrc_PC5_RLC_ParametersSidelink_r16 = -1; static gint ett_nr_rrc_BandCombinationListSidelinkNR_r16 = -1; static gint ett_nr_rrc_BandCombinationParametersSidelinkNR_r16 = -1; -static gint ett_nr_rrc_PC5_BandSidelink_r16 = -1; +static gint ett_nr_rrc_BandSidelinkPC5_r16 = -1; static gint ett_nr_rrc_T_sl_Reception_r16_01 = -1; static gint ett_nr_rrc_T_scs_CP_PatternRxSidelink_r16_01 = -1; static gint ett_nr_rrc_T_fr1_r16_02 = -1; static gint ett_nr_rrc_T_fr2_r16_02 = -1; +static gint ett_nr_rrc_T_csi_ReportSidelink_r16 = -1; /*--- End of included file: packet-nr-rrc-ett.c ---*/ #line 105 "./asn1/nr-rrc/packet-nr-rrc-template.c" @@ -8645,6 +8778,8 @@ static gint ett_nr_rrc_sl_ParametersEUTRA2_r16 = -1; static gint ett_nr_rrc_sl_ParametersEUTRA3_r16 = -1; static gint ett_nr_rrc_absTimeInfo = -1; static gint ett_nr_rrc_assistanceDataSIB_Element_r16 = -1; +static gint ett_nr_sl_V2X_ConfigCommon_r16 = -1; +static gint ett_nr_tdd_Config_r16 = -1; static expert_field ei_nr_rrc_number_pages_le15 = EI_INIT; @@ -9020,6 +9155,7 @@ static int dissect_OverheatingAssistance_PDU(tvbuff_t *tvb _U_, packet_info *pin static int dissect_SystemInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); static int dissect_PosSystemInformation_r16_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); static int dissect_UECapabilityEnquiry_v1560_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); +static int dissect_UE_NR_Capability_v15c0_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); @@ -9967,7 +10103,7 @@ dissect_nr_rrc_SEQUENCE_SIZE_1_maxNPN_r16_OF_NID_r16(tvbuff_t *tvb _U_, int offs static const per_sequence_t T_snpn_r16_sequence[] = { - { &hf_nr_rrc_plmn_Identity, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_PLMN_Identity }, + { &hf_nr_rrc_plmn_Identity_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_PLMN_Identity }, { &hf_nr_rrc_nid_List_r16 , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_SEQUENCE_SIZE_1_maxNPN_r16_OF_NID_r16 }, { NULL, 0, 0, NULL } }; @@ -12923,9 +13059,24 @@ dissect_nr_rrc_T_nonCriticalExtension_02(tvbuff_t *tvb _U_, int offset _U_, asn1 } +static const per_sequence_t CG_Config_v1630_IEs_sequence[] = { + { &hf_nr_rrc_selectedToffset_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_Offset_r16 }, + { &hf_nr_rrc_nonCriticalExtension_08, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_02 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_CG_Config_v1630_IEs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_CG_Config_v1630_IEs, CG_Config_v1630_IEs_sequence); + + return offset; +} + + static const per_sequence_t CG_Config_v1620_IEs_sequence[] = { { &hf_nr_rrc_ueAssistanceInformationSCG_r16_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_ueAssistanceInformationSCG_r16_01 }, - { &hf_nr_rrc_nonCriticalExtension_07, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_02 }, + { &hf_nr_rrc_nonCriticalExtension_07, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_CG_Config_v1630_IEs }, { NULL, 0, 0, NULL } }; @@ -14139,7 +14290,7 @@ dissect_nr_rrc_T_nonCriticalExtension_03(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t CG_ConfigInfo_v1620_IEs_sequence[] = { { &hf_nr_rrc_ueAssistanceInformationSourceSCG_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_ueAssistanceInformationSourceSCG_r16 }, - { &hf_nr_rrc_nonCriticalExtension_14, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_03 }, + { &hf_nr_rrc_nonCriticalExtension_15, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_03 }, { NULL, 0, 0, NULL } }; @@ -14159,7 +14310,7 @@ static const per_sequence_t CG_ConfigInfo_v1610_IEs_sequence[] = { { &hf_nr_rrc_scgFailureInfoEUTRA_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scgFailureInfoEUTRA_r16 }, { &hf_nr_rrc_sidelinkUEInformationNR_r16_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_sidelinkUEInformationNR_r16_01 }, { &hf_nr_rrc_sidelinkUEInformationEUTRA_r16_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_13, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_CG_ConfigInfo_v1620_IEs }, + { &hf_nr_rrc_nonCriticalExtension_14, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_CG_ConfigInfo_v1620_IEs }, { NULL, 0, 0, NULL } }; @@ -14174,7 +14325,7 @@ dissect_nr_rrc_CG_ConfigInfo_v1610_IEs(tvbuff_t *tvb _U_, int offset _U_, asn1_c static const per_sequence_t CG_ConfigInfo_v1590_IEs_sequence[] = { { &hf_nr_rrc_servFrequenciesMN_NR, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SEQUENCE_SIZE_1_maxNrofServingCells_1_OF_ARFCN_ValueNR }, - { &hf_nr_rrc_nonCriticalExtension_12, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_CG_ConfigInfo_v1610_IEs }, + { &hf_nr_rrc_nonCriticalExtension_13, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_CG_ConfigInfo_v1610_IEs }, { NULL, 0, 0, NULL } }; @@ -14190,7 +14341,7 @@ dissect_nr_rrc_CG_ConfigInfo_v1590_IEs(tvbuff_t *tvb _U_, int offset _U_, asn1_c static const per_sequence_t CG_ConfigInfo_v1570_IEs_sequence[] = { { &hf_nr_rrc_sftdFrequencyList_NR, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SFTD_FrequencyList_NR }, { &hf_nr_rrc_sftdFrequencyList_EUTRA, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SFTD_FrequencyList_EUTRA }, - { &hf_nr_rrc_nonCriticalExtension_11, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_CG_ConfigInfo_v1590_IEs }, + { &hf_nr_rrc_nonCriticalExtension_12, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_CG_ConfigInfo_v1590_IEs }, { NULL, 0, 0, NULL } }; @@ -14212,7 +14363,7 @@ static const per_sequence_t CG_ConfigInfo_v1560_IEs_sequence[] = { { &hf_nr_rrc_measResultReportCGI_EUTRA, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_measResultReportCGI_EUTRA }, { &hf_nr_rrc_measResultCellListSFTD_EUTRA, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_MeasResultCellListSFTD_EUTRA }, { &hf_nr_rrc_fr_InfoListMCG, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_FR_InfoList }, - { &hf_nr_rrc_nonCriticalExtension_10, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_CG_ConfigInfo_v1570_IEs }, + { &hf_nr_rrc_nonCriticalExtension_11, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_CG_ConfigInfo_v1570_IEs }, { NULL, 0, 0, NULL } }; @@ -14228,7 +14379,7 @@ dissect_nr_rrc_CG_ConfigInfo_v1560_IEs(tvbuff_t *tvb _U_, int offset _U_, asn1_c static const per_sequence_t CG_ConfigInfo_v1540_IEs_sequence[] = { { &hf_nr_rrc_ph_InfoMCG , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PH_TypeListMCG }, { &hf_nr_rrc_measResultReportCGI, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_measResultReportCGI }, - { &hf_nr_rrc_nonCriticalExtension_09, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_CG_ConfigInfo_v1560_IEs }, + { &hf_nr_rrc_nonCriticalExtension_10, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_CG_ConfigInfo_v1560_IEs }, { NULL, 0, 0, NULL } }; @@ -14254,7 +14405,7 @@ static const per_sequence_t CG_ConfigInfo_IEs_sequence[] = { { &hf_nr_rrc_scg_RB_Config_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scg_RB_Config_01 }, { &hf_nr_rrc_mcg_RB_Config, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_mcg_RB_Config }, { &hf_nr_rrc_mrdc_AssistanceInfo, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_MRDC_AssistanceInfo }, - { &hf_nr_rrc_nonCriticalExtension_08, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_CG_ConfigInfo_v1540_IEs }, + { &hf_nr_rrc_nonCriticalExtension_09, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_CG_ConfigInfo_v1540_IEs }, { NULL, 0, 0, NULL } }; @@ -14822,7 +14973,7 @@ dissect_nr_rrc_T_nonCriticalExtension_04(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t MeasurementTimingConfiguration_v1610_IEs_sequence[] = { { &hf_nr_rrc_csi_RS_Config_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_csi_RS_Config_r16 }, - { &hf_nr_rrc_nonCriticalExtension_17, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_04 }, + { &hf_nr_rrc_nonCriticalExtension_18, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_04 }, { NULL, 0, 0, NULL } }; @@ -14838,7 +14989,7 @@ dissect_nr_rrc_MeasurementTimingConfiguration_v1610_IEs(tvbuff_t *tvb _U_, int o static const per_sequence_t MeasurementTimingConfiguration_v1550_IEs_sequence[] = { { &hf_nr_rrc_campOnFirstSSB, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BOOLEAN }, { &hf_nr_rrc_psCellOnlyOnFirstSSB, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BOOLEAN }, - { &hf_nr_rrc_nonCriticalExtension_16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_MeasurementTimingConfiguration_v1610_IEs }, + { &hf_nr_rrc_nonCriticalExtension_17, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_MeasurementTimingConfiguration_v1610_IEs }, { NULL, 0, 0, NULL } }; @@ -14853,7 +15004,7 @@ dissect_nr_rrc_MeasurementTimingConfiguration_v1550_IEs(tvbuff_t *tvb _U_, int o static const per_sequence_t MeasurementTimingConfiguration_IEs_sequence[] = { { &hf_nr_rrc_measTiming , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_MeasTimingList }, - { &hf_nr_rrc_nonCriticalExtension_15, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_MeasurementTimingConfiguration_v1550_IEs }, + { &hf_nr_rrc_nonCriticalExtension_16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_MeasurementTimingConfiguration_v1550_IEs }, { NULL, 0, 0, NULL } }; @@ -14972,7 +15123,7 @@ dissect_nr_rrc_T_nonCriticalExtension_05(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t UERadioPagingInformation_IEs_sequence[] = { { &hf_nr_rrc_supportedBandListNRForPaging, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SEQUENCE_SIZE_1_maxBands_OF_FreqBandIndicatorNR }, - { &hf_nr_rrc_nonCriticalExtension_18, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_05 }, + { &hf_nr_rrc_nonCriticalExtension_19, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_05 }, { NULL, 0, 0, NULL } }; @@ -15095,7 +15246,7 @@ dissect_nr_rrc_T_nonCriticalExtension_06(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t UERadioAccessCapabilityInformation_IEs_sequence[] = { { &hf_nr_rrc_ue_RadioAccessCapabilityInfo, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_ue_RadioAccessCapabilityInfo }, - { &hf_nr_rrc_nonCriticalExtension_19, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_06 }, + { &hf_nr_rrc_nonCriticalExtension_20, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_06 }, { NULL, 0, 0, NULL } }; @@ -17943,10 +18094,46 @@ dissect_nr_rrc_SIB12_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ } + +static int +dissect_nr_rrc_T_sl_V2X_ConfigCommon_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + tvbuff_t *sl_v2x_configcommon_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, + NO_BOUND, NO_BOUND, FALSE, &sl_v2x_configcommon_tvb); + + if (sl_v2x_configcommon_tvb) { + proto_tree *subtree; + subtree = proto_item_add_subtree(actx->created_item, ett_nr_sl_V2X_ConfigCommon_r16); + dissect_lte_rrc_SystemInformationBlockType21_r14_PDU(sl_v2x_configcommon_tvb, actx->pinfo, subtree, NULL); + } + + + return offset; +} + + + +static int +dissect_nr_rrc_T_tdd_Config_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + tvbuff_t *tdd_config_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, + NO_BOUND, NO_BOUND, FALSE, &tdd_config_tvb); + + if (tdd_config_tvb) { + proto_tree *subtree; + subtree = proto_item_add_subtree(actx->created_item, ett_nr_tdd_Config_r16); + dissect_lte_rrc_TDD_Config_PDU(tdd_config_tvb, actx->pinfo, subtree, NULL); + } + + + return offset; +} + + static const per_sequence_t SIB13_r16_sequence[] = { - { &hf_nr_rrc_sl_V2X_ConfigCommon_r16, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_sl_Bandwidth_r16, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_tdd_Config_r16, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_OCTET_STRING }, + { &hf_nr_rrc_sl_V2X_ConfigCommon_r16, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_sl_V2X_ConfigCommon_r16 }, + { &hf_nr_rrc_dummy_02 , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_OCTET_STRING }, + { &hf_nr_rrc_tdd_Config_r16, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_tdd_Config_r16 }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, { NULL, 0, 0, NULL } }; @@ -18053,7 +18240,7 @@ dissect_nr_rrc_T_nonCriticalExtension_38(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t SystemInformation_IEs_sequence[] = { { &hf_nr_rrc_sib_TypeAndInfo, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_sib_TypeAndInfo }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_71, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_38 }, + { &hf_nr_rrc_nonCriticalExtension_73, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_38 }, { NULL, 0, 0, NULL } }; @@ -18631,7 +18818,7 @@ dissect_nr_rrc_T_nonCriticalExtension_48(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t PosSystemInformation_r16_IEs_sequence[] = { { &hf_nr_rrc_posSIB_TypeAndInfo_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_posSIB_TypeAndInfo_r16 }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_84, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_48 }, + { &hf_nr_rrc_nonCriticalExtension_86, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_48 }, { NULL, 0, 0, NULL } }; @@ -22495,7 +22682,7 @@ dissect_nr_rrc_T_messagePowerOffsetGroupB_01(tvbuff_t *tvb _U_, int offset _U_, static const per_sequence_t GroupB_ConfiguredTwoStepRA_r16_sequence[] = { { &hf_nr_rrc_ra_MsgA_SizeGroupA, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_ra_MsgA_SizeGroupA }, { &hf_nr_rrc_messagePowerOffsetGroupB_01, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_messagePowerOffsetGroupB_01 }, - { &hf_nr_rrc_numberofRA_PreamblesGroupA, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_INTEGER_1_64 }, + { &hf_nr_rrc_numberOfRA_PreamblesGroupA, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_INTEGER_1_64 }, { NULL, 0, 0, NULL } }; @@ -23181,15 +23368,15 @@ dissect_nr_rrc_T_period(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, } -static const per_sequence_t SemiStaticChannelAccessConfig_sequence[] = { +static const per_sequence_t SemiStaticChannelAccessConfig_r16_sequence[] = { { &hf_nr_rrc_period , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_period }, { NULL, 0, 0, NULL } }; static int -dissect_nr_rrc_SemiStaticChannelAccessConfig(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_SemiStaticChannelAccessConfig_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_nr_rrc_SemiStaticChannelAccessConfig, SemiStaticChannelAccessConfig_sequence); + ett_nr_rrc_SemiStaticChannelAccessConfig_r16, SemiStaticChannelAccessConfig_r16_sequence); return offset; } @@ -23203,7 +23390,7 @@ static const value_string nr_rrc_T_channelAccessMode_r16_01_vals[] = { static const per_choice_t T_channelAccessMode_r16_01_choice[] = { { 0, &hf_nr_rrc_dynamic_02 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_semiStatic_01, ASN1_NO_EXTENSIONS , dissect_nr_rrc_SemiStaticChannelAccessConfig }, + { 1, &hf_nr_rrc_semiStatic_01, ASN1_NO_EXTENSIONS , dissect_nr_rrc_SemiStaticChannelAccessConfig_r16 }, { 0, NULL, 0, NULL } }; @@ -24120,6 +24307,52 @@ dissect_nr_rrc_PosSI_SchedulingInfo_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ } +static const value_string nr_rrc_UAC_AC1_SelectAssistInfo_r16_vals[] = { + { 0, "a" }, + { 1, "b" }, + { 2, "c" }, + { 3, "notConfigured" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_UAC_AC1_SelectAssistInfo_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 4, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t SEQUENCE_SIZE_2_maxPLMN_OF_UAC_AC1_SelectAssistInfo_r16_sequence_of[1] = { + { &hf_nr_rrc_uac_AC1_SelectAssistInfo_r16_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_UAC_AC1_SelectAssistInfo_r16 }, +}; + +static int +dissect_nr_rrc_SEQUENCE_SIZE_2_maxPLMN_OF_UAC_AC1_SelectAssistInfo_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_SEQUENCE_SIZE_2_maxPLMN_OF_UAC_AC1_SelectAssistInfo_r16, SEQUENCE_SIZE_2_maxPLMN_OF_UAC_AC1_SelectAssistInfo_r16_sequence_of, + 2, maxPLMN, FALSE); + + return offset; +} + + +static const per_sequence_t T_uac_BarringInfo_v1630_sequence[] = { + { &hf_nr_rrc_uac_AC1_SelectAssistInfo_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_SEQUENCE_SIZE_2_maxPLMN_OF_UAC_AC1_SelectAssistInfo_r16 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_T_uac_BarringInfo_v1630(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_T_uac_BarringInfo_v1630, T_uac_BarringInfo_v1630_sequence); + + return offset; +} + + static const per_sequence_t T_nonCriticalExtension_36_sequence[] = { { NULL, 0, 0, NULL } }; @@ -24133,11 +24366,26 @@ dissect_nr_rrc_T_nonCriticalExtension_36(tvbuff_t *tvb _U_, int offset _U_, asn1 } +static const per_sequence_t SIB1_v1630_IEs_sequence[] = { + { &hf_nr_rrc_uac_BarringInfo_v1630, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_uac_BarringInfo_v1630 }, + { &hf_nr_rrc_nonCriticalExtension_71, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_36 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_SIB1_v1630_IEs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_SIB1_v1630_IEs, SIB1_v1630_IEs_sequence); + + return offset; +} + + static const per_sequence_t SIB1_v1610_IEs_sequence[] = { { &hf_nr_rrc_idleModeMeasurementsEUTRA_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_idleModeMeasurementsEUTRA_r16 }, { &hf_nr_rrc_idleModeMeasurementsNR_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_idleModeMeasurementsNR_r16 }, { &hf_nr_rrc_posSI_SchedulingInfo_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PosSI_SchedulingInfo_r16 }, - { &hf_nr_rrc_nonCriticalExtension_69, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_36 }, + { &hf_nr_rrc_nonCriticalExtension_70, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SIB1_v1630_IEs }, { NULL, 0, 0, NULL } }; @@ -24162,7 +24410,7 @@ static const per_sequence_t SIB1_sequence[] = { { &hf_nr_rrc_uac_BarringInfo, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_uac_BarringInfo }, { &hf_nr_rrc_useFullResumeID, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_useFullResumeID }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_68, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SIB1_v1610_IEs }, + { &hf_nr_rrc_nonCriticalExtension_69, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SIB1_v1610_IEs }, { NULL, 0, 0, NULL } }; @@ -24284,7 +24532,7 @@ dissect_nr_rrc_T_nonCriticalExtension_25(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t RRCReject_IEs_sequence[] = { { &hf_nr_rrc_waitTime , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RejectWaitTime }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_49, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_25 }, + { &hf_nr_rrc_nonCriticalExtension_50, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_25 }, { NULL, 0, 0, NULL } }; @@ -25487,7 +25735,6 @@ dissect_nr_rrc_IntegrityProtAlgorithm(tvbuff_t *tvb _U_, int offset _U_, asn1_ct p_security_algorithms->integrity = (enum nr_security_integrity_algorithm_e)value; - return offset; } @@ -25601,7 +25848,7 @@ static const per_sequence_t RRCSetup_IEs_sequence[] = { { &hf_nr_rrc_radioBearerConfig, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_RadioBearerConfig }, { &hf_nr_rrc_masterCellGroup_02, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_masterCellGroup_02 }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_58, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_29 }, + { &hf_nr_rrc_nonCriticalExtension_59, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_29 }, { NULL, 0, 0, NULL } }; @@ -27846,7 +28093,7 @@ static const value_string nr_rrc_T_ul_DelayValueConfig_r16_vals[] = { static const per_choice_t T_ul_DelayValueConfig_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_96 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_UL_DelayValueConfig_r16 }, + { 1, &hf_nr_rrc_setup_98 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_UL_DelayValueConfig_r16 }, { 0, NULL, 0, NULL } }; @@ -30026,7 +30273,7 @@ static const value_string nr_rrc_T_delayBudgetReportingConfig_vals[] = { static const per_choice_t T_delayBudgetReportingConfig_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_110 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_T_setup }, + { 1, &hf_nr_rrc_setup_113 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_T_setup }, { 0, NULL, 0, NULL } }; @@ -30106,7 +30353,7 @@ static const value_string nr_rrc_T_overheatingAssistanceConfig_vals[] = { static const per_choice_t T_overheatingAssistanceConfig_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_111 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_OverheatingAssistanceConfig }, + { 1, &hf_nr_rrc_setup_114 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_OverheatingAssistanceConfig }, { 0, NULL, 0, NULL } }; @@ -30292,7 +30539,7 @@ static const value_string nr_rrc_T_idc_AssistanceConfig_r16_vals[] = { static const per_choice_t T_idc_AssistanceConfig_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_112 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_IDC_AssistanceConfig_r16 }, + { 1, &hf_nr_rrc_setup_115 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_IDC_AssistanceConfig_r16 }, { 0, NULL, 0, NULL } }; @@ -30358,7 +30605,7 @@ static const value_string nr_rrc_T_drx_PreferenceConfig_r16_vals[] = { static const per_choice_t T_drx_PreferenceConfig_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_113 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_DRX_PreferenceConfig_r16 }, + { 1, &hf_nr_rrc_setup_116 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_DRX_PreferenceConfig_r16 }, { 0, NULL, 0, NULL } }; @@ -30424,7 +30671,7 @@ static const value_string nr_rrc_T_maxBW_PreferenceConfig_r16_vals[] = { static const per_choice_t T_maxBW_PreferenceConfig_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_114 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_MaxBW_PreferenceConfig_r16 }, + { 1, &hf_nr_rrc_setup_117 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_MaxBW_PreferenceConfig_r16 }, { 0, NULL, 0, NULL } }; @@ -30490,7 +30737,7 @@ static const value_string nr_rrc_T_maxCC_PreferenceConfig_r16_vals[] = { static const per_choice_t T_maxCC_PreferenceConfig_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_115 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_MaxCC_PreferenceConfig_r16 }, + { 1, &hf_nr_rrc_setup_118 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_MaxCC_PreferenceConfig_r16 }, { 0, NULL, 0, NULL } }; @@ -30556,7 +30803,7 @@ static const value_string nr_rrc_T_maxMIMO_LayerPreferenceConfig_r16_vals[] = { static const per_choice_t T_maxMIMO_LayerPreferenceConfig_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_116 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_MaxMIMO_LayerPreferenceConfig_r16 }, + { 1, &hf_nr_rrc_setup_119 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_MaxMIMO_LayerPreferenceConfig_r16 }, { 0, NULL, 0, NULL } }; @@ -30622,7 +30869,7 @@ static const value_string nr_rrc_T_minSchedulingOffsetPreferenceConfig_r16_vals[ static const per_choice_t T_minSchedulingOffsetPreferenceConfig_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_117 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_MinSchedulingOffsetPreferenceConfig_r16 }, + { 1, &hf_nr_rrc_setup_120 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_MinSchedulingOffsetPreferenceConfig_r16 }, { 0, NULL, 0, NULL } }; @@ -30704,7 +30951,7 @@ static const value_string nr_rrc_T_releasePreferenceConfig_r16_vals[] = { static const per_choice_t T_releasePreferenceConfig_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_118 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_ReleasePreferenceConfig_r16 }, + { 1, &hf_nr_rrc_setup_121 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_ReleasePreferenceConfig_r16 }, { 0, NULL, 0, NULL } }; @@ -30991,7 +31238,7 @@ dissect_nr_rrc_IAB_IP_Address_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static const value_string nr_rrc_IAB_IP_Usage_r16_vals[] = { - { 0, "f1-c" }, + { 0, "f1-C" }, { 1, "f1-U" }, { 2, "non-F1" }, { 3, "spare" }, @@ -31729,12 +31976,40 @@ dissect_nr_rrc_SL_ConfiguredGrantConfigList_r16(tvbuff_t *tvb _U_, int offset _U } +static const per_sequence_t T_sl_DCI_ToSL_Trans_r16_sequence_of[1] = { + { &hf_nr_rrc_sl_DCI_ToSL_Trans_r16_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_INTEGER_1_32 }, +}; + +static int +dissect_nr_rrc_T_sl_DCI_ToSL_Trans_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_T_sl_DCI_ToSL_Trans_r16, T_sl_DCI_ToSL_Trans_r16_sequence_of, + 1, 8, FALSE); + + return offset; +} + + +static const per_sequence_t SL_ScheduledConfig_r16_eag_1_sequence[] = { + { &hf_nr_rrc_sl_DCI_ToSL_Trans_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_sl_DCI_ToSL_Trans_r16 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_SL_ScheduledConfig_r16_eag_1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence_eag(tvb, offset, actx, tree, SL_ScheduledConfig_r16_eag_1_sequence); + + return offset; +} + + static const per_sequence_t SL_ScheduledConfig_r16_sequence[] = { { &hf_nr_rrc_sl_RNTI_r16 , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_RNTI_Value }, { &hf_nr_rrc_mac_MainConfigSL_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_MAC_MainConfigSL_r16 }, { &hf_nr_rrc_sl_CS_RNTI_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_RNTI_Value }, { &hf_nr_rrc_sl_PSFCH_ToPUCCH_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_sl_PSFCH_ToPUCCH_r16 }, { &hf_nr_rrc_sl_ConfiguredGrantConfigList_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_SL_ConfiguredGrantConfigList_r16 }, + { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_SL_ScheduledConfig_r16_eag_1 }, { NULL, 0, 0, NULL } }; @@ -31755,7 +32030,7 @@ static const value_string nr_rrc_T_sl_ScheduledConfig_r16_vals[] = { static const per_choice_t T_sl_ScheduledConfig_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_120 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SL_ScheduledConfig_r16 }, + { 1, &hf_nr_rrc_setup_123 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SL_ScheduledConfig_r16 }, { 0, NULL, 0, NULL } }; @@ -32051,7 +32326,7 @@ static const value_string nr_rrc_T_sl_UE_SelectedConfig_r16_vals[] = { static const per_choice_t T_sl_UE_SelectedConfig_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_121 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SL_UE_SelectedConfig_r16 }, + { 1, &hf_nr_rrc_setup_124 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SL_UE_SelectedConfig_r16 }, { 0, NULL, 0, NULL } }; @@ -32227,7 +32502,7 @@ static const value_string nr_rrc_T_sl_PSBCH_Config_r16_vals[] = { static const per_choice_t T_sl_PSBCH_Config_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_119 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SL_PSBCH_Config_r16 }, + { 1, &hf_nr_rrc_setup_122 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SL_PSBCH_Config_r16 }, { 0, NULL, 0, NULL } }; @@ -32329,7 +32604,7 @@ static const value_string nr_rrc_T_sl_PSCCH_Config_r16_vals[] = { static const per_choice_t T_sl_PSCCH_Config_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_123 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SL_PSCCH_Config_r16 }, + { 1, &hf_nr_rrc_setup_126 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SL_PSCCH_Config_r16 }, { 0, NULL, 0, NULL } }; @@ -32423,7 +32698,7 @@ static const value_string nr_rrc_T_sl_PSSCH_Config_r16_vals[] = { static const per_choice_t T_sl_PSSCH_Config_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_124 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SL_PSSCH_Config_r16 }, + { 1, &hf_nr_rrc_setup_127 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SL_PSSCH_Config_r16 }, { 0, NULL, 0, NULL } }; @@ -32542,7 +32817,7 @@ static const value_string nr_rrc_T_sl_PSFCH_Config_r16_vals[] = { static const per_choice_t T_sl_PSFCH_Config_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_125 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SL_PSFCH_Config_r16 }, + { 1, &hf_nr_rrc_setup_128 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SL_PSFCH_Config_r16 }, { 0, NULL, 0, NULL } }; @@ -33459,13 +33734,36 @@ dissect_nr_rrc_SL_MinMaxMCS_List_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx } + +static int +dissect_nr_rrc_BIT_STRING_SIZE_10_160(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, + 10, 160, FALSE, NULL, 0, NULL, NULL); + + return offset; +} + + +static const per_sequence_t SL_ResourcePool_r16_eag_1_sequence[] = { + { &hf_nr_rrc_sl_TimeResource_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_10_160 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_SL_ResourcePool_r16_eag_1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence_eag(tvb, offset, actx, tree, SL_ResourcePool_r16_eag_1_sequence); + + return offset; +} + + static const per_sequence_t SL_ResourcePool_r16_sequence[] = { { &hf_nr_rrc_sl_PSCCH_Config_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_sl_PSCCH_Config_r16 }, { &hf_nr_rrc_sl_PSSCH_Config_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_sl_PSSCH_Config_r16 }, { &hf_nr_rrc_sl_PSFCH_Config_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_sl_PSFCH_Config_r16 }, { &hf_nr_rrc_sl_SyncAllowed_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_SL_SyncAllowed_r16 }, { &hf_nr_rrc_sl_SubchannelSize_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_sl_SubchannelSize_r16 }, - { &hf_nr_rrc_sl_TimeResource_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_INTEGER_10_160 }, + { &hf_nr_rrc_dummy_15 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_INTEGER_10_160 }, { &hf_nr_rrc_sl_StartRB_Subchannel_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_INTEGER_0_265 }, { &hf_nr_rrc_sl_NumSubchannel_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_INTEGER_1_27 }, { &hf_nr_rrc_sl_Additional_MCS_Table_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_sl_Additional_MCS_Table_r16 }, @@ -33485,6 +33783,7 @@ static const per_sequence_t SL_ResourcePool_r16_sequence[] = { { &hf_nr_rrc_sl_PowerControl_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_SL_PowerControl_r16 }, { &hf_nr_rrc_sl_TxPercentageList_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_SL_TxPercentageList_r16 }, { &hf_nr_rrc_sl_MinMaxMCS_List_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_SL_MinMaxMCS_List_r16 }, + { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_SL_ResourcePool_r16_eag_1 }, { NULL, 0, 0, NULL } }; @@ -34468,7 +34767,7 @@ static const value_string nr_rrc_T_sl_CSI_SchedulingRequestId_r16_vals[] = { static const per_choice_t T_sl_CSI_SchedulingRequestId_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_122 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SchedulingRequestId }, + { 1, &hf_nr_rrc_setup_125 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SchedulingRequestId }, { 0, NULL, 0, NULL } }; @@ -35599,8 +35898,8 @@ static const per_sequence_t RRCReconfiguration_v1610_IEs_sequence[] = { { &hf_nr_rrc_dedicatedPosSysInfoDelivery_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dedicatedPosSysInfoDelivery_r16 }, { &hf_nr_rrc_sl_ConfigDedicatedNR_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_sl_ConfigDedicatedNR_r16 }, { &hf_nr_rrc_sl_ConfigDedicatedEUTRA_Info_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_sl_ConfigDedicatedEUTRA_Info_r16 }, - { &hf_nr_rrc_smtc_r16 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SSB_MTC }, - { &hf_nr_rrc_nonCriticalExtension_44, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_23 }, + { &hf_nr_rrc_targetCellSMTC_SCG_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SSB_MTC }, + { &hf_nr_rrc_nonCriticalExtension_45, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_23 }, { NULL, 0, 0, NULL } }; @@ -35617,7 +35916,7 @@ static const per_sequence_t RRCReconfiguration_v1560_IEs_sequence[] = { { &hf_nr_rrc_mrdc_SecondaryCellGroupConfig, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_mrdc_SecondaryCellGroupConfig }, { &hf_nr_rrc_radioBearerConfig2, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_radioBearerConfig2 }, { &hf_nr_rrc_sk_Counter , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SK_Counter }, - { &hf_nr_rrc_nonCriticalExtension_43, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCReconfiguration_v1610_IEs }, + { &hf_nr_rrc_nonCriticalExtension_44, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCReconfiguration_v1610_IEs }, { NULL, 0, 0, NULL } }; @@ -35632,7 +35931,7 @@ dissect_nr_rrc_RRCReconfiguration_v1560_IEs(tvbuff_t *tvb _U_, int offset _U_, a static const per_sequence_t RRCReconfiguration_v1540_IEs_sequence[] = { { &hf_nr_rrc_otherConfig_v1540, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OtherConfig_v1540 }, - { &hf_nr_rrc_nonCriticalExtension_42, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCReconfiguration_v1560_IEs }, + { &hf_nr_rrc_nonCriticalExtension_43, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCReconfiguration_v1560_IEs }, { NULL, 0, 0, NULL } }; @@ -35653,7 +35952,7 @@ static const per_sequence_t RRCReconfiguration_v1530_IEs_sequence[] = { { &hf_nr_rrc_dedicatedSIB1_Delivery, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dedicatedSIB1_Delivery }, { &hf_nr_rrc_dedicatedSystemInformationDelivery, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dedicatedSystemInformationDelivery }, { &hf_nr_rrc_otherConfig , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OtherConfig }, - { &hf_nr_rrc_nonCriticalExtension_41, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCReconfiguration_v1540_IEs }, + { &hf_nr_rrc_nonCriticalExtension_42, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCReconfiguration_v1540_IEs }, { NULL, 0, 0, NULL } }; @@ -35671,7 +35970,7 @@ static const per_sequence_t RRCReconfiguration_IEs_sequence[] = { { &hf_nr_rrc_secondaryCellGroup, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_secondaryCellGroup }, { &hf_nr_rrc_measConfig , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_MeasConfig }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_40, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCReconfiguration_v1530_IEs }, + { &hf_nr_rrc_nonCriticalExtension_41, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCReconfiguration_v1530_IEs }, { NULL, 0, 0, NULL } }; @@ -35909,7 +36208,7 @@ static const per_sequence_t RRCResume_v1610_IEs_sequence[] = { { &hf_nr_rrc_restoreSCG_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_restoreSCG_r16 }, { &hf_nr_rrc_mrdc_SecondaryCellGroup_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_mrdc_SecondaryCellGroup_r16 }, { &hf_nr_rrc_needForGapsConfigNR_r16_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_needForGapsConfigNR_r16_01 }, - { &hf_nr_rrc_nonCriticalExtension_55, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_27 }, + { &hf_nr_rrc_nonCriticalExtension_56, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_27 }, { NULL, 0, 0, NULL } }; @@ -35925,7 +36224,7 @@ dissect_nr_rrc_RRCResume_v1610_IEs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static const per_sequence_t RRCResume_v1560_IEs_sequence[] = { { &hf_nr_rrc_radioBearerConfig2_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_radioBearerConfig2_01 }, { &hf_nr_rrc_sk_Counter , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SK_Counter }, - { &hf_nr_rrc_nonCriticalExtension_54, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCResume_v1610_IEs }, + { &hf_nr_rrc_nonCriticalExtension_55, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCResume_v1610_IEs }, { NULL, 0, 0, NULL } }; @@ -35944,7 +36243,7 @@ static const per_sequence_t RRCResume_IEs_sequence[] = { { &hf_nr_rrc_measConfig , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_MeasConfig }, { &hf_nr_rrc_fullConfig_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_fullConfig_01 }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_53, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCResume_v1560_IEs }, + { &hf_nr_rrc_nonCriticalExtension_54, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCResume_v1560_IEs }, { NULL, 0, 0, NULL } }; @@ -36421,7 +36720,7 @@ dissect_nr_rrc_T_nonCriticalExtension_26(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t RRCRelease_v1610_IEs_sequence[] = { { &hf_nr_rrc_voiceFallbackIndication_r16_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_voiceFallbackIndication_r16_01 }, { &hf_nr_rrc_measIdleConfig_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_measIdleConfig_r16 }, - { &hf_nr_rrc_nonCriticalExtension_52, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_26 }, + { &hf_nr_rrc_nonCriticalExtension_53, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_26 }, { NULL, 0, 0, NULL } }; @@ -36436,7 +36735,7 @@ dissect_nr_rrc_RRCRelease_v1610_IEs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static const per_sequence_t RRCRelease_v1540_IEs_sequence[] = { { &hf_nr_rrc_waitTime , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RejectWaitTime }, - { &hf_nr_rrc_nonCriticalExtension_51, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCRelease_v1610_IEs }, + { &hf_nr_rrc_nonCriticalExtension_52, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCRelease_v1610_IEs }, { NULL, 0, 0, NULL } }; @@ -36455,7 +36754,7 @@ static const per_sequence_t RRCRelease_IEs_sequence[] = { { &hf_nr_rrc_suspendConfig, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SuspendConfig }, { &hf_nr_rrc_deprioritisationReq, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_deprioritisationReq }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_50, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCRelease_v1540_IEs }, + { &hf_nr_rrc_nonCriticalExtension_51, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCRelease_v1540_IEs }, { NULL, 0, 0, NULL } }; @@ -36536,7 +36835,7 @@ dissect_nr_rrc_T_nonCriticalExtension_21(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t RRCReestablishment_IEs_sequence[] = { { &hf_nr_rrc_nextHopChainingCount, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_NextHopChainingCount }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_37, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_21 }, + { &hf_nr_rrc_nonCriticalExtension_38, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_21 }, { NULL, 0, 0, NULL } }; @@ -36631,7 +36930,7 @@ dissect_nr_rrc_T_nonCriticalExtension_33(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t SecurityModeCommand_IEs_sequence[] = { { &hf_nr_rrc_securityConfigSMC, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_SecurityConfigSMC }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_65, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_33 }, + { &hf_nr_rrc_nonCriticalExtension_66, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_33 }, { NULL, 0, 0, NULL } }; @@ -36711,7 +37010,7 @@ dissect_nr_rrc_T_nonCriticalExtension_11(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t DLInformationTransfer_v1610_IEs_sequence[] = { { &hf_nr_rrc_referenceTimeInfo_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_ReferenceTimeInfo_r16 }, - { &hf_nr_rrc_nonCriticalExtension_25, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_11 }, + { &hf_nr_rrc_nonCriticalExtension_26, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_11 }, { NULL, 0, 0, NULL } }; @@ -36727,7 +37026,7 @@ dissect_nr_rrc_DLInformationTransfer_v1610_IEs(tvbuff_t *tvb _U_, int offset _U_ static const per_sequence_t DLInformationTransfer_IEs_sequence[] = { { &hf_nr_rrc_dedicatedNAS_Message, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_DedicatedNAS_Message }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_24, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_DLInformationTransfer_v1610_IEs }, + { &hf_nr_rrc_nonCriticalExtension_25, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_DLInformationTransfer_v1610_IEs }, { NULL, 0, 0, NULL } }; @@ -36991,7 +37290,7 @@ dissect_nr_rrc_T_nonCriticalExtension_07(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t CounterCheck_IEs_sequence[] = { { &hf_nr_rrc_drb_CountMSB_InfoList, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_DRB_CountMSB_InfoList }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_20, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_07 }, + { &hf_nr_rrc_nonCriticalExtension_21, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_07 }, { NULL, 0, 0, NULL } }; @@ -37166,7 +37465,7 @@ dissect_nr_rrc_T_nonCriticalExtension_19(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t MobilityFromNRCommand_v1610_IEs_sequence[] = { { &hf_nr_rrc_voiceFallbackIndication_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_voiceFallbackIndication_r16 }, - { &hf_nr_rrc_nonCriticalExtension_35, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_19 }, + { &hf_nr_rrc_nonCriticalExtension_36, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_19 }, { NULL, 0, 0, NULL } }; @@ -37184,7 +37483,7 @@ static const per_sequence_t MobilityFromNRCommand_IEs_sequence[] = { { &hf_nr_rrc_targetRAT_MessageContainer, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_targetRAT_MessageContainer }, { &hf_nr_rrc_nas_SecurityParamFromNR, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nas_SecurityParamFromNR }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_34, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_MobilityFromNRCommand_v1610_IEs }, + { &hf_nr_rrc_nonCriticalExtension_35, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_MobilityFromNRCommand_v1610_IEs }, { NULL, 0, 0, NULL } }; @@ -37283,7 +37582,7 @@ static const per_sequence_t DLDedicatedMessageSegment_r16_IEs_sequence[] = { { &hf_nr_rrc_rrc_MessageSegmentContainer_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_OCTET_STRING }, { &hf_nr_rrc_rrc_MessageSegmentType_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_rrc_MessageSegmentType_r16 }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_23, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_10 }, + { &hf_nr_rrc_nonCriticalExtension_24, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_10 }, { NULL, 0, 0, NULL } }; @@ -37458,7 +37757,7 @@ static const per_sequence_t UEInformationRequest_r16_IEs_sequence[] = { { &hf_nr_rrc_rlf_ReportReq_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_rlf_ReportReq_r16 }, { &hf_nr_rrc_mobilityHistoryReportReq_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_mobilityHistoryReportReq_r16 }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_78, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_42 }, + { &hf_nr_rrc_nonCriticalExtension_80, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_42 }, { NULL, 0, 0, NULL } }; @@ -37576,7 +37875,7 @@ static const per_sequence_t DLInformationTransferMRDC_r16_IEs_sequence[] = { { &hf_nr_rrc_dl_DCCH_MessageNR_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dl_DCCH_MessageNR_r16 }, { &hf_nr_rrc_dl_DCCH_MessageEUTRA_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dl_DCCH_MessageEUTRA_r16 }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_26, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_12 }, + { &hf_nr_rrc_nonCriticalExtension_27, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_12 }, { NULL, 0, 0, NULL } }; @@ -38130,7 +38429,7 @@ static const per_sequence_t LoggedMeasurementConfiguration_r16_IEs_sequence[] = { &hf_nr_rrc_loggingDuration_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_LoggingDuration_r16 }, { &hf_nr_rrc_reportType , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_reportType }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_31, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_16 }, + { &hf_nr_rrc_nonCriticalExtension_32, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_16 }, { NULL, 0, 0, NULL } }; @@ -38395,7 +38694,7 @@ dissect_nr_rrc_T_nonCriticalExtension_20(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t Paging_sequence[] = { { &hf_nr_rrc_pagingRecordList, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PagingRecordList }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_36, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_20 }, + { &hf_nr_rrc_nonCriticalExtension_37, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_20 }, { NULL, 0, 0, NULL } }; @@ -39821,7 +40120,7 @@ dissect_nr_rrc_T_nonCriticalExtension_18(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t MeasurementReport_IEs_sequence[] = { { &hf_nr_rrc_measResults , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_MeasResults }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_33, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_18 }, + { &hf_nr_rrc_nonCriticalExtension_34, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_18 }, { NULL, 0, 0, NULL } }; @@ -40119,7 +40418,7 @@ dissect_nr_rrc_T_nonCriticalExtension_24(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t RRCReconfigurationComplete_v1610_IEs_sequence[] = { { &hf_nr_rrc_ue_MeasurementsAvailable_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_MeasurementsAvailable_r16 }, { &hf_nr_rrc_needForGapsInfoNR_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_NeedForGapsInfoNR_r16 }, - { &hf_nr_rrc_nonCriticalExtension_48, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_24 }, + { &hf_nr_rrc_nonCriticalExtension_49, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_24 }, { NULL, 0, 0, NULL } }; @@ -40134,7 +40433,7 @@ dissect_nr_rrc_RRCReconfigurationComplete_v1610_IEs(tvbuff_t *tvb _U_, int offse static const per_sequence_t RRCReconfigurationComplete_v1560_IEs_sequence[] = { { &hf_nr_rrc_scg_Response , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scg_Response }, - { &hf_nr_rrc_nonCriticalExtension_47, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCReconfigurationComplete_v1610_IEs }, + { &hf_nr_rrc_nonCriticalExtension_48, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCReconfigurationComplete_v1610_IEs }, { NULL, 0, 0, NULL } }; @@ -40149,7 +40448,7 @@ dissect_nr_rrc_RRCReconfigurationComplete_v1560_IEs(tvbuff_t *tvb _U_, int offse static const per_sequence_t RRCReconfigurationComplete_v1530_IEs_sequence[] = { { &hf_nr_rrc_uplinkTxDirectCurrentList, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UplinkTxDirectCurrentList }, - { &hf_nr_rrc_nonCriticalExtension_46, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCReconfigurationComplete_v1560_IEs }, + { &hf_nr_rrc_nonCriticalExtension_47, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCReconfigurationComplete_v1560_IEs }, { NULL, 0, 0, NULL } }; @@ -40164,7 +40463,7 @@ dissect_nr_rrc_RRCReconfigurationComplete_v1530_IEs(tvbuff_t *tvb _U_, int offse static const per_sequence_t RRCReconfigurationComplete_IEs_sequence[] = { { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_45, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCReconfigurationComplete_v1530_IEs }, + { &hf_nr_rrc_nonCriticalExtension_46, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCReconfigurationComplete_v1530_IEs }, { NULL, 0, 0, NULL } }; @@ -40422,7 +40721,7 @@ static const per_sequence_t RRCSetupComplete_v1610_IEs_sequence[] = { { &hf_nr_rrc_ue_MeasurementsAvailable_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_MeasurementsAvailable_r16 }, { &hf_nr_rrc_mobilityHistoryAvail_r16_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_mobilityHistoryAvail_r16_01 }, { &hf_nr_rrc_mobilityState_r16_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_mobilityState_r16_01 }, - { &hf_nr_rrc_nonCriticalExtension_60, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_30 }, + { &hf_nr_rrc_nonCriticalExtension_61, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_30 }, { NULL, 0, 0, NULL } }; @@ -40443,7 +40742,7 @@ static const per_sequence_t RRCSetupComplete_IEs_sequence[] = { { &hf_nr_rrc_dedicatedNAS_Message, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_DedicatedNAS_Message }, { &hf_nr_rrc_ng_5G_S_TMSI_Value, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_ng_5G_S_TMSI_Value }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_59, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCSetupComplete_v1610_IEs }, + { &hf_nr_rrc_nonCriticalExtension_60, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCSetupComplete_v1610_IEs }, { NULL, 0, 0, NULL } }; @@ -40523,7 +40822,7 @@ dissect_nr_rrc_T_nonCriticalExtension_22(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t RRCReestablishmentComplete_v1610_IEs_sequence[] = { { &hf_nr_rrc_ue_MeasurementsAvailable_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_MeasurementsAvailable_r16 }, - { &hf_nr_rrc_nonCriticalExtension_39, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_22 }, + { &hf_nr_rrc_nonCriticalExtension_40, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_22 }, { NULL, 0, 0, NULL } }; @@ -40538,7 +40837,7 @@ dissect_nr_rrc_RRCReestablishmentComplete_v1610_IEs(tvbuff_t *tvb _U_, int offse static const per_sequence_t RRCReestablishmentComplete_IEs_sequence[] = { { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_38, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCReestablishmentComplete_v1610_IEs }, + { &hf_nr_rrc_nonCriticalExtension_39, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCReestablishmentComplete_v1610_IEs }, { NULL, 0, 0, NULL } }; @@ -40959,7 +41258,7 @@ static const per_sequence_t RRCResumeComplete_v1610_IEs_sequence[] = { { &hf_nr_rrc_mobilityHistoryAvail_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_mobilityHistoryAvail_r16 }, { &hf_nr_rrc_mobilityState_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_mobilityState_r16 }, { &hf_nr_rrc_needForGapsInfoNR_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_NeedForGapsInfoNR_r16 }, - { &hf_nr_rrc_nonCriticalExtension_57, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_28 }, + { &hf_nr_rrc_nonCriticalExtension_58, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_28 }, { NULL, 0, 0, NULL } }; @@ -40977,7 +41276,7 @@ static const per_sequence_t RRCResumeComplete_IEs_sequence[] = { { &hf_nr_rrc_selectedPLMN_Identity, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_INTEGER_1_maxPLMN }, { &hf_nr_rrc_uplinkTxDirectCurrentList, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UplinkTxDirectCurrentList }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_56, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCResumeComplete_v1610_IEs }, + { &hf_nr_rrc_nonCriticalExtension_57, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RRCResumeComplete_v1610_IEs }, { NULL, 0, 0, NULL } }; @@ -41057,7 +41356,7 @@ dissect_nr_rrc_T_nonCriticalExtension_34(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t SecurityModeComplete_IEs_sequence[] = { { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_66, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_34 }, + { &hf_nr_rrc_nonCriticalExtension_67, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_34 }, { NULL, 0, 0, NULL } }; @@ -41137,7 +41436,7 @@ dissect_nr_rrc_T_nonCriticalExtension_35(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t SecurityModeFailure_IEs_sequence[] = { { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_67, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_35 }, + { &hf_nr_rrc_nonCriticalExtension_68, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_35 }, { NULL, 0, 0, NULL } }; @@ -41228,7 +41527,7 @@ dissect_nr_rrc_T_nonCriticalExtension_45(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t ULInformationTransfer_IEs_sequence[] = { { &hf_nr_rrc_dedicatedNAS_Message, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_DedicatedNAS_Message }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_81, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_45 }, + { &hf_nr_rrc_nonCriticalExtension_83, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_45 }, { NULL, 0, 0, NULL } }; @@ -41461,7 +41760,7 @@ dissect_nr_rrc_T_nonCriticalExtension_15(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t LocationMeasurementIndication_IEs_sequence[] = { { &hf_nr_rrc_measurementIndication, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_measurementIndication }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_30, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_15 }, + { &hf_nr_rrc_nonCriticalExtension_31, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_15 }, { NULL, 0, 0, NULL } }; @@ -41541,7 +41840,7 @@ dissect_nr_rrc_T_nonCriticalExtension_41(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t UECapabilityInformation_IEs_sequence[] = { { &hf_nr_rrc_ue_CapabilityRAT_ContainerList, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_CapabilityRAT_ContainerList }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_77, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_41 }, + { &hf_nr_rrc_nonCriticalExtension_79, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_41 }, { NULL, 0, 0, NULL } }; @@ -41662,7 +41961,7 @@ dissect_nr_rrc_T_nonCriticalExtension_08(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t CounterCheckResponse_IEs_sequence[] = { { &hf_nr_rrc_drb_CountInfoList, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_DRB_CountInfoList }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_21, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_08 }, + { &hf_nr_rrc_nonCriticalExtension_22, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_08 }, { NULL, 0, 0, NULL } }; @@ -42550,7 +42849,7 @@ static const per_sequence_t UEAssistanceInformation_v1610_IEs_sequence[] = { { &hf_nr_rrc_releasePreference_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_ReleasePreference_r16 }, { &hf_nr_rrc_sl_UE_AssistanceInformationNR_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SL_UE_AssistanceInformationNR_r16 }, { &hf_nr_rrc_referenceTimeInfoPreference_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BOOLEAN }, - { &hf_nr_rrc_nonCriticalExtension_74, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_39 }, + { &hf_nr_rrc_nonCriticalExtension_76, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_39 }, { NULL, 0, 0, NULL } }; @@ -42565,7 +42864,7 @@ dissect_nr_rrc_UEAssistanceInformation_v1610_IEs(tvbuff_t *tvb _U_, int offset _ static const per_sequence_t UEAssistanceInformation_v1540_IEs_sequence[] = { { &hf_nr_rrc_overheatingAssistance, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OverheatingAssistance }, - { &hf_nr_rrc_nonCriticalExtension_73, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UEAssistanceInformation_v1610_IEs }, + { &hf_nr_rrc_nonCriticalExtension_75, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UEAssistanceInformation_v1610_IEs }, { NULL, 0, 0, NULL } }; @@ -42581,7 +42880,7 @@ dissect_nr_rrc_UEAssistanceInformation_v1540_IEs(tvbuff_t *tvb _U_, int offset _ static const per_sequence_t UEAssistanceInformation_IEs_sequence[] = { { &hf_nr_rrc_delayBudgetReport, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_DelayBudgetReport }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_72, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UEAssistanceInformation_v1540_IEs }, + { &hf_nr_rrc_nonCriticalExtension_74, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UEAssistanceInformation_v1540_IEs }, { NULL, 0, 0, NULL } }; @@ -42728,7 +43027,7 @@ dissect_nr_rrc_T_nonCriticalExtension_13(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t FailureInformation_v1610_IEs_sequence[] = { { &hf_nr_rrc_failureInfoDAPS_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_FailureInfoDAPS_r16 }, - { &hf_nr_rrc_nonCriticalExtension_28, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_13 }, + { &hf_nr_rrc_nonCriticalExtension_29, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_13 }, { NULL, 0, 0, NULL } }; @@ -42744,7 +43043,7 @@ dissect_nr_rrc_FailureInformation_v1610_IEs(tvbuff_t *tvb _U_, int offset _U_, a static const per_sequence_t FailureInformation_IEs_sequence[] = { { &hf_nr_rrc_failureInfoRLC_Bearer, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_FailureInfoRLC_Bearer }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_27, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_FailureInformation_v1610_IEs }, + { &hf_nr_rrc_nonCriticalExtension_28, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_FailureInformation_v1610_IEs }, { NULL, 0, 0, NULL } }; @@ -42861,7 +43160,7 @@ static const per_sequence_t ULInformationTransferMRDC_IEs_sequence[] = { { &hf_nr_rrc_ul_DCCH_MessageNR, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_ul_DCCH_MessageNR }, { &hf_nr_rrc_ul_DCCH_MessageEUTRA, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_ul_DCCH_MessageEUTRA }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_83, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_47 }, + { &hf_nr_rrc_nonCriticalExtension_85, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_47 }, { NULL, 0, 0, NULL } }; @@ -43065,7 +43364,7 @@ dissect_nr_rrc_T_nonCriticalExtension_31(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t SCGFailureInformation_v1590_IEs_sequence[] = { { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_62, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_31 }, + { &hf_nr_rrc_nonCriticalExtension_63, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_31 }, { NULL, 0, 0, NULL } }; @@ -43080,7 +43379,7 @@ dissect_nr_rrc_SCGFailureInformation_v1590_IEs(tvbuff_t *tvb _U_, int offset _U_ static const per_sequence_t SCGFailureInformation_IEs_sequence[] = { { &hf_nr_rrc_failureReportSCG, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_FailureReportSCG }, - { &hf_nr_rrc_nonCriticalExtension_61, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SCGFailureInformation_v1590_IEs }, + { &hf_nr_rrc_nonCriticalExtension_62, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SCGFailureInformation_v1590_IEs }, { NULL, 0, 0, NULL } }; @@ -43243,7 +43542,7 @@ dissect_nr_rrc_T_nonCriticalExtension_32(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t SCGFailureInformationEUTRA_v1590_IEs_sequence[] = { { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_64, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_32 }, + { &hf_nr_rrc_nonCriticalExtension_65, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_32 }, { NULL, 0, 0, NULL } }; @@ -43258,7 +43557,7 @@ dissect_nr_rrc_SCGFailureInformationEUTRA_v1590_IEs(tvbuff_t *tvb _U_, int offse static const per_sequence_t SCGFailureInformationEUTRA_IEs_sequence[] = { { &hf_nr_rrc_failureReportSCG_EUTRA, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_FailureReportSCG_EUTRA }, - { &hf_nr_rrc_nonCriticalExtension_63, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SCGFailureInformationEUTRA_v1590_IEs }, + { &hf_nr_rrc_nonCriticalExtension_64, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SCGFailureInformationEUTRA_v1590_IEs }, { NULL, 0, 0, NULL } }; @@ -43406,7 +43705,7 @@ static const per_sequence_t ULDedicatedMessageSegment_r16_IEs_sequence[] = { { &hf_nr_rrc_rrc_MessageSegmentContainer_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_OCTET_STRING }, { &hf_nr_rrc_rrc_MessageSegmentType_r16_01, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_rrc_MessageSegmentType_r16_01 }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_80, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_44 }, + { &hf_nr_rrc_nonCriticalExtension_82, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_44 }, { NULL, 0, 0, NULL } }; @@ -43618,7 +43917,7 @@ dissect_nr_rrc_T_nonCriticalExtension_09(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t DedicatedSIBRequest_r16_IEs_sequence[] = { { &hf_nr_rrc_onDemandSIB_RequestList_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_onDemandSIB_RequestList_r16 }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_22, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_09 }, + { &hf_nr_rrc_nonCriticalExtension_23, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_09 }, { NULL, 0, 0, NULL } }; @@ -43825,7 +44124,7 @@ dissect_nr_rrc_T_nonCriticalExtension_17(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t MCGFailureInformation_r16_IEs_sequence[] = { { &hf_nr_rrc_failureReportMCG_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_FailureReportMCG_r16 }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_32, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_17 }, + { &hf_nr_rrc_nonCriticalExtension_33, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_17 }, { NULL, 0, 0, NULL } }; @@ -45083,7 +45382,7 @@ static const per_sequence_t UEInformationResponse_r16_IEs_sequence[] = { { &hf_nr_rrc_rlf_Report_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RLF_Report_r16 }, { &hf_nr_rrc_mobilityHistoryReport_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_MobilityHistoryReport_r16 }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_79, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_43 }, + { &hf_nr_rrc_nonCriticalExtension_81, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_43 }, { NULL, 0, 0, NULL } }; @@ -45429,7 +45728,7 @@ static const per_sequence_t SidelinkUEInformationNR_r16_IEs_sequence[] = { { &hf_nr_rrc_sl_TxResourceReqList_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SL_TxResourceReqList_r16 }, { &hf_nr_rrc_sl_FailureList_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SL_FailureList_r16 }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_70, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_37 }, + { &hf_nr_rrc_nonCriticalExtension_72, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_37 }, { NULL, 0, 0, NULL } }; @@ -45527,7 +45826,7 @@ dissect_nr_rrc_T_nonCriticalExtension_46(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t ULInformationTransferIRAT_r16_IEs_sequence[] = { { &hf_nr_rrc_ul_DCCH_MessageEUTRA_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_ul_DCCH_MessageEUTRA_r16 }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_82, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_46 }, + { &hf_nr_rrc_nonCriticalExtension_84, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_46 }, { NULL, 0, 0, NULL } }; @@ -45871,7 +46170,7 @@ dissect_nr_rrc_T_nonCriticalExtension_14(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t IABOtherInformation_r16_IEs_sequence[] = { { &hf_nr_rrc_ip_InfoType_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_ip_InfoType_r16 }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_29, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_14 }, + { &hf_nr_rrc_nonCriticalExtension_30, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_14 }, { NULL, 0, 0, NULL } }; @@ -46279,7 +46578,7 @@ dissect_nr_rrc_T_nonCriticalExtension_40(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t UECapabilityEnquiry_v1610_IEs_sequence[] = { { &hf_nr_rrc_rrc_SegAllowed_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_rrc_SegAllowed_r16 }, - { &hf_nr_rrc_nonCriticalExtension_76, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_40 }, + { &hf_nr_rrc_nonCriticalExtension_78, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_40 }, { NULL, 0, 0, NULL } }; @@ -46294,7 +46593,7 @@ dissect_nr_rrc_UECapabilityEnquiry_v1610_IEs(tvbuff_t *tvb _U_, int offset _U_, static const per_sequence_t UECapabilityEnquiry_v1560_IEs_sequence[] = { { &hf_nr_rrc_capabilityRequestFilterCommon, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_CapabilityRequestFilterCommon }, - { &hf_nr_rrc_nonCriticalExtension_75, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UECapabilityEnquiry_v1610_IEs }, + { &hf_nr_rrc_nonCriticalExtension_77, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UECapabilityEnquiry_v1610_IEs }, { NULL, 0, 0, NULL } }; @@ -46808,7 +47107,7 @@ static const value_string nr_rrc_BH_LogicalChannelIdentity_r16_vals[] = { }; static const per_choice_t BH_LogicalChannelIdentity_r16_choice[] = { - { 0, &hf_nr_rrc_bh_LogicalChannelIdentity_r16_01, ASN1_NO_EXTENSIONS , dissect_nr_rrc_LogicalChannelIdentity }, + { 0, &hf_nr_rrc_bh_LogicalChannelIdentity_r16, ASN1_NO_EXTENSIONS , dissect_nr_rrc_LogicalChannelIdentity }, { 1, &hf_nr_rrc_bh_LogicalChannelIdentityExt_r16, ASN1_NO_EXTENSIONS , dissect_nr_rrc_BH_LogicalChannelIdentity_Ext_r16 }, { 0, NULL, 0, NULL } }; @@ -47419,7 +47718,7 @@ dissect_nr_rrc_LogicalChannelConfig(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static const per_sequence_t BH_RLC_ChannelConfig_r16_sequence[] = { - { &hf_nr_rrc_bh_LogicalChannelIdentity_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_BH_LogicalChannelIdentity_r16 }, + { &hf_nr_rrc_bh_LogicalChannelIdentity_r16_01, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_BH_LogicalChannelIdentity_r16 }, { &hf_nr_rrc_bh_RLC_ChannelID_r16, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BH_RLC_ChannelID_r16 }, { &hf_nr_rrc_reestablishRLC_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_reestablishRLC_r16 }, { &hf_nr_rrc_rlc_Config_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_RLC_Config }, @@ -48687,7 +48986,7 @@ static const per_sequence_t RateMatchPattern_sequence[] = { { &hf_nr_rrc_rateMatchPatternId, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_RateMatchPatternId }, { &hf_nr_rrc_patternType , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_patternType }, { &hf_nr_rrc_subcarrierSpacing, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_SubcarrierSpacing }, - { &hf_nr_rrc_dummy_04 , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_dummy_01 }, + { &hf_nr_rrc_dummy_05 , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_dummy_01 }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_RateMatchPattern_eag_1 }, { NULL, 0, 0, NULL } }; @@ -49792,7 +50091,7 @@ static const value_string nr_rrc_T_fdm_TDM_r16_vals[] = { static const per_choice_t T_fdm_TDM_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_94 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_FDM_TDM_r16 }, + { 1, &hf_nr_rrc_setup_95 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_FDM_TDM_r16 }, { 0, NULL, 0, NULL } }; @@ -49808,7 +50107,7 @@ dissect_nr_rrc_T_fdm_TDM_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static const value_string nr_rrc_T_tciMapping_r16_vals[] = { { 0, "cyclicMapping" }, - { 1, "sequenticalMapping" }, + { 1, "sequentialMapping" }, { 0, NULL } }; @@ -49824,7 +50123,7 @@ dissect_nr_rrc_T_tciMapping_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static const per_sequence_t SlotBased_r16_sequence[] = { { &hf_nr_rrc_tciMapping_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_tciMapping_r16 }, - { &hf_nr_rrc_sequenceOffsetforRV_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_INTEGER_1_3 }, + { &hf_nr_rrc_sequenceOffsetForRV_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_INTEGER_1_3 }, { NULL, 0, 0, NULL } }; @@ -49845,7 +50144,7 @@ static const value_string nr_rrc_T_slotBased_r16_vals[] = { static const per_choice_t T_slotBased_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_95 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SlotBased_r16 }, + { 1, &hf_nr_rrc_setup_96 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SlotBased_r16 }, { 0, NULL, 0, NULL } }; @@ -49939,6 +50238,118 @@ dissect_nr_rrc_PDSCH_Config_eag_1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } +static const value_string nr_rrc_T_tciMapping_r16_01_vals[] = { + { 0, "cyclicMapping" }, + { 1, "sequentialMapping" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_tciMapping_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 2, NULL, FALSE, 0, NULL); + + return offset; +} + + + +static int +dissect_nr_rrc_INTEGER_0(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 0U, NULL, FALSE); + + return offset; +} + + +static const per_sequence_t SlotBased_v1630_sequence[] = { + { &hf_nr_rrc_tciMapping_r16_01, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_tciMapping_r16_01 }, + { &hf_nr_rrc_sequenceOffsetForRV_r16_01, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_INTEGER_0 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_SlotBased_v1630(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_SlotBased_v1630, SlotBased_v1630_sequence); + + return offset; +} + + +static const value_string nr_rrc_T_slotBased_v1630_vals[] = { + { 0, "release" }, + { 1, "setup" }, + { 0, NULL } +}; + +static const per_choice_t T_slotBased_v1630_choice[] = { + { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, + { 1, &hf_nr_rrc_setup_97 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SlotBased_v1630 }, + { 0, NULL, 0, NULL } +}; + +static int +dissect_nr_rrc_T_slotBased_v1630(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_T_slotBased_v1630, T_slotBased_v1630_choice, + NULL); + + return offset; +} + + +static const per_sequence_t RepetitionSchemeConfig_v1630_sequence[] = { + { &hf_nr_rrc_slotBased_v1630, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_slotBased_v1630 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_RepetitionSchemeConfig_v1630(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_RepetitionSchemeConfig_v1630, RepetitionSchemeConfig_v1630_sequence); + + return offset; +} + + +static const value_string nr_rrc_T_repetitionSchemeConfig_v1630_vals[] = { + { 0, "release" }, + { 1, "setup" }, + { 0, NULL } +}; + +static const per_choice_t T_repetitionSchemeConfig_v1630_choice[] = { + { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, + { 1, &hf_nr_rrc_setup_66 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_RepetitionSchemeConfig_v1630 }, + { 0, NULL, 0, NULL } +}; + +static int +dissect_nr_rrc_T_repetitionSchemeConfig_v1630(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_T_repetitionSchemeConfig_v1630, T_repetitionSchemeConfig_v1630_choice, + NULL); + + return offset; +} + + +static const per_sequence_t PDSCH_Config_eag_2_sequence[] = { + { &hf_nr_rrc_repetitionSchemeConfig_v1630, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_repetitionSchemeConfig_v1630 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_PDSCH_Config_eag_2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence_eag(tvb, offset, actx, tree, PDSCH_Config_eag_2_sequence); + + return offset; +} + + static const per_sequence_t PDSCH_Config_sequence[] = { { &hf_nr_rrc_dataScramblingIdentityPDSCH, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_INTEGER_0_1023 }, { &hf_nr_rrc_dmrs_DownlinkForPDSCH_MappingTypeA, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_dmrs_DownlinkForPDSCH_MappingTypeA }, @@ -49965,6 +50376,7 @@ static const per_sequence_t PDSCH_Config_sequence[] = { { &hf_nr_rrc_sp_ZP_CSI_RS_ResourceSetsToReleaseList, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_SEQUENCE_SIZE_1_maxNrofZP_CSI_RS_ResourceSets_OF_ZP_CSI_RS_ResourceSetId }, { &hf_nr_rrc_p_ZP_CSI_RS_ResourceSet, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_p_ZP_CSI_RS_ResourceSet }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_PDSCH_Config_eag_1 }, + { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_PDSCH_Config_eag_2 }, { NULL, 0, 0, NULL } }; @@ -50939,7 +51351,7 @@ static const value_string nr_rrc_T_format1_vals[] = { static const per_choice_t T_format1_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_76 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUCCH_FormatConfig }, + { 1, &hf_nr_rrc_setup_77 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUCCH_FormatConfig }, { 0, NULL, 0, NULL } }; @@ -50961,7 +51373,7 @@ static const value_string nr_rrc_T_format2_vals[] = { static const per_choice_t T_format2_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_76 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUCCH_FormatConfig }, + { 1, &hf_nr_rrc_setup_77 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUCCH_FormatConfig }, { 0, NULL, 0, NULL } }; @@ -50983,7 +51395,7 @@ static const value_string nr_rrc_T_format3_vals[] = { static const per_choice_t T_format3_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_76 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUCCH_FormatConfig }, + { 1, &hf_nr_rrc_setup_77 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUCCH_FormatConfig }, { 0, NULL, 0, NULL } }; @@ -51005,7 +51417,7 @@ static const value_string nr_rrc_T_format4_vals[] = { static const per_choice_t T_format4_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_76 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUCCH_FormatConfig }, + { 1, &hf_nr_rrc_setup_77 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUCCH_FormatConfig }, { 0, NULL, 0, NULL } }; @@ -51448,7 +51860,7 @@ static const value_string nr_rrc_T_pathlossReferenceRSs_v1610_vals[] = { static const per_choice_t T_pathlossReferenceRSs_v1610_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_81 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PathlossReferenceRSs_v1610 }, + { 1, &hf_nr_rrc_setup_82 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PathlossReferenceRSs_v1610 }, { 0, NULL, 0, NULL } }; @@ -51666,7 +52078,7 @@ static const value_string nr_rrc_T_dl_DataToUL_ACK_r16_vals[] = { static const per_choice_t T_dl_DataToUL_ACK_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_77 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_DL_DataToUL_ACK_r16 }, + { 1, &hf_nr_rrc_setup_78 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_DL_DataToUL_ACK_r16 }, { 0, NULL, 0, NULL } }; @@ -51702,7 +52114,7 @@ static const value_string nr_rrc_T_ul_AccessConfigListDCI_1_1_r16_vals[] = { static const per_choice_t T_ul_AccessConfigListDCI_1_1_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_78 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_UL_AccessConfigListDCI_1_1_r16 }, + { 1, &hf_nr_rrc_setup_79 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_UL_AccessConfigListDCI_1_1_r16 }, { 0, NULL, 0, NULL } }; @@ -51792,7 +52204,7 @@ static const value_string nr_rrc_T_dl_DataToUL_ACK_DCI_1_2_r16_vals[] = { static const per_choice_t T_dl_DataToUL_ACK_DCI_1_2_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_79 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_DL_DataToUL_ACK_DCI_1_2_r16 }, + { 1, &hf_nr_rrc_setup_80 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_DL_DataToUL_ACK_DCI_1_2_r16 }, { 0, NULL, 0, NULL } }; @@ -52016,7 +52428,7 @@ static const value_string nr_rrc_T_sps_PUCCH_AN_List_r16_vals[] = { static const per_choice_t T_sps_PUCCH_AN_List_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_80 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SPS_PUCCH_AN_List_r16 }, + { 1, &hf_nr_rrc_setup_81 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SPS_PUCCH_AN_List_r16 }, { 0, NULL, 0, NULL } }; @@ -52571,7 +52983,7 @@ static const value_string nr_rrc_T_dmrs_UplinkForPUSCH_MappingTypeA_vals[] = { static const per_choice_t T_dmrs_UplinkForPUSCH_MappingTypeA_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_82 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_DMRS_UplinkConfig }, + { 1, &hf_nr_rrc_setup_83 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_DMRS_UplinkConfig }, { 0, NULL, 0, NULL } }; @@ -52593,7 +53005,7 @@ static const value_string nr_rrc_T_dmrs_UplinkForPUSCH_MappingTypeB_vals[] = { static const per_choice_t T_dmrs_UplinkForPUSCH_MappingTypeB_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_82 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_DMRS_UplinkConfig }, + { 1, &hf_nr_rrc_setup_83 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_DMRS_UplinkConfig }, { 0, NULL, 0, NULL } }; @@ -52926,7 +53338,7 @@ static const value_string nr_rrc_T_pusch_TimeDomainAllocationList_vals[] = { static const per_choice_t T_pusch_TimeDomainAllocationList_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_83 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUSCH_TimeDomainResourceAllocationList }, + { 1, &hf_nr_rrc_setup_84 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUSCH_TimeDomainResourceAllocationList }, { 0, NULL, 0, NULL } }; @@ -53114,7 +53526,7 @@ static const value_string nr_rrc_T_uci_OnPUSCH_01_vals[] = { static const per_choice_t T_uci_OnPUSCH_01_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_84 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_UCI_OnPUSCH }, + { 1, &hf_nr_rrc_setup_85 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_UCI_OnPUSCH }, { 0, NULL, 0, NULL } }; @@ -53175,7 +53587,7 @@ static const value_string nr_rrc_T_minimumSchedulingOffsetK2_r16_vals[] = { static const per_choice_t T_minimumSchedulingOffsetK2_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_85 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_MinSchedulingOffsetK2_Values_r16 }, + { 1, &hf_nr_rrc_setup_86 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_MinSchedulingOffsetK2_Values_r16 }, { 0, NULL, 0, NULL } }; @@ -53211,7 +53623,7 @@ static const value_string nr_rrc_T_ul_AccessConfigListDCI_0_1_r16_vals[] = { static const per_choice_t T_ul_AccessConfigListDCI_0_1_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_86 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_UL_AccessConfigListDCI_0_1_r16 }, + { 1, &hf_nr_rrc_setup_87 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_UL_AccessConfigListDCI_0_1_r16 }, { 0, NULL, 0, NULL } }; @@ -53263,7 +53675,7 @@ static const value_string nr_rrc_T_dmrs_UplinkForPUSCH_MappingTypeA_DCI_0_2_r16_ static const per_choice_t T_dmrs_UplinkForPUSCH_MappingTypeA_DCI_0_2_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_82 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_DMRS_UplinkConfig }, + { 1, &hf_nr_rrc_setup_83 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_DMRS_UplinkConfig }, { 0, NULL, 0, NULL } }; @@ -53285,7 +53697,7 @@ static const value_string nr_rrc_T_dmrs_UplinkForPUSCH_MappingTypeB_DCI_0_2_r16_ static const per_choice_t T_dmrs_UplinkForPUSCH_MappingTypeB_DCI_0_2_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_82 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_DMRS_UplinkConfig }, + { 1, &hf_nr_rrc_setup_83 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_DMRS_UplinkConfig }, { 0, NULL, 0, NULL } }; @@ -53375,7 +53787,7 @@ static const value_string nr_rrc_T_frequencyHoppingOffsetListsDCI_0_2_r16_vals[] static const per_choice_t T_frequencyHoppingOffsetListsDCI_0_2_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_87 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_FrequencyHoppingOffsetListsDCI_0_2_r16 }, + { 1, &hf_nr_rrc_setup_88 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_FrequencyHoppingOffsetListsDCI_0_2_r16 }, { 0, NULL, 0, NULL } }; @@ -53632,7 +54044,7 @@ static const value_string nr_rrc_T_uci_OnPUSCH_ListDCI_0_2_r16_vals[] = { static const per_choice_t T_uci_OnPUSCH_ListDCI_0_2_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_88 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_UCI_OnPUSCH_ListDCI_0_2_r16 }, + { 1, &hf_nr_rrc_setup_89 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_UCI_OnPUSCH_ListDCI_0_2_r16 }, { 0, NULL, 0, NULL } }; @@ -53753,7 +54165,7 @@ static const value_string nr_rrc_T_pusch_TimeDomainAllocationListDCI_0_2_r16_val static const per_choice_t T_pusch_TimeDomainAllocationListDCI_0_2_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_89 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUSCH_TimeDomainResourceAllocationList_r16 }, + { 1, &hf_nr_rrc_setup_90 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUSCH_TimeDomainResourceAllocationList_r16 }, { 0, NULL, 0, NULL } }; @@ -53775,7 +54187,7 @@ static const value_string nr_rrc_T_pusch_TimeDomainAllocationListDCI_0_1_r16_val static const per_choice_t T_pusch_TimeDomainAllocationListDCI_0_1_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_89 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUSCH_TimeDomainResourceAllocationList_r16 }, + { 1, &hf_nr_rrc_setup_90 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUSCH_TimeDomainResourceAllocationList_r16 }, { 0, NULL, 0, NULL } }; @@ -53873,7 +54285,7 @@ static const value_string nr_rrc_T_uci_OnPUSCH_ListDCI_0_1_r16_vals[] = { static const per_choice_t T_uci_OnPUSCH_ListDCI_0_1_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_90 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_UCI_OnPUSCH_ListDCI_0_1_r16 }, + { 1, &hf_nr_rrc_setup_91 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_UCI_OnPUSCH_ListDCI_0_1_r16 }, { 0, NULL, 0, NULL } }; @@ -54134,7 +54546,7 @@ static const value_string nr_rrc_T_pusch_PowerControl_v1610_vals[] = { static const per_choice_t T_pusch_PowerControl_v1610_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_91 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUSCH_PowerControl_v1610 }, + { 1, &hf_nr_rrc_setup_92 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUSCH_PowerControl_v1610 }, { 0, NULL, 0, NULL } }; @@ -54151,7 +54563,7 @@ dissect_nr_rrc_T_pusch_PowerControl_v1610(tvbuff_t *tvb _U_, int offset _U_, asn static const value_string nr_rrc_T_ul_FullPowerTransmission_r16_vals[] = { { 0, "fullpower" }, { 1, "fullpowerMode1" }, - { 2, "fullpoweMode2" }, + { 2, "fullpowerMode2" }, { 0, NULL } }; @@ -54173,7 +54585,7 @@ static const value_string nr_rrc_T_pusch_TimeDomainAllocationListForMultiPUSCH_r static const per_choice_t T_pusch_TimeDomainAllocationListForMultiPUSCH_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_89 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUSCH_TimeDomainResourceAllocationList_r16 }, + { 1, &hf_nr_rrc_setup_90 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUSCH_TimeDomainResourceAllocationList_r16 }, { 0, NULL, 0, NULL } }; @@ -54755,14 +55167,14 @@ dissect_nr_rrc_CG_StartingOffsets_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ct } -static const value_string nr_rrc_T_cg_UCI_Multiplexing_vals[] = { +static const value_string nr_rrc_T_cg_UCI_Multiplexing_r16_vals[] = { { 0, "enabled" }, { 0, NULL } }; static int -dissect_nr_rrc_T_cg_UCI_Multiplexing(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_cg_UCI_Multiplexing_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -54895,7 +55307,7 @@ static const per_sequence_t ConfiguredGrantConfig_eag_1_sequence[] = { { &hf_nr_rrc_cg_nrofPUSCH_InSlot_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_INTEGER_1_7 }, { &hf_nr_rrc_cg_nrofSlots_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_INTEGER_1_40 }, { &hf_nr_rrc_cg_StartingOffsets_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_CG_StartingOffsets_r16 }, - { &hf_nr_rrc_cg_UCI_Multiplexing, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_cg_UCI_Multiplexing }, + { &hf_nr_rrc_cg_UCI_Multiplexing_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_cg_UCI_Multiplexing_r16 }, { &hf_nr_rrc_cg_COT_SharingOffset_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_INTEGER_1_39 }, { &hf_nr_rrc_betaOffsetCG_UCI_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_INTEGER_0_31 }, { &hf_nr_rrc_cg_COT_SharingList_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SEQUENCE_SIZE_1_1709_OF_CG_COT_Sharing_r16 }, @@ -55217,7 +55629,7 @@ static const value_string nr_rrc_T_pathlossReferenceRSList_r16_vals[] = { static const per_choice_t T_pathlossReferenceRSList_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_109 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PathlossReferenceRSList_r16 }, + { 1, &hf_nr_rrc_setup_112 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PathlossReferenceRSList_r16 }, { 0, NULL, 0, NULL } }; @@ -56894,7 +57306,7 @@ static const value_string nr_rrc_T_mpe_Reporting_FR2_r16_vals[] = { static const per_choice_t T_mpe_Reporting_FR2_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_68 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_MPE_Config_FR2_r16 }, + { 1, &hf_nr_rrc_setup_69 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_MPE_Config_FR2_r16 }, { 0, NULL, 0, NULL } }; @@ -56926,7 +57338,7 @@ static const per_sequence_t PHR_Config_sequence[] = { { &hf_nr_rrc_phr_ProhibitTimer, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_phr_ProhibitTimer }, { &hf_nr_rrc_phr_Tx_PowerFactorChange, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_phr_Tx_PowerFactorChange }, { &hf_nr_rrc_multiplePHR , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BOOLEAN }, - { &hf_nr_rrc_dummy_03 , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BOOLEAN }, + { &hf_nr_rrc_dummy_04 , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BOOLEAN }, { &hf_nr_rrc_phr_Type2OtherCell, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BOOLEAN }, { &hf_nr_rrc_phr_ModeOtherCG, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_phr_ModeOtherCG }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_PHR_Config_eag_1 }, @@ -57307,7 +57719,7 @@ static const value_string nr_rrc_T_cs_RNTI_vals[] = { static const per_choice_t T_cs_RNTI_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_69 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_RNTI_Value }, + { 1, &hf_nr_rrc_setup_70 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_RNTI_Value }, { 0, NULL, 0, NULL } }; @@ -57384,7 +57796,7 @@ static const value_string nr_rrc_T_pdcch_BlindDetection_vals[] = { static const per_choice_t T_pdcch_BlindDetection_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_70 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PDCCH_BlindDetection }, + { 1, &hf_nr_rrc_setup_71 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PDCCH_BlindDetection }, { 0, NULL, 0, NULL } }; @@ -57514,7 +57926,7 @@ static const value_string nr_rrc_T_dcp_Config_r16_vals[] = { static const per_choice_t T_dcp_Config_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_71 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_DCP_Config_r16 }, + { 1, &hf_nr_rrc_setup_72 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_DCP_Config_r16 }, { 0, NULL, 0, NULL } }; @@ -57770,7 +58182,7 @@ static const value_string nr_rrc_T_pdsch_HARQ_ACK_CodebookList_r16_vals[] = { static const per_choice_t T_pdsch_HARQ_ACK_CodebookList_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_72 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PDSCH_HARQ_ACK_CodebookList_r16 }, + { 1, &hf_nr_rrc_setup_73 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PDSCH_HARQ_ACK_CodebookList_r16 }, { 0, NULL, 0, NULL } }; @@ -57823,7 +58235,7 @@ static const value_string nr_rrc_T_pdcch_BlindDetectionCA_CombIndicator_r16_vals static const per_choice_t T_pdcch_BlindDetectionCA_CombIndicator_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_73 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PDCCH_BlindDetectionCA_CombIndicator_r16 }, + { 1, &hf_nr_rrc_setup_74 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PDCCH_BlindDetectionCA_CombIndicator_r16 }, { 0, NULL, 0, NULL } }; @@ -57855,7 +58267,7 @@ static const value_string nr_rrc_T_pdcch_BlindDetection2_r16_vals[] = { static const per_choice_t T_pdcch_BlindDetection2_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_74 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PDCCH_BlindDetection2_r16 }, + { 1, &hf_nr_rrc_setup_75 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PDCCH_BlindDetection2_r16 }, { 0, NULL, 0, NULL } }; @@ -57887,7 +58299,7 @@ static const value_string nr_rrc_T_pdcch_BlindDetection3_r16_vals[] = { static const per_choice_t T_pdcch_BlindDetection3_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_75 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PDCCH_BlindDetection3_r16 }, + { 1, &hf_nr_rrc_setup_76 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PDCCH_BlindDetection3_r16 }, { 0, NULL, 0, NULL } }; @@ -58327,7 +58739,7 @@ static const value_string nr_rrc_T_lte_CRS_ToMatchAround_01_vals[] = { static const per_choice_t T_lte_CRS_ToMatchAround_01_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_100 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_RateMatchPatternLTE_CRS }, + { 1, &hf_nr_rrc_setup_102 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_RateMatchPatternLTE_CRS }, { 0, NULL, 0, NULL } }; @@ -58349,7 +58761,7 @@ static const value_string nr_rrc_T_channelAccessMode_r16_vals[] = { static const per_choice_t T_channelAccessMode_r16_choice[] = { { 0, &hf_nr_rrc_dynamic_02 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_semiStatic_01, ASN1_NO_EXTENSIONS , dissect_nr_rrc_SemiStaticChannelAccessConfig }, + { 1, &hf_nr_rrc_semiStatic_01, ASN1_NO_EXTENSIONS , dissect_nr_rrc_SemiStaticChannelAccessConfig_r16 }, { 0, NULL, 0, NULL } }; @@ -58497,7 +58909,7 @@ dissect_nr_rrc_INTEGER_0_3071(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act static const per_sequence_t CFRA_SSB_Resource_eag_1_sequence[] = { - { &hf_nr_rrc_msgA_PUSCH_resource_Index_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_INTEGER_0_3071 }, + { &hf_nr_rrc_msgA_PUSCH_Resource_Index_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_INTEGER_0_3071 }, { NULL, 0, 0, NULL } }; @@ -59288,7 +59700,7 @@ static const value_string nr_rrc_T_codeBlockGroupTransmission_01_vals[] = { static const per_choice_t T_codeBlockGroupTransmission_01_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_92 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUSCH_CodeBlockGroupTransmission }, + { 1, &hf_nr_rrc_setup_93 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUSCH_CodeBlockGroupTransmission }, { 0, NULL, 0, NULL } }; @@ -59366,7 +59778,7 @@ static const value_string nr_rrc_T_maxMIMO_LayersDCI_0_2_r16_vals[] = { static const per_choice_t T_maxMIMO_LayersDCI_0_2_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_93 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_MaxMIMO_LayersDCI_0_2_r16 }, + { 1, &hf_nr_rrc_setup_94 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_MaxMIMO_LayersDCI_0_2_r16 }, { 0, NULL, 0, NULL } }; @@ -59419,7 +59831,7 @@ static const value_string nr_rrc_T_pusch_ServingCellConfig_vals[] = { static const per_choice_t T_pusch_ServingCellConfig_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_104 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUSCH_ServingCellConfig }, + { 1, &hf_nr_rrc_setup_107 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PUSCH_ServingCellConfig }, { 0, NULL, 0, NULL } }; @@ -59567,7 +59979,7 @@ static const value_string nr_rrc_T_carrierSwitching_vals[] = { static const per_choice_t T_carrierSwitching_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_105 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SRS_CarrierSwitching }, + { 1, &hf_nr_rrc_setup_108 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SRS_CarrierSwitching }, { 0, NULL, 0, NULL } }; @@ -59694,7 +60106,7 @@ static const value_string nr_rrc_T_uplinkTxSwitching_r16_vals[] = { static const per_choice_t T_uplinkTxSwitching_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_106 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_UplinkTxSwitching_r16 }, + { 1, &hf_nr_rrc_setup_109 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_UplinkTxSwitching_r16 }, { 0, NULL, 0, NULL } }; @@ -60164,7 +60576,7 @@ static const value_string nr_rrc_T_pdcch_ServingCellConfig_vals[] = { static const per_choice_t T_pdcch_ServingCellConfig_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_97 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PDCCH_ServingCellConfig }, + { 1, &hf_nr_rrc_setup_99 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PDCCH_ServingCellConfig }, { 0, NULL, 0, NULL } }; @@ -60219,7 +60631,7 @@ static const value_string nr_rrc_T_codeBlockGroupTransmission_vals[] = { static const per_choice_t T_codeBlockGroupTransmission_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_66 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PDSCH_CodeBlockGroupTransmission }, + { 1, &hf_nr_rrc_setup_67 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PDSCH_CodeBlockGroupTransmission }, { 0, NULL, 0, NULL } }; @@ -60306,7 +60718,7 @@ static const value_string nr_rrc_T_pdsch_CodeBlockGroupTransmissionList_r16_vals static const per_choice_t T_pdsch_CodeBlockGroupTransmissionList_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_67 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PDSCH_CodeBlockGroupTransmissionList_r16 }, + { 1, &hf_nr_rrc_setup_68 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PDSCH_CodeBlockGroupTransmissionList_r16 }, { 0, NULL, 0, NULL } }; @@ -60360,7 +60772,7 @@ static const value_string nr_rrc_T_pdsch_ServingCellConfig_vals[] = { static const per_choice_t T_pdsch_ServingCellConfig_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_98 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PDSCH_ServingCellConfig }, + { 1, &hf_nr_rrc_setup_100 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_PDSCH_ServingCellConfig }, { 0, NULL, 0, NULL } }; @@ -62645,7 +63057,7 @@ static const per_sequence_t CSI_ReportConfig_sequence[] = { { &hf_nr_rrc_timeRestrictionForChannelMeasurements, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_timeRestrictionForChannelMeasurements }, { &hf_nr_rrc_timeRestrictionForInterferenceMeasurements, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_timeRestrictionForInterferenceMeasurements }, { &hf_nr_rrc_codebookConfig, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_CodebookConfig }, - { &hf_nr_rrc_dummy_02 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy }, + { &hf_nr_rrc_dummy_03 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy }, { &hf_nr_rrc_groupBasedBeamReporting, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_groupBasedBeamReporting }, { &hf_nr_rrc_cqi_Table , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_cqi_Table }, { &hf_nr_rrc_subbandSize , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_subbandSize }, @@ -62956,7 +63368,7 @@ static const value_string nr_rrc_T_csi_MeasConfig_vals[] = { static const per_choice_t T_csi_MeasConfig_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_99 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_CSI_MeasConfig }, + { 1, &hf_nr_rrc_setup_101 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_CSI_MeasConfig }, { 0, NULL, 0, NULL } }; @@ -63110,14 +63522,14 @@ dissect_nr_rrc_CrossCarrierSchedulingConfig(tvbuff_t *tvb _U_, int offset _U_, a } -static const value_string nr_rrc_T_dummy_02_vals[] = { +static const value_string nr_rrc_T_dummy1_01_vals[] = { { 0, "enabled" }, { 0, NULL } }; static int -dissect_nr_rrc_T_dummy_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_dummy1_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -63149,7 +63561,7 @@ static const value_string nr_rrc_T_lte_CRS_ToMatchAround_vals[] = { static const per_choice_t T_lte_CRS_ToMatchAround_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_100 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_RateMatchPatternLTE_CRS }, + { 1, &hf_nr_rrc_setup_102 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_RateMatchPatternLTE_CRS }, { 0, NULL, 0, NULL } }; @@ -63179,14 +63591,14 @@ dissect_nr_rrc_ServingCellConfig_eag_1(tvbuff_t *tvb _U_, int offset _U_, asn1_c } -static const value_string nr_rrc_T_supplementaryUplinkRelease_vals[] = { +static const value_string nr_rrc_T_supplementaryUplinkRelease_r16_vals[] = { { 0, "true" }, { 0, NULL } }; static int -dissect_nr_rrc_T_supplementaryUplinkRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_supplementaryUplinkRelease_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -63327,7 +63739,7 @@ static const value_string nr_rrc_T_withinActiveTimeConfig_r16_vals[] = { static const per_choice_t T_withinActiveTimeConfig_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_107 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_WithinActiveTimeConfig_r16 }, + { 1, &hf_nr_rrc_setup_110 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_WithinActiveTimeConfig_r16 }, { 0, NULL, 0, NULL } }; @@ -63364,7 +63776,7 @@ static const value_string nr_rrc_T_outsideActiveTimeConfig_r16_vals[] = { static const per_choice_t T_outsideActiveTimeConfig_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_108 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_OutsideActiveTimeConfig_r16 }, + { 1, &hf_nr_rrc_setup_111 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_OutsideActiveTimeConfig_r16 }, { 0, NULL, 0, NULL } }; @@ -63402,7 +63814,7 @@ static const value_string nr_rrc_T_dormantBWP_Config_r16_vals[] = { static const per_choice_t T_dormantBWP_Config_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_101 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_DormantBWP_Config_r16 }, + { 1, &hf_nr_rrc_setup_103 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_DormantBWP_Config_r16 }, { 0, NULL, 0, NULL } }; @@ -63517,7 +63929,7 @@ dissect_nr_rrc_T_absenceOfAnyOtherTechnology_r16(tvbuff_t *tvb _U_, int offset _ } -static const per_sequence_t ChannelAccessConfig_r16_sequence[] = { +static const per_sequence_t DummyJ_sequence[] = { { &hf_nr_rrc_maxEnergyDetectionThreshold_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_INTEGER_M85_M52 }, { &hf_nr_rrc_energyDetectionThresholdOffset_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_INTEGER_M20_M13 }, { &hf_nr_rrc_ul_toDL_COT_SharingED_Threshold_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_INTEGER_M85_M52 }, @@ -63526,30 +63938,30 @@ static const per_sequence_t ChannelAccessConfig_r16_sequence[] = { }; static int -dissect_nr_rrc_ChannelAccessConfig_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_DummyJ(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_nr_rrc_ChannelAccessConfig_r16, ChannelAccessConfig_r16_sequence); + ett_nr_rrc_DummyJ, DummyJ_sequence); return offset; } -static const value_string nr_rrc_T_channelAccessConfig_r16_vals[] = { +static const value_string nr_rrc_T_dummy2_01_vals[] = { { 0, "release" }, { 1, "setup" }, { 0, NULL } }; -static const per_choice_t T_channelAccessConfig_r16_choice[] = { +static const per_choice_t T_dummy2_01_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_102 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_ChannelAccessConfig_r16 }, + { 1, &hf_nr_rrc_setup_104 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_DummyJ }, { 0, NULL, 0, NULL } }; static int -dissect_nr_rrc_T_channelAccessConfig_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_dummy2_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, - ett_nr_rrc_T_channelAccessConfig_r16, T_channelAccessConfig_r16_choice, + ett_nr_rrc_T_dummy2_01, T_dummy2_01_choice, NULL); return offset; @@ -63624,14 +64036,14 @@ dissect_nr_rrc_SEQUENCE_SIZE_1_maxSCSs_OF_IntraCellGuardBandsPerSCS_r16(tvbuff_t } -static const value_string nr_rrc_T_csi_RS_ValidationWith_DCI_r16_vals[] = { +static const value_string nr_rrc_T_csi_RS_ValidationWithDCI_r16_vals[] = { { 0, "enabled" }, { 0, NULL } }; static int -dissect_nr_rrc_T_csi_RS_ValidationWith_DCI_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_csi_RS_ValidationWithDCI_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -63661,7 +64073,7 @@ static const value_string nr_rrc_T_lte_CRS_PatternList1_r16_vals[] = { static const per_choice_t T_lte_CRS_PatternList1_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_103 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_LTE_CRS_PatternList_r16 }, + { 1, &hf_nr_rrc_setup_105 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_LTE_CRS_PatternList_r16 }, { 0, NULL, 0, NULL } }; @@ -63683,7 +64095,7 @@ static const value_string nr_rrc_T_lte_CRS_PatternList2_r16_vals[] = { static const per_choice_t T_lte_CRS_PatternList2_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_103 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_LTE_CRS_PatternList_r16 }, + { 1, &hf_nr_rrc_setup_105 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_LTE_CRS_PatternList_r16 }, { 0, NULL, 0, NULL } }; @@ -63788,14 +64200,14 @@ dissect_nr_rrc_T_cbg_TxDiffTBsProcessingType2_r16(tvbuff_t *tvb _U_, int offset static const per_sequence_t ServingCellConfig_eag_2_sequence[] = { - { &hf_nr_rrc_supplementaryUplinkRelease, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_supplementaryUplinkRelease }, + { &hf_nr_rrc_supplementaryUplinkRelease_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_supplementaryUplinkRelease_r16 }, { &hf_nr_rrc_tdd_UL_DL_ConfigurationDedicated_IAB_MT_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_TDD_UL_DL_ConfigDedicated_IAB_MT_r16 }, { &hf_nr_rrc_dormantBWP_Config_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dormantBWP_Config_r16 }, { &hf_nr_rrc_ca_SlotOffset_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_ca_SlotOffset_r16 }, - { &hf_nr_rrc_channelAccessConfig_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_channelAccessConfig_r16 }, + { &hf_nr_rrc_dummy2_01 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy2_01 }, { &hf_nr_rrc_intraCellGuardBandsDL_List_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SEQUENCE_SIZE_1_maxSCSs_OF_IntraCellGuardBandsPerSCS_r16 }, { &hf_nr_rrc_intraCellGuardBandsUL_List_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SEQUENCE_SIZE_1_maxSCSs_OF_IntraCellGuardBandsPerSCS_r16 }, - { &hf_nr_rrc_csi_RS_ValidationWith_DCI_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_csi_RS_ValidationWith_DCI_r16 }, + { &hf_nr_rrc_csi_RS_ValidationWithDCI_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_csi_RS_ValidationWithDCI_r16 }, { &hf_nr_rrc_lte_CRS_PatternList1_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_lte_CRS_PatternList1_r16 }, { &hf_nr_rrc_lte_CRS_PatternList2_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_lte_CRS_PatternList2_r16 }, { &hf_nr_rrc_crs_RateMatch_PerCORESETPoolIndex_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_crs_RateMatch_PerCORESETPoolIndex_r16 }, @@ -63815,6 +64227,120 @@ dissect_nr_rrc_ServingCellConfig_eag_2(tvbuff_t *tvb _U_, int offset _U_, asn1_c } +static const value_string nr_rrc_T_directionalCollisionHandling_r16_vals[] = { + { 0, "enabled" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_directionalCollisionHandling_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + + +static int +dissect_nr_rrc_INTEGER_M13_20(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + -13, 20U, NULL, FALSE); + + return offset; +} + + +static const value_string nr_rrc_T_energyDetectionConfig_r16_vals[] = { + { 0, "maxEnergyDetectionThreshold-r16" }, + { 1, "energyDetectionThresholdOffset-r16" }, + { 0, NULL } +}; + +static const per_choice_t T_energyDetectionConfig_r16_choice[] = { + { 0, &hf_nr_rrc_maxEnergyDetectionThreshold_r16, ASN1_NO_EXTENSIONS , dissect_nr_rrc_INTEGER_M85_M52 }, + { 1, &hf_nr_rrc_energyDetectionThresholdOffset_r16_01, ASN1_NO_EXTENSIONS , dissect_nr_rrc_INTEGER_M13_20 }, + { 0, NULL, 0, NULL } +}; + +static int +dissect_nr_rrc_T_energyDetectionConfig_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_T_energyDetectionConfig_r16, T_energyDetectionConfig_r16_choice, + NULL); + + return offset; +} + + +static const value_string nr_rrc_T_absenceOfAnyOtherTechnology_r16_01_vals[] = { + { 0, "true" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_absenceOfAnyOtherTechnology_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t ChannelAccessConfig_r16_sequence[] = { + { &hf_nr_rrc_energyDetectionConfig_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_energyDetectionConfig_r16 }, + { &hf_nr_rrc_ul_toDL_COT_SharingED_Threshold_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_INTEGER_M85_M52 }, + { &hf_nr_rrc_absenceOfAnyOtherTechnology_r16_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_absenceOfAnyOtherTechnology_r16_01 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_ChannelAccessConfig_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_ChannelAccessConfig_r16, ChannelAccessConfig_r16_sequence); + + return offset; +} + + +static const value_string nr_rrc_T_channelAccessConfig_r16_vals[] = { + { 0, "release" }, + { 1, "setup" }, + { 0, NULL } +}; + +static const per_choice_t T_channelAccessConfig_r16_choice[] = { + { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, + { 1, &hf_nr_rrc_setup_106 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_ChannelAccessConfig_r16 }, + { 0, NULL, 0, NULL } +}; + +static int +dissect_nr_rrc_T_channelAccessConfig_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_T_channelAccessConfig_r16, T_channelAccessConfig_r16_choice, + NULL); + + return offset; +} + + +static const per_sequence_t ServingCellConfig_eag_3_sequence[] = { + { &hf_nr_rrc_directionalCollisionHandling_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_directionalCollisionHandling_r16 }, + { &hf_nr_rrc_channelAccessConfig_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_channelAccessConfig_r16 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_ServingCellConfig_eag_3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence_eag(tvb, offset, actx, tree, ServingCellConfig_eag_3_sequence); + + return offset; +} + + static const per_sequence_t ServingCellConfig_sequence[] = { { &hf_nr_rrc_tdd_UL_DL_ConfigurationDedicated, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_TDD_UL_DL_ConfigDedicated }, { &hf_nr_rrc_initialDownlinkBWP_01, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_BWP_DownlinkDedicated }, @@ -63831,11 +64357,12 @@ static const per_sequence_t ServingCellConfig_sequence[] = { { &hf_nr_rrc_sCellDeactivationTimer, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_sCellDeactivationTimer }, { &hf_nr_rrc_crossCarrierSchedulingConfig, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_CrossCarrierSchedulingConfig }, { &hf_nr_rrc_tag_Id , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_TAG_Id }, - { &hf_nr_rrc_dummy_05 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy_02 }, + { &hf_nr_rrc_dummy1_01 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy1_01 }, { &hf_nr_rrc_pathlossReferenceLinking, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_pathlossReferenceLinking }, { &hf_nr_rrc_servingCellMO, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_MeasObjectId }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_ServingCellConfig_eag_1 }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_ServingCellConfig_eag_2 }, + { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_ServingCellConfig_eag_3 }, { NULL, 0, 0, NULL } }; @@ -64424,14 +64951,14 @@ dissect_nr_rrc_CA_ParametersEUTRA(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } -static const value_string nr_rrc_T_dummy_03_vals[] = { +static const value_string nr_rrc_T_dummy_02_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_dummy_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_dummy_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -64547,7 +65074,7 @@ dissect_nr_rrc_T_supportedNumberTAG(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static const per_sequence_t CA_ParametersNR_sequence[] = { - { &hf_nr_rrc_dummy_07 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy_03 }, + { &hf_nr_rrc_dummy_07 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy_02 }, { &hf_nr_rrc_parallelTxSRS_PUCCH_PUSCH, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_parallelTxSRS_PUCCH_PUSCH }, { &hf_nr_rrc_parallelTxPRACH_SRS_PUCCH_PUSCH, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_parallelTxPRACH_SRS_PUCCH_PUSCH }, { &hf_nr_rrc_simultaneousRxTxInterBandCA, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_simultaneousRxTxInterBandCA }, @@ -65179,14 +65706,14 @@ dissect_nr_rrc_BandCombinationList_v1540(tvbuff_t *tvb _U_, int offset _U_, asn1 } -static const value_string nr_rrc_T_dummy_04_vals[] = { +static const value_string nr_rrc_T_dummy_03_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_dummy_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_dummy_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -65195,7 +65722,7 @@ dissect_nr_rrc_T_dummy_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static const per_sequence_t CA_ParametersNR_v1550_sequence[] = { - { &hf_nr_rrc_dummy_08 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy_04 }, + { &hf_nr_rrc_dummy_08 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy_03 }, { NULL, 0, 0, NULL } }; @@ -66847,6 +67374,312 @@ dissect_nr_rrc_BandCombinationList_v1610(tvbuff_t *tvb _U_, int offset _U_, asn1 } +static const value_string nr_rrc_T_supportSRS_xTyR_xLessThanY_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_supportSRS_xTyR_xLessThanY_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_supportSRS_xTyR_xEqualToY_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_supportSRS_xTyR_xEqualToY_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_supportSRS_AntennaSwitching_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_supportSRS_AntennaSwitching_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t SimulSRS_ForAntennaSwitching_r16_sequence[] = { + { &hf_nr_rrc_supportSRS_xTyR_xLessThanY_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_supportSRS_xTyR_xLessThanY_r16 }, + { &hf_nr_rrc_supportSRS_xTyR_xEqualToY_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_supportSRS_xTyR_xEqualToY_r16 }, + { &hf_nr_rrc_supportSRS_AntennaSwitching_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_supportSRS_AntennaSwitching_r16 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_SimulSRS_ForAntennaSwitching_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_SimulSRS_ForAntennaSwitching_r16, SimulSRS_ForAntennaSwitching_r16_sequence); + + return offset; +} + + +static const value_string nr_rrc_T_beamManagementType_r16_vals[] = { + { 0, "ibm" }, + { 1, "cbm" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_beamManagementType_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 2, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_intraBandFreqSeparationUL_AggBW_GapBW_r16_vals[] = { + { 0, "classI" }, + { 1, "classII" }, + { 2, "classIII" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_intraBandFreqSeparationUL_AggBW_GapBW_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 3, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_interCA_NonAlignedFrame_B_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_interCA_NonAlignedFrame_B_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t CA_ParametersNR_v1630_sequence[] = { + { &hf_nr_rrc_simulTX_SRS_AntSwitchingInterBandUL_CA_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SimulSRS_ForAntennaSwitching_r16 }, + { &hf_nr_rrc_beamManagementType_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_beamManagementType_r16 }, + { &hf_nr_rrc_intraBandFreqSeparationUL_AggBW_GapBW_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_intraBandFreqSeparationUL_AggBW_GapBW_r16 }, + { &hf_nr_rrc_interCA_NonAlignedFrame_B_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_interCA_NonAlignedFrame_B_r16 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_CA_ParametersNR_v1630(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_CA_ParametersNR_v1630, CA_ParametersNR_v1630_sequence); + + return offset; +} + + +static const per_sequence_t CA_ParametersNRDC_v1630_sequence[] = { + { &hf_nr_rrc_ca_ParametersNR_ForDC_v1610, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_CA_ParametersNR_v1610 }, + { &hf_nr_rrc_ca_ParametersNR_ForDC_v1630, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_CA_ParametersNR_v1630 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_CA_ParametersNRDC_v1630(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_CA_ParametersNRDC_v1630, CA_ParametersNRDC_v1630_sequence); + + return offset; +} + + +static const value_string nr_rrc_T_maxUplinkDutyCycle_FDD_TDD_EN_DC1_r16_vals[] = { + { 0, "n30" }, + { 1, "n40" }, + { 2, "n50" }, + { 3, "n60" }, + { 4, "n70" }, + { 5, "n80" }, + { 6, "n90" }, + { 7, "n100" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_maxUplinkDutyCycle_FDD_TDD_EN_DC1_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 8, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_maxUplinkDutyCycle_FDD_TDD_EN_DC2_r16_vals[] = { + { 0, "n30" }, + { 1, "n40" }, + { 2, "n50" }, + { 3, "n60" }, + { 4, "n70" }, + { 5, "n80" }, + { 6, "n90" }, + { 7, "n100" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_maxUplinkDutyCycle_FDD_TDD_EN_DC2_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 8, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t T_maxUplinkDutyCycle_interBandENDC_FDD_TDD_PC2_r16_sequence[] = { + { &hf_nr_rrc_maxUplinkDutyCycle_FDD_TDD_EN_DC1_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_maxUplinkDutyCycle_FDD_TDD_EN_DC1_r16 }, + { &hf_nr_rrc_maxUplinkDutyCycle_FDD_TDD_EN_DC2_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_maxUplinkDutyCycle_FDD_TDD_EN_DC2_r16 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_T_maxUplinkDutyCycle_interBandENDC_FDD_TDD_PC2_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_T_maxUplinkDutyCycle_interBandENDC_FDD_TDD_PC2_r16, T_maxUplinkDutyCycle_interBandENDC_FDD_TDD_PC2_r16_sequence); + + return offset; +} + + +static const value_string nr_rrc_T_interBandMRDC_WithOverlapDL_Bands_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_interBandMRDC_WithOverlapDL_Bands_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t MRDC_Parameters_v1630_sequence[] = { + { &hf_nr_rrc_maxUplinkDutyCycle_interBandENDC_FDD_TDD_PC2_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_maxUplinkDutyCycle_interBandENDC_FDD_TDD_PC2_r16 }, + { &hf_nr_rrc_interBandMRDC_WithOverlapDL_Bands_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_interBandMRDC_WithOverlapDL_Bands_r16 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_MRDC_Parameters_v1630(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_MRDC_Parameters_v1630, MRDC_Parameters_v1630_sequence); + + return offset; +} + + + +static int +dissect_nr_rrc_BIT_STRING_SIZE_1_maxBandComb(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, + 1, maxBandComb, FALSE, NULL, 0, NULL, NULL); + + return offset; +} + + +static const value_string nr_rrc_ScalingFactorSidelink_r16_vals[] = { + { 0, "f0p4" }, + { 1, "f0p75" }, + { 2, "f0p8" }, + { 3, "f1" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_ScalingFactorSidelink_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 4, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t SEQUENCE_SIZE_1_maxBandComb_OF_ScalingFactorSidelink_r16_sequence_of[1] = { + { &hf_nr_rrc_scalingFactorTxSidelink_r16_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_ScalingFactorSidelink_r16 }, +}; + +static int +dissect_nr_rrc_SEQUENCE_SIZE_1_maxBandComb_OF_ScalingFactorSidelink_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_SEQUENCE_SIZE_1_maxBandComb_OF_ScalingFactorSidelink_r16, SEQUENCE_SIZE_1_maxBandComb_OF_ScalingFactorSidelink_r16_sequence_of, + 1, maxBandComb, FALSE); + + return offset; +} + + +static const per_sequence_t BandCombination_v1630_sequence[] = { + { &hf_nr_rrc_ca_ParametersNR_v1630, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_CA_ParametersNR_v1630 }, + { &hf_nr_rrc_ca_ParametersNRDC_v1630, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_CA_ParametersNRDC_v1630 }, + { &hf_nr_rrc_mrdc_Parameters_v1630, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_MRDC_Parameters_v1630 }, + { &hf_nr_rrc_supportedTxBandCombListPerBC_Sidelink_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_1_maxBandComb }, + { &hf_nr_rrc_supportedRxBandCombListPerBC_Sidelink_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_1_maxBandComb }, + { &hf_nr_rrc_scalingFactorTxSidelink_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SEQUENCE_SIZE_1_maxBandComb_OF_ScalingFactorSidelink_r16 }, + { &hf_nr_rrc_scalingFactorRxSidelink_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SEQUENCE_SIZE_1_maxBandComb_OF_ScalingFactorSidelink_r16 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_BandCombination_v1630(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_BandCombination_v1630, BandCombination_v1630_sequence); + + return offset; +} + + +static const per_sequence_t BandCombinationList_v1630_sequence_of[1] = { + { &hf_nr_rrc_BandCombinationList_v1630_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BandCombination_v1630 }, +}; + +static int +dissect_nr_rrc_BandCombinationList_v1630(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_BandCombinationList_v1630, BandCombinationList_v1630_sequence_of, + 1, maxBandComb, FALSE); + + return offset; +} + + static int dissect_nr_rrc_INTEGER_1_maxSimultaneousBands(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -66984,15 +67817,29 @@ dissect_nr_rrc_BandCombinationList_UplinkTxSwitch_r16(tvbuff_t *tvb _U_, int off } -static const per_sequence_t BandParametersSidelink_r16_sequence[] = { - { &hf_nr_rrc_freqBandSidelink_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_FreqBandIndicatorNR }, +static const per_sequence_t BandCombination_UplinkTxSwitch_v1630_sequence[] = { + { &hf_nr_rrc_bandCombination_v1630, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BandCombination_v1630 }, { NULL, 0, 0, NULL } }; static int -dissect_nr_rrc_BandParametersSidelink_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_BandCombination_UplinkTxSwitch_v1630(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_nr_rrc_BandParametersSidelink_r16, BandParametersSidelink_r16_sequence); + ett_nr_rrc_BandCombination_UplinkTxSwitch_v1630, BandCombination_UplinkTxSwitch_v1630_sequence); + + return offset; +} + + +static const per_sequence_t BandCombinationList_UplinkTxSwitch_v1630_sequence_of[1] = { + { &hf_nr_rrc_BandCombinationList_UplinkTxSwitch_v1630_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BandCombination_UplinkTxSwitch_v1630 }, +}; + +static int +dissect_nr_rrc_BandCombinationList_UplinkTxSwitch_v1630(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_BandCombinationList_UplinkTxSwitch_v1630, BandCombinationList_UplinkTxSwitch_v1630_sequence_of, + 1, maxBandComb, FALSE); return offset; } @@ -67049,6 +67896,20 @@ dissect_nr_rrc_T_eutra_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U } +static const per_sequence_t BandParametersSidelink_r16_sequence[] = { + { &hf_nr_rrc_freqBandSidelink_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_FreqBandIndicatorNR }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_BandParametersSidelink_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_BandParametersSidelink_r16, BandParametersSidelink_r16_sequence); + + return offset; +} + + static const per_sequence_t T_nr_02_sequence[] = { { &hf_nr_rrc_bandParametersSidelinkNR_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BandParametersSidelink_r16 }, { NULL, 0, 0, NULL } @@ -67113,6 +67974,117 @@ dissect_nr_rrc_BandCombinationListSidelinkEUTRA_NR_r16(tvbuff_t *tvb _U_, int of } +static const value_string nr_rrc_T_tx_Sidelink_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_tx_Sidelink_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_rx_Sidelink_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_rx_Sidelink_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_sl_CrossCarrierScheduling_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_sl_CrossCarrierScheduling_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t T_nr_03_sequence[] = { + { &hf_nr_rrc_tx_Sidelink_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_tx_Sidelink_r16 }, + { &hf_nr_rrc_rx_Sidelink_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_rx_Sidelink_r16 }, + { &hf_nr_rrc_sl_CrossCarrierScheduling_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_sl_CrossCarrierScheduling_r16 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_T_nr_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_T_nr_03, T_nr_03_sequence); + + return offset; +} + + +static const value_string nr_rrc_BandParametersSidelinkEUTRA_NR_v1630_vals[] = { + { 0, "eutra" }, + { 1, "nr" }, + { 0, NULL } +}; + +static const per_choice_t BandParametersSidelinkEUTRA_NR_v1630_choice[] = { + { 0, &hf_nr_rrc_eutra_04 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, + { 1, &hf_nr_rrc_nr_04 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_T_nr_03 }, + { 0, NULL, 0, NULL } +}; + +static int +dissect_nr_rrc_BandParametersSidelinkEUTRA_NR_v1630(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_BandParametersSidelinkEUTRA_NR_v1630, BandParametersSidelinkEUTRA_NR_v1630_choice, + NULL); + + return offset; +} + + +static const per_sequence_t BandCombinationParametersSidelinkEUTRA_NR_v1630_sequence_of[1] = { + { &hf_nr_rrc_BandCombinationParametersSidelinkEUTRA_NR_v1630_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BandParametersSidelinkEUTRA_NR_v1630 }, +}; + +static int +dissect_nr_rrc_BandCombinationParametersSidelinkEUTRA_NR_v1630(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_BandCombinationParametersSidelinkEUTRA_NR_v1630, BandCombinationParametersSidelinkEUTRA_NR_v1630_sequence_of, + 1, maxSimultaneousBands, FALSE); + + return offset; +} + + +static const per_sequence_t BandCombinationListSidelinkEUTRA_NR_v1630_sequence_of[1] = { + { &hf_nr_rrc_BandCombinationListSidelinkEUTRA_NR_v1630_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BandCombinationParametersSidelinkEUTRA_NR_v1630 }, +}; + +static int +dissect_nr_rrc_BandCombinationListSidelinkEUTRA_NR_v1630(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_BandCombinationListSidelinkEUTRA_NR_v1630, BandCombinationListSidelinkEUTRA_NR_v1630_sequence_of, + 1, maxBandComb, FALSE); + + return offset; +} + + static const value_string nr_rrc_T_fr1fdd_FR1TDD_CA_SpCellOnFR1FDD_vals[] = { { 0, "supported" }, { 0, NULL } @@ -67600,14 +68572,14 @@ dissect_nr_rrc_T_rank3_4_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } -static const value_string nr_rrc_T_softAmpRestriction_r16_vals[] = { +static const value_string nr_rrc_T_amplitudeSubsetRestriction_r16_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_softAmpRestriction_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_amplitudeSubsetRestriction_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -67620,7 +68592,7 @@ static const per_sequence_t T_etype2_r16_sequence[] = { { &hf_nr_rrc_etype2R2_r16 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_etype2R2_r16 }, { &hf_nr_rrc_paramComb7_8_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_paramComb7_8_r16 }, { &hf_nr_rrc_rank3_4_r16 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_rank3_4_r16 }, - { &hf_nr_rrc_softAmpRestriction_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_softAmpRestriction_r16 }, + { &hf_nr_rrc_amplitudeSubsetRestriction_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_amplitudeSubsetRestriction_r16 }, { NULL, 0, 0, NULL } }; @@ -68223,16 +69195,16 @@ dissect_nr_rrc_FeatureSetUplinkId(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } -static const per_sequence_t T_nr_03_sequence[] = { +static const per_sequence_t T_nr_04_sequence[] = { { &hf_nr_rrc_downlinkSetNR, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_FeatureSetDownlinkId }, { &hf_nr_rrc_uplinkSetNR , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_FeatureSetUplinkId }, { NULL, 0, 0, NULL } }; static int -dissect_nr_rrc_T_nr_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_nr_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_nr_rrc_T_nr_03, T_nr_03_sequence); + ett_nr_rrc_T_nr_04, T_nr_04_sequence); return offset; } @@ -68245,8 +69217,8 @@ static const value_string nr_rrc_FeatureSet_vals[] = { }; static const per_choice_t FeatureSet_choice[] = { - { 0, &hf_nr_rrc_eutra_04 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_T_eutra_03 }, - { 1, &hf_nr_rrc_nr_04 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_T_nr_03 }, + { 0, &hf_nr_rrc_eutra_05 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_T_eutra_03 }, + { 1, &hf_nr_rrc_nr_05 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_T_nr_04 }, { 0, NULL, 0, NULL } }; @@ -68346,14 +69318,14 @@ dissect_nr_rrc_T_scalingFactor(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac } -static const value_string nr_rrc_T_crossCarrierScheduling_OtherSCS_vals[] = { +static const value_string nr_rrc_T_dummy8_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_crossCarrierScheduling_OtherSCS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_dummy8(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -68391,14 +69363,14 @@ dissect_nr_rrc_T_csi_RS_MeasSCellWithoutSSB(tvbuff_t *tvb _U_, int offset _U_, a } -static const value_string nr_rrc_T_dummy1_01_vals[] = { +static const value_string nr_rrc_T_dummy1_02_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_dummy1_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_dummy1_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -68437,14 +69409,14 @@ dissect_nr_rrc_T_pdcch_MonitoringAnyOccasions(tvbuff_t *tvb _U_, int offset _U_, } -static const value_string nr_rrc_T_dummy2_01_vals[] = { +static const value_string nr_rrc_T_dummy2_02_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_dummy2_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_dummy2_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -69112,13 +70084,13 @@ static const per_sequence_t FeatureSetDownlink_sequence[] = { { &hf_nr_rrc_featureSetListPerDownlinkCC, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_SEQUENCE_SIZE_1_maxNrofServingCells_OF_FeatureSetDownlinkPerCC_Id }, { &hf_nr_rrc_intraBandFreqSeparationDL, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_FreqSeparationClass }, { &hf_nr_rrc_scalingFactor, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scalingFactor }, - { &hf_nr_rrc_crossCarrierScheduling_OtherSCS, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_crossCarrierScheduling_OtherSCS }, + { &hf_nr_rrc_dummy8 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy8 }, { &hf_nr_rrc_scellWithoutSSB, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scellWithoutSSB }, { &hf_nr_rrc_csi_RS_MeasSCellWithoutSSB, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_csi_RS_MeasSCellWithoutSSB }, - { &hf_nr_rrc_dummy1_01 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy1_01 }, + { &hf_nr_rrc_dummy1_02 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy1_02 }, { &hf_nr_rrc_type1_3_CSS , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_type1_3_CSS }, { &hf_nr_rrc_pdcch_MonitoringAnyOccasions, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_pdcch_MonitoringAnyOccasions }, - { &hf_nr_rrc_dummy2_01 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy2_01 }, + { &hf_nr_rrc_dummy2_02 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy2_02 }, { &hf_nr_rrc_ue_SpecificUL_DL_Assignment, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_ue_SpecificUL_DL_Assignment }, { &hf_nr_rrc_searchSpaceSharingCA_DL, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_searchSpaceSharingCA_DL }, { &hf_nr_rrc_timeDurationForQCL, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_timeDurationForQCL }, @@ -69561,7 +70533,7 @@ dissect_nr_rrc_FeatureSetDownlink_v15a0(tvbuff_t *tvb _U_, int offset _U_, asn1_ } -static const value_string nr_rrc_T_scs_15kHz_02_vals[] = { +static const value_string nr_rrc_T_scs_15kHz_r16_vals[] = { { 0, "one" }, { 1, "upto2" }, { 2, "upto4" }, @@ -69571,7 +70543,7 @@ static const value_string nr_rrc_T_scs_15kHz_02_vals[] = { static int -dissect_nr_rrc_T_scs_15kHz_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_15kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 4, NULL, FALSE, 0, NULL); @@ -69579,7 +70551,7 @@ dissect_nr_rrc_T_scs_15kHz_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_30kHz_02_vals[] = { +static const value_string nr_rrc_T_scs_30kHz_r16_vals[] = { { 0, "one" }, { 1, "upto2" }, { 2, "upto4" }, @@ -69589,7 +70561,7 @@ static const value_string nr_rrc_T_scs_30kHz_02_vals[] = { static int -dissect_nr_rrc_T_scs_30kHz_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_30kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 4, NULL, FALSE, 0, NULL); @@ -69597,7 +70569,7 @@ dissect_nr_rrc_T_scs_30kHz_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_60kHz_03_vals[] = { +static const value_string nr_rrc_T_scs_60kHz_r16_vals[] = { { 0, "one" }, { 1, "upto2" }, { 2, "upto4" }, @@ -69607,7 +70579,7 @@ static const value_string nr_rrc_T_scs_60kHz_03_vals[] = { static int -dissect_nr_rrc_T_scs_60kHz_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_60kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 4, NULL, FALSE, 0, NULL); @@ -69615,7 +70587,7 @@ dissect_nr_rrc_T_scs_60kHz_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_120kHz_03_vals[] = { +static const value_string nr_rrc_T_scs_120kHz_r16_vals[] = { { 0, "one" }, { 1, "upto2" }, { 2, "upto4" }, @@ -69625,7 +70597,7 @@ static const value_string nr_rrc_T_scs_120kHz_03_vals[] = { static int -dissect_nr_rrc_T_scs_120kHz_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_120kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 4, NULL, FALSE, 0, NULL); @@ -69633,24 +70605,24 @@ dissect_nr_rrc_T_scs_120kHz_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac } -static const per_sequence_t T_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_sequence[] = { - { &hf_nr_rrc_scs_15kHz_03 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_15kHz_02 }, - { &hf_nr_rrc_scs_30kHz_03 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_30kHz_02 }, - { &hf_nr_rrc_scs_60kHz_04 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_03 }, - { &hf_nr_rrc_scs_120kHz_03, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_03 }, +static const per_sequence_t T_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_sequence[] = { + { &hf_nr_rrc_scs_15kHz_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_15kHz_r16 }, + { &hf_nr_rrc_scs_30kHz_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_30kHz_r16 }, + { &hf_nr_rrc_scs_60kHz_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_r16 }, + { &hf_nr_rrc_scs_120kHz_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_r16 }, { NULL, 0, 0, NULL } }; static int -dissect_nr_rrc_T_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_nr_rrc_T_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot, T_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_sequence); + ett_nr_rrc_T_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16, T_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_sequence); return offset; } -static const value_string nr_rrc_T_scs_15kHz_03_vals[] = { +static const value_string nr_rrc_T_scs_15kHz_r16_01_vals[] = { { 0, "one" }, { 1, "upto2" }, { 2, "upto4" }, @@ -69660,7 +70632,7 @@ static const value_string nr_rrc_T_scs_15kHz_03_vals[] = { static int -dissect_nr_rrc_T_scs_15kHz_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_15kHz_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 4, NULL, FALSE, 0, NULL); @@ -69668,7 +70640,7 @@ dissect_nr_rrc_T_scs_15kHz_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_30kHz_03_vals[] = { +static const value_string nr_rrc_T_scs_30kHz_r16_01_vals[] = { { 0, "one" }, { 1, "upto2" }, { 2, "upto4" }, @@ -69678,7 +70650,7 @@ static const value_string nr_rrc_T_scs_30kHz_03_vals[] = { static int -dissect_nr_rrc_T_scs_30kHz_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_30kHz_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 4, NULL, FALSE, 0, NULL); @@ -69686,7 +70658,7 @@ dissect_nr_rrc_T_scs_30kHz_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_60kHz_04_vals[] = { +static const value_string nr_rrc_T_scs_60kHz_r16_01_vals[] = { { 0, "one" }, { 1, "upto2" }, { 2, "upto4" }, @@ -69696,7 +70668,7 @@ static const value_string nr_rrc_T_scs_60kHz_04_vals[] = { static int -dissect_nr_rrc_T_scs_60kHz_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_60kHz_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 4, NULL, FALSE, 0, NULL); @@ -69704,7 +70676,7 @@ dissect_nr_rrc_T_scs_60kHz_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_120kHz_04_vals[] = { +static const value_string nr_rrc_T_scs_120kHz_r16_01_vals[] = { { 0, "one" }, { 1, "upto2" }, { 2, "upto4" }, @@ -69714,7 +70686,7 @@ static const value_string nr_rrc_T_scs_120kHz_04_vals[] = { static int -dissect_nr_rrc_T_scs_120kHz_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_120kHz_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 4, NULL, FALSE, 0, NULL); @@ -69722,18 +70694,18 @@ dissect_nr_rrc_T_scs_120kHz_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac } -static const per_sequence_t T_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_sequence[] = { - { &hf_nr_rrc_scs_15kHz_04 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_15kHz_03 }, - { &hf_nr_rrc_scs_30kHz_04 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_30kHz_03 }, - { &hf_nr_rrc_scs_60kHz_05 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_04 }, - { &hf_nr_rrc_scs_120kHz_04, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_04 }, +static const per_sequence_t T_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_sequence[] = { + { &hf_nr_rrc_scs_15kHz_r16_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_15kHz_r16_01 }, + { &hf_nr_rrc_scs_30kHz_r16_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_30kHz_r16_01 }, + { &hf_nr_rrc_scs_60kHz_r16_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_r16_01 }, + { &hf_nr_rrc_scs_120kHz_r16_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_r16_01 }, { NULL, 0, 0, NULL } }; static int -dissect_nr_rrc_T_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_nr_rrc_T_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot, T_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_sequence); + ett_nr_rrc_T_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16, T_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_sequence); return offset; } @@ -69886,8 +70858,8 @@ dissect_nr_rrc_PDCCH_MonitoringOccasions_r16(tvbuff_t *tvb _U_, int offset _U_, static const per_sequence_t T_pdsch_ProcessingType1_r16_sequence[] = { - { &hf_nr_rrc_scs_15kHz_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PDCCH_MonitoringOccasions_r16 }, - { &hf_nr_rrc_scs_30kHz_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PDCCH_MonitoringOccasions_r16 }, + { &hf_nr_rrc_scs_15kHz_r16_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PDCCH_MonitoringOccasions_r16 }, + { &hf_nr_rrc_scs_30kHz_r16_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PDCCH_MonitoringOccasions_r16 }, { NULL, 0, 0, NULL } }; @@ -69901,8 +70873,8 @@ dissect_nr_rrc_T_pdsch_ProcessingType1_r16(tvbuff_t *tvb _U_, int offset _U_, as static const per_sequence_t T_pdsch_ProcessingType2_r16_sequence[] = { - { &hf_nr_rrc_scs_15kHz_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PDCCH_MonitoringOccasions_r16 }, - { &hf_nr_rrc_scs_30kHz_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PDCCH_MonitoringOccasions_r16 }, + { &hf_nr_rrc_scs_15kHz_r16_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PDCCH_MonitoringOccasions_r16 }, + { &hf_nr_rrc_scs_30kHz_r16_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PDCCH_MonitoringOccasions_r16 }, { NULL, 0, 0, NULL } }; @@ -70076,8 +71048,8 @@ dissect_nr_rrc_T_singleDCI_SDM_scheme_r16(tvbuff_t *tvb _U_, int offset _U_, asn static const per_sequence_t FeatureSetDownlink_v1610_sequence[] = { - { &hf_nr_rrc_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot }, - { &hf_nr_rrc_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot }, + { &hf_nr_rrc_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16 }, + { &hf_nr_rrc_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16 }, { &hf_nr_rrc_intraFreqDAPS_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_intraFreqDAPS_r16 }, { &hf_nr_rrc_intraBandFreqSeparationDL_v1620, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_FreqSeparationClassDL_v1620 }, { &hf_nr_rrc_intraBandFreqSeparationDL_Only_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_FreqSeparationClassDL_Only_r16 }, @@ -70367,14 +71339,14 @@ dissect_nr_rrc_T_scalingFactor_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } -static const value_string nr_rrc_T_crossCarrierScheduling_OtherSCS_01_vals[] = { +static const value_string nr_rrc_T_dummy3_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_crossCarrierScheduling_OtherSCS_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_dummy3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -70491,7 +71463,7 @@ dissect_nr_rrc_T_simultaneousTxSUL_NonSUL(tvbuff_t *tvb _U_, int offset _U_, asn } -static const value_string nr_rrc_T_scs_15kHz_04_vals[] = { +static const value_string nr_rrc_T_scs_15kHz_02_vals[] = { { 0, "upto2" }, { 1, "upto4" }, { 2, "upto7" }, @@ -70500,7 +71472,7 @@ static const value_string nr_rrc_T_scs_15kHz_04_vals[] = { static int -dissect_nr_rrc_T_scs_15kHz_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_15kHz_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 3, NULL, FALSE, 0, NULL); @@ -70508,7 +71480,7 @@ dissect_nr_rrc_T_scs_15kHz_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_30kHz_04_vals[] = { +static const value_string nr_rrc_T_scs_30kHz_02_vals[] = { { 0, "upto2" }, { 1, "upto4" }, { 2, "upto7" }, @@ -70517,7 +71489,7 @@ static const value_string nr_rrc_T_scs_30kHz_04_vals[] = { static int -dissect_nr_rrc_T_scs_30kHz_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_30kHz_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 3, NULL, FALSE, 0, NULL); @@ -70525,7 +71497,7 @@ dissect_nr_rrc_T_scs_30kHz_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_60kHz_05_vals[] = { +static const value_string nr_rrc_T_scs_60kHz_03_vals[] = { { 0, "upto2" }, { 1, "upto4" }, { 2, "upto7" }, @@ -70534,7 +71506,7 @@ static const value_string nr_rrc_T_scs_60kHz_05_vals[] = { static int -dissect_nr_rrc_T_scs_60kHz_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_60kHz_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 3, NULL, FALSE, 0, NULL); @@ -70542,7 +71514,7 @@ dissect_nr_rrc_T_scs_60kHz_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_120kHz_05_vals[] = { +static const value_string nr_rrc_T_scs_120kHz_03_vals[] = { { 0, "upto2" }, { 1, "upto4" }, { 2, "upto7" }, @@ -70551,7 +71523,7 @@ static const value_string nr_rrc_T_scs_120kHz_05_vals[] = { static int -dissect_nr_rrc_T_scs_120kHz_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_120kHz_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 3, NULL, FALSE, 0, NULL); @@ -70560,10 +71532,10 @@ dissect_nr_rrc_T_scs_120kHz_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac static const per_sequence_t T_pusch_ProcessingType1_DifferentTB_PerSlot_sequence[] = { - { &hf_nr_rrc_scs_15kHz_05 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_15kHz_04 }, - { &hf_nr_rrc_scs_30kHz_05 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_30kHz_04 }, - { &hf_nr_rrc_scs_60kHz_06 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_05 }, - { &hf_nr_rrc_scs_120kHz_05, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_05 }, + { &hf_nr_rrc_scs_15kHz_03 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_15kHz_02 }, + { &hf_nr_rrc_scs_30kHz_03 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_30kHz_02 }, + { &hf_nr_rrc_scs_60kHz_04 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_03 }, + { &hf_nr_rrc_scs_120kHz_03, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_03 }, { NULL, 0, 0, NULL } }; @@ -70596,16 +71568,16 @@ dissect_nr_rrc_DummyF(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p static const per_sequence_t FeatureSetUplink_sequence[] = { { &hf_nr_rrc_featureSetListPerUplinkCC, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_SEQUENCE_SIZE_1_maxNrofServingCells_OF_FeatureSetUplinkPerCC_Id }, { &hf_nr_rrc_scalingFactor_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scalingFactor_01 }, - { &hf_nr_rrc_crossCarrierScheduling_OtherSCS_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_crossCarrierScheduling_OtherSCS_01 }, + { &hf_nr_rrc_dummy3_01 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy3 }, { &hf_nr_rrc_intraBandFreqSeparationUL, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_FreqSeparationClass }, { &hf_nr_rrc_searchSpaceSharingCA_UL, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_searchSpaceSharingCA_UL }, - { &hf_nr_rrc_dummy1_02 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_DummyI }, + { &hf_nr_rrc_dummy1_03 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_DummyI }, { &hf_nr_rrc_supportedSRS_Resources, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SRS_Resources }, { &hf_nr_rrc_twoPUCCH_Group, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_twoPUCCH_Group }, { &hf_nr_rrc_dynamicSwitchSUL, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dynamicSwitchSUL }, { &hf_nr_rrc_simultaneousTxSUL_NonSUL, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_simultaneousTxSUL_NonSUL }, { &hf_nr_rrc_pusch_ProcessingType1_DifferentTB_PerSlot, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_pusch_ProcessingType1_DifferentTB_PerSlot }, - { &hf_nr_rrc_dummy2_02 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_DummyF }, + { &hf_nr_rrc_dummy2_03 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_DummyF }, { NULL, 0, 0, NULL } }; @@ -70998,7 +71970,7 @@ dissect_nr_rrc_T_ul_CancellationCrossCarrier_r16(tvbuff_t *tvb _U_, int offset _ } -static const value_string nr_rrc_T_ul_FullPwrMode2_MaxSRS_ResInSet_vals[] = { +static const value_string nr_rrc_T_ul_FullPwrMode2_MaxSRS_ResInSet_r16_vals[] = { { 0, "n1" }, { 1, "n2" }, { 2, "n4" }, @@ -71007,7 +71979,7 @@ static const value_string nr_rrc_T_ul_FullPwrMode2_MaxSRS_ResInSet_vals[] = { static int -dissect_nr_rrc_T_ul_FullPwrMode2_MaxSRS_ResInSet(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_ul_FullPwrMode2_MaxSRS_ResInSet_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 3, NULL, FALSE, 0, NULL); @@ -71015,7 +71987,7 @@ dissect_nr_rrc_T_ul_FullPwrMode2_MaxSRS_ResInSet(tvbuff_t *tvb _U_, int offset _ } -static const value_string nr_rrc_T_scs_15kHz_05_vals[] = { +static const value_string nr_rrc_T_scs_15kHz_r16_02_vals[] = { { 0, "one-pusch" }, { 1, "upto2" }, { 2, "upto4" }, @@ -71025,7 +71997,7 @@ static const value_string nr_rrc_T_scs_15kHz_05_vals[] = { static int -dissect_nr_rrc_T_scs_15kHz_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_15kHz_r16_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 4, NULL, FALSE, 0, NULL); @@ -71033,7 +72005,7 @@ dissect_nr_rrc_T_scs_15kHz_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_30kHz_05_vals[] = { +static const value_string nr_rrc_T_scs_30kHz_r16_02_vals[] = { { 0, "one-pusch" }, { 1, "upto2" }, { 2, "upto4" }, @@ -71043,7 +72015,7 @@ static const value_string nr_rrc_T_scs_30kHz_05_vals[] = { static int -dissect_nr_rrc_T_scs_30kHz_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_30kHz_r16_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 4, NULL, FALSE, 0, NULL); @@ -71051,7 +72023,7 @@ dissect_nr_rrc_T_scs_30kHz_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_60kHz_06_vals[] = { +static const value_string nr_rrc_T_scs_60kHz_r16_02_vals[] = { { 0, "one-pusch" }, { 1, "upto2" }, { 2, "upto4" }, @@ -71061,7 +72033,7 @@ static const value_string nr_rrc_T_scs_60kHz_06_vals[] = { static int -dissect_nr_rrc_T_scs_60kHz_06(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_60kHz_r16_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 4, NULL, FALSE, 0, NULL); @@ -71069,7 +72041,7 @@ dissect_nr_rrc_T_scs_60kHz_06(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_120kHz_06_vals[] = { +static const value_string nr_rrc_T_scs_120kHz_r16_02_vals[] = { { 0, "one-pusch" }, { 1, "upto2" }, { 2, "upto4" }, @@ -71079,7 +72051,7 @@ static const value_string nr_rrc_T_scs_120kHz_06_vals[] = { static int -dissect_nr_rrc_T_scs_120kHz_06(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_120kHz_r16_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 4, NULL, FALSE, 0, NULL); @@ -71087,24 +72059,24 @@ dissect_nr_rrc_T_scs_120kHz_06(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac } -static const per_sequence_t T_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_sequence[] = { - { &hf_nr_rrc_scs_15kHz_06 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_15kHz_05 }, - { &hf_nr_rrc_scs_30kHz_06 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_30kHz_05 }, - { &hf_nr_rrc_scs_60kHz_07 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_06 }, - { &hf_nr_rrc_scs_120kHz_06, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_06 }, +static const per_sequence_t T_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_sequence[] = { + { &hf_nr_rrc_scs_15kHz_r16_03, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_15kHz_r16_02 }, + { &hf_nr_rrc_scs_30kHz_r16_03, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_30kHz_r16_02 }, + { &hf_nr_rrc_scs_60kHz_r16_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_r16_02 }, + { &hf_nr_rrc_scs_120kHz_r16_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_r16_02 }, { NULL, 0, 0, NULL } }; static int -dissect_nr_rrc_T_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_nr_rrc_T_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot, T_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_sequence); + ett_nr_rrc_T_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16, T_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_sequence); return offset; } -static const value_string nr_rrc_T_scs_15kHz_06_vals[] = { +static const value_string nr_rrc_T_scs_15kHz_r16_03_vals[] = { { 0, "one-pusch" }, { 1, "upto2" }, { 2, "upto4" }, @@ -71114,7 +72086,7 @@ static const value_string nr_rrc_T_scs_15kHz_06_vals[] = { static int -dissect_nr_rrc_T_scs_15kHz_06(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_15kHz_r16_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 4, NULL, FALSE, 0, NULL); @@ -71122,7 +72094,7 @@ dissect_nr_rrc_T_scs_15kHz_06(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_30kHz_06_vals[] = { +static const value_string nr_rrc_T_scs_30kHz_r16_03_vals[] = { { 0, "one-pusch" }, { 1, "upto2" }, { 2, "upto4" }, @@ -71132,7 +72104,7 @@ static const value_string nr_rrc_T_scs_30kHz_06_vals[] = { static int -dissect_nr_rrc_T_scs_30kHz_06(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_30kHz_r16_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 4, NULL, FALSE, 0, NULL); @@ -71140,7 +72112,7 @@ dissect_nr_rrc_T_scs_30kHz_06(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_60kHz_07_vals[] = { +static const value_string nr_rrc_T_scs_60kHz_r16_03_vals[] = { { 0, "one-pusch" }, { 1, "upto2" }, { 2, "upto4" }, @@ -71150,7 +72122,7 @@ static const value_string nr_rrc_T_scs_60kHz_07_vals[] = { static int -dissect_nr_rrc_T_scs_60kHz_07(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_60kHz_r16_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 4, NULL, FALSE, 0, NULL); @@ -71158,7 +72130,7 @@ dissect_nr_rrc_T_scs_60kHz_07(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_120kHz_07_vals[] = { +static const value_string nr_rrc_T_scs_120kHz_r16_03_vals[] = { { 0, "one-pusch" }, { 1, "upto2" }, { 2, "upto4" }, @@ -71168,7 +72140,7 @@ static const value_string nr_rrc_T_scs_120kHz_07_vals[] = { static int -dissect_nr_rrc_T_scs_120kHz_07(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_120kHz_r16_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 4, NULL, FALSE, 0, NULL); @@ -71176,18 +72148,18 @@ dissect_nr_rrc_T_scs_120kHz_07(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac } -static const per_sequence_t T_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_sequence[] = { - { &hf_nr_rrc_scs_15kHz_07 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_15kHz_06 }, - { &hf_nr_rrc_scs_30kHz_07 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_30kHz_06 }, - { &hf_nr_rrc_scs_60kHz_08 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_07 }, - { &hf_nr_rrc_scs_120kHz_07, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_07 }, +static const per_sequence_t T_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_sequence[] = { + { &hf_nr_rrc_scs_15kHz_r16_04, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_15kHz_r16_03 }, + { &hf_nr_rrc_scs_30kHz_r16_04, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_30kHz_r16_03 }, + { &hf_nr_rrc_scs_60kHz_r16_03, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_r16_03 }, + { &hf_nr_rrc_scs_120kHz_r16_03, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_r16_03 }, { NULL, 0, 0, NULL } }; static int -dissect_nr_rrc_T_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_nr_rrc_T_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot, T_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_sequence); + ett_nr_rrc_T_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16, T_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_sequence); return offset; } @@ -72093,9 +73065,9 @@ static const per_sequence_t FeatureSetUplink_v1610_sequence[] = { { &hf_nr_rrc_pusch_RepetitionTypeB_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_pusch_RepetitionTypeB_r16 }, { &hf_nr_rrc_ul_CancellationSelfCarrier_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_ul_CancellationSelfCarrier_r16 }, { &hf_nr_rrc_ul_CancellationCrossCarrier_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_ul_CancellationCrossCarrier_r16 }, - { &hf_nr_rrc_ul_FullPwrMode2_MaxSRS_ResInSet, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_ul_FullPwrMode2_MaxSRS_ResInSet }, - { &hf_nr_rrc_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot }, - { &hf_nr_rrc_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot }, + { &hf_nr_rrc_ul_FullPwrMode2_MaxSRS_ResInSet_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_ul_FullPwrMode2_MaxSRS_ResInSet_r16 }, + { &hf_nr_rrc_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16 }, + { &hf_nr_rrc_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16 }, { &hf_nr_rrc_supportedSRS_PosResources_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SRS_AllPosResources_r16 }, { &hf_nr_rrc_intraFreqDAPS_UL_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_intraFreqDAPS_UL_r16 }, { &hf_nr_rrc_intraBandFreqSeparationUL_v1620, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_FreqSeparationClassUL_v1620 }, @@ -72175,6 +73147,142 @@ dissect_nr_rrc_FeatureSets_eag_3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * } +static const value_string nr_rrc_T_offsetSRS_CB_PUSCH_Ant_Switch_fr1_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_offsetSRS_CB_PUSCH_Ant_Switch_fr1_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_offsetSRS_CB_PUSCH_PDCCH_MonitorSingleOcc_fr1_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_offsetSRS_CB_PUSCH_PDCCH_MonitorSingleOcc_fr1_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithoutGap_fr1_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithoutGap_fr1_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithGap_fr1_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithGap_fr1_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithSpanGap_fr1_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithSpanGap_fr1_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_partialCancellationPUCCH_PUSCH_PRACH_TX_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_partialCancellationPUCCH_PUSCH_PRACH_TX_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t FeatureSetUplink_v1630_sequence[] = { + { &hf_nr_rrc_offsetSRS_CB_PUSCH_Ant_Switch_fr1_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_offsetSRS_CB_PUSCH_Ant_Switch_fr1_r16 }, + { &hf_nr_rrc_offsetSRS_CB_PUSCH_PDCCH_MonitorSingleOcc_fr1_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_offsetSRS_CB_PUSCH_PDCCH_MonitorSingleOcc_fr1_r16 }, + { &hf_nr_rrc_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithoutGap_fr1_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithoutGap_fr1_r16 }, + { &hf_nr_rrc_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithGap_fr1_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithGap_fr1_r16 }, + { &hf_nr_rrc_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithSpanGap_fr1_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithSpanGap_fr1_r16 }, + { &hf_nr_rrc_partialCancellationPUCCH_PUSCH_PRACH_TX_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_partialCancellationPUCCH_PUSCH_PRACH_TX_r16 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_FeatureSetUplink_v1630(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_FeatureSetUplink_v1630, FeatureSetUplink_v1630_sequence); + + return offset; +} + + +static const per_sequence_t SEQUENCE_SIZE_1_maxUplinkFeatureSets_OF_FeatureSetUplink_v1630_sequence_of[1] = { + { &hf_nr_rrc_featureSetsUplink_v1630_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_FeatureSetUplink_v1630 }, +}; + +static int +dissect_nr_rrc_SEQUENCE_SIZE_1_maxUplinkFeatureSets_OF_FeatureSetUplink_v1630(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_SEQUENCE_SIZE_1_maxUplinkFeatureSets_OF_FeatureSetUplink_v1630, SEQUENCE_SIZE_1_maxUplinkFeatureSets_OF_FeatureSetUplink_v1630_sequence_of, + 1, maxUplinkFeatureSets, FALSE); + + return offset; +} + + +static const per_sequence_t FeatureSets_eag_4_sequence[] = { + { &hf_nr_rrc_featureSetsUplink_v1630, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SEQUENCE_SIZE_1_maxUplinkFeatureSets_OF_FeatureSetUplink_v1630 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_FeatureSets_eag_4(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence_eag(tvb, offset, actx, tree, FeatureSets_eag_4_sequence); + + return offset; +} + + static const per_sequence_t FeatureSets_sequence[] = { { &hf_nr_rrc_featureSetsDownlink, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_SEQUENCE_SIZE_1_maxDownlinkFeatureSets_OF_FeatureSetDownlink }, { &hf_nr_rrc_featureSetsDownlinkPerCC, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_SEQUENCE_SIZE_1_maxPerCC_FeatureSets_OF_FeatureSetDownlinkPerCC }, @@ -72183,6 +73291,7 @@ static const per_sequence_t FeatureSets_sequence[] = { { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_FeatureSets_eag_1 }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_FeatureSets_eag_2 }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_FeatureSets_eag_3 }, + { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_FeatureSets_eag_4 }, { NULL, 0, 0, NULL } }; @@ -72752,7 +73861,7 @@ dissect_nr_rrc_InterRAT_Parameters_eag_1(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t InterRAT_Parameters_sequence[] = { - { &hf_nr_rrc_eutra_05 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_EUTRA_Parameters }, + { &hf_nr_rrc_eutra_06 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_EUTRA_Parameters }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_InterRAT_Parameters_eag_1 }, { NULL, 0, 0, NULL } }; @@ -72781,14 +73890,14 @@ dissect_nr_rrc_T_lcp_Restriction(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * } -static const value_string nr_rrc_T_dummy_05_vals[] = { +static const value_string nr_rrc_T_dummy_04_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_dummy_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_dummy_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -73029,7 +74138,7 @@ dissect_nr_rrc_MAC_ParametersCommon_eag_2(tvbuff_t *tvb _U_, int offset _U_, asn static const per_sequence_t MAC_ParametersCommon_sequence[] = { { &hf_nr_rrc_lcp_Restriction, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_lcp_Restriction }, - { &hf_nr_rrc_dummy_09 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy_05 }, + { &hf_nr_rrc_dummy_09 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy_04 }, { &hf_nr_rrc_lch_ToSCellRestriction, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_lch_ToSCellRestriction }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_MAC_ParametersCommon_eag_1 }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_MAC_ParametersCommon_eag_2 }, @@ -73258,7 +74367,7 @@ dissect_nr_rrc_T_directSCG_SCellActivationResume_r16(tvbuff_t *tvb _U_, int offs } -static const value_string nr_rrc_T_scs_15kHz_r16_vals[] = { +static const value_string nr_rrc_T_scs_15kHz_r16_04_vals[] = { { 0, "sl1" }, { 1, "sl3" }, { 0, NULL } @@ -73266,7 +74375,7 @@ static const value_string nr_rrc_T_scs_15kHz_r16_vals[] = { static int -dissect_nr_rrc_T_scs_15kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_15kHz_r16_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 2, NULL, FALSE, 0, NULL); @@ -73274,7 +74383,7 @@ dissect_nr_rrc_T_scs_15kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac } -static const value_string nr_rrc_T_scs_30kHz_r16_vals[] = { +static const value_string nr_rrc_T_scs_30kHz_r16_04_vals[] = { { 0, "sl1" }, { 1, "sl6" }, { 0, NULL } @@ -73282,7 +74391,7 @@ static const value_string nr_rrc_T_scs_30kHz_r16_vals[] = { static int -dissect_nr_rrc_T_scs_30kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_30kHz_r16_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 2, NULL, FALSE, 0, NULL); @@ -73290,7 +74399,7 @@ dissect_nr_rrc_T_scs_30kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac } -static const value_string nr_rrc_T_scs_60kHz_r16_vals[] = { +static const value_string nr_rrc_T_scs_60kHz_r16_04_vals[] = { { 0, "sl1" }, { 1, "sl12" }, { 0, NULL } @@ -73298,7 +74407,7 @@ static const value_string nr_rrc_T_scs_60kHz_r16_vals[] = { static int -dissect_nr_rrc_T_scs_60kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_60kHz_r16_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 2, NULL, FALSE, 0, NULL); @@ -73306,7 +74415,7 @@ dissect_nr_rrc_T_scs_60kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac } -static const value_string nr_rrc_T_scs_120kHz_r16_vals[] = { +static const value_string nr_rrc_T_scs_120kHz_r16_04_vals[] = { { 0, "sl2" }, { 1, "sl24" }, { 0, NULL } @@ -73314,7 +74423,7 @@ static const value_string nr_rrc_T_scs_120kHz_r16_vals[] = { static int -dissect_nr_rrc_T_scs_120kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_120kHz_r16_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 2, NULL, FALSE, 0, NULL); @@ -73323,10 +74432,10 @@ dissect_nr_rrc_T_scs_120kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static const per_sequence_t MinTimeGap_r16_sequence[] = { - { &hf_nr_rrc_scs_15kHz_r16_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_15kHz_r16 }, - { &hf_nr_rrc_scs_30kHz_r16_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_30kHz_r16 }, - { &hf_nr_rrc_scs_60kHz_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_r16 }, - { &hf_nr_rrc_scs_120kHz_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_r16 }, + { &hf_nr_rrc_scs_15kHz_r16_05, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_15kHz_r16_04 }, + { &hf_nr_rrc_scs_30kHz_r16_05, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_30kHz_r16_04 }, + { &hf_nr_rrc_scs_60kHz_r16_04, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_r16_04 }, + { &hf_nr_rrc_scs_120kHz_r16_04, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_r16_04 }, { NULL, 0, 0, NULL } }; @@ -73845,14 +74954,14 @@ dissect_nr_rrc_T_mfbi_IAB_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_multipleNS_And_Pmax_IAB_r16_vals[] = { +static const value_string nr_rrc_T_dummy_05_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_multipleNS_And_Pmax_IAB_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_dummy_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -73975,7 +75084,7 @@ static const per_sequence_t MeasAndMobParametersCommon_eag_5_sequence[] = { { &hf_nr_rrc_maxNumberCLI_SRS_RSRP_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_maxNumberCLI_SRS_RSRP_r16 }, { &hf_nr_rrc_maxNumberPerSlotCLI_SRS_RSRP_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_maxNumberPerSlotCLI_SRS_RSRP_r16 }, { &hf_nr_rrc_mfbi_IAB_r16 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_mfbi_IAB_r16 }, - { &hf_nr_rrc_multipleNS_And_Pmax_IAB_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_multipleNS_And_Pmax_IAB_r16 }, + { &hf_nr_rrc_dummy_10 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy_05 }, { &hf_nr_rrc_nr_CGI_Reporting_NPN_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nr_CGI_Reporting_NPN_r16 }, { &hf_nr_rrc_idleInactiveEUTRA_MeasReport_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_idleInactiveEUTRA_MeasReport_r16 }, { &hf_nr_rrc_idleInactive_ValidityArea_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_idleInactive_ValidityArea_r16 }, @@ -74578,6 +75687,34 @@ dissect_nr_rrc_MeasAndMobParametersFRX_Diff_eag_4(tvbuff_t *tvb _U_, int offset } +static const value_string nr_rrc_T_increasedNumberofCSIRSPerMO_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_increasedNumberofCSIRSPerMO_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t MeasAndMobParametersFRX_Diff_eag_5_sequence[] = { + { &hf_nr_rrc_increasedNumberofCSIRSPerMO_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_increasedNumberofCSIRSPerMO_r16 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_MeasAndMobParametersFRX_Diff_eag_5(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence_eag(tvb, offset, actx, tree, MeasAndMobParametersFRX_Diff_eag_5_sequence); + + return offset; +} + + static const per_sequence_t MeasAndMobParametersFRX_Diff_sequence[] = { { &hf_nr_rrc_ss_SINR_Meas , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_ss_SINR_Meas }, { &hf_nr_rrc_csi_RSRP_AndRSRQ_MeasWithSSB, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_csi_RSRP_AndRSRQ_MeasWithSSB }, @@ -74588,6 +75725,7 @@ static const per_sequence_t MeasAndMobParametersFRX_Diff_sequence[] = { { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_MeasAndMobParametersFRX_Diff_eag_2 }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_MeasAndMobParametersFRX_Diff_eag_3 }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_MeasAndMobParametersFRX_Diff_eag_4 }, + { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_MeasAndMobParametersFRX_Diff_eag_5 }, { NULL, 0, 0, NULL } }; @@ -75124,7 +76262,7 @@ dissect_nr_rrc_INTEGER_2_8(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ } -static const value_string nr_rrc_T_scs_15kHz_07_vals[] = { +static const value_string nr_rrc_T_scs_15kHz_03_vals[] = { { 0, "n4" }, { 1, "n7" }, { 2, "n14" }, @@ -75133,7 +76271,7 @@ static const value_string nr_rrc_T_scs_15kHz_07_vals[] = { static int -dissect_nr_rrc_T_scs_15kHz_07(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_15kHz_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 3, NULL, FALSE, 0, NULL); @@ -75141,7 +76279,7 @@ dissect_nr_rrc_T_scs_15kHz_07(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_30kHz_07_vals[] = { +static const value_string nr_rrc_T_scs_30kHz_03_vals[] = { { 0, "n4" }, { 1, "n7" }, { 2, "n14" }, @@ -75150,7 +76288,7 @@ static const value_string nr_rrc_T_scs_30kHz_07_vals[] = { static int -dissect_nr_rrc_T_scs_30kHz_07(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_30kHz_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 3, NULL, FALSE, 0, NULL); @@ -75158,7 +76296,7 @@ dissect_nr_rrc_T_scs_30kHz_07(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_60kHz_08_vals[] = { +static const value_string nr_rrc_T_scs_60kHz_04_vals[] = { { 0, "n4" }, { 1, "n7" }, { 2, "n14" }, @@ -75167,7 +76305,7 @@ static const value_string nr_rrc_T_scs_60kHz_08_vals[] = { static int -dissect_nr_rrc_T_scs_60kHz_08(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_60kHz_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 3, NULL, FALSE, 0, NULL); @@ -75175,7 +76313,7 @@ dissect_nr_rrc_T_scs_60kHz_08(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_120kHz_08_vals[] = { +static const value_string nr_rrc_T_scs_120kHz_04_vals[] = { { 0, "n4" }, { 1, "n7" }, { 2, "n14" }, @@ -75184,7 +76322,7 @@ static const value_string nr_rrc_T_scs_120kHz_08_vals[] = { static int -dissect_nr_rrc_T_scs_120kHz_08(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_120kHz_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 3, NULL, FALSE, 0, NULL); @@ -75210,10 +76348,10 @@ dissect_nr_rrc_T_scs_240kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static const per_sequence_t T_maxNumberRxTxBeamSwitchDL_sequence[] = { - { &hf_nr_rrc_scs_15kHz_08 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_15kHz_07 }, - { &hf_nr_rrc_scs_30kHz_08 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_30kHz_07 }, - { &hf_nr_rrc_scs_60kHz_09 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_08 }, - { &hf_nr_rrc_scs_120kHz_08, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_08 }, + { &hf_nr_rrc_scs_15kHz_04 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_15kHz_03 }, + { &hf_nr_rrc_scs_30kHz_04 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_30kHz_03 }, + { &hf_nr_rrc_scs_60kHz_05 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_04 }, + { &hf_nr_rrc_scs_120kHz_04, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_04 }, { &hf_nr_rrc_scs_240kHz , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_240kHz }, { NULL, 0, 0, NULL } }; @@ -75302,14 +76440,14 @@ dissect_nr_rrc_INTEGER_1_256(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } -static const value_string nr_rrc_T_dummy2_02_vals[] = { +static const value_string nr_rrc_T_dummy2_03_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_dummy2_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_dummy2_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -75332,7 +76470,7 @@ dissect_nr_rrc_T_twoPortsPTRS_UL(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * } -static const value_string nr_rrc_T_scs_15kHz_08_vals[] = { +static const value_string nr_rrc_T_scs_15kHz_04_vals[] = { { 0, "sym2" }, { 1, "sym4" }, { 2, "sym8" }, @@ -75341,7 +76479,7 @@ static const value_string nr_rrc_T_scs_15kHz_08_vals[] = { static int -dissect_nr_rrc_T_scs_15kHz_08(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_15kHz_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 3, NULL, FALSE, 0, NULL); @@ -75349,7 +76487,7 @@ dissect_nr_rrc_T_scs_15kHz_08(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_30kHz_08_vals[] = { +static const value_string nr_rrc_T_scs_30kHz_04_vals[] = { { 0, "sym4" }, { 1, "sym8" }, { 2, "sym14" }, @@ -75359,7 +76497,7 @@ static const value_string nr_rrc_T_scs_30kHz_08_vals[] = { static int -dissect_nr_rrc_T_scs_30kHz_08(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_30kHz_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 4, NULL, FALSE, 0, NULL); @@ -75367,7 +76505,7 @@ dissect_nr_rrc_T_scs_30kHz_08(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_60kHz_09_vals[] = { +static const value_string nr_rrc_T_scs_60kHz_05_vals[] = { { 0, "sym8" }, { 1, "sym14" }, { 2, "sym28" }, @@ -75376,7 +76514,7 @@ static const value_string nr_rrc_T_scs_60kHz_09_vals[] = { static int -dissect_nr_rrc_T_scs_60kHz_09(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_60kHz_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 3, NULL, FALSE, 0, NULL); @@ -75384,7 +76522,7 @@ dissect_nr_rrc_T_scs_60kHz_09(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_120kHz_09_vals[] = { +static const value_string nr_rrc_T_scs_120kHz_05_vals[] = { { 0, "sym14" }, { 1, "sym28" }, { 2, "sym56" }, @@ -75393,7 +76531,7 @@ static const value_string nr_rrc_T_scs_120kHz_09_vals[] = { static int -dissect_nr_rrc_T_scs_120kHz_09(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_120kHz_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 3, NULL, FALSE, 0, NULL); @@ -75402,10 +76540,10 @@ dissect_nr_rrc_T_scs_120kHz_09(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac static const per_sequence_t T_beamReportTiming_sequence[] = { - { &hf_nr_rrc_scs_15kHz_09 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_15kHz_08 }, - { &hf_nr_rrc_scs_30kHz_09 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_30kHz_08 }, - { &hf_nr_rrc_scs_60kHz_10 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_09 }, - { &hf_nr_rrc_scs_120kHz_09, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_09 }, + { &hf_nr_rrc_scs_15kHz_05 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_15kHz_04 }, + { &hf_nr_rrc_scs_30kHz_05 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_30kHz_04 }, + { &hf_nr_rrc_scs_60kHz_06 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_05 }, + { &hf_nr_rrc_scs_120kHz_05, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_05 }, { NULL, 0, 0, NULL } }; @@ -75437,10 +76575,10 @@ dissect_nr_rrc_PTRS_DensityRecommendationDL(tvbuff_t *tvb _U_, int offset _U_, a static const per_sequence_t T_ptrs_DensityRecommendationSetDL_sequence[] = { - { &hf_nr_rrc_scs_15kHz_10 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PTRS_DensityRecommendationDL }, - { &hf_nr_rrc_scs_30kHz_10 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PTRS_DensityRecommendationDL }, - { &hf_nr_rrc_scs_60kHz_11 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PTRS_DensityRecommendationDL }, - { &hf_nr_rrc_scs_120kHz_10, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PTRS_DensityRecommendationDL }, + { &hf_nr_rrc_scs_15kHz_06 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PTRS_DensityRecommendationDL }, + { &hf_nr_rrc_scs_30kHz_06 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PTRS_DensityRecommendationDL }, + { &hf_nr_rrc_scs_60kHz_07 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PTRS_DensityRecommendationDL }, + { &hf_nr_rrc_scs_120kHz_06, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PTRS_DensityRecommendationDL }, { NULL, 0, 0, NULL } }; @@ -75477,10 +76615,10 @@ dissect_nr_rrc_PTRS_DensityRecommendationUL(tvbuff_t *tvb _U_, int offset _U_, a static const per_sequence_t T_ptrs_DensityRecommendationSetUL_sequence[] = { - { &hf_nr_rrc_scs_15kHz_11 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PTRS_DensityRecommendationUL }, - { &hf_nr_rrc_scs_30kHz_11 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PTRS_DensityRecommendationUL }, - { &hf_nr_rrc_scs_60kHz_12 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PTRS_DensityRecommendationUL }, - { &hf_nr_rrc_scs_120kHz_11, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PTRS_DensityRecommendationUL }, + { &hf_nr_rrc_scs_15kHz_07 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PTRS_DensityRecommendationUL }, + { &hf_nr_rrc_scs_30kHz_07 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PTRS_DensityRecommendationUL }, + { &hf_nr_rrc_scs_60kHz_08 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PTRS_DensityRecommendationUL }, + { &hf_nr_rrc_scs_120kHz_07, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PTRS_DensityRecommendationUL }, { NULL, 0, 0, NULL } }; @@ -75665,7 +76803,7 @@ dissect_nr_rrc_BeamManagementSSB_CSI_RS(tvbuff_t *tvb _U_, int offset _U_, asn1_ } -static const value_string nr_rrc_T_scs_60kHz_10_vals[] = { +static const value_string nr_rrc_T_scs_60kHz_06_vals[] = { { 0, "sym14" }, { 1, "sym28" }, { 2, "sym48" }, @@ -75676,7 +76814,7 @@ static const value_string nr_rrc_T_scs_60kHz_10_vals[] = { static int -dissect_nr_rrc_T_scs_60kHz_10(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_60kHz_06(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 5, NULL, FALSE, 0, NULL); @@ -75684,7 +76822,7 @@ dissect_nr_rrc_T_scs_60kHz_10(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_120kHz_10_vals[] = { +static const value_string nr_rrc_T_scs_120kHz_06_vals[] = { { 0, "sym14" }, { 1, "sym28" }, { 2, "sym48" }, @@ -75695,7 +76833,7 @@ static const value_string nr_rrc_T_scs_120kHz_10_vals[] = { static int -dissect_nr_rrc_T_scs_120kHz_10(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_120kHz_06(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 5, NULL, FALSE, 0, NULL); @@ -75704,8 +76842,8 @@ dissect_nr_rrc_T_scs_120kHz_10(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac static const per_sequence_t T_beamSwitchTiming_sequence[] = { - { &hf_nr_rrc_scs_60kHz_13 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_10 }, - { &hf_nr_rrc_scs_120kHz_12, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_10 }, + { &hf_nr_rrc_scs_60kHz_09 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_06 }, + { &hf_nr_rrc_scs_120kHz_08, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_06 }, { NULL, 0, 0, NULL } }; @@ -76651,7 +77789,7 @@ dissect_nr_rrc_T_beamCorrespondenceCSI_RS_based_r16(tvbuff_t *tvb _U_, int offse } -static const value_string nr_rrc_T_scs_60kHz_r16_01_vals[] = { +static const value_string nr_rrc_T_scs_60kHz_r16_05_vals[] = { { 0, "sym224" }, { 1, "sym336" }, { 0, NULL } @@ -76659,7 +77797,7 @@ static const value_string nr_rrc_T_scs_60kHz_r16_01_vals[] = { static int -dissect_nr_rrc_T_scs_60kHz_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_60kHz_r16_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 2, NULL, FALSE, 0, NULL); @@ -76667,7 +77805,7 @@ dissect_nr_rrc_T_scs_60kHz_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } -static const value_string nr_rrc_T_scs_120kHz_r16_01_vals[] = { +static const value_string nr_rrc_T_scs_120kHz_r16_05_vals[] = { { 0, "sym224" }, { 1, "sym336" }, { 0, NULL } @@ -76675,7 +77813,7 @@ static const value_string nr_rrc_T_scs_120kHz_r16_01_vals[] = { static int -dissect_nr_rrc_T_scs_120kHz_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_120kHz_r16_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 2, NULL, FALSE, 0, NULL); @@ -76684,8 +77822,8 @@ dissect_nr_rrc_T_scs_120kHz_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static const per_sequence_t T_beamSwitchTiming_r16_sequence[] = { - { &hf_nr_rrc_scs_60kHz_r16_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_r16_01 }, - { &hf_nr_rrc_scs_120kHz_r16_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_r16_01 }, + { &hf_nr_rrc_scs_60kHz_r16_05, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_r16_05 }, + { &hf_nr_rrc_scs_120kHz_r16_05, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_r16_05 }, { NULL, 0, 0, NULL } }; @@ -76734,6 +77872,80 @@ dissect_nr_rrc_MIMO_ParametersPerBand_eag_2(tvbuff_t *tvb _U_, int offset _U_, a } +static const value_string nr_rrc_T_supportReportFormat1_2OFDM_syms_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_supportReportFormat1_2OFDM_syms_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_supportReportFormat4_14OFDM_syms_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_supportReportFormat4_14OFDM_syms_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t T_semi_PersistentL1_SINR_Report_PUCCH_r16_sequence[] = { + { &hf_nr_rrc_supportReportFormat1_2OFDM_syms_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_supportReportFormat1_2OFDM_syms_r16 }, + { &hf_nr_rrc_supportReportFormat4_14OFDM_syms_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_supportReportFormat4_14OFDM_syms_r16 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_T_semi_PersistentL1_SINR_Report_PUCCH_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_T_semi_PersistentL1_SINR_Report_PUCCH_r16, T_semi_PersistentL1_SINR_Report_PUCCH_r16_sequence); + + return offset; +} + + +static const value_string nr_rrc_T_semi_PersistentL1_SINR_Report_PUSCH_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_semi_PersistentL1_SINR_Report_PUSCH_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t MIMO_ParametersPerBand_eag_3_sequence[] = { + { &hf_nr_rrc_semi_PersistentL1_SINR_Report_PUCCH_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_semi_PersistentL1_SINR_Report_PUCCH_r16 }, + { &hf_nr_rrc_semi_PersistentL1_SINR_Report_PUSCH_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_semi_PersistentL1_SINR_Report_PUSCH_r16 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_MIMO_ParametersPerBand_eag_3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence_eag(tvb, offset, actx, tree, MIMO_ParametersPerBand_eag_3_sequence); + + return offset; +} + + static const per_sequence_t MIMO_ParametersPerBand_sequence[] = { { &hf_nr_rrc_tci_StatePDSCH, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_tci_StatePDSCH }, { &hf_nr_rrc_additionalActiveTCI_StatePDCCH, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_additionalActiveTCI_StatePDCCH }, @@ -76743,7 +77955,7 @@ static const per_sequence_t MIMO_ParametersPerBand_sequence[] = { { &hf_nr_rrc_aperiodicBeamReport, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_aperiodicBeamReport }, { &hf_nr_rrc_sp_BeamReportPUCCH, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_sp_BeamReportPUCCH }, { &hf_nr_rrc_sp_BeamReportPUSCH, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_sp_BeamReportPUSCH }, - { &hf_nr_rrc_dummy1_03 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_DummyG }, + { &hf_nr_rrc_dummy1_04 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_DummyG }, { &hf_nr_rrc_maxNumberRxBeam, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_INTEGER_2_8 }, { &hf_nr_rrc_maxNumberRxTxBeamSwitchDL, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_maxNumberRxTxBeamSwitchDL }, { &hf_nr_rrc_maxNumberNonGroupBeamReporting, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_maxNumberNonGroupBeamReporting }, @@ -76752,10 +77964,10 @@ static const per_sequence_t MIMO_ParametersPerBand_sequence[] = { { &hf_nr_rrc_maxNumberCSI_RS_BFD, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_INTEGER_1_64 }, { &hf_nr_rrc_maxNumberSSB_BFD, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_INTEGER_1_64 }, { &hf_nr_rrc_maxNumberCSI_RS_SSB_CBD, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_INTEGER_1_256 }, - { &hf_nr_rrc_dummy2_03 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy2_02 }, + { &hf_nr_rrc_dummy2_04 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy2_03 }, { &hf_nr_rrc_twoPortsPTRS_UL, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_twoPortsPTRS_UL }, { &hf_nr_rrc_dummy5_01 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_SRS_Resources }, - { &hf_nr_rrc_dummy3_01 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_INTEGER_1_4 }, + { &hf_nr_rrc_dummy3_02 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_INTEGER_1_4 }, { &hf_nr_rrc_beamReportTiming, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_beamReportTiming }, { &hf_nr_rrc_ptrs_DensityRecommendationSetDL, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_ptrs_DensityRecommendationSetDL }, { &hf_nr_rrc_ptrs_DensityRecommendationSetUL, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_ptrs_DensityRecommendationSetUL }, @@ -76763,6 +77975,7 @@ static const per_sequence_t MIMO_ParametersPerBand_sequence[] = { { &hf_nr_rrc_aperiodicTRS , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_aperiodicTRS }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_MIMO_ParametersPerBand_eag_1 }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_MIMO_ParametersPerBand_eag_2 }, + { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_MIMO_ParametersPerBand_eag_3 }, { NULL, 0, 0, NULL } }; @@ -76901,8 +78114,8 @@ static const per_sequence_t NRDC_Parameters_sequence[] = { { &hf_nr_rrc_tdd_Add_UE_NRDC_Capabilities, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_MRDC_CapabilityAddXDD_Mode }, { &hf_nr_rrc_fr1_Add_UE_NRDC_Capabilities, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_MRDC_CapabilityAddFRX_Mode }, { &hf_nr_rrc_fr2_Add_UE_NRDC_Capabilities, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_MRDC_CapabilityAddFRX_Mode }, - { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_dummy_10 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy_06 }, + { &hf_nr_rrc_dummy2_05 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, + { &hf_nr_rrc_dummy_11 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy_06 }, { NULL, 0, 0, NULL } }; @@ -76944,6 +78157,51 @@ dissect_nr_rrc_NRDC_Parameters_v1570(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx } +static const value_string nr_rrc_T_pdcp_DuplicationSplitSRB_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_pdcp_DuplicationSplitSRB(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_pdcp_DuplicationSplitDRB_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_pdcp_DuplicationSplitDRB(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t NRDC_Parameters_v15c0_sequence[] = { + { &hf_nr_rrc_pdcp_DuplicationSplitSRB, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_pdcp_DuplicationSplitSRB }, + { &hf_nr_rrc_pdcp_DuplicationSplitDRB, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_pdcp_DuplicationSplitDRB }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_NRDC_Parameters_v15c0(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_NRDC_Parameters_v15c0, NRDC_Parameters_v15c0_sequence); + + return offset; +} + + static const per_sequence_t NRDC_Parameters_v1610_sequence[] = { { &hf_nr_rrc_measAndMobParametersNRDC_v1610, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_MeasAndMobParametersMRDC_v1610 }, { NULL, 0, 0, NULL } @@ -77358,14 +78616,14 @@ dissect_nr_rrc_PDCP_Parameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac } -static const value_string nr_rrc_T_pdcp_DuplicationSplitSRB_vals[] = { +static const value_string nr_rrc_T_pdcp_DuplicationSplitSRB_01_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_pdcp_DuplicationSplitSRB(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_pdcp_DuplicationSplitSRB_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -77373,14 +78631,14 @@ dissect_nr_rrc_T_pdcp_DuplicationSplitSRB(tvbuff_t *tvb _U_, int offset _U_, asn } -static const value_string nr_rrc_T_pdcp_DuplicationSplitDRB_vals[] = { +static const value_string nr_rrc_T_pdcp_DuplicationSplitDRB_01_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_pdcp_DuplicationSplitDRB(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_pdcp_DuplicationSplitDRB_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -77389,8 +78647,8 @@ dissect_nr_rrc_T_pdcp_DuplicationSplitDRB(tvbuff_t *tvb _U_, int offset _U_, asn static const per_sequence_t PDCP_ParametersMRDC_sequence[] = { - { &hf_nr_rrc_pdcp_DuplicationSplitSRB, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_pdcp_DuplicationSplitSRB }, - { &hf_nr_rrc_pdcp_DuplicationSplitDRB, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_pdcp_DuplicationSplitDRB }, + { &hf_nr_rrc_pdcp_DuplicationSplitSRB_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_pdcp_DuplicationSplitSRB_01 }, + { &hf_nr_rrc_pdcp_DuplicationSplitDRB_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_pdcp_DuplicationSplitDRB_01 }, { NULL, 0, 0, NULL } }; @@ -77959,7 +79217,7 @@ dissect_nr_rrc_T_dummy_07(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static const per_sequence_t Phy_ParametersCommon_eag_1_sequence[] = { - { &hf_nr_rrc_dummy_11 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy_07 }, + { &hf_nr_rrc_dummy_12 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy_07 }, { NULL, 0, 0, NULL } }; @@ -78711,6 +79969,66 @@ dissect_nr_rrc_Phy_ParametersCommon_eag_4(tvbuff_t *tvb _U_, int offset _U_, asn } +static const value_string nr_rrc_T_targetSMTC_SCG_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_targetSMTC_SCG_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_supportRepetitionZeroOffsetRV_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_supportRepetitionZeroOffsetRV_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_cbg_TransInOrderPUSCH_UL_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_cbg_TransInOrderPUSCH_UL_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t Phy_ParametersCommon_eag_5_sequence[] = { + { &hf_nr_rrc_targetSMTC_SCG_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_targetSMTC_SCG_r16 }, + { &hf_nr_rrc_supportRepetitionZeroOffsetRV_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_supportRepetitionZeroOffsetRV_r16 }, + { &hf_nr_rrc_cbg_TransInOrderPUSCH_UL_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_cbg_TransInOrderPUSCH_UL_r16 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_Phy_ParametersCommon_eag_5(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence_eag(tvb, offset, actx, tree, Phy_ParametersCommon_eag_5_sequence); + + return offset; +} + + static const per_sequence_t Phy_ParametersCommon_sequence[] = { { &hf_nr_rrc_csi_RS_CFRA_ForHO, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_csi_RS_CFRA_ForHO }, { &hf_nr_rrc_dynamicPRB_BundlingDL, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_dynamicPRB_BundlingDL }, @@ -78750,6 +80068,7 @@ static const per_sequence_t Phy_ParametersCommon_sequence[] = { { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_Phy_ParametersCommon_eag_2 }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_Phy_ParametersCommon_eag_3 }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_Phy_ParametersCommon_eag_4 }, + { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_Phy_ParametersCommon_eag_5 }, { NULL, 0, 0, NULL } }; @@ -79865,12 +81184,40 @@ dissect_nr_rrc_Phy_ParametersFRX_Diff_eag_3(tvbuff_t *tvb _U_, int offset _U_, a } +static const value_string nr_rrc_T_twoTCI_Act_servingCellInCC_List_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_twoTCI_Act_servingCellInCC_List_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t Phy_ParametersFRX_Diff_eag_4_sequence[] = { + { &hf_nr_rrc_twoTCI_Act_servingCellInCC_List_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_twoTCI_Act_servingCellInCC_List_r16 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_Phy_ParametersFRX_Diff_eag_4(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence_eag(tvb, offset, actx, tree, Phy_ParametersFRX_Diff_eag_4_sequence); + + return offset; +} + + static const per_sequence_t Phy_ParametersFRX_Diff_sequence[] = { { &hf_nr_rrc_dynamicSFI_01, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_dynamicSFI_01 }, - { &hf_nr_rrc_dummy1_04 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_2 }, + { &hf_nr_rrc_dummy1_05 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_2 }, { &hf_nr_rrc_twoFL_DMRS , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_2 }, - { &hf_nr_rrc_dummy2_04 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_2 }, - { &hf_nr_rrc_dummy3_02 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_2 }, + { &hf_nr_rrc_dummy2_06 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_2 }, + { &hf_nr_rrc_dummy3_03 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_2 }, { &hf_nr_rrc_supportedDMRS_TypeDL, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_supportedDMRS_TypeDL }, { &hf_nr_rrc_supportedDMRS_TypeUL, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_supportedDMRS_TypeUL }, { &hf_nr_rrc_semiOpenLoopCSI, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_semiOpenLoopCSI }, @@ -79906,6 +81253,7 @@ static const per_sequence_t Phy_ParametersFRX_Diff_sequence[] = { { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_Phy_ParametersFRX_Diff_eag_1 }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_Phy_ParametersFRX_Diff_eag_2 }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_Phy_ParametersFRX_Diff_eag_3 }, + { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_Phy_ParametersFRX_Diff_eag_4 }, { NULL, 0, 0, NULL } }; @@ -79933,14 +81281,14 @@ dissect_nr_rrc_T_pdcch_MonitoringSingleOccasion(tvbuff_t *tvb _U_, int offset _U } -static const value_string nr_rrc_T_scs_60kHz_11_vals[] = { +static const value_string nr_rrc_T_scs_60kHz_07_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_scs_60kHz_11(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_60kHz_07(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -80024,7 +81372,7 @@ dissect_nr_rrc_Phy_ParametersFR1_eag_1(tvbuff_t *tvb _U_, int offset _U_, asn1_c static const per_sequence_t Phy_ParametersFR1_sequence[] = { { &hf_nr_rrc_pdcch_MonitoringSingleOccasion, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_pdcch_MonitoringSingleOccasion }, - { &hf_nr_rrc_scs_60kHz_14 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_11 }, + { &hf_nr_rrc_scs_60kHz_10 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_07 }, { &hf_nr_rrc_pdsch_256QAM_FR1, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_pdsch_256QAM_FR1 }, { &hf_nr_rrc_pdsch_RE_MappingFR1_PerSymbol, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_pdsch_RE_MappingFR1_PerSymbol }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_Phy_ParametersFR1_eag_1 }, @@ -80196,7 +81544,7 @@ dissect_nr_rrc_Phy_ParametersFR2_eag_2(tvbuff_t *tvb _U_, int offset _U_, asn1_c static const per_sequence_t Phy_ParametersFR2_sequence[] = { - { &hf_nr_rrc_dummy_12 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy_08 }, + { &hf_nr_rrc_dummy_13 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy_08 }, { &hf_nr_rrc_pdsch_RE_MappingFR2_PerSymbol, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_pdsch_RE_MappingFR2_PerSymbol }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_Phy_ParametersFR2_eag_1 }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_Phy_ParametersFR2_eag_2 }, @@ -80664,9 +82012,9 @@ dissect_nr_rrc_T_rateMatchingLTE_CRS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx static const per_sequence_t T_fr1_sequence[] = { - { &hf_nr_rrc_scs_15kHz_12 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_10 }, - { &hf_nr_rrc_scs_30kHz_12 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_10 }, - { &hf_nr_rrc_scs_60kHz_15 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_10 }, + { &hf_nr_rrc_scs_15kHz_08 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_10 }, + { &hf_nr_rrc_scs_30kHz_08 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_10 }, + { &hf_nr_rrc_scs_60kHz_11 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_10 }, { NULL, 0, 0, NULL } }; @@ -80680,8 +82028,8 @@ dissect_nr_rrc_T_fr1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr static const per_sequence_t T_fr2_sequence[] = { - { &hf_nr_rrc_scs_60kHz_16 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_3 }, - { &hf_nr_rrc_scs_120kHz_13, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_3 }, + { &hf_nr_rrc_scs_60kHz_12 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_3 }, + { &hf_nr_rrc_scs_120kHz_09, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_3 }, { NULL, 0, 0, NULL } }; @@ -80717,9 +82065,9 @@ dissect_nr_rrc_T_channelBWs_DL(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac static const per_sequence_t T_fr1_01_sequence[] = { - { &hf_nr_rrc_scs_15kHz_12 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_10 }, - { &hf_nr_rrc_scs_30kHz_12 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_10 }, - { &hf_nr_rrc_scs_60kHz_15 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_10 }, + { &hf_nr_rrc_scs_15kHz_08 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_10 }, + { &hf_nr_rrc_scs_30kHz_08 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_10 }, + { &hf_nr_rrc_scs_60kHz_11 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_10 }, { NULL, 0, 0, NULL } }; @@ -80733,8 +82081,8 @@ dissect_nr_rrc_T_fr1_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static const per_sequence_t T_fr2_01_sequence[] = { - { &hf_nr_rrc_scs_60kHz_16 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_3 }, - { &hf_nr_rrc_scs_120kHz_13, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_3 }, + { &hf_nr_rrc_scs_60kHz_12 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_3 }, + { &hf_nr_rrc_scs_120kHz_09, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_3 }, { NULL, 0, 0, NULL } }; @@ -80884,9 +82232,9 @@ dissect_nr_rrc_BandNR_eag_3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static const per_sequence_t T_fr1_02_sequence[] = { - { &hf_nr_rrc_scs_15kHz_13 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, - { &hf_nr_rrc_scs_30kHz_13 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, - { &hf_nr_rrc_scs_60kHz_17 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, + { &hf_nr_rrc_scs_15kHz_09 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, + { &hf_nr_rrc_scs_30kHz_09 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, + { &hf_nr_rrc_scs_60kHz_13 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, { NULL, 0, 0, NULL } }; @@ -80900,8 +82248,8 @@ dissect_nr_rrc_T_fr1_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static const per_sequence_t T_fr2_02_sequence[] = { - { &hf_nr_rrc_scs_60kHz_18 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_8 }, - { &hf_nr_rrc_scs_120kHz_14, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_8 }, + { &hf_nr_rrc_scs_60kHz_14 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_8 }, + { &hf_nr_rrc_scs_120kHz_10, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_8 }, { NULL, 0, 0, NULL } }; @@ -80937,9 +82285,9 @@ dissect_nr_rrc_T_channelBWs_DL_v1590(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx static const per_sequence_t T_fr1_03_sequence[] = { - { &hf_nr_rrc_scs_15kHz_13 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, - { &hf_nr_rrc_scs_30kHz_13 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, - { &hf_nr_rrc_scs_60kHz_17 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, + { &hf_nr_rrc_scs_15kHz_09 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, + { &hf_nr_rrc_scs_30kHz_09 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, + { &hf_nr_rrc_scs_60kHz_13 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, { NULL, 0, 0, NULL } }; @@ -80953,8 +82301,8 @@ dissect_nr_rrc_T_fr1_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static const per_sequence_t T_fr2_03_sequence[] = { - { &hf_nr_rrc_scs_60kHz_18 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_8 }, - { &hf_nr_rrc_scs_120kHz_14, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_8 }, + { &hf_nr_rrc_scs_60kHz_14 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_8 }, + { &hf_nr_rrc_scs_120kHz_10, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_8 }, { NULL, 0, 0, NULL } }; @@ -81136,14 +82484,14 @@ dissect_nr_rrc_T_sib1_Acquisition_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ct } -static const value_string nr_rrc_T_extendedRAR_Window_r16_vals[] = { +static const value_string nr_rrc_T_extRA_ResponseWindow_r16_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_extendedRAR_Window_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_extRA_ResponseWindow_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -81640,7 +82988,7 @@ static const per_sequence_t SharedSpectrumChAccessParamsPerBand_r16_sequence[] = { &hf_nr_rrc_ssb_RLM_DynamicChAccess_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_ssb_RLM_DynamicChAccess_r16 }, { &hf_nr_rrc_ssb_RLM_Semi_StaticChAccess_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_ssb_RLM_Semi_StaticChAccess_r16 }, { &hf_nr_rrc_sib1_Acquisition_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_sib1_Acquisition_r16 }, - { &hf_nr_rrc_extendedRAR_Window_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_extendedRAR_Window_r16 }, + { &hf_nr_rrc_extRA_ResponseWindow_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_extRA_ResponseWindow_r16 }, { &hf_nr_rrc_ssb_BFD_CBD_dynamicChannelAccess_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_ssb_BFD_CBD_dynamicChannelAccess_r16 }, { &hf_nr_rrc_ssb_BFD_CBD_semi_staticChannelAccess_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_ssb_BFD_CBD_semi_staticChannelAccess_r16 }, { &hf_nr_rrc_csi_RS_BFD_CBD_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_csi_RS_BFD_CBD_r16 }, @@ -81895,14 +83243,14 @@ dissect_nr_rrc_T_simulSRS_MIMO_TransWithinBand_r16(tvbuff_t *tvb _U_, int offset } -static const value_string nr_rrc_T_scs_15kHz_09_vals[] = { +static const value_string nr_rrc_T_scs_15kHz_05_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_scs_15kHz_09(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_15kHz_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -81910,14 +83258,14 @@ dissect_nr_rrc_T_scs_15kHz_09(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_30kHz_09_vals[] = { +static const value_string nr_rrc_T_scs_30kHz_05_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_scs_30kHz_09(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_30kHz_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -81925,14 +83273,14 @@ dissect_nr_rrc_T_scs_30kHz_09(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_60kHz_12_vals[] = { +static const value_string nr_rrc_T_scs_60kHz_08_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_scs_60kHz_12(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_60kHz_08(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -81941,9 +83289,9 @@ dissect_nr_rrc_T_scs_60kHz_12(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act static const per_sequence_t T_fr1_100mhz_sequence[] = { - { &hf_nr_rrc_scs_15kHz_14 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_15kHz_09 }, - { &hf_nr_rrc_scs_30kHz_14 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_30kHz_09 }, - { &hf_nr_rrc_scs_60kHz_19 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_12 }, + { &hf_nr_rrc_scs_15kHz_10 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_15kHz_05 }, + { &hf_nr_rrc_scs_30kHz_10 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_30kHz_05 }, + { &hf_nr_rrc_scs_60kHz_15 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_08 }, { NULL, 0, 0, NULL } }; @@ -81956,14 +83304,14 @@ dissect_nr_rrc_T_fr1_100mhz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } -static const value_string nr_rrc_T_scs_60kHz_13_vals[] = { +static const value_string nr_rrc_T_scs_60kHz_09_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_scs_60kHz_13(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_60kHz_09(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -81971,14 +83319,14 @@ dissect_nr_rrc_T_scs_60kHz_13(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_120kHz_11_vals[] = { +static const value_string nr_rrc_T_scs_120kHz_07_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_scs_120kHz_11(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_120kHz_07(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -81987,8 +83335,8 @@ dissect_nr_rrc_T_scs_120kHz_11(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac static const per_sequence_t T_fr2_200mhz_sequence[] = { - { &hf_nr_rrc_scs_60kHz_20 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_13 }, - { &hf_nr_rrc_scs_120kHz_15, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_11 }, + { &hf_nr_rrc_scs_60kHz_16 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_09 }, + { &hf_nr_rrc_scs_120kHz_11, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_07 }, { NULL, 0, 0, NULL } }; @@ -82023,14 +83371,14 @@ dissect_nr_rrc_T_channelBW_DL_IAB_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ct } -static const value_string nr_rrc_T_scs_15kHz_10_vals[] = { +static const value_string nr_rrc_T_scs_15kHz_06_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_scs_15kHz_10(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_15kHz_06(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -82038,14 +83386,14 @@ dissect_nr_rrc_T_scs_15kHz_10(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_30kHz_10_vals[] = { +static const value_string nr_rrc_T_scs_30kHz_06_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_scs_30kHz_10(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_30kHz_06(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -82053,14 +83401,14 @@ dissect_nr_rrc_T_scs_30kHz_10(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_60kHz_14_vals[] = { +static const value_string nr_rrc_T_scs_60kHz_10_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_scs_60kHz_14(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_60kHz_10(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -82069,9 +83417,9 @@ dissect_nr_rrc_T_scs_60kHz_14(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act static const per_sequence_t T_fr1_100mhz_01_sequence[] = { - { &hf_nr_rrc_scs_15kHz_15 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_15kHz_10 }, - { &hf_nr_rrc_scs_30kHz_15 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_30kHz_10 }, - { &hf_nr_rrc_scs_60kHz_21 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_14 }, + { &hf_nr_rrc_scs_15kHz_11 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_15kHz_06 }, + { &hf_nr_rrc_scs_30kHz_11 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_30kHz_06 }, + { &hf_nr_rrc_scs_60kHz_17 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_10 }, { NULL, 0, 0, NULL } }; @@ -82084,14 +83432,14 @@ dissect_nr_rrc_T_fr1_100mhz_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac } -static const value_string nr_rrc_T_scs_60kHz_15_vals[] = { +static const value_string nr_rrc_T_scs_60kHz_11_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_scs_60kHz_15(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_60kHz_11(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -82099,14 +83447,14 @@ dissect_nr_rrc_T_scs_60kHz_15(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string nr_rrc_T_scs_120kHz_12_vals[] = { +static const value_string nr_rrc_T_scs_120kHz_08_vals[] = { { 0, "supported" }, { 0, NULL } }; static int -dissect_nr_rrc_T_scs_120kHz_12(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_scs_120kHz_08(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, FALSE, 0, NULL); @@ -82115,8 +83463,8 @@ dissect_nr_rrc_T_scs_120kHz_12(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac static const per_sequence_t T_fr2_200mhz_01_sequence[] = { - { &hf_nr_rrc_scs_60kHz_22 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_15 }, - { &hf_nr_rrc_scs_120kHz_16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_12 }, + { &hf_nr_rrc_scs_60kHz_18 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_60kHz_11 }, + { &hf_nr_rrc_scs_120kHz_12, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_120kHz_08 }, { NULL, 0, 0, NULL } }; @@ -82444,6 +83792,65 @@ dissect_nr_rrc_BandNR_eag_6(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } +static const value_string nr_rrc_T_dl_ReceptionIntraCellGuardband_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_dl_ReceptionIntraCellGuardband_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_dl_ReceptionLBT_subsetRB_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_dl_ReceptionLBT_subsetRB_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t SharedSpectrumChAccessParamsPerBand_v1630_sequence[] = { + { &hf_nr_rrc_dl_ReceptionIntraCellGuardband_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dl_ReceptionIntraCellGuardband_r16 }, + { &hf_nr_rrc_dl_ReceptionLBT_subsetRB_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dl_ReceptionLBT_subsetRB_r16 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_SharedSpectrumChAccessParamsPerBand_v1630(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_SharedSpectrumChAccessParamsPerBand_v1630, SharedSpectrumChAccessParamsPerBand_v1630_sequence); + + return offset; +} + + +static const per_sequence_t BandNR_eag_7_sequence[] = { + { &hf_nr_rrc_simulTX_SRS_AntSwitchingIntraBandUL_CA_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SimulSRS_ForAntennaSwitching_r16 }, + { &hf_nr_rrc_sharedSpectrumChAccessParamsPerBand_v1630, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SharedSpectrumChAccessParamsPerBand_v1630 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_BandNR_eag_7(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence_eag(tvb, offset, actx, tree, BandNR_eag_7_sequence); + + return offset; +} + + static const per_sequence_t BandNR_sequence[] = { { &hf_nr_rrc_bandNR , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_FreqBandIndicatorNR }, { &hf_nr_rrc_modifiedMPR_Behaviour, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_8 }, @@ -82466,6 +83873,7 @@ static const per_sequence_t BandNR_sequence[] = { { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_BandNR_eag_4 }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_BandNR_eag_5 }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_BandNR_eag_6 }, + { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_BandNR_eag_7 }, { NULL, 0, 0, NULL } }; @@ -82562,6 +83970,21 @@ dissect_nr_rrc_RF_Parameters_eag_4(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } +static const per_sequence_t RF_Parameters_eag_5_sequence[] = { + { &hf_nr_rrc_supportedBandCombinationList_v1630, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BandCombinationList_v1630 }, + { &hf_nr_rrc_supportedBandCombinationListSidelinkEUTRA_NR_v1630, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BandCombinationListSidelinkEUTRA_NR_v1630 }, + { &hf_nr_rrc_supportedBandCombinationList_UplinkTxSwitch_v1630, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BandCombinationList_UplinkTxSwitch_v1630 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_RF_Parameters_eag_5(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence_eag(tvb, offset, actx, tree, RF_Parameters_eag_5_sequence); + + return offset; +} + + static const per_sequence_t RF_Parameters_sequence[] = { { &hf_nr_rrc_supportedBandListNR, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_SEQUENCE_SIZE_1_maxBands_OF_BandNR }, { &hf_nr_rrc_supportedBandCombinationList, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_BandCombinationList }, @@ -82570,6 +83993,7 @@ static const per_sequence_t RF_Parameters_sequence[] = { { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_RF_Parameters_eag_2 }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_RF_Parameters_eag_3 }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_RF_Parameters_eag_4 }, + { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_RF_Parameters_eag_5 }, { NULL, 0, 0, NULL } }; @@ -82723,6 +84147,21 @@ dissect_nr_rrc_RF_ParametersMRDC_eag_8(tvbuff_t *tvb _U_, int offset _U_, asn1_c } +static const per_sequence_t RF_ParametersMRDC_eag_9_sequence[] = { + { &hf_nr_rrc_supportedBandCombinationList_v1630, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BandCombinationList_v1630 }, + { &hf_nr_rrc_supportedBandCombinationListNEDC_Only_v1630, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BandCombinationList_v1630 }, + { &hf_nr_rrc_supportedBandCombinationList_UplinkTxSwitch_v1630, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BandCombinationList_UplinkTxSwitch_v1630 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_RF_ParametersMRDC_eag_9(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence_eag(tvb, offset, actx, tree, RF_ParametersMRDC_eag_9_sequence); + + return offset; +} + + static const per_sequence_t RF_ParametersMRDC_sequence[] = { { &hf_nr_rrc_supportedBandCombinationList, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_BandCombinationList }, { &hf_nr_rrc_appliedFreqBandListFilter, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_FreqBandList }, @@ -82734,6 +84173,7 @@ static const per_sequence_t RF_ParametersMRDC_sequence[] = { { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_RF_ParametersMRDC_eag_6 }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_RF_ParametersMRDC_eag_7 }, { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_RF_ParametersMRDC_eag_8 }, + { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_RF_ParametersMRDC_eag_9 }, { NULL, 0, 0, NULL } }; @@ -83126,9 +84566,9 @@ dissect_nr_rrc_T_pscch_RxSidelink_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ct static const per_sequence_t T_fr1_r16_sequence[] = { - { &hf_nr_rrc_scs_15kHz_r16_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, - { &hf_nr_rrc_scs_30kHz_r16_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, - { &hf_nr_rrc_scs_60kHz_r16_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, + { &hf_nr_rrc_scs_15kHz_r16_06, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, + { &hf_nr_rrc_scs_30kHz_r16_06, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, + { &hf_nr_rrc_scs_60kHz_r16_06, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, { NULL, 0, 0, NULL } }; @@ -83142,8 +84582,8 @@ dissect_nr_rrc_T_fr1_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static const per_sequence_t T_fr2_r16_sequence[] = { - { &hf_nr_rrc_scs_60kHz_r16_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, - { &hf_nr_rrc_scs_120kHz_r16_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, + { &hf_nr_rrc_scs_60kHz_r16_06, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, + { &hf_nr_rrc_scs_120kHz_r16_06, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, { NULL, 0, 0, NULL } }; @@ -83227,9 +84667,9 @@ dissect_nr_rrc_T_harq_TxProcessModeOneSidelink_r16(tvbuff_t *tvb _U_, int offset static const per_sequence_t T_fr1_r16_01_sequence[] = { - { &hf_nr_rrc_scs_15kHz_r16_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, - { &hf_nr_rrc_scs_30kHz_r16_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, - { &hf_nr_rrc_scs_60kHz_r16_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, + { &hf_nr_rrc_scs_15kHz_r16_06, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, + { &hf_nr_rrc_scs_30kHz_r16_06, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, + { &hf_nr_rrc_scs_60kHz_r16_06, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, { NULL, 0, 0, NULL } }; @@ -83243,8 +84683,8 @@ dissect_nr_rrc_T_fr1_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static const per_sequence_t T_fr2_r16_01_sequence[] = { - { &hf_nr_rrc_scs_60kHz_r16_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, - { &hf_nr_rrc_scs_120kHz_r16_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, + { &hf_nr_rrc_scs_60kHz_r16_06, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, + { &hf_nr_rrc_scs_120kHz_r16_06, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, { NULL, 0, 0, NULL } }; @@ -83486,6 +84926,176 @@ dissect_nr_rrc_T_enb_sync_Sidelink_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_c } +static const value_string nr_rrc_T_harq_TxProcessModeTwoSidelink_r16_vals[] = { + { 0, "n8" }, + { 1, "n16" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_harq_TxProcessModeTwoSidelink_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 2, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_scs_CP_PatternTxSidelinkModeTwo_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_scs_CP_PatternTxSidelinkModeTwo_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_dl_openLoopPC_Sidelink_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_dl_openLoopPC_Sidelink_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t T_sl_TransmissionMode2_r16_sequence[] = { + { &hf_nr_rrc_harq_TxProcessModeTwoSidelink_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_harq_TxProcessModeTwoSidelink_r16 }, + { &hf_nr_rrc_scs_CP_PatternTxSidelinkModeTwo_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_scs_CP_PatternTxSidelinkModeTwo_r16 }, + { &hf_nr_rrc_dl_openLoopPC_Sidelink_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dl_openLoopPC_Sidelink_r16 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_T_sl_TransmissionMode2_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_T_sl_TransmissionMode2_r16, T_sl_TransmissionMode2_r16_sequence); + + return offset; +} + + +static const value_string nr_rrc_T_cbr_ReportSidelink_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_cbr_ReportSidelink_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_cbr_CR_TimeLimitSidelink_r16_vals[] = { + { 0, "time1" }, + { 1, "time2" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_cbr_CR_TimeLimitSidelink_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 2, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t T_congestionControlSidelink_r16_sequence[] = { + { &hf_nr_rrc_cbr_ReportSidelink_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_cbr_ReportSidelink_r16 }, + { &hf_nr_rrc_cbr_CR_TimeLimitSidelink_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_cbr_CR_TimeLimitSidelink_r16 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_T_congestionControlSidelink_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_T_congestionControlSidelink_r16, T_congestionControlSidelink_r16_sequence); + + return offset; +} + + +static const value_string nr_rrc_T_fewerSymbolSlotSidelink_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_fewerSymbolSlotSidelink_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_sl_openLoopPC_RSRP_ReportSidelink_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_sl_openLoopPC_RSRP_ReportSidelink_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_sl_Rx_256QAM_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_sl_Rx_256QAM_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t BandSidelink_r16_eag_1_sequence[] = { + { &hf_nr_rrc_sl_TransmissionMode2_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_sl_TransmissionMode2_r16 }, + { &hf_nr_rrc_congestionControlSidelink_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_congestionControlSidelink_r16 }, + { &hf_nr_rrc_fewerSymbolSlotSidelink_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_fewerSymbolSlotSidelink_r16 }, + { &hf_nr_rrc_sl_openLoopPC_RSRP_ReportSidelink_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_sl_openLoopPC_RSRP_ReportSidelink_r16 }, + { &hf_nr_rrc_sl_Rx_256QAM_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_sl_Rx_256QAM_r16 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_BandSidelink_r16_eag_1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence_eag(tvb, offset, actx, tree, BandSidelink_r16_eag_1_sequence); + + return offset; +} + + static const per_sequence_t BandSidelink_r16_sequence[] = { { &hf_nr_rrc_freqBandSidelink_r16, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_FreqBandIndicatorNR }, { &hf_nr_rrc_sl_Reception_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_sl_Reception_r16 }, @@ -83495,6 +85105,7 @@ static const per_sequence_t BandSidelink_r16_sequence[] = { { &hf_nr_rrc_psfch_FormatZeroSidelink_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_psfch_FormatZeroSidelink_r16 }, { &hf_nr_rrc_lowSE_64QAM_MCS_TableSidelink_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_lowSE_64QAM_MCS_TableSidelink_r16 }, { &hf_nr_rrc_enb_sync_Sidelink_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_enb_sync_Sidelink_r16 }, + { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_BandSidelink_r16_eag_1 }, { NULL, 0, 0, NULL } }; @@ -83950,7 +85561,7 @@ dissect_nr_rrc_T_nonCriticalExtension_49(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t UE_CapabilityRequestFilterNR_v1540_sequence[] = { { &hf_nr_rrc_srs_SwitchingTimeRequest, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_srs_SwitchingTimeRequest }, - { &hf_nr_rrc_nonCriticalExtension_86, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_49 }, + { &hf_nr_rrc_nonCriticalExtension_88, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_49 }, { NULL, 0, 0, NULL } }; @@ -83965,7 +85576,7 @@ dissect_nr_rrc_UE_CapabilityRequestFilterNR_v1540(tvbuff_t *tvb _U_, int offset static const per_sequence_t UE_CapabilityRequestFilterNR_sequence[] = { { &hf_nr_rrc_frequencyBandListFilter, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_FreqBandList }, - { &hf_nr_rrc_nonCriticalExtension_85, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_CapabilityRequestFilterNR_v1540 }, + { &hf_nr_rrc_nonCriticalExtension_87, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_CapabilityRequestFilterNR_v1540 }, { NULL, 0, 0, NULL } }; @@ -84062,7 +85673,7 @@ static const per_sequence_t UE_MRDC_Capability_v1610_sequence[] = { { &hf_nr_rrc_measAndMobParametersMRDC_v1610, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_MeasAndMobParametersMRDC_v1610 }, { &hf_nr_rrc_generalParametersMRDC_v1610, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_GeneralParametersMRDC_v1610 }, { &hf_nr_rrc_pdcp_ParametersMRDC_v1610, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PDCP_ParametersMRDC_v1610 }, - { &hf_nr_rrc_nonCriticalExtension_89, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_50 }, + { &hf_nr_rrc_nonCriticalExtension_91, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_50 }, { NULL, 0, 0, NULL } }; @@ -84080,7 +85691,7 @@ static const per_sequence_t UE_MRDC_Capability_v1560_sequence[] = { { &hf_nr_rrc_measAndMobParametersMRDC_v1560, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_MeasAndMobParametersMRDC_v1560 }, { &hf_nr_rrc_fdd_Add_UE_MRDC_Capabilities_v1560, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_MRDC_CapabilityAddXDD_Mode_v1560 }, { &hf_nr_rrc_tdd_Add_UE_MRDC_Capabilities_v1560, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_MRDC_CapabilityAddXDD_Mode_v1560 }, - { &hf_nr_rrc_nonCriticalExtension_88, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_MRDC_Capability_v1610 }, + { &hf_nr_rrc_nonCriticalExtension_90, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_MRDC_Capability_v1610 }, { NULL, 0, 0, NULL } }; @@ -84105,7 +85716,7 @@ static const per_sequence_t UE_MRDC_Capability_sequence[] = { { &hf_nr_rrc_featureSetCombinations, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SEQUENCE_SIZE_1_maxFeatureSetCombinations_OF_FeatureSetCombination }, { &hf_nr_rrc_pdcp_ParametersMRDC_v1530, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PDCP_ParametersMRDC }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_87, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_MRDC_Capability_v1560 }, + { &hf_nr_rrc_nonCriticalExtension_89, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_MRDC_Capability_v1560 }, { NULL, 0, 0, NULL } }; @@ -84149,6 +85760,16 @@ dissect_nr_rrc_UE_NR_CapabilityAddFRX_Mode(tvbuff_t *tvb _U_, int offset _U_, as } + +static int +dissect_nr_rrc_T_lateNonCriticalExtension(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_octet_string_containing_pdu_new(tvb, offset, actx, tree, hf_index, + NO_BOUND, NO_BOUND, FALSE, dissect_UE_NR_Capability_v15c0_PDU); + + return offset; +} + + static const per_sequence_t UE_NR_CapabilityAddXDD_Mode_v1530_sequence[] = { { &hf_nr_rrc_eutra_ParametersXDD_Diff, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_EUTRA_ParametersXDD_Diff }, { NULL, 0, 0, NULL } @@ -84472,14 +86093,14 @@ dissect_nr_rrc_T_onDemandSIB_Connected_r16(tvbuff_t *tvb _U_, int offset _U_, as } -static const per_sequence_t T_nonCriticalExtension_51_sequence[] = { +static const per_sequence_t T_nonCriticalExtension_52_sequence[] = { { NULL, 0, 0, NULL } }; static int -dissect_nr_rrc_T_nonCriticalExtension_51(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_nonCriticalExtension_52(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_nr_rrc_T_nonCriticalExtension_51, T_nonCriticalExtension_51_sequence); + ett_nr_rrc_T_nonCriticalExtension_52, T_nonCriticalExtension_52_sequence); return offset; } @@ -84506,7 +86127,7 @@ static const per_sequence_t UE_NR_Capability_v1610_sequence[] = { { &hf_nr_rrc_ue_BasedPerfMeas_Parameters_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_BasedPerfMeas_Parameters_r16 }, { &hf_nr_rrc_son_Parameters_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SON_Parameters_r16 }, { &hf_nr_rrc_onDemandSIB_Connected_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_onDemandSIB_Connected_r16 }, - { &hf_nr_rrc_nonCriticalExtension_96, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_51 }, + { &hf_nr_rrc_nonCriticalExtension_99, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_52 }, { NULL, 0, 0, NULL } }; @@ -84521,7 +86142,7 @@ dissect_nr_rrc_UE_NR_Capability_v1610(tvbuff_t *tvb _U_, int offset _U_, asn1_ct static const per_sequence_t UE_NR_Capability_v1570_sequence[] = { { &hf_nr_rrc_nrdc_Parameters_v1570, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_NRDC_Parameters_v1570 }, - { &hf_nr_rrc_nonCriticalExtension_95, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_NR_Capability_v1610 }, + { &hf_nr_rrc_nonCriticalExtension_97, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_NR_Capability_v1610 }, { NULL, 0, 0, NULL } }; @@ -84537,7 +86158,7 @@ dissect_nr_rrc_UE_NR_Capability_v1570(tvbuff_t *tvb _U_, int offset _U_, asn1_ct static const per_sequence_t UE_NR_Capability_v1560_sequence[] = { { &hf_nr_rrc_nrdc_Parameters, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_NRDC_Parameters }, { &hf_nr_rrc_receivedFilters_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_receivedFilters_01 }, - { &hf_nr_rrc_nonCriticalExtension_94, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_NR_Capability_v1570 }, + { &hf_nr_rrc_nonCriticalExtension_96, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_NR_Capability_v1570 }, { NULL, 0, 0, NULL } }; @@ -84552,7 +86173,7 @@ dissect_nr_rrc_UE_NR_Capability_v1560(tvbuff_t *tvb _U_, int offset _U_, asn1_ct static const per_sequence_t UE_NR_Capability_v1550_sequence[] = { { &hf_nr_rrc_reducedCP_Latency, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_reducedCP_Latency }, - { &hf_nr_rrc_nonCriticalExtension_93, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_NR_Capability_v1560 }, + { &hf_nr_rrc_nonCriticalExtension_95, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_NR_Capability_v1560 }, { NULL, 0, 0, NULL } }; @@ -84572,7 +86193,7 @@ static const per_sequence_t UE_NR_Capability_v1540_sequence[] = { { &hf_nr_rrc_fr1_Add_UE_NR_Capabilities_v1540, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_NR_CapabilityAddFRX_Mode_v1540 }, { &hf_nr_rrc_fr2_Add_UE_NR_Capabilities_v1540, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_NR_CapabilityAddFRX_Mode_v1540 }, { &hf_nr_rrc_fr1_fr2_Add_UE_NR_Capabilities, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_NR_CapabilityAddFRX_Mode }, - { &hf_nr_rrc_nonCriticalExtension_92, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_NR_Capability_v1550 }, + { &hf_nr_rrc_nonCriticalExtension_94, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_NR_Capability_v1550 }, { NULL, 0, 0, NULL } }; @@ -84588,11 +86209,11 @@ dissect_nr_rrc_UE_NR_Capability_v1540(tvbuff_t *tvb _U_, int offset _U_, asn1_ct static const per_sequence_t UE_NR_Capability_v1530_sequence[] = { { &hf_nr_rrc_fdd_Add_UE_NR_Capabilities_v1530, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_NR_CapabilityAddXDD_Mode_v1530 }, { &hf_nr_rrc_tdd_Add_UE_NR_Capabilities_v1530, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_NR_CapabilityAddXDD_Mode_v1530 }, - { &hf_nr_rrc_dummy_13 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy_09 }, + { &hf_nr_rrc_dummy_14 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_dummy_09 }, { &hf_nr_rrc_interRAT_Parameters, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_InterRAT_Parameters }, { &hf_nr_rrc_inactiveState, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_inactiveState }, { &hf_nr_rrc_delayBudgetReporting, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_delayBudgetReporting }, - { &hf_nr_rrc_nonCriticalExtension_91, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_NR_Capability_v1540 }, + { &hf_nr_rrc_nonCriticalExtension_93, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_NR_Capability_v1540 }, { NULL, 0, 0, NULL } }; @@ -84619,8 +86240,8 @@ static const per_sequence_t UE_NR_Capability_sequence[] = { { &hf_nr_rrc_fr2_Add_UE_NR_Capabilities, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_NR_CapabilityAddFRX_Mode }, { &hf_nr_rrc_featureSets , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_FeatureSets }, { &hf_nr_rrc_featureSetCombinations, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SEQUENCE_SIZE_1_maxFeatureSetCombinations_OF_FeatureSetCombination }, - { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_90, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_NR_Capability_v1530 }, + { &hf_nr_rrc_lateNonCriticalExtension_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_lateNonCriticalExtension }, + { &hf_nr_rrc_nonCriticalExtension_92, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_UE_NR_Capability_v1530 }, { NULL, 0, 0, NULL } }; @@ -84633,6 +86254,50 @@ dissect_nr_rrc_UE_NR_Capability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a } +static const value_string nr_rrc_T_partialFR2_FallbackRX_Req_vals[] = { + { 0, "true" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_partialFR2_FallbackRX_Req(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t T_nonCriticalExtension_51_sequence[] = { + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_T_nonCriticalExtension_51(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_T_nonCriticalExtension_51, T_nonCriticalExtension_51_sequence); + + return offset; +} + + +static const per_sequence_t UE_NR_Capability_v15c0_sequence[] = { + { &hf_nr_rrc_nrdc_Parameters_v15c0, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_NRDC_Parameters_v15c0 }, + { &hf_nr_rrc_partialFR2_FallbackRX_Req, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_partialFR2_FallbackRX_Req }, + { &hf_nr_rrc_nonCriticalExtension_98, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_51 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_UE_NR_Capability_v15c0(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_UE_NR_Capability_v15c0, UE_NR_Capability_v15c0_sequence); + + return offset; +} + + static const per_sequence_t MasterInformationBlockSidelink_sequence[] = { { &hf_nr_rrc_sl_TDD_Config_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BIT_STRING_SIZE_12 }, { &hf_nr_rrc_inCoverage_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BOOLEAN }, @@ -84775,14 +86440,14 @@ dissect_nr_rrc_SL_MeasResults_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } -static const per_sequence_t T_nonCriticalExtension_52_sequence[] = { +static const per_sequence_t T_nonCriticalExtension_53_sequence[] = { { NULL, 0, 0, NULL } }; static int -dissect_nr_rrc_T_nonCriticalExtension_52(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_nonCriticalExtension_53(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_nr_rrc_T_nonCriticalExtension_52, T_nonCriticalExtension_52_sequence); + ett_nr_rrc_T_nonCriticalExtension_53, T_nonCriticalExtension_53_sequence); return offset; } @@ -84791,7 +86456,7 @@ dissect_nr_rrc_T_nonCriticalExtension_52(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t MeasurementReportSidelink_IEs_r16_sequence[] = { { &hf_nr_rrc_sl_measResults_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_SL_MeasResults_r16 }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_97, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_52 }, + { &hf_nr_rrc_nonCriticalExtension_100, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_53 }, { NULL, 0, 0, NULL } }; @@ -85101,7 +86766,7 @@ static const value_string nr_rrc_T_sl_MeasConfig_r16_vals[] = { static const per_choice_t T_sl_MeasConfig_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_126 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SL_MeasConfig_r16 }, + { 1, &hf_nr_rrc_setup_129 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SL_MeasConfig_r16 }, { 0, NULL, 0, NULL } }; @@ -85170,7 +86835,7 @@ static const value_string nr_rrc_T_sl_CSI_RS_Config_r16_vals[] = { static const per_choice_t T_sl_CSI_RS_Config_r16_choice[] = { { 0, &hf_nr_rrc_release , ASN1_NO_EXTENSIONS , dissect_nr_rrc_NULL }, - { 1, &hf_nr_rrc_setup_127 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SL_CSI_RS_Config_r16 }, + { 1, &hf_nr_rrc_setup_130 , ASN1_NO_EXTENSIONS , dissect_nr_rrc_SL_CSI_RS_Config_r16 }, { 0, NULL, 0, NULL } }; @@ -85209,14 +86874,14 @@ dissect_nr_rrc_INTEGER_3_160(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } -static const per_sequence_t T_nonCriticalExtension_53_sequence[] = { +static const per_sequence_t T_nonCriticalExtension_54_sequence[] = { { NULL, 0, 0, NULL } }; static int -dissect_nr_rrc_T_nonCriticalExtension_53(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_nonCriticalExtension_54(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_nr_rrc_T_nonCriticalExtension_53, T_nonCriticalExtension_53_sequence); + ett_nr_rrc_T_nonCriticalExtension_54, T_nonCriticalExtension_54_sequence); return offset; } @@ -85230,7 +86895,7 @@ static const per_sequence_t RRCReconfigurationSidelink_IEs_r16_sequence[] = { { &hf_nr_rrc_sl_ResetConfig_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_sl_ResetConfig_r16 }, { &hf_nr_rrc_sl_LatencyBoundCSI_Report_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_INTEGER_3_160 }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_98, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_53 }, + { &hf_nr_rrc_nonCriticalExtension_101, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_54 }, { NULL, 0, 0, NULL } }; @@ -85295,14 +86960,14 @@ dissect_nr_rrc_RRCReconfigurationSidelink(tvbuff_t *tvb _U_, int offset _U_, asn } -static const per_sequence_t T_nonCriticalExtension_54_sequence[] = { +static const per_sequence_t T_nonCriticalExtension_55_sequence[] = { { NULL, 0, 0, NULL } }; static int -dissect_nr_rrc_T_nonCriticalExtension_54(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_nonCriticalExtension_55(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_nr_rrc_T_nonCriticalExtension_54, T_nonCriticalExtension_54_sequence); + ett_nr_rrc_T_nonCriticalExtension_55, T_nonCriticalExtension_55_sequence); return offset; } @@ -85310,7 +86975,7 @@ dissect_nr_rrc_T_nonCriticalExtension_54(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t RRCReconfigurationCompleteSidelink_IEs_r16_sequence[] = { { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_99, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_54 }, + { &hf_nr_rrc_nonCriticalExtension_102, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_55 }, { NULL, 0, 0, NULL } }; @@ -85375,14 +87040,14 @@ dissect_nr_rrc_RRCReconfigurationCompleteSidelink(tvbuff_t *tvb _U_, int offset } -static const per_sequence_t T_nonCriticalExtension_55_sequence[] = { +static const per_sequence_t T_nonCriticalExtension_56_sequence[] = { { NULL, 0, 0, NULL } }; static int -dissect_nr_rrc_T_nonCriticalExtension_55(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_nonCriticalExtension_56(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_nr_rrc_T_nonCriticalExtension_55, T_nonCriticalExtension_55_sequence); + ett_nr_rrc_T_nonCriticalExtension_56, T_nonCriticalExtension_56_sequence); return offset; } @@ -85390,7 +87055,7 @@ dissect_nr_rrc_T_nonCriticalExtension_55(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t RRCReconfigurationFailureSidelink_IEs_r16_sequence[] = { { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_100, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_55 }, + { &hf_nr_rrc_nonCriticalExtension_103, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_56 }, { NULL, 0, 0, NULL } }; @@ -85455,14 +87120,14 @@ dissect_nr_rrc_RRCReconfigurationFailureSidelink(tvbuff_t *tvb _U_, int offset _ } -static const per_sequence_t T_nonCriticalExtension_56_sequence[] = { +static const per_sequence_t T_nonCriticalExtension_57_sequence[] = { { NULL, 0, 0, NULL } }; static int -dissect_nr_rrc_T_nonCriticalExtension_56(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_nonCriticalExtension_57(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_nr_rrc_T_nonCriticalExtension_56, T_nonCriticalExtension_56_sequence); + ett_nr_rrc_T_nonCriticalExtension_57, T_nonCriticalExtension_57_sequence); return offset; } @@ -85472,7 +87137,7 @@ static const per_sequence_t UECapabilityEnquirySidelink_IEs_r16_sequence[] = { { &hf_nr_rrc_frequencyBandListFilterSidelink_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_FreqBandList }, { &hf_nr_rrc_ue_CapabilityInformationSidelink_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_101, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_56 }, + { &hf_nr_rrc_nonCriticalExtension_104, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_57 }, { NULL, 0, 0, NULL } }; @@ -85588,51 +87253,6 @@ dissect_nr_rrc_PDCP_ParametersSidelink_r16(tvbuff_t *tvb _U_, int offset _U_, as } -static const value_string nr_rrc_T_am_WithLongSN_Sidelink_r16_01_vals[] = { - { 0, "supported" }, - { 0, NULL } -}; - - -static int -dissect_nr_rrc_T_am_WithLongSN_Sidelink_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, - 1, NULL, FALSE, 0, NULL); - - return offset; -} - - -static const value_string nr_rrc_T_um_WithLongSN_Sidelink_r16_01_vals[] = { - { 0, "supported" }, - { 0, NULL } -}; - - -static int -dissect_nr_rrc_T_um_WithLongSN_Sidelink_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, - 1, NULL, FALSE, 0, NULL); - - return offset; -} - - -static const per_sequence_t PC5_RLC_ParametersSidelink_r16_sequence[] = { - { &hf_nr_rrc_am_WithLongSN_Sidelink_r16_01, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_am_WithLongSN_Sidelink_r16_01 }, - { &hf_nr_rrc_um_WithLongSN_Sidelink_r16_01, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_um_WithLongSN_Sidelink_r16_01 }, - { NULL, 0, 0, NULL } -}; - -static int -dissect_nr_rrc_PC5_RLC_ParametersSidelink_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_nr_rrc_PC5_RLC_ParametersSidelink_r16, PC5_RLC_ParametersSidelink_r16_sequence); - - return offset; -} - - static const per_sequence_t BandCombinationParametersSidelinkNR_r16_sequence_of[1] = { { &hf_nr_rrc_BandCombinationParametersSidelinkNR_r16_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BandParametersSidelink_r16 }, }; @@ -85696,9 +87316,9 @@ dissect_nr_rrc_T_pscch_RxSidelink_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t T_fr1_r16_02_sequence[] = { - { &hf_nr_rrc_scs_15kHz_r16_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, - { &hf_nr_rrc_scs_30kHz_r16_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, - { &hf_nr_rrc_scs_60kHz_r16_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, + { &hf_nr_rrc_scs_15kHz_r16_06, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, + { &hf_nr_rrc_scs_30kHz_r16_06, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, + { &hf_nr_rrc_scs_60kHz_r16_06, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, { NULL, 0, 0, NULL } }; @@ -85712,8 +87332,8 @@ dissect_nr_rrc_T_fr1_r16_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static const per_sequence_t T_fr2_r16_02_sequence[] = { - { &hf_nr_rrc_scs_60kHz_r16_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, - { &hf_nr_rrc_scs_120kHz_r16_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, + { &hf_nr_rrc_scs_60kHz_r16_06, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, + { &hf_nr_rrc_scs_120kHz_r16_06, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BIT_STRING_SIZE_16 }, { NULL, 0, 0, NULL } }; @@ -85810,45 +87430,137 @@ dissect_nr_rrc_T_lowSE_64QAM_MCS_TableSidelink_r16_01(tvbuff_t *tvb _U_, int off } -static const per_sequence_t PC5_BandSidelink_r16_sequence[] = { +static const value_string nr_rrc_T_csi_RS_PortsSidelink_r16_vals[] = { + { 0, "p1" }, + { 1, "p2" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_csi_RS_PortsSidelink_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 2, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t T_csi_ReportSidelink_r16_sequence[] = { + { &hf_nr_rrc_csi_RS_PortsSidelink_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_csi_RS_PortsSidelink_r16 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_T_csi_ReportSidelink_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_nr_rrc_T_csi_ReportSidelink_r16, T_csi_ReportSidelink_r16_sequence); + + return offset; +} + + +static const value_string nr_rrc_T_rankTwoReception_r16_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_rankTwoReception_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_sl_openLoopPC_RSRP_ReportSidelink_r16_01_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_sl_openLoopPC_RSRP_ReportSidelink_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string nr_rrc_T_sl_Rx_256QAM_r16_01_vals[] = { + { 0, "supported" }, + { 0, NULL } +}; + + +static int +dissect_nr_rrc_T_sl_Rx_256QAM_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t BandSidelinkPC5_r16_eag_1_sequence[] = { + { &hf_nr_rrc_csi_ReportSidelink_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_csi_ReportSidelink_r16 }, + { &hf_nr_rrc_rankTwoReception_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_rankTwoReception_r16 }, + { &hf_nr_rrc_sl_openLoopPC_RSRP_ReportSidelink_r16_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_sl_openLoopPC_RSRP_ReportSidelink_r16_01 }, + { &hf_nr_rrc_sl_Rx_256QAM_r16_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_sl_Rx_256QAM_r16_01 }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_nr_rrc_BandSidelinkPC5_r16_eag_1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence_eag(tvb, offset, actx, tree, BandSidelinkPC5_r16_eag_1_sequence); + + return offset; +} + + +static const per_sequence_t BandSidelinkPC5_r16_sequence[] = { { &hf_nr_rrc_freqBandSidelink_r16, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_FreqBandIndicatorNR }, { &hf_nr_rrc_sl_Reception_r16_01, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_sl_Reception_r16_01 }, { &hf_nr_rrc_sl_Tx_256QAM_r16_01, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_sl_Tx_256QAM_r16_01 }, { &hf_nr_rrc_lowSE_64QAM_MCS_TableSidelink_r16_01, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_lowSE_64QAM_MCS_TableSidelink_r16_01 }, + { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_BandSidelinkPC5_r16_eag_1 }, { NULL, 0, 0, NULL } }; static int -dissect_nr_rrc_PC5_BandSidelink_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_BandSidelinkPC5_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_nr_rrc_PC5_BandSidelink_r16, PC5_BandSidelink_r16_sequence); + ett_nr_rrc_BandSidelinkPC5_r16, BandSidelinkPC5_r16_sequence); return offset; } -static const per_sequence_t SEQUENCE_SIZE_1_maxBands_OF_PC5_BandSidelink_r16_sequence_of[1] = { - { &hf_nr_rrc_supportedBandListSidelink_r16_item_01, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_PC5_BandSidelink_r16 }, +static const per_sequence_t SEQUENCE_SIZE_1_maxBands_OF_BandSidelinkPC5_r16_sequence_of[1] = { + { &hf_nr_rrc_supportedBandListSidelink_r16_item_01, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BandSidelinkPC5_r16 }, }; static int -dissect_nr_rrc_SEQUENCE_SIZE_1_maxBands_OF_PC5_BandSidelink_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_SEQUENCE_SIZE_1_maxBands_OF_BandSidelinkPC5_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, - ett_nr_rrc_SEQUENCE_SIZE_1_maxBands_OF_PC5_BandSidelink_r16, SEQUENCE_SIZE_1_maxBands_OF_PC5_BandSidelink_r16_sequence_of, + ett_nr_rrc_SEQUENCE_SIZE_1_maxBands_OF_BandSidelinkPC5_r16, SEQUENCE_SIZE_1_maxBands_OF_BandSidelinkPC5_r16_sequence_of, 1, maxBands, FALSE); return offset; } -static const per_sequence_t T_nonCriticalExtension_57_sequence[] = { +static const per_sequence_t T_nonCriticalExtension_58_sequence[] = { { NULL, 0, 0, NULL } }; static int -dissect_nr_rrc_T_nonCriticalExtension_57(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_nr_rrc_T_nonCriticalExtension_58(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_nr_rrc_T_nonCriticalExtension_57, T_nonCriticalExtension_57_sequence); + ett_nr_rrc_T_nonCriticalExtension_58, T_nonCriticalExtension_58_sequence); return offset; } @@ -85857,12 +87569,12 @@ dissect_nr_rrc_T_nonCriticalExtension_57(tvbuff_t *tvb _U_, int offset _U_, asn1 static const per_sequence_t UECapabilityInformationSidelink_IEs_r16_sequence[] = { { &hf_nr_rrc_accessStratumReleaseSidelink_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_AccessStratumReleaseSidelink_r16 }, { &hf_nr_rrc_pdcp_ParametersSidelink_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PDCP_ParametersSidelink_r16 }, - { &hf_nr_rrc_rlc_ParametersSidelink_r16_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_PC5_RLC_ParametersSidelink_r16 }, + { &hf_nr_rrc_rlc_ParametersSidelink_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_RLC_ParametersSidelink_r16 }, { &hf_nr_rrc_supportedBandCombinationListSidelinkNR_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BandCombinationListSidelinkNR_r16 }, - { &hf_nr_rrc_supportedBandListSidelink_r16_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SEQUENCE_SIZE_1_maxBands_OF_PC5_BandSidelink_r16 }, + { &hf_nr_rrc_supportedBandListSidelink_r16_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SEQUENCE_SIZE_1_maxBands_OF_BandSidelinkPC5_r16 }, { &hf_nr_rrc_appliedFreqBandListFilter_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_FreqBandList }, { &hf_nr_rrc_lateNonCriticalExtension, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_OCTET_STRING }, - { &hf_nr_rrc_nonCriticalExtension_102, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_57 }, + { &hf_nr_rrc_nonCriticalExtension_105, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_nonCriticalExtension_58 }, { NULL, 0, 0, NULL } }; @@ -86770,10 +88482,20 @@ static int dissect_UECapabilityEnquiry_v1560_IEs_PDU(tvbuff_t *tvb _U_, packet_i offset += 7; offset >>= 3; return offset; } +static int dissect_UE_NR_Capability_v15c0_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); + proto_item_set_hidden(prot_ti); + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); + offset = dissect_nr_rrc_UE_NR_Capability_v15c0(tvb, offset, &asn1_ctx, tree, hf_nr_rrc_UE_NR_Capability_v15c0_PDU); + offset += 7; offset >>= 3; + return offset; +} /*--- End of included file: packet-nr-rrc-fn.c ---*/ -#line 519 "./asn1/nr-rrc/packet-nr-rrc-template.c" +#line 521 "./asn1/nr-rrc/packet-nr-rrc-template.c" int dissect_nr_rrc_nr_RLF_Report_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { @@ -87108,6 +88830,10 @@ proto_register_nr_rrc(void) { { "UECapabilityEnquiry-v1560-IEs", "nr-rrc.UECapabilityEnquiry_v1560_IEs_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nr_rrc_UE_NR_Capability_v15c0_PDU, + { "UE-NR-Capability-v15c0", "nr-rrc.UE_NR_Capability_v15c0_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_nr_rrc_criticalExtensions, { "criticalExtensions", "nr-rrc.criticalExtensions", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_criticalExtensions_vals), 0, @@ -87463,6 +89189,14 @@ proto_register_nr_rrc(void) { { &hf_nr_rrc_nonCriticalExtension_07, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, + "CG_Config_v1630_IEs", HFILL }}, + { &hf_nr_rrc_selectedToffset_r16, + { "selectedToffset-r16", "nr-rrc.selectedToffset_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_Offset_r16_vals), 0, + "T_Offset_r16", HFILL }}, + { &hf_nr_rrc_nonCriticalExtension_08, + { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", + FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_02", HFILL }}, { &hf_nr_rrc_PH_TypeListSCG_item, { "PH-InfoSCG", "nr-rrc.PH_InfoSCG_element", @@ -87620,7 +89354,7 @@ proto_register_nr_rrc(void) { { "mrdc-AssistanceInfo", "nr-rrc.mrdc_AssistanceInfo_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_08, + { &hf_nr_rrc_nonCriticalExtension_09, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "CG_ConfigInfo_v1540_IEs", HFILL }}, @@ -87636,7 +89370,7 @@ proto_register_nr_rrc(void) { { "cgi-Info", "nr-rrc.cgi_Info_element", FT_NONE, BASE_NONE, NULL, 0, "CGI_InfoNR", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_09, + { &hf_nr_rrc_nonCriticalExtension_10, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "CG_ConfigInfo_v1560_IEs", HFILL }}, @@ -87684,7 +89418,7 @@ proto_register_nr_rrc(void) { { "fr-InfoListMCG", "nr-rrc.fr_InfoListMCG", FT_UINT32, BASE_DEC, NULL, 0, "FR_InfoList", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_10, + { &hf_nr_rrc_nonCriticalExtension_11, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "CG_ConfigInfo_v1570_IEs", HFILL }}, @@ -87696,7 +89430,7 @@ proto_register_nr_rrc(void) { { "sftdFrequencyList-EUTRA", "nr-rrc.sftdFrequencyList_EUTRA", FT_UINT32, BASE_DEC, NULL, 0, "SFTD_FrequencyList_EUTRA", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_11, + { &hf_nr_rrc_nonCriticalExtension_12, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "CG_ConfigInfo_v1590_IEs", HFILL }}, @@ -87708,7 +89442,7 @@ proto_register_nr_rrc(void) { { "ARFCN-ValueNR", "nr-rrc.ARFCN_ValueNR", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_12, + { &hf_nr_rrc_nonCriticalExtension_13, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "CG_ConfigInfo_v1610_IEs", HFILL }}, @@ -87752,7 +89486,7 @@ proto_register_nr_rrc(void) { { "sidelinkUEInformationEUTRA-r16", "nr-rrc.sidelinkUEInformationEUTRA_r16", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_13, + { &hf_nr_rrc_nonCriticalExtension_14, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "CG_ConfigInfo_v1620_IEs", HFILL }}, @@ -87760,7 +89494,7 @@ proto_register_nr_rrc(void) { { "ueAssistanceInformationSourceSCG-r16", "nr-rrc.ueAssistanceInformationSourceSCG_r16", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_14, + { &hf_nr_rrc_nonCriticalExtension_15, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_03", HFILL }}, @@ -88136,7 +89870,7 @@ proto_register_nr_rrc(void) { { "measTiming", "nr-rrc.measTiming", FT_UINT32, BASE_DEC, NULL, 0, "MeasTimingList", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_15, + { &hf_nr_rrc_nonCriticalExtension_16, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "MeasurementTimingConfiguration_v1550_IEs", HFILL }}, @@ -88148,7 +89882,7 @@ proto_register_nr_rrc(void) { { "psCellOnlyOnFirstSSB", "nr-rrc.psCellOnlyOnFirstSSB", FT_BOOLEAN, BASE_NONE, NULL, 0, "BOOLEAN", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_16, + { &hf_nr_rrc_nonCriticalExtension_17, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "MeasurementTimingConfiguration_v1610_IEs", HFILL }}, @@ -88168,7 +89902,7 @@ proto_register_nr_rrc(void) { { "refSSBFreq-r16", "nr-rrc.refSSBFreq_r16", FT_UINT32, BASE_DEC, NULL, 0, "ARFCN_ValueNR", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_17, + { &hf_nr_rrc_nonCriticalExtension_18, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_04", HFILL }}, @@ -88244,7 +89978,7 @@ proto_register_nr_rrc(void) { { "FreqBandIndicatorNR", "nr-rrc.FreqBandIndicatorNR", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_18, + { &hf_nr_rrc_nonCriticalExtension_19, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_05", HFILL }}, @@ -88268,7 +90002,7 @@ proto_register_nr_rrc(void) { { "ue-RadioAccessCapabilityInfo", "nr-rrc.ue_RadioAccessCapabilityInfo", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_19, + { &hf_nr_rrc_nonCriticalExtension_20, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_06", HFILL }}, @@ -88592,7 +90326,7 @@ proto_register_nr_rrc(void) { { "lateNonCriticalExtension", "nr-rrc.lateNonCriticalExtension", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_20, + { &hf_nr_rrc_nonCriticalExtension_21, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_07", HFILL }}, @@ -88628,7 +90362,7 @@ proto_register_nr_rrc(void) { { "drb-CountInfoList", "nr-rrc.drb_CountInfoList", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_21, + { &hf_nr_rrc_nonCriticalExtension_22, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_08", HFILL }}, @@ -88676,7 +90410,7 @@ proto_register_nr_rrc(void) { { "PosSIB-ReqInfo-r16", "nr-rrc.PosSIB_ReqInfo_r16_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_22, + { &hf_nr_rrc_nonCriticalExtension_23, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_09", HFILL }}, @@ -88716,7 +90450,7 @@ proto_register_nr_rrc(void) { { "rrc-MessageSegmentType-r16", "nr-rrc.rrc_MessageSegmentType_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_rrc_MessageSegmentType_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_23, + { &hf_nr_rrc_nonCriticalExtension_24, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_10", HFILL }}, @@ -88736,7 +90470,7 @@ proto_register_nr_rrc(void) { { "dedicatedNAS-Message", "nr-rrc.dedicatedNAS_Message", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_24, + { &hf_nr_rrc_nonCriticalExtension_25, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "DLInformationTransfer_v1610_IEs", HFILL }}, @@ -88744,7 +90478,7 @@ proto_register_nr_rrc(void) { { "referenceTimeInfo-r16", "nr-rrc.referenceTimeInfo_r16_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_25, + { &hf_nr_rrc_nonCriticalExtension_26, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_11", HFILL }}, @@ -88772,7 +90506,7 @@ proto_register_nr_rrc(void) { { "dl-DCCH-MessageEUTRA-r16", "nr-rrc.dl_DCCH_MessageEUTRA_r16", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_26, + { &hf_nr_rrc_nonCriticalExtension_27, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_12", HFILL }}, @@ -88792,7 +90526,7 @@ proto_register_nr_rrc(void) { { "failureInfoRLC-Bearer", "nr-rrc.failureInfoRLC_Bearer_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_27, + { &hf_nr_rrc_nonCriticalExtension_28, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "FailureInformation_v1610_IEs", HFILL }}, @@ -88812,7 +90546,7 @@ proto_register_nr_rrc(void) { { "failureInfoDAPS-r16", "nr-rrc.failureInfoDAPS_r16_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_28, + { &hf_nr_rrc_nonCriticalExtension_29, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_13", HFILL }}, @@ -88876,7 +90610,7 @@ proto_register_nr_rrc(void) { { "iab-IPv6-PrefixReport-r16", "nr-rrc.iab_IPv6_PrefixReport_r16_element", FT_NONE, BASE_NONE, NULL, 0, "IAB_IP_PrefixAndTraffic_r16", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_29, + { &hf_nr_rrc_nonCriticalExtension_30, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_14", HFILL }}, @@ -88980,7 +90714,7 @@ proto_register_nr_rrc(void) { { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, VALS(nr_rrc_LocationMeasurementInfo_vals), 0, "LocationMeasurementInfo", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_30, + { &hf_nr_rrc_nonCriticalExtension_31, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_15", HFILL }}, @@ -89060,7 +90794,7 @@ proto_register_nr_rrc(void) { { "eventTriggered", "nr-rrc.eventTriggered_element", FT_NONE, BASE_NONE, NULL, 0, "LoggedEventTriggerConfig_r16", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_31, + { &hf_nr_rrc_nonCriticalExtension_32, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_16", HFILL }}, @@ -89108,7 +90842,7 @@ proto_register_nr_rrc(void) { { "failureReportMCG-r16", "nr-rrc.failureReportMCG_r16_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_32, + { &hf_nr_rrc_nonCriticalExtension_33, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_17", HFILL }}, @@ -89168,7 +90902,7 @@ proto_register_nr_rrc(void) { { "measResults", "nr-rrc.measResults_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_33, + { &hf_nr_rrc_nonCriticalExtension_34, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_18", HFILL }}, @@ -89228,7 +90962,7 @@ proto_register_nr_rrc(void) { { "nas-SecurityParamFromNR", "nr-rrc.nas_SecurityParamFromNR", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_34, + { &hf_nr_rrc_nonCriticalExtension_35, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "MobilityFromNRCommand_v1610_IEs", HFILL }}, @@ -89236,7 +90970,7 @@ proto_register_nr_rrc(void) { { "voiceFallbackIndication-r16", "nr-rrc.voiceFallbackIndication_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_voiceFallbackIndication_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_35, + { &hf_nr_rrc_nonCriticalExtension_36, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_19", HFILL }}, @@ -89244,7 +90978,7 @@ proto_register_nr_rrc(void) { { "pagingRecordList", "nr-rrc.pagingRecordList", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_36, + { &hf_nr_rrc_nonCriticalExtension_37, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_20", HFILL }}, @@ -89284,7 +91018,7 @@ proto_register_nr_rrc(void) { { "nextHopChainingCount", "nr-rrc.nextHopChainingCount", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_37, + { &hf_nr_rrc_nonCriticalExtension_38, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_21", HFILL }}, @@ -89300,7 +91034,7 @@ proto_register_nr_rrc(void) { { "criticalExtensionsFuture", "nr-rrc.criticalExtensionsFuture_element", FT_NONE, BASE_NONE, NULL, 0, "T_criticalExtensionsFuture_21", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_38, + { &hf_nr_rrc_nonCriticalExtension_39, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "RRCReestablishmentComplete_v1610_IEs", HFILL }}, @@ -89308,7 +91042,7 @@ proto_register_nr_rrc(void) { { "ue-MeasurementsAvailable-r16", "nr-rrc.ue_MeasurementsAvailable_r16_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_39, + { &hf_nr_rrc_nonCriticalExtension_40, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_22", HFILL }}, @@ -89352,7 +91086,7 @@ proto_register_nr_rrc(void) { { "measConfig", "nr-rrc.measConfig_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_40, + { &hf_nr_rrc_nonCriticalExtension_41, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "RRCReconfiguration_v1530_IEs", HFILL }}, @@ -89388,7 +91122,7 @@ proto_register_nr_rrc(void) { { "otherConfig", "nr-rrc.otherConfig_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_41, + { &hf_nr_rrc_nonCriticalExtension_42, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "RRCReconfiguration_v1540_IEs", HFILL }}, @@ -89396,7 +91130,7 @@ proto_register_nr_rrc(void) { { "otherConfig-v1540", "nr-rrc.otherConfig_v1540_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_42, + { &hf_nr_rrc_nonCriticalExtension_43, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "RRCReconfiguration_v1560_IEs", HFILL }}, @@ -89416,7 +91150,7 @@ proto_register_nr_rrc(void) { { "sk-Counter", "nr-rrc.sk_Counter", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_43, + { &hf_nr_rrc_nonCriticalExtension_44, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "RRCReconfiguration_v1610_IEs", HFILL }}, @@ -89488,11 +91222,11 @@ proto_register_nr_rrc(void) { { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "SL_ConfigDedicatedEUTRA_Info_r16", HFILL }}, - { &hf_nr_rrc_smtc_r16, - { "smtc-r16", "nr-rrc.smtc_r16_element", + { &hf_nr_rrc_targetCellSMTC_SCG_r16, + { "targetCellSMTC-SCG-r16", "nr-rrc.targetCellSMTC_SCG_r16_element", FT_NONE, BASE_NONE, NULL, 0, "SSB_MTC", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_44, + { &hf_nr_rrc_nonCriticalExtension_45, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_23", HFILL }}, @@ -89596,7 +91330,7 @@ proto_register_nr_rrc(void) { { "criticalExtensionsFuture", "nr-rrc.criticalExtensionsFuture_element", FT_NONE, BASE_NONE, NULL, 0, "T_criticalExtensionsFuture_23", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_45, + { &hf_nr_rrc_nonCriticalExtension_46, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "RRCReconfigurationComplete_v1530_IEs", HFILL }}, @@ -89604,7 +91338,7 @@ proto_register_nr_rrc(void) { { "uplinkTxDirectCurrentList", "nr-rrc.uplinkTxDirectCurrentList", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_46, + { &hf_nr_rrc_nonCriticalExtension_47, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "RRCReconfigurationComplete_v1560_IEs", HFILL }}, @@ -89620,11 +91354,11 @@ proto_register_nr_rrc(void) { { "eutra-SCG-Response", "nr-rrc.eutra_SCG_Response", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_47, + { &hf_nr_rrc_nonCriticalExtension_48, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "RRCReconfigurationComplete_v1610_IEs", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_48, + { &hf_nr_rrc_nonCriticalExtension_49, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_24", HFILL }}, @@ -89644,7 +91378,7 @@ proto_register_nr_rrc(void) { { "waitTime", "nr-rrc.waitTime", FT_UINT32, BASE_DEC|BASE_UNIT_STRING, &units_seconds, 0, "RejectWaitTime", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_49, + { &hf_nr_rrc_nonCriticalExtension_50, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_25", HFILL }}, @@ -89684,11 +91418,11 @@ proto_register_nr_rrc(void) { { "deprioritisationTimer", "nr-rrc.deprioritisationTimer", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_deprioritisationTimer_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_50, + { &hf_nr_rrc_nonCriticalExtension_51, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "RRCRelease_v1540_IEs", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_51, + { &hf_nr_rrc_nonCriticalExtension_52, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "RRCRelease_v1610_IEs", HFILL }}, @@ -89704,7 +91438,7 @@ proto_register_nr_rrc(void) { { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "MeasIdleConfigDedicated_r16", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_52, + { &hf_nr_rrc_nonCriticalExtension_53, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_26", HFILL }}, @@ -89836,7 +91570,7 @@ proto_register_nr_rrc(void) { { "fullConfig", "nr-rrc.fullConfig", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_fullConfig_01_vals), 0, "T_fullConfig_01", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_53, + { &hf_nr_rrc_nonCriticalExtension_54, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "RRCResume_v1560_IEs", HFILL }}, @@ -89844,7 +91578,7 @@ proto_register_nr_rrc(void) { { "radioBearerConfig2", "nr-rrc.radioBearerConfig2", FT_BYTES, BASE_NONE, NULL, 0, "T_radioBearerConfig2_01", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_54, + { &hf_nr_rrc_nonCriticalExtension_55, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "RRCResume_v1610_IEs", HFILL }}, @@ -89876,7 +91610,7 @@ proto_register_nr_rrc(void) { { "needForGapsConfigNR-r16", "nr-rrc.needForGapsConfigNR_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_needForGapsConfigNR_r16_01_vals), 0, "T_needForGapsConfigNR_r16_01", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_55, + { &hf_nr_rrc_nonCriticalExtension_56, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_27", HFILL }}, @@ -89896,7 +91630,7 @@ proto_register_nr_rrc(void) { { "selectedPLMN-Identity", "nr-rrc.selectedPLMN_Identity", FT_UINT32, BASE_DEC, NULL, 0, "INTEGER_1_maxPLMN", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_56, + { &hf_nr_rrc_nonCriticalExtension_57, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "RRCResumeComplete_v1610_IEs", HFILL }}, @@ -89932,7 +91666,7 @@ proto_register_nr_rrc(void) { { "mobilityState-r16", "nr-rrc.mobilityState_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_mobilityState_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_57, + { &hf_nr_rrc_nonCriticalExtension_58, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_28", HFILL }}, @@ -89976,7 +91710,7 @@ proto_register_nr_rrc(void) { { "masterCellGroup", "nr-rrc.masterCellGroup", FT_BYTES, BASE_NONE, NULL, 0, "T_masterCellGroup_02", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_58, + { &hf_nr_rrc_nonCriticalExtension_59, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_29", HFILL }}, @@ -90016,7 +91750,7 @@ proto_register_nr_rrc(void) { { "ng-5G-S-TMSI-Part2", "nr-rrc.ng_5G_S_TMSI_Part2", FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING_SIZE_9", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_59, + { &hf_nr_rrc_nonCriticalExtension_60, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "RRCSetupComplete_v1610_IEs", HFILL }}, @@ -90036,7 +91770,7 @@ proto_register_nr_rrc(void) { { "mobilityState-r16", "nr-rrc.mobilityState_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_mobilityState_r16_01_vals), 0, "T_mobilityState_r16_01", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_60, + { &hf_nr_rrc_nonCriticalExtension_61, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_30", HFILL }}, @@ -90116,11 +91850,11 @@ proto_register_nr_rrc(void) { { "failureReportSCG", "nr-rrc.failureReportSCG_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_61, + { &hf_nr_rrc_nonCriticalExtension_62, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "SCGFailureInformation_v1590_IEs", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_62, + { &hf_nr_rrc_nonCriticalExtension_63, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_31", HFILL }}, @@ -90164,11 +91898,11 @@ proto_register_nr_rrc(void) { { "failureReportSCG-EUTRA", "nr-rrc.failureReportSCG_EUTRA_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_63, + { &hf_nr_rrc_nonCriticalExtension_64, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "SCGFailureInformationEUTRA_v1590_IEs", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_64, + { &hf_nr_rrc_nonCriticalExtension_65, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_32", HFILL }}, @@ -90204,7 +91938,7 @@ proto_register_nr_rrc(void) { { "securityConfigSMC", "nr-rrc.securityConfigSMC_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_65, + { &hf_nr_rrc_nonCriticalExtension_66, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_33", HFILL }}, @@ -90224,7 +91958,7 @@ proto_register_nr_rrc(void) { { "criticalExtensionsFuture", "nr-rrc.criticalExtensionsFuture_element", FT_NONE, BASE_NONE, NULL, 0, "T_criticalExtensionsFuture_34", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_66, + { &hf_nr_rrc_nonCriticalExtension_67, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_34", HFILL }}, @@ -90240,7 +91974,7 @@ proto_register_nr_rrc(void) { { "criticalExtensionsFuture", "nr-rrc.criticalExtensionsFuture_element", FT_NONE, BASE_NONE, NULL, 0, "T_criticalExtensionsFuture_35", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_67, + { &hf_nr_rrc_nonCriticalExtension_68, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_35", HFILL }}, @@ -90332,7 +92066,7 @@ proto_register_nr_rrc(void) { { "useFullResumeID", "nr-rrc.useFullResumeID", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_useFullResumeID_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_68, + { &hf_nr_rrc_nonCriticalExtension_69, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "SIB1_v1610_IEs", HFILL }}, @@ -90348,7 +92082,23 @@ proto_register_nr_rrc(void) { { "posSI-SchedulingInfo-r16", "nr-rrc.posSI_SchedulingInfo_r16_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_69, + { &hf_nr_rrc_nonCriticalExtension_70, + { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", + FT_NONE, BASE_NONE, NULL, 0, + "SIB1_v1630_IEs", HFILL }}, + { &hf_nr_rrc_uac_BarringInfo_v1630, + { "uac-BarringInfo-v1630", "nr-rrc.uac_BarringInfo_v1630_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_uac_AC1_SelectAssistInfo_r16, + { "uac-AC1-SelectAssistInfo-r16", "nr-rrc.uac_AC1_SelectAssistInfo_r16", + FT_UINT32, BASE_DEC, NULL, 0, + "SEQUENCE_SIZE_2_maxPLMN_OF_UAC_AC1_SelectAssistInfo_r16", HFILL }}, + { &hf_nr_rrc_uac_AC1_SelectAssistInfo_r16_item, + { "UAC-AC1-SelectAssistInfo-r16", "nr-rrc.UAC_AC1_SelectAssistInfo_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_UAC_AC1_SelectAssistInfo_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_nonCriticalExtension_71, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_36", HFILL }}, @@ -90376,7 +92126,7 @@ proto_register_nr_rrc(void) { { "sl-FailureList-r16", "nr-rrc.sl_FailureList_r16", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_70, + { &hf_nr_rrc_nonCriticalExtension_72, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_37", HFILL }}, @@ -90540,7 +92290,7 @@ proto_register_nr_rrc(void) { { "sib14-v1610", "nr-rrc.sib14_v1610_element", FT_NONE, BASE_NONE, NULL, 0, "SIB14_r16", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_71, + { &hf_nr_rrc_nonCriticalExtension_73, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_38", HFILL }}, @@ -90560,7 +92310,7 @@ proto_register_nr_rrc(void) { { "delayBudgetReport", "nr-rrc.delayBudgetReport", FT_UINT32, BASE_DEC, VALS(nr_rrc_DelayBudgetReport_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_72, + { &hf_nr_rrc_nonCriticalExtension_74, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "UEAssistanceInformation_v1540_IEs", HFILL }}, @@ -90572,7 +92322,7 @@ proto_register_nr_rrc(void) { { "overheatingAssistance", "nr-rrc.overheatingAssistance_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_73, + { &hf_nr_rrc_nonCriticalExtension_75, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "UEAssistanceInformation_v1610_IEs", HFILL }}, @@ -90648,7 +92398,7 @@ proto_register_nr_rrc(void) { { "referenceTimeInfoPreference-r16", "nr-rrc.referenceTimeInfoPreference_r16", FT_BOOLEAN, BASE_NONE, NULL, 0, "BOOLEAN", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_74, + { &hf_nr_rrc_nonCriticalExtension_76, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_39", HFILL }}, @@ -90868,7 +92618,7 @@ proto_register_nr_rrc(void) { { "capabilityRequestFilterCommon", "nr-rrc.capabilityRequestFilterCommon_element", FT_NONE, BASE_NONE, NULL, 0, "UE_CapabilityRequestFilterCommon", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_75, + { &hf_nr_rrc_nonCriticalExtension_77, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "UECapabilityEnquiry_v1610_IEs", HFILL }}, @@ -90876,7 +92626,7 @@ proto_register_nr_rrc(void) { { "rrc-SegAllowed-r16", "nr-rrc.rrc_SegAllowed_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_rrc_SegAllowed_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_76, + { &hf_nr_rrc_nonCriticalExtension_78, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_40", HFILL }}, @@ -90896,7 +92646,7 @@ proto_register_nr_rrc(void) { { "ue-CapabilityRAT-ContainerList", "nr-rrc.ue_CapabilityRAT_ContainerList", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_77, + { &hf_nr_rrc_nonCriticalExtension_79, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_41", HFILL }}, @@ -90936,7 +92686,7 @@ proto_register_nr_rrc(void) { { "mobilityHistoryReportReq-r16", "nr-rrc.mobilityHistoryReportReq_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_mobilityHistoryReportReq_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_78, + { &hf_nr_rrc_nonCriticalExtension_80, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_42", HFILL }}, @@ -90972,7 +92722,7 @@ proto_register_nr_rrc(void) { { "mobilityHistoryReport-r16", "nr-rrc.mobilityHistoryReport_r16", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_79, + { &hf_nr_rrc_nonCriticalExtension_81, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_43", HFILL }}, @@ -91408,7 +93158,7 @@ proto_register_nr_rrc(void) { { "rrc-MessageSegmentType-r16", "nr-rrc.rrc_MessageSegmentType_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_rrc_MessageSegmentType_r16_01_vals), 0, "T_rrc_MessageSegmentType_r16_01", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_80, + { &hf_nr_rrc_nonCriticalExtension_82, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_44", HFILL }}, @@ -91424,7 +93174,7 @@ proto_register_nr_rrc(void) { { "criticalExtensionsFuture", "nr-rrc.criticalExtensionsFuture_element", FT_NONE, BASE_NONE, NULL, 0, "T_criticalExtensionsFuture_44", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_81, + { &hf_nr_rrc_nonCriticalExtension_83, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_45", HFILL }}, @@ -91448,7 +93198,7 @@ proto_register_nr_rrc(void) { { "ul-DCCH-MessageEUTRA-r16", "nr-rrc.ul_DCCH_MessageEUTRA_r16", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_82, + { &hf_nr_rrc_nonCriticalExtension_84, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_46", HFILL }}, @@ -91476,7 +93226,7 @@ proto_register_nr_rrc(void) { { "ul-DCCH-MessageEUTRA", "nr-rrc.ul_DCCH_MessageEUTRA", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_83, + { &hf_nr_rrc_nonCriticalExtension_85, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_47", HFILL }}, @@ -91979,15 +93729,15 @@ proto_register_nr_rrc(void) { { &hf_nr_rrc_sl_V2X_ConfigCommon_r16, { "sl-V2X-ConfigCommon-r16", "nr-rrc.sl_V2X_ConfigCommon_r16", FT_BYTES, BASE_NONE, NULL, 0, - "OCTET_STRING", HFILL }}, - { &hf_nr_rrc_sl_Bandwidth_r16, - { "sl-Bandwidth-r16", "nr-rrc.sl_Bandwidth_r16", + NULL, HFILL }}, + { &hf_nr_rrc_dummy_02, + { "dummy", "nr-rrc.dummy", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING", HFILL }}, { &hf_nr_rrc_tdd_Config_r16, { "tdd-Config-r16", "nr-rrc.tdd_Config_r16", FT_BYTES, BASE_NONE, NULL, 0, - "OCTET_STRING", HFILL }}, + NULL, HFILL }}, { &hf_nr_rrc_sl_V2X_ConfigCommonExt_r16, { "sl-V2X-ConfigCommonExt-r16", "nr-rrc.sl_V2X_ConfigCommonExt_r16", FT_BYTES, BASE_NONE, NULL, 0, @@ -92148,7 +93898,7 @@ proto_register_nr_rrc(void) { { "posSib6-3-r16", "nr-rrc.posSib6_3_r16_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_84, + { &hf_nr_rrc_nonCriticalExtension_86, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_48", HFILL }}, @@ -92418,6 +94168,14 @@ proto_register_nr_rrc(void) { "INTEGER_0_31", HFILL }}, { &hf_nr_rrc_bh_LogicalChannelIdentity_r16, { "bh-LogicalChannelIdentity-r16", "nr-rrc.bh_LogicalChannelIdentity_r16", + FT_UINT32, BASE_DEC, NULL, 0, + "LogicalChannelIdentity", HFILL }}, + { &hf_nr_rrc_bh_LogicalChannelIdentityExt_r16, + { "bh-LogicalChannelIdentityExt-r16", "nr-rrc.bh_LogicalChannelIdentityExt_r16", + FT_UINT32, BASE_DEC, NULL, 0, + "BH_LogicalChannelIdentity_Ext_r16", HFILL }}, + { &hf_nr_rrc_bh_LogicalChannelIdentity_r16_01, + { "bh-LogicalChannelIdentity-r16", "nr-rrc.bh_LogicalChannelIdentity_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_BH_LogicalChannelIdentity_r16_vals), 0, NULL, HFILL }}, { &hf_nr_rrc_bh_RLC_ChannelID_r16, @@ -92436,14 +94194,6 @@ proto_register_nr_rrc(void) { { "mac-LogicalChannelConfig-r16", "nr-rrc.mac_LogicalChannelConfig_r16_element", FT_NONE, BASE_NONE, NULL, 0, "LogicalChannelConfig", HFILL }}, - { &hf_nr_rrc_bh_LogicalChannelIdentity_r16_01, - { "bh-LogicalChannelIdentity-r16", "nr-rrc.bh_LogicalChannelIdentity_r16", - FT_UINT32, BASE_DEC, NULL, 0, - "LogicalChannelIdentity", HFILL }}, - { &hf_nr_rrc_bh_LogicalChannelIdentityExt_r16, - { "bh-LogicalChannelIdentityExt-r16", "nr-rrc.bh_LogicalChannelIdentityExt_r16", - FT_UINT32, BASE_DEC, NULL, 0, - "BH_LogicalChannelIdentity_Ext_r16", HFILL }}, { &hf_nr_rrc_periodicBSR_Timer, { "periodicBSR-Timer", "nr-rrc.periodicBSR_Timer", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_periodicBSR_Timer_vals), 0, @@ -93528,9 +95278,9 @@ proto_register_nr_rrc(void) { { "cg-StartingOffsets-r16", "nr-rrc.cg_StartingOffsets_r16_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_cg_UCI_Multiplexing, - { "cg-UCI-Multiplexing", "nr-rrc.cg_UCI_Multiplexing", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_cg_UCI_Multiplexing_vals), 0, + { &hf_nr_rrc_cg_UCI_Multiplexing_r16, + { "cg-UCI-Multiplexing-r16", "nr-rrc.cg_UCI_Multiplexing_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_cg_UCI_Multiplexing_r16_vals), 0, NULL, HFILL }}, { &hf_nr_rrc_cg_COT_SharingOffset_r16, { "cg-COT-SharingOffset-r16", "nr-rrc.cg_COT_SharingOffset_r16", @@ -94216,7 +95966,7 @@ proto_register_nr_rrc(void) { { "codebookConfig", "nr-rrc.codebookConfig_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_dummy_02, + { &hf_nr_rrc_dummy_03, { "dummy", "nr-rrc.dummy", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_vals), 0, NULL, HFILL }}, @@ -95484,6 +97234,10 @@ proto_register_nr_rrc(void) { { "absThreshSS-BlocksConsolidation-r16", "nr-rrc.absThreshSS_BlocksConsolidation_r16_element", FT_NONE, BASE_NONE, NULL, 0, "ThresholdNR", HFILL }}, + { &hf_nr_rrc_smtc_r16, + { "smtc-r16", "nr-rrc.smtc_r16_element", + FT_NONE, BASE_NONE, NULL, 0, + "SSB_MTC", HFILL }}, { &hf_nr_rrc_ssb_ToMeasure_r16, { "ssb-ToMeasure-r16", "nr-rrc.ssb_ToMeasure_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_SSB_ToMeasure_vals), 0, @@ -97412,6 +99166,14 @@ proto_register_nr_rrc(void) { { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, VALS(nr_rrc_RepetitionSchemeConfig_r16_vals), 0, "RepetitionSchemeConfig_r16", HFILL }}, + { &hf_nr_rrc_repetitionSchemeConfig_v1630, + { "repetitionSchemeConfig-v1630", "nr-rrc.repetitionSchemeConfig_v1630", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_repetitionSchemeConfig_v1630_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_setup_66, + { "setup", "nr-rrc.setup_element", + FT_NONE, BASE_NONE, NULL, 0, + "RepetitionSchemeConfig_v1630", HFILL }}, { &hf_nr_rrc_RateMatchPatternGroup_item, { "RateMatchPatternGroup item", "nr-rrc.RateMatchPatternGroup_item", FT_UINT32, BASE_DEC, VALS(nr_rrc_RateMatchPatternGroup_item_vals), 0, @@ -97436,7 +99198,7 @@ proto_register_nr_rrc(void) { { "codeBlockGroupTransmission", "nr-rrc.codeBlockGroupTransmission", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_codeBlockGroupTransmission_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_66, + { &hf_nr_rrc_setup_67, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "PDSCH_CodeBlockGroupTransmission", HFILL }}, @@ -97464,7 +99226,7 @@ proto_register_nr_rrc(void) { { "pdsch-CodeBlockGroupTransmissionList-r16", "nr-rrc.pdsch_CodeBlockGroupTransmissionList_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdsch_CodeBlockGroupTransmissionList_r16_vals), 0, "T_pdsch_CodeBlockGroupTransmissionList_r16", HFILL }}, - { &hf_nr_rrc_setup_67, + { &hf_nr_rrc_setup_68, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "PDSCH_CodeBlockGroupTransmissionList_r16", HFILL }}, @@ -97532,7 +99294,7 @@ proto_register_nr_rrc(void) { { "multiplePHR", "nr-rrc.multiplePHR", FT_BOOLEAN, BASE_NONE, NULL, 0, "BOOLEAN", HFILL }}, - { &hf_nr_rrc_dummy_03, + { &hf_nr_rrc_dummy_04, { "dummy", "nr-rrc.dummy", FT_BOOLEAN, BASE_NONE, NULL, 0, "BOOLEAN", HFILL }}, @@ -97548,7 +99310,7 @@ proto_register_nr_rrc(void) { { "mpe-Reporting-FR2-r16", "nr-rrc.mpe_Reporting_FR2_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_mpe_Reporting_FR2_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_68, + { &hf_nr_rrc_setup_69, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "MPE_Config_FR2_r16", HFILL }}, @@ -97596,7 +99358,7 @@ proto_register_nr_rrc(void) { { "cs-RNTI", "nr-rrc.cs_RNTI", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_cs_RNTI_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_69, + { &hf_nr_rrc_setup_70, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "RNTI_Value", HFILL }}, @@ -97616,7 +99378,7 @@ proto_register_nr_rrc(void) { { "pdcch-BlindDetection", "nr-rrc.pdcch_BlindDetection", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdcch_BlindDetection_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_70, + { &hf_nr_rrc_setup_71, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "PDCCH_BlindDetection", HFILL }}, @@ -97624,7 +99386,7 @@ proto_register_nr_rrc(void) { { "dcp-Config-r16", "nr-rrc.dcp_Config_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dcp_Config_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_71, + { &hf_nr_rrc_setup_72, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "DCP_Config_r16", HFILL }}, @@ -97692,7 +99454,7 @@ proto_register_nr_rrc(void) { { "pdsch-HARQ-ACK-CodebookList-r16", "nr-rrc.pdsch_HARQ_ACK_CodebookList_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdsch_HARQ_ACK_CodebookList_r16_vals), 0, "T_pdsch_HARQ_ACK_CodebookList_r16", HFILL }}, - { &hf_nr_rrc_setup_72, + { &hf_nr_rrc_setup_73, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "PDSCH_HARQ_ACK_CodebookList_r16", HFILL }}, @@ -97704,7 +99466,7 @@ proto_register_nr_rrc(void) { { "pdcch-BlindDetectionCA-CombIndicator-r16", "nr-rrc.pdcch_BlindDetectionCA_CombIndicator_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdcch_BlindDetectionCA_CombIndicator_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_73, + { &hf_nr_rrc_setup_74, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "PDCCH_BlindDetectionCA_CombIndicator_r16", HFILL }}, @@ -97712,7 +99474,7 @@ proto_register_nr_rrc(void) { { "pdcch-BlindDetection2-r16", "nr-rrc.pdcch_BlindDetection2_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdcch_BlindDetection2_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_74, + { &hf_nr_rrc_setup_75, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "PDCCH_BlindDetection2_r16", HFILL }}, @@ -97720,7 +99482,7 @@ proto_register_nr_rrc(void) { { "pdcch-BlindDetection3-r16", "nr-rrc.pdcch_BlindDetection3_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdcch_BlindDetection3_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_75, + { &hf_nr_rrc_setup_76, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "PDCCH_BlindDetection3_r16", HFILL }}, @@ -97916,7 +99678,7 @@ proto_register_nr_rrc(void) { { "format1", "nr-rrc.format1", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_format1_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_76, + { &hf_nr_rrc_setup_77, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "PUCCH_FormatConfig", HFILL }}, @@ -97996,7 +99758,7 @@ proto_register_nr_rrc(void) { { "dl-DataToUL-ACK-r16", "nr-rrc.dl_DataToUL_ACK_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dl_DataToUL_ACK_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_77, + { &hf_nr_rrc_setup_78, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "DL_DataToUL_ACK_r16", HFILL }}, @@ -98004,7 +99766,7 @@ proto_register_nr_rrc(void) { { "ul-AccessConfigListDCI-1-1-r16", "nr-rrc.ul_AccessConfigListDCI_1_1_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_ul_AccessConfigListDCI_1_1_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_78, + { &hf_nr_rrc_setup_79, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "UL_AccessConfigListDCI_1_1_r16", HFILL }}, @@ -98024,7 +99786,7 @@ proto_register_nr_rrc(void) { { "dl-DataToUL-ACK-DCI-1-2-r16", "nr-rrc.dl_DataToUL_ACK_DCI_1_2_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dl_DataToUL_ACK_DCI_1_2_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_79, + { &hf_nr_rrc_setup_80, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "DL_DataToUL_ACK_DCI_1_2_r16", HFILL }}, @@ -98088,7 +99850,7 @@ proto_register_nr_rrc(void) { { "sps-PUCCH-AN-List-r16", "nr-rrc.sps_PUCCH_AN_List_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sps_PUCCH_AN_List_r16_vals), 0, "T_sps_PUCCH_AN_List_r16", HFILL }}, - { &hf_nr_rrc_setup_80, + { &hf_nr_rrc_setup_81, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "SPS_PUCCH_AN_List_r16", HFILL }}, @@ -98344,7 +100106,7 @@ proto_register_nr_rrc(void) { { "pathlossReferenceRSs-v1610", "nr-rrc.pathlossReferenceRSs_v1610", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pathlossReferenceRSs_v1610_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_81, + { &hf_nr_rrc_setup_82, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "PathlossReferenceRSs_v1610", HFILL }}, @@ -98436,7 +100198,7 @@ proto_register_nr_rrc(void) { { "dmrs-UplinkForPUSCH-MappingTypeA", "nr-rrc.dmrs_UplinkForPUSCH_MappingTypeA", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dmrs_UplinkForPUSCH_MappingTypeA_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_82, + { &hf_nr_rrc_setup_83, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "DMRS_UplinkConfig", HFILL }}, @@ -98468,7 +100230,7 @@ proto_register_nr_rrc(void) { { "pusch-TimeDomainAllocationList", "nr-rrc.pusch_TimeDomainAllocationList", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pusch_TimeDomainAllocationList_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_83, + { &hf_nr_rrc_setup_84, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "PUSCH_TimeDomainResourceAllocationList", HFILL }}, @@ -98504,7 +100266,7 @@ proto_register_nr_rrc(void) { { "uci-OnPUSCH", "nr-rrc.uci_OnPUSCH", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_uci_OnPUSCH_01_vals), 0, "T_uci_OnPUSCH_01", HFILL }}, - { &hf_nr_rrc_setup_84, + { &hf_nr_rrc_setup_85, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "UCI_OnPUSCH", HFILL }}, @@ -98516,7 +100278,7 @@ proto_register_nr_rrc(void) { { "minimumSchedulingOffsetK2-r16", "nr-rrc.minimumSchedulingOffsetK2_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_minimumSchedulingOffsetK2_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_85, + { &hf_nr_rrc_setup_86, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "MinSchedulingOffsetK2_Values_r16", HFILL }}, @@ -98524,7 +100286,7 @@ proto_register_nr_rrc(void) { { "ul-AccessConfigListDCI-0-1-r16", "nr-rrc.ul_AccessConfigListDCI_0_1_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_ul_AccessConfigListDCI_0_1_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_86, + { &hf_nr_rrc_setup_87, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "UL_AccessConfigListDCI_0_1_r16", HFILL }}, @@ -98568,7 +100330,7 @@ proto_register_nr_rrc(void) { { "frequencyHoppingOffsetListsDCI-0-2-r16", "nr-rrc.frequencyHoppingOffsetListsDCI_0_2_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_frequencyHoppingOffsetListsDCI_0_2_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_87, + { &hf_nr_rrc_setup_88, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "FrequencyHoppingOffsetListsDCI_0_2_r16", HFILL }}, @@ -98612,7 +100374,7 @@ proto_register_nr_rrc(void) { { "uci-OnPUSCH-ListDCI-0-2-r16", "nr-rrc.uci_OnPUSCH_ListDCI_0_2_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_uci_OnPUSCH_ListDCI_0_2_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_88, + { &hf_nr_rrc_setup_89, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "UCI_OnPUSCH_ListDCI_0_2_r16", HFILL }}, @@ -98620,7 +100382,7 @@ proto_register_nr_rrc(void) { { "pusch-TimeDomainAllocationListDCI-0-2-r16", "nr-rrc.pusch_TimeDomainAllocationListDCI_0_2_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pusch_TimeDomainAllocationListDCI_0_2_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_89, + { &hf_nr_rrc_setup_90, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "PUSCH_TimeDomainResourceAllocationList_r16", HFILL }}, @@ -98648,7 +100410,7 @@ proto_register_nr_rrc(void) { { "uci-OnPUSCH-ListDCI-0-1-r16", "nr-rrc.uci_OnPUSCH_ListDCI_0_1_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_uci_OnPUSCH_ListDCI_0_1_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_90, + { &hf_nr_rrc_setup_91, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "UCI_OnPUSCH_ListDCI_0_1_r16", HFILL }}, @@ -98660,7 +100422,7 @@ proto_register_nr_rrc(void) { { "pusch-PowerControl-v1610", "nr-rrc.pusch_PowerControl_v1610", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pusch_PowerControl_v1610_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_91, + { &hf_nr_rrc_setup_92, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "PUSCH_PowerControl_v1610", HFILL }}, @@ -98912,7 +100674,7 @@ proto_register_nr_rrc(void) { { "codeBlockGroupTransmission", "nr-rrc.codeBlockGroupTransmission", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_codeBlockGroupTransmission_01_vals), 0, "T_codeBlockGroupTransmission_01", HFILL }}, - { &hf_nr_rrc_setup_92, + { &hf_nr_rrc_setup_93, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "PUSCH_CodeBlockGroupTransmission", HFILL }}, @@ -98932,7 +100694,7 @@ proto_register_nr_rrc(void) { { "maxMIMO-LayersDCI-0-2-r16", "nr-rrc.maxMIMO_LayersDCI_0_2_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_maxMIMO_LayersDCI_0_2_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_93, + { &hf_nr_rrc_setup_94, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "MaxMIMO_LayersDCI_0_2_r16", HFILL }}, @@ -99256,10 +101018,6 @@ proto_register_nr_rrc(void) { { "messagePowerOffsetGroupB", "nr-rrc.messagePowerOffsetGroupB", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_messagePowerOffsetGroupB_01_vals), 0, "T_messagePowerOffsetGroupB_01", HFILL }}, - { &hf_nr_rrc_numberofRA_PreamblesGroupA, - { "numberofRA-PreamblesGroupA", "nr-rrc.numberofRA_PreamblesGroupA", - FT_UINT32, BASE_DEC, NULL, 0, - "INTEGER_1_64", HFILL }}, { &hf_nr_rrc_cfra, { "cfra", "nr-rrc.cfra_element", FT_NONE, BASE_NONE, NULL, 0, @@ -99328,8 +101086,8 @@ proto_register_nr_rrc(void) { { "resourcesTwoStep-r16", "nr-rrc.resourcesTwoStep_r16_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_msgA_PUSCH_resource_Index_r16, - { "msgA-PUSCH-resource-Index-r16", "nr-rrc.msgA_PUSCH_resource_Index_r16", + { &hf_nr_rrc_msgA_PUSCH_Resource_Index_r16, + { "msgA-PUSCH-Resource-Index-r16", "nr-rrc.msgA_PUSCH_Resource_Index_r16", FT_UINT32, BASE_DEC, NULL, 0, "INTEGER_0_3071", HFILL }}, { &hf_nr_rrc_csi_RS_02, @@ -99572,7 +101330,7 @@ proto_register_nr_rrc(void) { { "controlResourceSet", "nr-rrc.controlResourceSet", FT_UINT32, BASE_DEC, NULL, 0, "ControlResourceSetId", HFILL }}, - { &hf_nr_rrc_dummy_04, + { &hf_nr_rrc_dummy_05, { "dummy", "nr-rrc.dummy", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_01_vals), 0, "T_dummy_01", HFILL }}, @@ -99640,7 +101398,7 @@ proto_register_nr_rrc(void) { { "fdm-TDM-r16", "nr-rrc.fdm_TDM_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_fdm_TDM_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_94, + { &hf_nr_rrc_setup_95, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "FDM_TDM_r16", HFILL }}, @@ -99648,10 +101406,18 @@ proto_register_nr_rrc(void) { { "slotBased-r16", "nr-rrc.slotBased_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_slotBased_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_95, + { &hf_nr_rrc_setup_96, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "SlotBased_r16", HFILL }}, + { &hf_nr_rrc_slotBased_v1630, + { "slotBased-v1630", "nr-rrc.slotBased_v1630", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_slotBased_v1630_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_setup_97, + { "setup", "nr-rrc.setup_element", + FT_NONE, BASE_NONE, NULL, 0, + "SlotBased_v1630", HFILL }}, { &hf_nr_rrc_repetitionScheme_r16, { "repetitionScheme-r16", "nr-rrc.repetitionScheme_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_repetitionScheme_r16_vals), 0, @@ -99664,10 +101430,18 @@ proto_register_nr_rrc(void) { { "tciMapping-r16", "nr-rrc.tciMapping_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_tciMapping_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_sequenceOffsetforRV_r16, - { "sequenceOffsetforRV-r16", "nr-rrc.sequenceOffsetforRV_r16", + { &hf_nr_rrc_sequenceOffsetForRV_r16, + { "sequenceOffsetForRV-r16", "nr-rrc.sequenceOffsetForRV_r16", FT_UINT32, BASE_DEC, NULL, 0, "INTEGER_1_3", HFILL }}, + { &hf_nr_rrc_tciMapping_r16_01, + { "tciMapping-r16", "nr-rrc.tciMapping_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_tciMapping_r16_01_vals), 0, + "T_tciMapping_r16_01", HFILL }}, + { &hf_nr_rrc_sequenceOffsetForRV_r16_01, + { "sequenceOffsetForRV-r16", "nr-rrc.sequenceOffsetForRV_r16", + FT_UINT32, BASE_DEC, NULL, 0, + "INTEGER_0", HFILL }}, { &hf_nr_rrc_reportType_01, { "reportType", "nr-rrc.reportType", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_reportType_01_vals), 0, @@ -100008,7 +101782,7 @@ proto_register_nr_rrc(void) { { "ul-DelayValueConfig-r16", "nr-rrc.ul_DelayValueConfig_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_ul_DelayValueConfig_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_96, + { &hf_nr_rrc_setup_98, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "UL_DelayValueConfig_r16", HFILL }}, @@ -100664,7 +102438,7 @@ proto_register_nr_rrc(void) { { "pdcch-ServingCellConfig", "nr-rrc.pdcch_ServingCellConfig", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdcch_ServingCellConfig_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_97, + { &hf_nr_rrc_setup_99, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "PDCCH_ServingCellConfig", HFILL }}, @@ -100672,7 +102446,7 @@ proto_register_nr_rrc(void) { { "pdsch-ServingCellConfig", "nr-rrc.pdsch_ServingCellConfig", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdsch_ServingCellConfig_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_98, + { &hf_nr_rrc_setup_100, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "PDSCH_ServingCellConfig", HFILL }}, @@ -100680,7 +102454,7 @@ proto_register_nr_rrc(void) { { "csi-MeasConfig", "nr-rrc.csi_MeasConfig", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_csi_MeasConfig_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_99, + { &hf_nr_rrc_setup_101, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "CSI_MeasConfig", HFILL }}, @@ -100696,10 +102470,10 @@ proto_register_nr_rrc(void) { { "tag-Id", "nr-rrc.tag_Id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_dummy_05, - { "dummy", "nr-rrc.dummy", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_02_vals), 0, - "T_dummy_02", HFILL }}, + { &hf_nr_rrc_dummy1_01, + { "dummy1", "nr-rrc.dummy1", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy1_01_vals), 0, + "T_dummy1_01", HFILL }}, { &hf_nr_rrc_pathlossReferenceLinking, { "pathlossReferenceLinking", "nr-rrc.pathlossReferenceLinking", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pathlossReferenceLinking_vals), 0, @@ -100712,7 +102486,7 @@ proto_register_nr_rrc(void) { { "lte-CRS-ToMatchAround", "nr-rrc.lte_CRS_ToMatchAround", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_lte_CRS_ToMatchAround_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_100, + { &hf_nr_rrc_setup_102, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "RateMatchPatternLTE_CRS", HFILL }}, @@ -100724,9 +102498,9 @@ proto_register_nr_rrc(void) { { "SCS-SpecificCarrier", "nr-rrc.SCS_SpecificCarrier_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_supplementaryUplinkRelease, - { "supplementaryUplinkRelease", "nr-rrc.supplementaryUplinkRelease", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_supplementaryUplinkRelease_vals), 0, + { &hf_nr_rrc_supplementaryUplinkRelease_r16, + { "supplementaryUplinkRelease-r16", "nr-rrc.supplementaryUplinkRelease_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_supplementaryUplinkRelease_r16_vals), 0, NULL, HFILL }}, { &hf_nr_rrc_tdd_UL_DL_ConfigurationDedicated_IAB_MT_r16, { "tdd-UL-DL-ConfigurationDedicated-IAB-MT-r16", "nr-rrc.tdd_UL_DL_ConfigurationDedicated_IAB_MT_r16_element", @@ -100736,7 +102510,7 @@ proto_register_nr_rrc(void) { { "dormantBWP-Config-r16", "nr-rrc.dormantBWP_Config_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dormantBWP_Config_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_101, + { &hf_nr_rrc_setup_103, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "DormantBWP_Config_r16", HFILL }}, @@ -100760,14 +102534,14 @@ proto_register_nr_rrc(void) { { "refSCS120KHz", "nr-rrc.refSCS120KHz", FT_INT32, BASE_DEC, NULL, 0, "INTEGER_M20_20", HFILL }}, - { &hf_nr_rrc_channelAccessConfig_r16, - { "channelAccessConfig-r16", "nr-rrc.channelAccessConfig_r16", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_channelAccessConfig_r16_vals), 0, - NULL, HFILL }}, - { &hf_nr_rrc_setup_102, + { &hf_nr_rrc_dummy2_01, + { "dummy2", "nr-rrc.dummy2", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy2_01_vals), 0, + "T_dummy2_01", HFILL }}, + { &hf_nr_rrc_setup_104, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, - "ChannelAccessConfig_r16", HFILL }}, + "DummyJ", HFILL }}, { &hf_nr_rrc_intraCellGuardBandsDL_List_r16, { "intraCellGuardBandsDL-List-r16", "nr-rrc.intraCellGuardBandsDL_List_r16", FT_UINT32, BASE_DEC, NULL, 0, @@ -100784,15 +102558,15 @@ proto_register_nr_rrc(void) { { "IntraCellGuardBandsPerSCS-r16", "nr-rrc.IntraCellGuardBandsPerSCS_r16_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_csi_RS_ValidationWith_DCI_r16, - { "csi-RS-ValidationWith-DCI-r16", "nr-rrc.csi_RS_ValidationWith_DCI_r16", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_csi_RS_ValidationWith_DCI_r16_vals), 0, + { &hf_nr_rrc_csi_RS_ValidationWithDCI_r16, + { "csi-RS-ValidationWithDCI-r16", "nr-rrc.csi_RS_ValidationWithDCI_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_csi_RS_ValidationWithDCI_r16_vals), 0, NULL, HFILL }}, { &hf_nr_rrc_lte_CRS_PatternList1_r16, { "lte-CRS-PatternList1-r16", "nr-rrc.lte_CRS_PatternList1_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_lte_CRS_PatternList1_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_103, + { &hf_nr_rrc_setup_105, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "LTE_CRS_PatternList_r16", HFILL }}, @@ -100824,6 +102598,18 @@ proto_register_nr_rrc(void) { { "cbg-TxDiffTBsProcessingType2-r16", "nr-rrc.cbg_TxDiffTBsProcessingType2_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_cbg_TxDiffTBsProcessingType2_r16_vals), 0, NULL, HFILL }}, + { &hf_nr_rrc_directionalCollisionHandling_r16, + { "directionalCollisionHandling-r16", "nr-rrc.directionalCollisionHandling_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_directionalCollisionHandling_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_channelAccessConfig_r16, + { "channelAccessConfig-r16", "nr-rrc.channelAccessConfig_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_channelAccessConfig_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_setup_106, + { "setup", "nr-rrc.setup_element", + FT_NONE, BASE_NONE, NULL, 0, + "ChannelAccessConfig_r16", HFILL }}, { &hf_nr_rrc_initialUplinkBWP, { "initialUplinkBWP", "nr-rrc.initialUplinkBWP_element", FT_NONE, BASE_NONE, NULL, 0, @@ -100852,7 +102638,7 @@ proto_register_nr_rrc(void) { { "pusch-ServingCellConfig", "nr-rrc.pusch_ServingCellConfig", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pusch_ServingCellConfig_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_104, + { &hf_nr_rrc_setup_107, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "PUSCH_ServingCellConfig", HFILL }}, @@ -100860,7 +102646,7 @@ proto_register_nr_rrc(void) { { "carrierSwitching", "nr-rrc.carrierSwitching", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_carrierSwitching_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_105, + { &hf_nr_rrc_setup_108, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "SRS_CarrierSwitching", HFILL }}, @@ -100896,7 +102682,7 @@ proto_register_nr_rrc(void) { { "uplinkTxSwitching-r16", "nr-rrc.uplinkTxSwitching_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_uplinkTxSwitching_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_106, + { &hf_nr_rrc_setup_109, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "UplinkTxSwitching_r16", HFILL }}, @@ -100906,11 +102692,11 @@ proto_register_nr_rrc(void) { "T_mpr_PowerBoost_FR2_r16", HFILL }}, { &hf_nr_rrc_maxEnergyDetectionThreshold_r16, { "maxEnergyDetectionThreshold-r16", "nr-rrc.maxEnergyDetectionThreshold_r16", - FT_INT32, BASE_DEC|BASE_UNIT_STRING, &units_dbm, 0, + FT_INT32, BASE_DEC, NULL, 0, "INTEGER_M85_M52", HFILL }}, { &hf_nr_rrc_energyDetectionThresholdOffset_r16, { "energyDetectionThresholdOffset-r16", "nr-rrc.energyDetectionThresholdOffset_r16", - FT_INT32, BASE_DEC|BASE_UNIT_STRING, &units_decibels, 0, + FT_INT32, BASE_DEC, NULL, 0, "INTEGER_M20_M13", HFILL }}, { &hf_nr_rrc_ul_toDL_COT_SharingED_Threshold_r16, { "ul-toDL-COT-SharingED-Threshold-r16", "nr-rrc.ul_toDL_COT_SharingED_Threshold_r16", @@ -100920,6 +102706,18 @@ proto_register_nr_rrc(void) { { "absenceOfAnyOtherTechnology-r16", "nr-rrc.absenceOfAnyOtherTechnology_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_absenceOfAnyOtherTechnology_r16_vals), 0, NULL, HFILL }}, + { &hf_nr_rrc_energyDetectionConfig_r16, + { "energyDetectionConfig-r16", "nr-rrc.energyDetectionConfig_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_energyDetectionConfig_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_energyDetectionThresholdOffset_r16_01, + { "energyDetectionThresholdOffset-r16", "nr-rrc.energyDetectionThresholdOffset_r16", + FT_INT32, BASE_DEC, NULL, 0, + "INTEGER_M13_20", HFILL }}, + { &hf_nr_rrc_absenceOfAnyOtherTechnology_r16_01, + { "absenceOfAnyOtherTechnology-r16", "nr-rrc.absenceOfAnyOtherTechnology_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_absenceOfAnyOtherTechnology_r16_01_vals), 0, + "T_absenceOfAnyOtherTechnology_r16_01", HFILL }}, { &hf_nr_rrc_guardBandSCS_r16, { "guardBandSCS-r16", "nr-rrc.guardBandSCS_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_SubcarrierSpacing_vals), 0, @@ -100948,7 +102746,7 @@ proto_register_nr_rrc(void) { { "withinActiveTimeConfig-r16", "nr-rrc.withinActiveTimeConfig_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_withinActiveTimeConfig_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_107, + { &hf_nr_rrc_setup_110, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "WithinActiveTimeConfig_r16", HFILL }}, @@ -100956,7 +102754,7 @@ proto_register_nr_rrc(void) { { "outsideActiveTimeConfig-r16", "nr-rrc.outsideActiveTimeConfig_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_outsideActiveTimeConfig_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_108, + { &hf_nr_rrc_setup_111, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "OutsideActiveTimeConfig_r16", HFILL }}, @@ -101047,7 +102845,7 @@ proto_register_nr_rrc(void) { { &hf_nr_rrc_semiStatic_01, { "semiStatic", "nr-rrc.semiStatic_element", FT_NONE, BASE_NONE, NULL, 0, - "SemiStaticChannelAccessConfig", HFILL }}, + "SemiStaticChannelAccessConfig_r16", HFILL }}, { &hf_nr_rrc_discoveryBurstWindowLength_r16, { "discoveryBurstWindowLength-r16", "nr-rrc.discoveryBurstWindowLength_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_discoveryBurstWindowLength_r16_vals), 0, @@ -101564,7 +103362,7 @@ proto_register_nr_rrc(void) { { "pathlossReferenceRSList-r16", "nr-rrc.pathlossReferenceRSList_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pathlossReferenceRSList_r16_vals), 0, "T_pathlossReferenceRSList_r16", HFILL }}, - { &hf_nr_rrc_setup_109, + { &hf_nr_rrc_setup_112, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "PathlossReferenceRSList_r16", HFILL }}, @@ -102524,10 +104322,18 @@ proto_register_nr_rrc(void) { { "BandCombination-v1610", "nr-rrc.BandCombination_v1610_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nr_rrc_BandCombinationList_v1630_item, + { "BandCombination-v1630", "nr-rrc.BandCombination_v1630_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_nr_rrc_BandCombinationList_UplinkTxSwitch_r16_item, { "BandCombination-UplinkTxSwitch-r16", "nr-rrc.BandCombination_UplinkTxSwitch_r16_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nr_rrc_BandCombinationList_UplinkTxSwitch_v1630_item, + { "BandCombination-UplinkTxSwitch-v1630", "nr-rrc.BandCombination_UplinkTxSwitch_v1630_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_nr_rrc_bandList, { "bandList", "nr-rrc.bandList", FT_UINT32, BASE_DEC, NULL, 0, @@ -102576,6 +104382,38 @@ proto_register_nr_rrc(void) { { "ca-ParametersNR-v1550", "nr-rrc.ca_ParametersNR_v1550_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nr_rrc_ne_DC_BC, + { "ne-DC-BC", "nr-rrc.ne_DC_BC", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_ne_DC_BC_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_ca_ParametersNRDC, + { "ca-ParametersNRDC", "nr-rrc.ca_ParametersNRDC_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_ca_ParametersEUTRA_v1560, + { "ca-ParametersEUTRA-v1560", "nr-rrc.ca_ParametersEUTRA_v1560_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_ca_ParametersNR_v1560, + { "ca-ParametersNR-v1560", "nr-rrc.ca_ParametersNR_v1560_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_ca_ParametersEUTRA_v1570, + { "ca-ParametersEUTRA-v1570", "nr-rrc.ca_ParametersEUTRA_v1570_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_mrdc_Parameters_v1580, + { "mrdc-Parameters-v1580", "nr-rrc.mrdc_Parameters_v1580_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_supportedBandwidthCombinationSetIntraENDC, + { "supportedBandwidthCombinationSetIntraENDC", "nr-rrc.supportedBandwidthCombinationSetIntraENDC", + FT_BYTES, BASE_NONE, NULL, 0, + "BIT_STRING_SIZE_1_32", HFILL }}, + { &hf_nr_rrc_mrdc_Parameters_v1590, + { "mrdc-Parameters-v1590", "nr-rrc.mrdc_Parameters_v1590_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_nr_rrc_bandList_v1610, { "bandList-v1610", "nr-rrc.bandList_v1610", FT_UINT32, BASE_DEC, NULL, 0, @@ -102608,37 +104446,41 @@ proto_register_nr_rrc(void) { { "mrdc-Parameters-v1620", "nr-rrc.mrdc_Parameters_v1620_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_ne_DC_BC, - { "ne-DC-BC", "nr-rrc.ne_DC_BC", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_ne_DC_BC_vals), 0, - NULL, HFILL }}, - { &hf_nr_rrc_ca_ParametersNRDC, - { "ca-ParametersNRDC", "nr-rrc.ca_ParametersNRDC_element", + { &hf_nr_rrc_ca_ParametersNR_v1630, + { "ca-ParametersNR-v1630", "nr-rrc.ca_ParametersNR_v1630_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_ca_ParametersEUTRA_v1560, - { "ca-ParametersEUTRA-v1560", "nr-rrc.ca_ParametersEUTRA_v1560_element", - FT_NONE, BASE_NONE, NULL, 0, - NULL, HFILL }}, - { &hf_nr_rrc_ca_ParametersNR_v1560, - { "ca-ParametersNR-v1560", "nr-rrc.ca_ParametersNR_v1560_element", + { &hf_nr_rrc_ca_ParametersNRDC_v1630, + { "ca-ParametersNRDC-v1630", "nr-rrc.ca_ParametersNRDC_v1630_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_ca_ParametersEUTRA_v1570, - { "ca-ParametersEUTRA-v1570", "nr-rrc.ca_ParametersEUTRA_v1570_element", - FT_NONE, BASE_NONE, NULL, 0, - NULL, HFILL }}, - { &hf_nr_rrc_mrdc_Parameters_v1580, - { "mrdc-Parameters-v1580", "nr-rrc.mrdc_Parameters_v1580_element", + { &hf_nr_rrc_mrdc_Parameters_v1630, + { "mrdc-Parameters-v1630", "nr-rrc.mrdc_Parameters_v1630_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_supportedBandwidthCombinationSetIntraENDC, - { "supportedBandwidthCombinationSetIntraENDC", "nr-rrc.supportedBandwidthCombinationSetIntraENDC", + { &hf_nr_rrc_supportedTxBandCombListPerBC_Sidelink_r16, + { "supportedTxBandCombListPerBC-Sidelink-r16", "nr-rrc.supportedTxBandCombListPerBC_Sidelink_r16", FT_BYTES, BASE_NONE, NULL, 0, - "BIT_STRING_SIZE_1_32", HFILL }}, - { &hf_nr_rrc_mrdc_Parameters_v1590, - { "mrdc-Parameters-v1590", "nr-rrc.mrdc_Parameters_v1590_element", - FT_NONE, BASE_NONE, NULL, 0, + "BIT_STRING_SIZE_1_maxBandComb", HFILL }}, + { &hf_nr_rrc_supportedRxBandCombListPerBC_Sidelink_r16, + { "supportedRxBandCombListPerBC-Sidelink-r16", "nr-rrc.supportedRxBandCombListPerBC_Sidelink_r16", + FT_BYTES, BASE_NONE, NULL, 0, + "BIT_STRING_SIZE_1_maxBandComb", HFILL }}, + { &hf_nr_rrc_scalingFactorTxSidelink_r16, + { "scalingFactorTxSidelink-r16", "nr-rrc.scalingFactorTxSidelink_r16", + FT_UINT32, BASE_DEC, NULL, 0, + "SEQUENCE_SIZE_1_maxBandComb_OF_ScalingFactorSidelink_r16", HFILL }}, + { &hf_nr_rrc_scalingFactorTxSidelink_r16_item, + { "ScalingFactorSidelink-r16", "nr-rrc.ScalingFactorSidelink_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_ScalingFactorSidelink_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_scalingFactorRxSidelink_r16, + { "scalingFactorRxSidelink-r16", "nr-rrc.scalingFactorRxSidelink_r16", + FT_UINT32, BASE_DEC, NULL, 0, + "SEQUENCE_SIZE_1_maxBandComb_OF_ScalingFactorSidelink_r16", HFILL }}, + { &hf_nr_rrc_scalingFactorRxSidelink_r16_item, + { "ScalingFactorSidelink-r16", "nr-rrc.ScalingFactorSidelink_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_ScalingFactorSidelink_r16_vals), 0, NULL, HFILL }}, { &hf_nr_rrc_bandCombination_r16, { "bandCombination-r16", "nr-rrc.bandCombination_r16_element", @@ -102684,6 +104526,10 @@ proto_register_nr_rrc(void) { { "uplinkTxSwitching-PowerBoosting-r16", "nr-rrc.uplinkTxSwitching_PowerBoosting_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_uplinkTxSwitching_PowerBoosting_r16_vals), 0, NULL, HFILL }}, + { &hf_nr_rrc_bandCombination_v1630, + { "bandCombination-v1630", "nr-rrc.bandCombination_v1630_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_nr_rrc_bandIndexUL1_r16, { "bandIndexUL1-r16", "nr-rrc.bandIndexUL1_r16", FT_UINT32, BASE_DEC, NULL, 0, @@ -102784,18 +104630,22 @@ proto_register_nr_rrc(void) { { "supportedSRS-TxPortSwitch-v1610", "nr-rrc.supportedSRS_TxPortSwitch_v1610", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_supportedSRS_TxPortSwitch_v1610_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_freqBandSidelink_r16, - { "freqBandSidelink-r16", "nr-rrc.freqBandSidelink_r16", - FT_UINT32, BASE_DEC, NULL, 0, - "FreqBandIndicatorNR", HFILL }}, { &hf_nr_rrc_BandCombinationListSidelinkEUTRA_NR_r16_item, { "BandCombinationParametersSidelinkEUTRA-NR-r16", "nr-rrc.BandCombinationParametersSidelinkEUTRA_NR_r16", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nr_rrc_BandCombinationListSidelinkEUTRA_NR_v1630_item, + { "BandCombinationParametersSidelinkEUTRA-NR-v1630", "nr-rrc.BandCombinationParametersSidelinkEUTRA_NR_v1630", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, { &hf_nr_rrc_BandCombinationParametersSidelinkEUTRA_NR_r16_item, { "BandParametersSidelinkEUTRA-NR-r16", "nr-rrc.BandParametersSidelinkEUTRA_NR_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_BandParametersSidelinkEUTRA_NR_r16_vals), 0, NULL, HFILL }}, + { &hf_nr_rrc_BandCombinationParametersSidelinkEUTRA_NR_v1630_item, + { "BandParametersSidelinkEUTRA-NR-v1630", "nr-rrc.BandParametersSidelinkEUTRA_NR_v1630", + FT_UINT32, BASE_DEC, VALS(nr_rrc_BandParametersSidelinkEUTRA_NR_v1630_vals), 0, + NULL, HFILL }}, { &hf_nr_rrc_eutra_03, { "eutra", "nr-rrc.eutra_element", FT_NONE, BASE_NONE, NULL, 0, @@ -102816,6 +104666,30 @@ proto_register_nr_rrc(void) { { "bandParametersSidelinkNR-r16", "nr-rrc.bandParametersSidelinkNR_r16_element", FT_NONE, BASE_NONE, NULL, 0, "BandParametersSidelink_r16", HFILL }}, + { &hf_nr_rrc_eutra_04, + { "eutra", "nr-rrc.eutra_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_nr_04, + { "nr", "nr-rrc.nr_element", + FT_NONE, BASE_NONE, NULL, 0, + "T_nr_03", HFILL }}, + { &hf_nr_rrc_tx_Sidelink_r16, + { "tx-Sidelink-r16", "nr-rrc.tx_Sidelink_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_tx_Sidelink_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_rx_Sidelink_r16, + { "rx-Sidelink-r16", "nr-rrc.rx_Sidelink_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_rx_Sidelink_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_sl_CrossCarrierScheduling_r16, + { "sl-CrossCarrierScheduling-r16", "nr-rrc.sl_CrossCarrierScheduling_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sl_CrossCarrierScheduling_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_freqBandSidelink_r16, + { "freqBandSidelink-r16", "nr-rrc.freqBandSidelink_r16", + FT_UINT32, BASE_DEC, NULL, 0, + "FreqBandIndicatorNR", HFILL }}, { &hf_nr_rrc_multipleTimingAdvance, { "multipleTimingAdvance", "nr-rrc.multipleTimingAdvance", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_multipleTimingAdvance_vals), 0, @@ -102850,8 +104724,8 @@ proto_register_nr_rrc(void) { "INTEGER_0_10", HFILL }}, { &hf_nr_rrc_dummy_07, { "dummy", "nr-rrc.dummy", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_03_vals), 0, - "T_dummy_03", HFILL }}, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_02_vals), 0, + "T_dummy_02", HFILL }}, { &hf_nr_rrc_parallelTxSRS_PUCCH_PUSCH, { "parallelTxSRS-PUCCH-PUSCH", "nr-rrc.parallelTxSRS_PUCCH_PUSCH", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_parallelTxSRS_PUCCH_PUSCH_vals), 0, @@ -102906,8 +104780,8 @@ proto_register_nr_rrc(void) { NULL, HFILL }}, { &hf_nr_rrc_dummy_08, { "dummy", "nr-rrc.dummy", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_04_vals), 0, - "T_dummy_04", HFILL }}, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_03_vals), 0, + "T_dummy_03", HFILL }}, { &hf_nr_rrc_diffNumerologyWithinPUCCH_GroupLargerSCS, { "diffNumerologyWithinPUCCH-GroupLargerSCS", "nr-rrc.diffNumerologyWithinPUCCH_GroupLargerSCS", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_diffNumerologyWithinPUCCH_GroupLargerSCS_vals), 0, @@ -103068,6 +104942,34 @@ proto_register_nr_rrc(void) { { "codebookComboParametersAdditionPerBC-r16", "nr-rrc.codebookComboParametersAdditionPerBC_r16_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nr_rrc_simulTX_SRS_AntSwitchingInterBandUL_CA_r16, + { "simulTX-SRS-AntSwitchingInterBandUL-CA-r16", "nr-rrc.simulTX_SRS_AntSwitchingInterBandUL_CA_r16_element", + FT_NONE, BASE_NONE, NULL, 0, + "SimulSRS_ForAntennaSwitching_r16", HFILL }}, + { &hf_nr_rrc_beamManagementType_r16, + { "beamManagementType-r16", "nr-rrc.beamManagementType_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_beamManagementType_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_intraBandFreqSeparationUL_AggBW_GapBW_r16, + { "intraBandFreqSeparationUL-AggBW-GapBW-r16", "nr-rrc.intraBandFreqSeparationUL_AggBW_GapBW_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_intraBandFreqSeparationUL_AggBW_GapBW_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_interCA_NonAlignedFrame_B_r16, + { "interCA-NonAlignedFrame-B-r16", "nr-rrc.interCA_NonAlignedFrame_B_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_interCA_NonAlignedFrame_B_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_supportSRS_xTyR_xLessThanY_r16, + { "supportSRS-xTyR-xLessThanY-r16", "nr-rrc.supportSRS_xTyR_xLessThanY_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_supportSRS_xTyR_xLessThanY_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_supportSRS_xTyR_xEqualToY_r16, + { "supportSRS-xTyR-xEqualToY-r16", "nr-rrc.supportSRS_xTyR_xEqualToY_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_supportSRS_xTyR_xEqualToY_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_supportSRS_AntennaSwitching_r16, + { "supportSRS-AntennaSwitching-r16", "nr-rrc.supportSRS_AntennaSwitching_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_supportSRS_AntennaSwitching_r16_vals), 0, + NULL, HFILL }}, { &hf_nr_rrc_ca_ParametersNR_ForDC, { "ca-ParametersNR-ForDC", "nr-rrc.ca_ParametersNR_ForDC_element", FT_NONE, BASE_NONE, NULL, 0, @@ -103104,6 +105006,14 @@ proto_register_nr_rrc(void) { { "asyncNRDC-r16", "nr-rrc.asyncNRDC_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_asyncNRDC_r16_vals), 0, NULL, HFILL }}, + { &hf_nr_rrc_ca_ParametersNR_ForDC_v1610, + { "ca-ParametersNR-ForDC-v1610", "nr-rrc.ca_ParametersNR_ForDC_v1610_element", + FT_NONE, BASE_NONE, NULL, 0, + "CA_ParametersNR_v1610", HFILL }}, + { &hf_nr_rrc_ca_ParametersNR_ForDC_v1630, + { "ca-ParametersNR-ForDC-v1630", "nr-rrc.ca_ParametersNR_ForDC_v1630_element", + FT_NONE, BASE_NONE, NULL, 0, + "CA_ParametersNR_v1630", HFILL }}, { &hf_nr_rrc_fr1fdd_FR1TDD_CA_SpCellOnFR1FDD, { "fr1fdd-FR1TDD-CA-SpCellOnFR1FDD", "nr-rrc.fr1fdd_FR1TDD_CA_SpCellOnFR1FDD", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_fr1fdd_FR1TDD_CA_SpCellOnFR1FDD_vals), 0, @@ -103268,9 +105178,9 @@ proto_register_nr_rrc(void) { { "rank3-4-r16", "nr-rrc.rank3_4_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_rank3_4_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_softAmpRestriction_r16, - { "softAmpRestriction-r16", "nr-rrc.softAmpRestriction_r16", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_softAmpRestriction_r16_vals), 0, + { &hf_nr_rrc_amplitudeSubsetRestriction_r16, + { "amplitudeSubsetRestriction-r16", "nr-rrc.amplitudeSubsetRestriction_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_amplitudeSubsetRestriction_r16_vals), 0, NULL, HFILL }}, { &hf_nr_rrc_etype2_PS_r16, { "etype2-PS-r16", "nr-rrc.etype2_PS_r16_element", @@ -103576,7 +105486,7 @@ proto_register_nr_rrc(void) { { "FeatureSet", "nr-rrc.FeatureSet", FT_UINT32, BASE_DEC, VALS(nr_rrc_FeatureSet_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_eutra_04, + { &hf_nr_rrc_eutra_05, { "eutra", "nr-rrc.eutra_element", FT_NONE, BASE_NONE, NULL, 0, "T_eutra_03", HFILL }}, @@ -103588,10 +105498,10 @@ proto_register_nr_rrc(void) { { "uplinkSetEUTRA", "nr-rrc.uplinkSetEUTRA", FT_UINT32, BASE_DEC, NULL, 0, "FeatureSetEUTRA_UplinkId", HFILL }}, - { &hf_nr_rrc_nr_04, + { &hf_nr_rrc_nr_05, { "nr", "nr-rrc.nr_element", FT_NONE, BASE_NONE, NULL, 0, - "T_nr_03", HFILL }}, + "T_nr_04", HFILL }}, { &hf_nr_rrc_downlinkSetNR, { "downlinkSetNR", "nr-rrc.downlinkSetNR", FT_UINT32, BASE_DEC, NULL, 0, @@ -103616,9 +105526,9 @@ proto_register_nr_rrc(void) { { "scalingFactor", "nr-rrc.scalingFactor", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scalingFactor_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_crossCarrierScheduling_OtherSCS, - { "crossCarrierScheduling-OtherSCS", "nr-rrc.crossCarrierScheduling_OtherSCS", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_crossCarrierScheduling_OtherSCS_vals), 0, + { &hf_nr_rrc_dummy8, + { "dummy8", "nr-rrc.dummy8", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy8_vals), 0, NULL, HFILL }}, { &hf_nr_rrc_scellWithoutSSB, { "scellWithoutSSB", "nr-rrc.scellWithoutSSB", @@ -103628,10 +105538,10 @@ proto_register_nr_rrc(void) { { "csi-RS-MeasSCellWithoutSSB", "nr-rrc.csi_RS_MeasSCellWithoutSSB", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_csi_RS_MeasSCellWithoutSSB_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_dummy1_01, + { &hf_nr_rrc_dummy1_02, { "dummy1", "nr-rrc.dummy1", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy1_01_vals), 0, - "T_dummy1_01", HFILL }}, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy1_02_vals), 0, + "T_dummy1_02", HFILL }}, { &hf_nr_rrc_type1_3_CSS, { "type1-3-CSS", "nr-rrc.type1_3_CSS", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_type1_3_CSS_vals), 0, @@ -103640,10 +105550,10 @@ proto_register_nr_rrc(void) { { "pdcch-MonitoringAnyOccasions", "nr-rrc.pdcch_MonitoringAnyOccasions", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdcch_MonitoringAnyOccasions_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_dummy2_01, + { &hf_nr_rrc_dummy2_02, { "dummy2", "nr-rrc.dummy2", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy2_01_vals), 0, - "T_dummy2_01", HFILL }}, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy2_02_vals), 0, + "T_dummy2_02", HFILL }}, { &hf_nr_rrc_ue_SpecificUL_DL_Assignment, { "ue-SpecificUL-DL-Assignment", "nr-rrc.ue_SpecificUL_DL_Assignment", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_ue_SpecificUL_DL_Assignment_vals), 0, @@ -103792,46 +105702,46 @@ proto_register_nr_rrc(void) { { "supportedSRS-Resources", "nr-rrc.supportedSRS_Resources_element", FT_NONE, BASE_NONE, NULL, 0, "SRS_Resources", HFILL }}, - { &hf_nr_rrc_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot, - { "cbgPDSCH-ProcessingType1-NumberOfTB-PerSlot", "nr-rrc.cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_element", + { &hf_nr_rrc_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16, + { "cbgPDSCH-ProcessingType1-NumberOfTB-PerSlot-r16", "nr-rrc.cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_element", FT_NONE, BASE_NONE, NULL, 0, + "T_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16", HFILL }}, + { &hf_nr_rrc_scs_15kHz_r16, + { "scs-15kHz-r16", "nr-rrc.scs_15kHz_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_scs_15kHz_03, - { "scs-15kHz", "nr-rrc.scs_15kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_02_vals), 0, - "T_scs_15kHz_02", HFILL }}, - { &hf_nr_rrc_scs_30kHz_03, - { "scs-30kHz", "nr-rrc.scs_30kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_02_vals), 0, - "T_scs_30kHz_02", HFILL }}, - { &hf_nr_rrc_scs_60kHz_04, - { "scs-60kHz", "nr-rrc.scs_60kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_03_vals), 0, - "T_scs_60kHz_03", HFILL }}, - { &hf_nr_rrc_scs_120kHz_03, - { "scs-120kHz", "nr-rrc.scs_120kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_03_vals), 0, - "T_scs_120kHz_03", HFILL }}, - { &hf_nr_rrc_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot, - { "cbgPDSCH-ProcessingType2-NumberOfTB-PerSlot", "nr-rrc.cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_element", - FT_NONE, BASE_NONE, NULL, 0, + { &hf_nr_rrc_scs_30kHz_r16, + { "scs-30kHz-r16", "nr-rrc.scs_30kHz_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_scs_15kHz_04, - { "scs-15kHz", "nr-rrc.scs_15kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_03_vals), 0, - "T_scs_15kHz_03", HFILL }}, - { &hf_nr_rrc_scs_30kHz_04, - { "scs-30kHz", "nr-rrc.scs_30kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_03_vals), 0, - "T_scs_30kHz_03", HFILL }}, - { &hf_nr_rrc_scs_60kHz_05, - { "scs-60kHz", "nr-rrc.scs_60kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_04_vals), 0, - "T_scs_60kHz_04", HFILL }}, - { &hf_nr_rrc_scs_120kHz_04, - { "scs-120kHz", "nr-rrc.scs_120kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_04_vals), 0, - "T_scs_120kHz_04", HFILL }}, + { &hf_nr_rrc_scs_60kHz_r16, + { "scs-60kHz-r16", "nr-rrc.scs_60kHz_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_scs_120kHz_r16, + { "scs-120kHz-r16", "nr-rrc.scs_120kHz_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16, + { "cbgPDSCH-ProcessingType2-NumberOfTB-PerSlot-r16", "nr-rrc.cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_element", + FT_NONE, BASE_NONE, NULL, 0, + "T_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16", HFILL }}, + { &hf_nr_rrc_scs_15kHz_r16_01, + { "scs-15kHz-r16", "nr-rrc.scs_15kHz_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_r16_01_vals), 0, + "T_scs_15kHz_r16_01", HFILL }}, + { &hf_nr_rrc_scs_30kHz_r16_01, + { "scs-30kHz-r16", "nr-rrc.scs_30kHz_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_r16_01_vals), 0, + "T_scs_30kHz_r16_01", HFILL }}, + { &hf_nr_rrc_scs_60kHz_r16_01, + { "scs-60kHz-r16", "nr-rrc.scs_60kHz_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_r16_01_vals), 0, + "T_scs_60kHz_r16_01", HFILL }}, + { &hf_nr_rrc_scs_120kHz_r16_01, + { "scs-120kHz-r16", "nr-rrc.scs_120kHz_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_r16_01_vals), 0, + "T_scs_120kHz_r16_01", HFILL }}, { &hf_nr_rrc_intraFreqDAPS_r16, { "intraFreqDAPS-r16", "nr-rrc.intraFreqDAPS_r16_element", FT_NONE, BASE_NONE, NULL, 0, @@ -103860,11 +105770,11 @@ proto_register_nr_rrc(void) { { "pdsch-ProcessingType1-r16", "nr-rrc.pdsch_ProcessingType1_r16_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_scs_15kHz_r16, + { &hf_nr_rrc_scs_15kHz_r16_02, { "scs-15kHz-r16", "nr-rrc.scs_15kHz_r16_element", FT_NONE, BASE_NONE, NULL, 0, "PDCCH_MonitoringOccasions_r16", HFILL }}, - { &hf_nr_rrc_scs_30kHz_r16, + { &hf_nr_rrc_scs_30kHz_r16_02, { "scs-30kHz-r16", "nr-rrc.scs_30kHz_r16_element", FT_NONE, BASE_NONE, NULL, 0, "PDCCH_MonitoringOccasions_r16", HFILL }}, @@ -104116,6 +106026,14 @@ proto_register_nr_rrc(void) { { "FeatureSetDownlinkPerCC-v1620", "nr-rrc.FeatureSetDownlinkPerCC_v1620_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nr_rrc_featureSetsUplink_v1630, + { "featureSetsUplink-v1630", "nr-rrc.featureSetsUplink_v1630", + FT_UINT32, BASE_DEC, NULL, 0, + "SEQUENCE_SIZE_1_maxUplinkFeatureSets_OF_FeatureSetUplink_v1630", HFILL }}, + { &hf_nr_rrc_featureSetsUplink_v1630_item, + { "FeatureSetUplink-v1630", "nr-rrc.FeatureSetUplink_v1630_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_nr_rrc_featureSetListPerUplinkCC, { "featureSetListPerUplinkCC", "nr-rrc.featureSetListPerUplinkCC", FT_UINT32, BASE_DEC, NULL, 0, @@ -104128,10 +106046,10 @@ proto_register_nr_rrc(void) { { "scalingFactor", "nr-rrc.scalingFactor", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scalingFactor_01_vals), 0, "T_scalingFactor_01", HFILL }}, - { &hf_nr_rrc_crossCarrierScheduling_OtherSCS_01, - { "crossCarrierScheduling-OtherSCS", "nr-rrc.crossCarrierScheduling_OtherSCS", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_crossCarrierScheduling_OtherSCS_01_vals), 0, - "T_crossCarrierScheduling_OtherSCS_01", HFILL }}, + { &hf_nr_rrc_dummy3_01, + { "dummy3", "nr-rrc.dummy3", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy3_vals), 0, + NULL, HFILL }}, { &hf_nr_rrc_intraBandFreqSeparationUL, { "intraBandFreqSeparationUL", "nr-rrc.intraBandFreqSeparationUL", FT_UINT32, BASE_DEC, VALS(nr_rrc_FreqSeparationClass_vals), 0, @@ -104140,7 +106058,7 @@ proto_register_nr_rrc(void) { { "searchSpaceSharingCA-UL", "nr-rrc.searchSpaceSharingCA_UL", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_searchSpaceSharingCA_UL_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_dummy1_02, + { &hf_nr_rrc_dummy1_03, { "dummy1", "nr-rrc.dummy1_element", FT_NONE, BASE_NONE, NULL, 0, "DummyI", HFILL }}, @@ -104160,23 +106078,23 @@ proto_register_nr_rrc(void) { { "pusch-ProcessingType1-DifferentTB-PerSlot", "nr-rrc.pusch_ProcessingType1_DifferentTB_PerSlot_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_scs_15kHz_05, + { &hf_nr_rrc_scs_15kHz_03, { "scs-15kHz", "nr-rrc.scs_15kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_04_vals), 0, - "T_scs_15kHz_04", HFILL }}, - { &hf_nr_rrc_scs_30kHz_05, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_02_vals), 0, + "T_scs_15kHz_02", HFILL }}, + { &hf_nr_rrc_scs_30kHz_03, { "scs-30kHz", "nr-rrc.scs_30kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_04_vals), 0, - "T_scs_30kHz_04", HFILL }}, - { &hf_nr_rrc_scs_60kHz_06, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_02_vals), 0, + "T_scs_30kHz_02", HFILL }}, + { &hf_nr_rrc_scs_60kHz_04, { "scs-60kHz", "nr-rrc.scs_60kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_05_vals), 0, - "T_scs_60kHz_05", HFILL }}, - { &hf_nr_rrc_scs_120kHz_05, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_03_vals), 0, + "T_scs_60kHz_03", HFILL }}, + { &hf_nr_rrc_scs_120kHz_03, { "scs-120kHz", "nr-rrc.scs_120kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_05_vals), 0, - "T_scs_120kHz_05", HFILL }}, - { &hf_nr_rrc_dummy2_02, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_03_vals), 0, + "T_scs_120kHz_03", HFILL }}, + { &hf_nr_rrc_dummy2_03, { "dummy2", "nr-rrc.dummy2_element", FT_NONE, BASE_NONE, NULL, 0, "DummyF", HFILL }}, @@ -104220,50 +106138,50 @@ proto_register_nr_rrc(void) { { "ul-CancellationCrossCarrier-r16", "nr-rrc.ul_CancellationCrossCarrier_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_ul_CancellationCrossCarrier_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_ul_FullPwrMode2_MaxSRS_ResInSet, - { "ul-FullPwrMode2-MaxSRS-ResInSet", "nr-rrc.ul_FullPwrMode2_MaxSRS_ResInSet", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_ul_FullPwrMode2_MaxSRS_ResInSet_vals), 0, - NULL, HFILL }}, - { &hf_nr_rrc_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot, - { "cbgPUSCH-ProcessingType1-DifferentTB-PerSlot", "nr-rrc.cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_element", + { &hf_nr_rrc_ul_FullPwrMode2_MaxSRS_ResInSet_r16, + { "ul-FullPwrMode2-MaxSRS-ResInSet-r16", "nr-rrc.ul_FullPwrMode2_MaxSRS_ResInSet_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_ul_FullPwrMode2_MaxSRS_ResInSet_r16_vals), 0, + "T_ul_FullPwrMode2_MaxSRS_ResInSet_r16", HFILL }}, + { &hf_nr_rrc_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16, + { "cbgPUSCH-ProcessingType1-DifferentTB-PerSlot-r16", "nr-rrc.cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_element", FT_NONE, BASE_NONE, NULL, 0, - NULL, HFILL }}, - { &hf_nr_rrc_scs_15kHz_06, - { "scs-15kHz", "nr-rrc.scs_15kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_05_vals), 0, - "T_scs_15kHz_05", HFILL }}, - { &hf_nr_rrc_scs_30kHz_06, - { "scs-30kHz", "nr-rrc.scs_30kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_05_vals), 0, - "T_scs_30kHz_05", HFILL }}, - { &hf_nr_rrc_scs_60kHz_07, - { "scs-60kHz", "nr-rrc.scs_60kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_06_vals), 0, - "T_scs_60kHz_06", HFILL }}, - { &hf_nr_rrc_scs_120kHz_06, - { "scs-120kHz", "nr-rrc.scs_120kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_06_vals), 0, - "T_scs_120kHz_06", HFILL }}, - { &hf_nr_rrc_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot, - { "cbgPUSCH-ProcessingType2-DifferentTB-PerSlot", "nr-rrc.cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_element", + "T_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16", HFILL }}, + { &hf_nr_rrc_scs_15kHz_r16_03, + { "scs-15kHz-r16", "nr-rrc.scs_15kHz_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_r16_02_vals), 0, + "T_scs_15kHz_r16_02", HFILL }}, + { &hf_nr_rrc_scs_30kHz_r16_03, + { "scs-30kHz-r16", "nr-rrc.scs_30kHz_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_r16_02_vals), 0, + "T_scs_30kHz_r16_02", HFILL }}, + { &hf_nr_rrc_scs_60kHz_r16_02, + { "scs-60kHz-r16", "nr-rrc.scs_60kHz_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_r16_02_vals), 0, + "T_scs_60kHz_r16_02", HFILL }}, + { &hf_nr_rrc_scs_120kHz_r16_02, + { "scs-120kHz-r16", "nr-rrc.scs_120kHz_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_r16_02_vals), 0, + "T_scs_120kHz_r16_02", HFILL }}, + { &hf_nr_rrc_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16, + { "cbgPUSCH-ProcessingType2-DifferentTB-PerSlot-r16", "nr-rrc.cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_element", FT_NONE, BASE_NONE, NULL, 0, - NULL, HFILL }}, - { &hf_nr_rrc_scs_15kHz_07, - { "scs-15kHz", "nr-rrc.scs_15kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_06_vals), 0, - "T_scs_15kHz_06", HFILL }}, - { &hf_nr_rrc_scs_30kHz_07, - { "scs-30kHz", "nr-rrc.scs_30kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_06_vals), 0, - "T_scs_30kHz_06", HFILL }}, - { &hf_nr_rrc_scs_60kHz_08, - { "scs-60kHz", "nr-rrc.scs_60kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_07_vals), 0, - "T_scs_60kHz_07", HFILL }}, - { &hf_nr_rrc_scs_120kHz_07, - { "scs-120kHz", "nr-rrc.scs_120kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_07_vals), 0, - "T_scs_120kHz_07", HFILL }}, + "T_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16", HFILL }}, + { &hf_nr_rrc_scs_15kHz_r16_04, + { "scs-15kHz-r16", "nr-rrc.scs_15kHz_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_r16_03_vals), 0, + "T_scs_15kHz_r16_03", HFILL }}, + { &hf_nr_rrc_scs_30kHz_r16_04, + { "scs-30kHz-r16", "nr-rrc.scs_30kHz_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_r16_03_vals), 0, + "T_scs_30kHz_r16_03", HFILL }}, + { &hf_nr_rrc_scs_60kHz_r16_03, + { "scs-60kHz-r16", "nr-rrc.scs_60kHz_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_r16_03_vals), 0, + "T_scs_60kHz_r16_03", HFILL }}, + { &hf_nr_rrc_scs_120kHz_r16_03, + { "scs-120kHz-r16", "nr-rrc.scs_120kHz_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_r16_03_vals), 0, + "T_scs_120kHz_r16_03", HFILL }}, { &hf_nr_rrc_supportedSRS_PosResources_r16, { "supportedSRS-PosResources-r16", "nr-rrc.supportedSRS_PosResources_r16_element", FT_NONE, BASE_NONE, NULL, 0, @@ -104432,6 +106350,30 @@ proto_register_nr_rrc(void) { { "fourPortsPartialCoherent-r16", "nr-rrc.fourPortsPartialCoherent_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_fourPortsPartialCoherent_r16_vals), 0, "T_fourPortsPartialCoherent_r16", HFILL }}, + { &hf_nr_rrc_offsetSRS_CB_PUSCH_Ant_Switch_fr1_r16, + { "offsetSRS-CB-PUSCH-Ant-Switch-fr1-r16", "nr-rrc.offsetSRS_CB_PUSCH_Ant_Switch_fr1_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_offsetSRS_CB_PUSCH_Ant_Switch_fr1_r16_vals), 0, + "T_offsetSRS_CB_PUSCH_Ant_Switch_fr1_r16", HFILL }}, + { &hf_nr_rrc_offsetSRS_CB_PUSCH_PDCCH_MonitorSingleOcc_fr1_r16, + { "offsetSRS-CB-PUSCH-PDCCH-MonitorSingleOcc-fr1-r16", "nr-rrc.offsetSRS_CB_PUSCH_PDCCH_MonitorSingleOcc_fr1_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_offsetSRS_CB_PUSCH_PDCCH_MonitorSingleOcc_fr1_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithoutGap_fr1_r16, + { "offsetSRS-CB-PUSCH-PDCCH-MonitorAnyOccWithoutGap-fr1-r16", "nr-rrc.offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithoutGap_fr1_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithoutGap_fr1_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithGap_fr1_r16, + { "offsetSRS-CB-PUSCH-PDCCH-MonitorAnyOccWithGap-fr1-r16", "nr-rrc.offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithGap_fr1_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithGap_fr1_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithSpanGap_fr1_r16, + { "offsetSRS-CB-PUSCH-PDCCH-MonitorAnyOccWithSpanGap-fr1-r16", "nr-rrc.offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithSpanGap_fr1_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_offsetSRS_CB_PUSCH_PDCCH_MonitorAnyOccWithSpanGap_fr1_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_partialCancellationPUCCH_PUSCH_PRACH_TX_r16, + { "partialCancellationPUCCH-PUSCH-PRACH-TX-r16", "nr-rrc.partialCancellationPUCCH_PUSCH_PRACH_TX_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_partialCancellationPUCCH_PUSCH_PRACH_TX_r16_vals), 0, + NULL, HFILL }}, { &hf_nr_rrc_srs_PosResources_r16, { "srs-PosResources-r16", "nr-rrc.srs_PosResources_r16_element", FT_NONE, BASE_NONE, NULL, 0, @@ -104624,7 +106566,7 @@ proto_register_nr_rrc(void) { { "voiceOverNR", "nr-rrc.voiceOverNR", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_voiceOverNR_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_eutra_05, + { &hf_nr_rrc_eutra_06, { "eutra", "nr-rrc.eutra_element", FT_NONE, BASE_NONE, NULL, 0, "EUTRA_Parameters", HFILL }}, @@ -104702,8 +106644,8 @@ proto_register_nr_rrc(void) { NULL, HFILL }}, { &hf_nr_rrc_dummy_09, { "dummy", "nr-rrc.dummy", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_05_vals), 0, - "T_dummy_05", HFILL }}, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_04_vals), 0, + "T_dummy_04", HFILL }}, { &hf_nr_rrc_lch_ToSCellRestriction, { "lch-ToSCellRestriction", "nr-rrc.lch_ToSCellRestriction", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_lch_ToSCellRestriction_vals), 0, @@ -104812,22 +106754,22 @@ proto_register_nr_rrc(void) { { "secondaryDRX-Group-r16", "nr-rrc.secondaryDRX_Group_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_secondaryDRX_Group_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_scs_15kHz_r16_01, + { &hf_nr_rrc_scs_15kHz_r16_05, { "scs-15kHz-r16", "nr-rrc.scs_15kHz_r16", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_r16_vals), 0, - NULL, HFILL }}, - { &hf_nr_rrc_scs_30kHz_r16_01, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_r16_04_vals), 0, + "T_scs_15kHz_r16_04", HFILL }}, + { &hf_nr_rrc_scs_30kHz_r16_05, { "scs-30kHz-r16", "nr-rrc.scs_30kHz_r16", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_r16_vals), 0, - NULL, HFILL }}, - { &hf_nr_rrc_scs_60kHz_r16, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_r16_04_vals), 0, + "T_scs_30kHz_r16_04", HFILL }}, + { &hf_nr_rrc_scs_60kHz_r16_04, { "scs-60kHz-r16", "nr-rrc.scs_60kHz_r16", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_r16_vals), 0, - NULL, HFILL }}, - { &hf_nr_rrc_scs_120kHz_r16, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_r16_04_vals), 0, + "T_scs_60kHz_r16_04", HFILL }}, + { &hf_nr_rrc_scs_120kHz_r16_04, { "scs-120kHz-r16", "nr-rrc.scs_120kHz_r16", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_r16_vals), 0, - NULL, HFILL }}, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_r16_04_vals), 0, + "T_scs_120kHz_r16_04", HFILL }}, { &hf_nr_rrc_measAndMobParametersCommon, { "measAndMobParametersCommon", "nr-rrc.measAndMobParametersCommon_element", FT_NONE, BASE_NONE, NULL, 0, @@ -104948,10 +106890,10 @@ proto_register_nr_rrc(void) { { "mfbi-IAB-r16", "nr-rrc.mfbi_IAB_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_mfbi_IAB_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_multipleNS_And_Pmax_IAB_r16, - { "multipleNS-And-Pmax-IAB-r16", "nr-rrc.multipleNS_And_Pmax_IAB_r16", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_multipleNS_And_Pmax_IAB_r16_vals), 0, - NULL, HFILL }}, + { &hf_nr_rrc_dummy_10, + { "dummy", "nr-rrc.dummy", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_05_vals), 0, + "T_dummy_05", HFILL }}, { &hf_nr_rrc_nr_CGI_Reporting_NPN_r16, { "nr-CGI-Reporting-NPN-r16", "nr-rrc.nr_CGI_Reporting_NPN_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_nr_CGI_Reporting_NPN_r16_vals), 0, @@ -105100,6 +107042,10 @@ proto_register_nr_rrc(void) { { "idleInactiveNR-MeasBeamReport-r16", "nr-rrc.idleInactiveNR_MeasBeamReport_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_idleInactiveNR_MeasBeamReport_r16_vals), 0, "T_idleInactiveNR_MeasBeamReport_r16", HFILL }}, + { &hf_nr_rrc_increasedNumberofCSIRSPerMO_r16, + { "increasedNumberofCSIRSPerMO-r16", "nr-rrc.increasedNumberofCSIRSPerMO_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_increasedNumberofCSIRSPerMO_r16_vals), 0, + NULL, HFILL }}, { &hf_nr_rrc_measAndMobParametersMRDC_Common, { "measAndMobParametersMRDC-Common", "nr-rrc.measAndMobParametersMRDC_Common_element", FT_NONE, BASE_NONE, NULL, 0, @@ -105200,7 +107146,7 @@ proto_register_nr_rrc(void) { { "sp-BeamReportPUSCH", "nr-rrc.sp_BeamReportPUSCH", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sp_BeamReportPUSCH_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_dummy1_03, + { &hf_nr_rrc_dummy1_04, { "dummy1", "nr-rrc.dummy1_element", FT_NONE, BASE_NONE, NULL, 0, "DummyG", HFILL }}, @@ -105212,22 +107158,22 @@ proto_register_nr_rrc(void) { { "maxNumberRxTxBeamSwitchDL", "nr-rrc.maxNumberRxTxBeamSwitchDL_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_scs_15kHz_08, + { &hf_nr_rrc_scs_15kHz_04, { "scs-15kHz", "nr-rrc.scs_15kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_07_vals), 0, - "T_scs_15kHz_07", HFILL }}, - { &hf_nr_rrc_scs_30kHz_08, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_03_vals), 0, + "T_scs_15kHz_03", HFILL }}, + { &hf_nr_rrc_scs_30kHz_04, { "scs-30kHz", "nr-rrc.scs_30kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_07_vals), 0, - "T_scs_30kHz_07", HFILL }}, - { &hf_nr_rrc_scs_60kHz_09, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_03_vals), 0, + "T_scs_30kHz_03", HFILL }}, + { &hf_nr_rrc_scs_60kHz_05, { "scs-60kHz", "nr-rrc.scs_60kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_08_vals), 0, - "T_scs_60kHz_08", HFILL }}, - { &hf_nr_rrc_scs_120kHz_08, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_04_vals), 0, + "T_scs_60kHz_04", HFILL }}, + { &hf_nr_rrc_scs_120kHz_04, { "scs-120kHz", "nr-rrc.scs_120kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_08_vals), 0, - "T_scs_120kHz_08", HFILL }}, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_04_vals), 0, + "T_scs_120kHz_04", HFILL }}, { &hf_nr_rrc_scs_240kHz, { "scs-240kHz", "nr-rrc.scs_240kHz", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_240kHz_vals), 0, @@ -105264,10 +107210,10 @@ proto_register_nr_rrc(void) { { "maxNumberCSI-RS-SSB-CBD", "nr-rrc.maxNumberCSI_RS_SSB_CBD", FT_UINT32, BASE_DEC, NULL, 0, "INTEGER_1_256", HFILL }}, - { &hf_nr_rrc_dummy2_03, + { &hf_nr_rrc_dummy2_04, { "dummy2", "nr-rrc.dummy2", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy2_02_vals), 0, - "T_dummy2_02", HFILL }}, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy2_03_vals), 0, + "T_dummy2_03", HFILL }}, { &hf_nr_rrc_twoPortsPTRS_UL, { "twoPortsPTRS-UL", "nr-rrc.twoPortsPTRS_UL", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_twoPortsPTRS_UL_vals), 0, @@ -105276,7 +107222,7 @@ proto_register_nr_rrc(void) { { "dummy5", "nr-rrc.dummy5_element", FT_NONE, BASE_NONE, NULL, 0, "SRS_Resources", HFILL }}, - { &hf_nr_rrc_dummy3_01, + { &hf_nr_rrc_dummy3_02, { "dummy3", "nr-rrc.dummy3", FT_UINT32, BASE_DEC, NULL, 0, "INTEGER_1_4", HFILL }}, @@ -105284,39 +107230,39 @@ proto_register_nr_rrc(void) { { "beamReportTiming", "nr-rrc.beamReportTiming_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_scs_15kHz_09, + { &hf_nr_rrc_scs_15kHz_05, { "scs-15kHz", "nr-rrc.scs_15kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_08_vals), 0, - "T_scs_15kHz_08", HFILL }}, - { &hf_nr_rrc_scs_30kHz_09, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_04_vals), 0, + "T_scs_15kHz_04", HFILL }}, + { &hf_nr_rrc_scs_30kHz_05, { "scs-30kHz", "nr-rrc.scs_30kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_08_vals), 0, - "T_scs_30kHz_08", HFILL }}, - { &hf_nr_rrc_scs_60kHz_10, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_04_vals), 0, + "T_scs_30kHz_04", HFILL }}, + { &hf_nr_rrc_scs_60kHz_06, { "scs-60kHz", "nr-rrc.scs_60kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_09_vals), 0, - "T_scs_60kHz_09", HFILL }}, - { &hf_nr_rrc_scs_120kHz_09, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_05_vals), 0, + "T_scs_60kHz_05", HFILL }}, + { &hf_nr_rrc_scs_120kHz_05, { "scs-120kHz", "nr-rrc.scs_120kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_09_vals), 0, - "T_scs_120kHz_09", HFILL }}, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_05_vals), 0, + "T_scs_120kHz_05", HFILL }}, { &hf_nr_rrc_ptrs_DensityRecommendationSetDL, { "ptrs-DensityRecommendationSetDL", "nr-rrc.ptrs_DensityRecommendationSetDL_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_scs_15kHz_10, + { &hf_nr_rrc_scs_15kHz_06, { "scs-15kHz", "nr-rrc.scs_15kHz_element", FT_NONE, BASE_NONE, NULL, 0, "PTRS_DensityRecommendationDL", HFILL }}, - { &hf_nr_rrc_scs_30kHz_10, + { &hf_nr_rrc_scs_30kHz_06, { "scs-30kHz", "nr-rrc.scs_30kHz_element", FT_NONE, BASE_NONE, NULL, 0, "PTRS_DensityRecommendationDL", HFILL }}, - { &hf_nr_rrc_scs_60kHz_11, + { &hf_nr_rrc_scs_60kHz_07, { "scs-60kHz", "nr-rrc.scs_60kHz_element", FT_NONE, BASE_NONE, NULL, 0, "PTRS_DensityRecommendationDL", HFILL }}, - { &hf_nr_rrc_scs_120kHz_10, + { &hf_nr_rrc_scs_120kHz_06, { "scs-120kHz", "nr-rrc.scs_120kHz_element", FT_NONE, BASE_NONE, NULL, 0, "PTRS_DensityRecommendationDL", HFILL }}, @@ -105324,19 +107270,19 @@ proto_register_nr_rrc(void) { { "ptrs-DensityRecommendationSetUL", "nr-rrc.ptrs_DensityRecommendationSetUL_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_scs_15kHz_11, + { &hf_nr_rrc_scs_15kHz_07, { "scs-15kHz", "nr-rrc.scs_15kHz_element", FT_NONE, BASE_NONE, NULL, 0, "PTRS_DensityRecommendationUL", HFILL }}, - { &hf_nr_rrc_scs_30kHz_11, + { &hf_nr_rrc_scs_30kHz_07, { "scs-30kHz", "nr-rrc.scs_30kHz_element", FT_NONE, BASE_NONE, NULL, 0, "PTRS_DensityRecommendationUL", HFILL }}, - { &hf_nr_rrc_scs_60kHz_12, + { &hf_nr_rrc_scs_60kHz_08, { "scs-60kHz", "nr-rrc.scs_60kHz_element", FT_NONE, BASE_NONE, NULL, 0, "PTRS_DensityRecommendationUL", HFILL }}, - { &hf_nr_rrc_scs_120kHz_11, + { &hf_nr_rrc_scs_120kHz_07, { "scs-120kHz", "nr-rrc.scs_120kHz_element", FT_NONE, BASE_NONE, NULL, 0, "PTRS_DensityRecommendationUL", HFILL }}, @@ -105360,14 +107306,14 @@ proto_register_nr_rrc(void) { { "beamSwitchTiming", "nr-rrc.beamSwitchTiming_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_scs_60kHz_13, + { &hf_nr_rrc_scs_60kHz_09, { "scs-60kHz", "nr-rrc.scs_60kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_10_vals), 0, - "T_scs_60kHz_10", HFILL }}, - { &hf_nr_rrc_scs_120kHz_12, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_06_vals), 0, + "T_scs_60kHz_06", HFILL }}, + { &hf_nr_rrc_scs_120kHz_08, { "scs-120kHz", "nr-rrc.scs_120kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_10_vals), 0, - "T_scs_120kHz_10", HFILL }}, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_06_vals), 0, + "T_scs_120kHz_06", HFILL }}, { &hf_nr_rrc_codebookParameters, { "codebookParameters", "nr-rrc.codebookParameters_element", FT_NONE, BASE_NONE, NULL, 0, @@ -105592,14 +107538,30 @@ proto_register_nr_rrc(void) { { "beamSwitchTiming-r16", "nr-rrc.beamSwitchTiming_r16_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_scs_60kHz_r16_01, + { &hf_nr_rrc_scs_60kHz_r16_05, { "scs-60kHz-r16", "nr-rrc.scs_60kHz_r16", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_r16_01_vals), 0, - "T_scs_60kHz_r16_01", HFILL }}, - { &hf_nr_rrc_scs_120kHz_r16_01, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_r16_05_vals), 0, + "T_scs_60kHz_r16_05", HFILL }}, + { &hf_nr_rrc_scs_120kHz_r16_05, { "scs-120kHz-r16", "nr-rrc.scs_120kHz_r16", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_r16_01_vals), 0, - "T_scs_120kHz_r16_01", HFILL }}, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_r16_05_vals), 0, + "T_scs_120kHz_r16_05", HFILL }}, + { &hf_nr_rrc_semi_PersistentL1_SINR_Report_PUCCH_r16, + { "semi-PersistentL1-SINR-Report-PUCCH-r16", "nr-rrc.semi_PersistentL1_SINR_Report_PUCCH_r16_element", + FT_NONE, BASE_NONE, NULL, 0, + "T_semi_PersistentL1_SINR_Report_PUCCH_r16", HFILL }}, + { &hf_nr_rrc_supportReportFormat1_2OFDM_syms_r16, + { "supportReportFormat1-2OFDM-syms-r16", "nr-rrc.supportReportFormat1_2OFDM_syms_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_supportReportFormat1_2OFDM_syms_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_supportReportFormat4_14OFDM_syms_r16, + { "supportReportFormat4-14OFDM-syms-r16", "nr-rrc.supportReportFormat4_14OFDM_syms_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_supportReportFormat4_14OFDM_syms_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_semi_PersistentL1_SINR_Report_PUSCH_r16, + { "semi-PersistentL1-SINR-Report-PUSCH-r16", "nr-rrc.semi_PersistentL1_SINR_Report_PUSCH_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_semi_PersistentL1_SINR_Report_PUSCH_r16_vals), 0, + "T_semi_PersistentL1_SINR_Report_PUSCH_r16", HFILL }}, { &hf_nr_rrc_maxNumberSSB_CSI_RS_ResourceOneTx, { "maxNumberSSB-CSI-RS-ResourceOneTx", "nr-rrc.maxNumberSSB_CSI_RS_ResourceOneTx", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_maxNumberSSB_CSI_RS_ResourceOneTx_vals), 0, @@ -105888,6 +107850,22 @@ proto_register_nr_rrc(void) { { "tdm-restrictionDualTX-FDD-endc-r16", "nr-rrc.tdm_restrictionDualTX_FDD_endc_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_tdm_restrictionDualTX_FDD_endc_r16_vals), 0, NULL, HFILL }}, + { &hf_nr_rrc_maxUplinkDutyCycle_interBandENDC_FDD_TDD_PC2_r16, + { "maxUplinkDutyCycle-interBandENDC-FDD-TDD-PC2-r16", "nr-rrc.maxUplinkDutyCycle_interBandENDC_FDD_TDD_PC2_r16_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_maxUplinkDutyCycle_FDD_TDD_EN_DC1_r16, + { "maxUplinkDutyCycle-FDD-TDD-EN-DC1-r16", "nr-rrc.maxUplinkDutyCycle_FDD_TDD_EN_DC1_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_maxUplinkDutyCycle_FDD_TDD_EN_DC1_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_maxUplinkDutyCycle_FDD_TDD_EN_DC2_r16, + { "maxUplinkDutyCycle-FDD-TDD-EN-DC2-r16", "nr-rrc.maxUplinkDutyCycle_FDD_TDD_EN_DC2_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_maxUplinkDutyCycle_FDD_TDD_EN_DC2_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_interBandMRDC_WithOverlapDL_Bands_r16, + { "interBandMRDC-WithOverlapDL-Bands-r16", "nr-rrc.interBandMRDC_WithOverlapDL_Bands_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_interBandMRDC_WithOverlapDL_Bands_r16_vals), 0, + NULL, HFILL }}, { &hf_nr_rrc_measAndMobParametersNRDC, { "measAndMobParametersNRDC", "nr-rrc.measAndMobParametersNRDC_element", FT_NONE, BASE_NONE, NULL, 0, @@ -105912,7 +107890,11 @@ proto_register_nr_rrc(void) { { "fr2-Add-UE-NRDC-Capabilities", "nr-rrc.fr2_Add_UE_NRDC_Capabilities_element", FT_NONE, BASE_NONE, NULL, 0, "UE_MRDC_CapabilityAddFRX_Mode", HFILL }}, - { &hf_nr_rrc_dummy_10, + { &hf_nr_rrc_dummy2_05, + { "dummy2", "nr-rrc.dummy2", + FT_BYTES, BASE_NONE, NULL, 0, + "OCTET_STRING", HFILL }}, + { &hf_nr_rrc_dummy_11, { "dummy", "nr-rrc.dummy_element", FT_NONE, BASE_NONE, NULL, 0, "T_dummy_06", HFILL }}, @@ -105920,6 +107902,14 @@ proto_register_nr_rrc(void) { { "sfn-SyncNRDC", "nr-rrc.sfn_SyncNRDC", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sfn_SyncNRDC_vals), 0, NULL, HFILL }}, + { &hf_nr_rrc_pdcp_DuplicationSplitSRB, + { "pdcp-DuplicationSplitSRB", "nr-rrc.pdcp_DuplicationSplitSRB", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdcp_DuplicationSplitSRB_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_pdcp_DuplicationSplitDRB, + { "pdcp-DuplicationSplitDRB", "nr-rrc.pdcp_DuplicationSplitDRB", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdcp_DuplicationSplitDRB_vals), 0, + NULL, HFILL }}, { &hf_nr_rrc_measAndMobParametersNRDC_v1610, { "measAndMobParametersNRDC-v1610", "nr-rrc.measAndMobParametersNRDC_v1610_element", FT_NONE, BASE_NONE, NULL, 0, @@ -106008,14 +107998,14 @@ proto_register_nr_rrc(void) { { "pdcp-DuplicationMoreThanTwoRLC-r16", "nr-rrc.pdcp_DuplicationMoreThanTwoRLC_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdcp_DuplicationMoreThanTwoRLC_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_pdcp_DuplicationSplitSRB, + { &hf_nr_rrc_pdcp_DuplicationSplitSRB_01, { "pdcp-DuplicationSplitSRB", "nr-rrc.pdcp_DuplicationSplitSRB", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdcp_DuplicationSplitSRB_vals), 0, - NULL, HFILL }}, - { &hf_nr_rrc_pdcp_DuplicationSplitDRB, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdcp_DuplicationSplitSRB_01_vals), 0, + "T_pdcp_DuplicationSplitSRB_01", HFILL }}, + { &hf_nr_rrc_pdcp_DuplicationSplitDRB_01, { "pdcp-DuplicationSplitDRB", "nr-rrc.pdcp_DuplicationSplitDRB", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdcp_DuplicationSplitDRB_vals), 0, - NULL, HFILL }}, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdcp_DuplicationSplitDRB_01_vals), 0, + "T_pdcp_DuplicationSplitDRB_01", HFILL }}, { &hf_nr_rrc_scg_DRB_NR_IAB_r16, { "scg-DRB-NR-IAB-r16", "nr-rrc.scg_DRB_NR_IAB_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scg_DRB_NR_IAB_r16_vals), 0, @@ -106176,7 +108166,7 @@ proto_register_nr_rrc(void) { { "bwp-SwitchingDelay", "nr-rrc.bwp_SwitchingDelay", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_bwp_SwitchingDelay_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_dummy_11, + { &hf_nr_rrc_dummy_12, { "dummy", "nr-rrc.dummy", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_07_vals), 0, "T_dummy_07", HFILL }}, @@ -106356,6 +108346,18 @@ proto_register_nr_rrc(void) { { "type2-r16", "nr-rrc.type2_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_type2_r16_01_vals), 0, "T_type2_r16_01", HFILL }}, + { &hf_nr_rrc_targetSMTC_SCG_r16, + { "targetSMTC-SCG-r16", "nr-rrc.targetSMTC_SCG_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_targetSMTC_SCG_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_supportRepetitionZeroOffsetRV_r16, + { "supportRepetitionZeroOffsetRV-r16", "nr-rrc.supportRepetitionZeroOffsetRV_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_supportRepetitionZeroOffsetRV_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_cbg_TransInOrderPUSCH_UL_r16, + { "cbg-TransInOrderPUSCH-UL-r16", "nr-rrc.cbg_TransInOrderPUSCH_UL_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_cbg_TransInOrderPUSCH_UL_r16_vals), 0, + NULL, HFILL }}, { &hf_nr_rrc_dynamicSFI, { "dynamicSFI", "nr-rrc.dynamicSFI", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dynamicSFI_vals), 0, @@ -106388,7 +108390,7 @@ proto_register_nr_rrc(void) { { "dynamicSFI", "nr-rrc.dynamicSFI", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dynamicSFI_01_vals), 0, "T_dynamicSFI_01", HFILL }}, - { &hf_nr_rrc_dummy1_04, + { &hf_nr_rrc_dummy1_05, { "dummy1", "nr-rrc.dummy1", FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING_SIZE_2", HFILL }}, @@ -106396,11 +108398,11 @@ proto_register_nr_rrc(void) { { "twoFL-DMRS", "nr-rrc.twoFL_DMRS", FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING_SIZE_2", HFILL }}, - { &hf_nr_rrc_dummy2_04, + { &hf_nr_rrc_dummy2_06, { "dummy2", "nr-rrc.dummy2", FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING_SIZE_2", HFILL }}, - { &hf_nr_rrc_dummy3_02, + { &hf_nr_rrc_dummy3_03, { "dummy3", "nr-rrc.dummy3", FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING_SIZE_2", HFILL }}, @@ -106648,14 +108650,18 @@ proto_register_nr_rrc(void) { { "maxNumberResAcrossCC-OneFR-r16", "nr-rrc.maxNumberResAcrossCC_OneFR_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_maxNumberResAcrossCC_OneFR_r16_vals), 0, NULL, HFILL }}, + { &hf_nr_rrc_twoTCI_Act_servingCellInCC_List_r16, + { "twoTCI-Act-servingCellInCC-List-r16", "nr-rrc.twoTCI_Act_servingCellInCC_List_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_twoTCI_Act_servingCellInCC_List_r16_vals), 0, + "T_twoTCI_Act_servingCellInCC_List_r16", HFILL }}, { &hf_nr_rrc_pdcch_MonitoringSingleOccasion, { "pdcch-MonitoringSingleOccasion", "nr-rrc.pdcch_MonitoringSingleOccasion", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdcch_MonitoringSingleOccasion_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_scs_60kHz_14, + { &hf_nr_rrc_scs_60kHz_10, { "scs-60kHz", "nr-rrc.scs_60kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_11_vals), 0, - "T_scs_60kHz_11", HFILL }}, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_07_vals), 0, + "T_scs_60kHz_07", HFILL }}, { &hf_nr_rrc_pdsch_256QAM_FR1, { "pdsch-256QAM-FR1", "nr-rrc.pdsch_256QAM_FR1", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdsch_256QAM_FR1_vals), 0, @@ -106668,7 +108674,7 @@ proto_register_nr_rrc(void) { { "pdsch-RE-MappingFR1-PerSlot", "nr-rrc.pdsch_RE_MappingFR1_PerSlot", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdsch_RE_MappingFR1_PerSlot_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_dummy_12, + { &hf_nr_rrc_dummy_13, { "dummy", "nr-rrc.dummy", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_08_vals), 0, "T_dummy_08", HFILL }}, @@ -106820,6 +108826,18 @@ proto_register_nr_rrc(void) { { "supportedBandCombinationList-UplinkTxSwitch-r16", "nr-rrc.supportedBandCombinationList_UplinkTxSwitch_r16", FT_UINT32, BASE_DEC, NULL, 0, "BandCombinationList_UplinkTxSwitch_r16", HFILL }}, + { &hf_nr_rrc_supportedBandCombinationList_v1630, + { "supportedBandCombinationList-v1630", "nr-rrc.supportedBandCombinationList_v1630", + FT_UINT32, BASE_DEC, NULL, 0, + "BandCombinationList_v1630", HFILL }}, + { &hf_nr_rrc_supportedBandCombinationListSidelinkEUTRA_NR_v1630, + { "supportedBandCombinationListSidelinkEUTRA-NR-v1630", "nr-rrc.supportedBandCombinationListSidelinkEUTRA_NR_v1630", + FT_UINT32, BASE_DEC, NULL, 0, + "BandCombinationListSidelinkEUTRA_NR_v1630", HFILL }}, + { &hf_nr_rrc_supportedBandCombinationList_UplinkTxSwitch_v1630, + { "supportedBandCombinationList-UplinkTxSwitch-v1630", "nr-rrc.supportedBandCombinationList_UplinkTxSwitch_v1630", + FT_UINT32, BASE_DEC, NULL, 0, + "BandCombinationList_UplinkTxSwitch_v1630", HFILL }}, { &hf_nr_rrc_modifiedMPR_Behaviour, { "modifiedMPR-Behaviour", "nr-rrc.modifiedMPR_Behaviour", FT_BYTES, BASE_NONE, NULL, 0, @@ -106876,15 +108894,15 @@ proto_register_nr_rrc(void) { { "fr1", "nr-rrc.fr1_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_scs_15kHz_12, + { &hf_nr_rrc_scs_15kHz_08, { "scs-15kHz", "nr-rrc.scs_15kHz", FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING_SIZE_10", HFILL }}, - { &hf_nr_rrc_scs_30kHz_12, + { &hf_nr_rrc_scs_30kHz_08, { "scs-30kHz", "nr-rrc.scs_30kHz", FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING_SIZE_10", HFILL }}, - { &hf_nr_rrc_scs_60kHz_15, + { &hf_nr_rrc_scs_60kHz_11, { "scs-60kHz", "nr-rrc.scs_60kHz", FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING_SIZE_10", HFILL }}, @@ -106892,11 +108910,11 @@ proto_register_nr_rrc(void) { { "fr2", "nr-rrc.fr2_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_scs_60kHz_16, + { &hf_nr_rrc_scs_60kHz_12, { "scs-60kHz", "nr-rrc.scs_60kHz", FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING_SIZE_3", HFILL }}, - { &hf_nr_rrc_scs_120kHz_13, + { &hf_nr_rrc_scs_120kHz_09, { "scs-120kHz", "nr-rrc.scs_120kHz", FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING_SIZE_3", HFILL }}, @@ -106936,15 +108954,15 @@ proto_register_nr_rrc(void) { { "fr1", "nr-rrc.fr1_element", FT_NONE, BASE_NONE, NULL, 0, "T_fr1_02", HFILL }}, - { &hf_nr_rrc_scs_15kHz_13, + { &hf_nr_rrc_scs_15kHz_09, { "scs-15kHz", "nr-rrc.scs_15kHz", FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING_SIZE_16", HFILL }}, - { &hf_nr_rrc_scs_30kHz_13, + { &hf_nr_rrc_scs_30kHz_09, { "scs-30kHz", "nr-rrc.scs_30kHz", FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING_SIZE_16", HFILL }}, - { &hf_nr_rrc_scs_60kHz_17, + { &hf_nr_rrc_scs_60kHz_13, { "scs-60kHz", "nr-rrc.scs_60kHz", FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING_SIZE_16", HFILL }}, @@ -106952,11 +108970,11 @@ proto_register_nr_rrc(void) { { "fr2", "nr-rrc.fr2_element", FT_NONE, BASE_NONE, NULL, 0, "T_fr2_02", HFILL }}, - { &hf_nr_rrc_scs_60kHz_18, + { &hf_nr_rrc_scs_60kHz_14, { "scs-60kHz", "nr-rrc.scs_60kHz", FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING_SIZE_8", HFILL }}, - { &hf_nr_rrc_scs_120kHz_14, + { &hf_nr_rrc_scs_120kHz_10, { "scs-120kHz", "nr-rrc.scs_120kHz", FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING_SIZE_8", HFILL }}, @@ -107028,30 +109046,30 @@ proto_register_nr_rrc(void) { { "fr1-100mhz", "nr-rrc.fr1_100mhz_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_scs_15kHz_14, + { &hf_nr_rrc_scs_15kHz_10, { "scs-15kHz", "nr-rrc.scs_15kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_09_vals), 0, - "T_scs_15kHz_09", HFILL }}, - { &hf_nr_rrc_scs_30kHz_14, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_05_vals), 0, + "T_scs_15kHz_05", HFILL }}, + { &hf_nr_rrc_scs_30kHz_10, { "scs-30kHz", "nr-rrc.scs_30kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_09_vals), 0, - "T_scs_30kHz_09", HFILL }}, - { &hf_nr_rrc_scs_60kHz_19, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_05_vals), 0, + "T_scs_30kHz_05", HFILL }}, + { &hf_nr_rrc_scs_60kHz_15, { "scs-60kHz", "nr-rrc.scs_60kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_12_vals), 0, - "T_scs_60kHz_12", HFILL }}, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_08_vals), 0, + "T_scs_60kHz_08", HFILL }}, { &hf_nr_rrc_fr2_200mhz, { "fr2-200mhz", "nr-rrc.fr2_200mhz_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_scs_60kHz_20, + { &hf_nr_rrc_scs_60kHz_16, { "scs-60kHz", "nr-rrc.scs_60kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_13_vals), 0, - "T_scs_60kHz_13", HFILL }}, - { &hf_nr_rrc_scs_120kHz_15, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_09_vals), 0, + "T_scs_60kHz_09", HFILL }}, + { &hf_nr_rrc_scs_120kHz_11, { "scs-120kHz", "nr-rrc.scs_120kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_11_vals), 0, - "T_scs_120kHz_11", HFILL }}, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_07_vals), 0, + "T_scs_120kHz_07", HFILL }}, { &hf_nr_rrc_channelBW_UL_IAB_r16, { "channelBW-UL-IAB-r16", "nr-rrc.channelBW_UL_IAB_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_channelBW_UL_IAB_r16_vals), 0, @@ -107060,30 +109078,30 @@ proto_register_nr_rrc(void) { { "fr1-100mhz", "nr-rrc.fr1_100mhz_element", FT_NONE, BASE_NONE, NULL, 0, "T_fr1_100mhz_01", HFILL }}, - { &hf_nr_rrc_scs_15kHz_15, + { &hf_nr_rrc_scs_15kHz_11, { "scs-15kHz", "nr-rrc.scs_15kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_10_vals), 0, - "T_scs_15kHz_10", HFILL }}, - { &hf_nr_rrc_scs_30kHz_15, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_06_vals), 0, + "T_scs_15kHz_06", HFILL }}, + { &hf_nr_rrc_scs_30kHz_11, { "scs-30kHz", "nr-rrc.scs_30kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_10_vals), 0, - "T_scs_30kHz_10", HFILL }}, - { &hf_nr_rrc_scs_60kHz_21, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_06_vals), 0, + "T_scs_30kHz_06", HFILL }}, + { &hf_nr_rrc_scs_60kHz_17, { "scs-60kHz", "nr-rrc.scs_60kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_14_vals), 0, - "T_scs_60kHz_14", HFILL }}, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_10_vals), 0, + "T_scs_60kHz_10", HFILL }}, { &hf_nr_rrc_fr2_200mhz_01, { "fr2-200mhz", "nr-rrc.fr2_200mhz_element", FT_NONE, BASE_NONE, NULL, 0, "T_fr2_200mhz_01", HFILL }}, - { &hf_nr_rrc_scs_60kHz_22, + { &hf_nr_rrc_scs_60kHz_18, { "scs-60kHz", "nr-rrc.scs_60kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_15_vals), 0, - "T_scs_60kHz_15", HFILL }}, - { &hf_nr_rrc_scs_120kHz_16, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_11_vals), 0, + "T_scs_60kHz_11", HFILL }}, + { &hf_nr_rrc_scs_120kHz_12, { "scs-120kHz", "nr-rrc.scs_120kHz", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_12_vals), 0, - "T_scs_120kHz_12", HFILL }}, + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_08_vals), 0, + "T_scs_120kHz_08", HFILL }}, { &hf_nr_rrc_rasterShift7dot5_IAB_r16, { "rasterShift7dot5-IAB-r16", "nr-rrc.rasterShift7dot5_IAB_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_rasterShift7dot5_IAB_r16_vals), 0, @@ -107156,6 +109174,14 @@ proto_register_nr_rrc(void) { { "handoverIntraF-IAB-r16", "nr-rrc.handoverIntraF_IAB_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_handoverIntraF_IAB_r16_vals), 0, NULL, HFILL }}, + { &hf_nr_rrc_simulTX_SRS_AntSwitchingIntraBandUL_CA_r16, + { "simulTX-SRS-AntSwitchingIntraBandUL-CA-r16", "nr-rrc.simulTX_SRS_AntSwitchingIntraBandUL_CA_r16_element", + FT_NONE, BASE_NONE, NULL, 0, + "SimulSRS_ForAntennaSwitching_r16", HFILL }}, + { &hf_nr_rrc_sharedSpectrumChAccessParamsPerBand_v1630, + { "sharedSpectrumChAccessParamsPerBand-v1630", "nr-rrc.sharedSpectrumChAccessParamsPerBand_v1630_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_nr_rrc_srs_SwitchingTimeRequested_01, { "srs-SwitchingTimeRequested", "nr-rrc.srs_SwitchingTimeRequested", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_srs_SwitchingTimeRequested_01_vals), 0, @@ -107184,6 +109210,10 @@ proto_register_nr_rrc(void) { { "supportedBandCombinationListNEDC-Only-v1610", "nr-rrc.supportedBandCombinationListNEDC_Only_v1610", FT_UINT32, BASE_DEC, NULL, 0, "BandCombinationList_v1610", HFILL }}, + { &hf_nr_rrc_supportedBandCombinationListNEDC_Only_v1630, + { "supportedBandCombinationListNEDC-Only-v1630", "nr-rrc.supportedBandCombinationListNEDC_Only_v1630", + FT_UINT32, BASE_DEC, NULL, 0, + "BandCombinationList_v1630", HFILL }}, { &hf_nr_rrc_am_WithShortSN, { "am-WithShortSN", "nr-rrc.am_WithShortSN", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_am_WithShortSN_vals), 0, @@ -107336,15 +109366,15 @@ proto_register_nr_rrc(void) { { "fr1-r16", "nr-rrc.fr1_r16_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_scs_15kHz_r16_02, + { &hf_nr_rrc_scs_15kHz_r16_06, { "scs-15kHz-r16", "nr-rrc.scs_15kHz_r16", FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING_SIZE_16", HFILL }}, - { &hf_nr_rrc_scs_30kHz_r16_02, + { &hf_nr_rrc_scs_30kHz_r16_06, { "scs-30kHz-r16", "nr-rrc.scs_30kHz_r16", FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING_SIZE_16", HFILL }}, - { &hf_nr_rrc_scs_60kHz_r16_02, + { &hf_nr_rrc_scs_60kHz_r16_06, { "scs-60kHz-r16", "nr-rrc.scs_60kHz_r16", FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING_SIZE_16", HFILL }}, @@ -107352,7 +109382,7 @@ proto_register_nr_rrc(void) { { "fr2-r16", "nr-rrc.fr2_r16_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_scs_120kHz_r16_02, + { &hf_nr_rrc_scs_120kHz_r16_06, { "scs-120kHz-r16", "nr-rrc.scs_120kHz_r16", FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING_SIZE_16", HFILL }}, @@ -107428,6 +109458,46 @@ proto_register_nr_rrc(void) { { "enb-sync-Sidelink-r16", "nr-rrc.enb_sync_Sidelink_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_enb_sync_Sidelink_r16_vals), 0, NULL, HFILL }}, + { &hf_nr_rrc_sl_TransmissionMode2_r16, + { "sl-TransmissionMode2-r16", "nr-rrc.sl_TransmissionMode2_r16_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_harq_TxProcessModeTwoSidelink_r16, + { "harq-TxProcessModeTwoSidelink-r16", "nr-rrc.harq_TxProcessModeTwoSidelink_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_harq_TxProcessModeTwoSidelink_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_scs_CP_PatternTxSidelinkModeTwo_r16, + { "scs-CP-PatternTxSidelinkModeTwo-r16", "nr-rrc.scs_CP_PatternTxSidelinkModeTwo_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_CP_PatternTxSidelinkModeTwo_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_dl_openLoopPC_Sidelink_r16, + { "dl-openLoopPC-Sidelink-r16", "nr-rrc.dl_openLoopPC_Sidelink_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dl_openLoopPC_Sidelink_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_congestionControlSidelink_r16, + { "congestionControlSidelink-r16", "nr-rrc.congestionControlSidelink_r16_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_cbr_ReportSidelink_r16, + { "cbr-ReportSidelink-r16", "nr-rrc.cbr_ReportSidelink_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_cbr_ReportSidelink_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_cbr_CR_TimeLimitSidelink_r16, + { "cbr-CR-TimeLimitSidelink-r16", "nr-rrc.cbr_CR_TimeLimitSidelink_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_cbr_CR_TimeLimitSidelink_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_fewerSymbolSlotSidelink_r16, + { "fewerSymbolSlotSidelink-r16", "nr-rrc.fewerSymbolSlotSidelink_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_fewerSymbolSlotSidelink_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_sl_openLoopPC_RSRP_ReportSidelink_r16, + { "sl-openLoopPC-RSRP-ReportSidelink-r16", "nr-rrc.sl_openLoopPC_RSRP_ReportSidelink_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sl_openLoopPC_RSRP_ReportSidelink_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_sl_Rx_256QAM_r16, + { "sl-Rx-256QAM-r16", "nr-rrc.sl_Rx_256QAM_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sl_Rx_256QAM_r16_vals), 0, + NULL, HFILL }}, { &hf_nr_rrc_rach_Report_r16, { "rach-Report-r16", "nr-rrc.rach_Report_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_rach_Report_r16_vals), 0, @@ -107584,7 +109654,7 @@ proto_register_nr_rrc(void) { { "frequencyBandListFilter", "nr-rrc.frequencyBandListFilter", FT_UINT32, BASE_DEC, NULL, 0, "FreqBandList", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_85, + { &hf_nr_rrc_nonCriticalExtension_87, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "UE_CapabilityRequestFilterNR_v1540", HFILL }}, @@ -107592,7 +109662,7 @@ proto_register_nr_rrc(void) { { "srs-SwitchingTimeRequest", "nr-rrc.srs_SwitchingTimeRequest", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_srs_SwitchingTimeRequest_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_86, + { &hf_nr_rrc_nonCriticalExtension_88, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_49", HFILL }}, @@ -107640,7 +109710,7 @@ proto_register_nr_rrc(void) { { "pdcp-ParametersMRDC-v1530", "nr-rrc.pdcp_ParametersMRDC_v1530_element", FT_NONE, BASE_NONE, NULL, 0, "PDCP_ParametersMRDC", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_87, + { &hf_nr_rrc_nonCriticalExtension_89, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "UE_MRDC_Capability_v1560", HFILL }}, @@ -107660,7 +109730,7 @@ proto_register_nr_rrc(void) { { "tdd-Add-UE-MRDC-Capabilities-v1560", "nr-rrc.tdd_Add_UE_MRDC_Capabilities_v1560_element", FT_NONE, BASE_NONE, NULL, 0, "UE_MRDC_CapabilityAddXDD_Mode_v1560", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_88, + { &hf_nr_rrc_nonCriticalExtension_90, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "UE_MRDC_Capability_v1610", HFILL }}, @@ -107676,7 +109746,7 @@ proto_register_nr_rrc(void) { { "pdcp-ParametersMRDC-v1610", "nr-rrc.pdcp_ParametersMRDC_v1610_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_89, + { &hf_nr_rrc_nonCriticalExtension_91, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_50", HFILL }}, @@ -107752,7 +109822,11 @@ proto_register_nr_rrc(void) { { "featureSets", "nr-rrc.featureSets_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_90, + { &hf_nr_rrc_lateNonCriticalExtension_01, + { "lateNonCriticalExtension", "nr-rrc.lateNonCriticalExtension", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_nonCriticalExtension_92, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "UE_NR_Capability_v1530", HFILL }}, @@ -107764,7 +109838,7 @@ proto_register_nr_rrc(void) { { "tdd-Add-UE-NR-Capabilities-v1530", "nr-rrc.tdd_Add_UE_NR_Capabilities_v1530_element", FT_NONE, BASE_NONE, NULL, 0, "UE_NR_CapabilityAddXDD_Mode_v1530", HFILL }}, - { &hf_nr_rrc_dummy_13, + { &hf_nr_rrc_dummy_14, { "dummy", "nr-rrc.dummy", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_09_vals), 0, "T_dummy_09", HFILL }}, @@ -107780,7 +109854,7 @@ proto_register_nr_rrc(void) { { "delayBudgetReporting", "nr-rrc.delayBudgetReporting", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_delayBudgetReporting_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_91, + { &hf_nr_rrc_nonCriticalExtension_93, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "UE_NR_Capability_v1540", HFILL }}, @@ -107808,7 +109882,7 @@ proto_register_nr_rrc(void) { { "fr1-fr2-Add-UE-NR-Capabilities", "nr-rrc.fr1_fr2_Add_UE_NR_Capabilities_element", FT_NONE, BASE_NONE, NULL, 0, "UE_NR_CapabilityAddFRX_Mode", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_92, + { &hf_nr_rrc_nonCriticalExtension_94, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "UE_NR_Capability_v1550", HFILL }}, @@ -107816,7 +109890,7 @@ proto_register_nr_rrc(void) { { "reducedCP-Latency", "nr-rrc.reducedCP_Latency", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_reducedCP_Latency_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_93, + { &hf_nr_rrc_nonCriticalExtension_95, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "UE_NR_Capability_v1560", HFILL }}, @@ -107828,7 +109902,7 @@ proto_register_nr_rrc(void) { { "receivedFilters", "nr-rrc.receivedFilters", FT_BYTES, BASE_NONE, NULL, 0, "T_receivedFilters_01", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_94, + { &hf_nr_rrc_nonCriticalExtension_96, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "UE_NR_Capability_v1570", HFILL }}, @@ -107836,10 +109910,22 @@ proto_register_nr_rrc(void) { { "nrdc-Parameters-v1570", "nr-rrc.nrdc_Parameters_v1570_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_95, + { &hf_nr_rrc_nonCriticalExtension_97, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, "UE_NR_Capability_v1610", HFILL }}, + { &hf_nr_rrc_nrdc_Parameters_v15c0, + { "nrdc-Parameters-v15c0", "nr-rrc.nrdc_Parameters_v15c0_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_partialFR2_FallbackRX_Req, + { "partialFR2-FallbackRX-Req", "nr-rrc.partialFR2_FallbackRX_Req", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_partialFR2_FallbackRX_Req_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_nonCriticalExtension_98, + { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", + FT_NONE, BASE_NONE, NULL, 0, + "T_nonCriticalExtension_51", HFILL }}, { &hf_nr_rrc_inDeviceCoexInd_r16, { "inDeviceCoexInd-r16", "nr-rrc.inDeviceCoexInd_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_inDeviceCoexInd_r16_vals), 0, @@ -107920,10 +110006,10 @@ proto_register_nr_rrc(void) { { "onDemandSIB-Connected-r16", "nr-rrc.onDemandSIB_Connected_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_onDemandSIB_Connected_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_96, + { &hf_nr_rrc_nonCriticalExtension_99, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, - "T_nonCriticalExtension_51", HFILL }}, + "T_nonCriticalExtension_52", HFILL }}, { &hf_nr_rrc_flowControlBH_RLC_ChannelBased_r16, { "flowControlBH-RLC-ChannelBased-r16", "nr-rrc.flowControlBH_RLC_ChannelBased_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_flowControlBH_RLC_ChannelBased_r16_vals), 0, @@ -107964,9 +110050,9 @@ proto_register_nr_rrc(void) { { "sib1-Acquisition-r16", "nr-rrc.sib1_Acquisition_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sib1_Acquisition_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_extendedRAR_Window_r16, - { "extendedRAR-Window-r16", "nr-rrc.extendedRAR_Window_r16", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_extendedRAR_Window_r16_vals), 0, + { &hf_nr_rrc_extRA_ResponseWindow_r16, + { "extRA-ResponseWindow-r16", "nr-rrc.extRA_ResponseWindow_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_extRA_ResponseWindow_r16_vals), 0, NULL, HFILL }}, { &hf_nr_rrc_ssb_BFD_CBD_dynamicChannelAccess_r16, { "ssb-BFD-CBD-dynamicChannelAccess-r16", "nr-rrc.ssb_BFD_CBD_dynamicChannelAccess_r16", @@ -108100,6 +110186,14 @@ proto_register_nr_rrc(void) { { "cg-resourceConfig-r16", "nr-rrc.cg_resourceConfig_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_cg_resourceConfig_r16_vals), 0, NULL, HFILL }}, + { &hf_nr_rrc_dl_ReceptionIntraCellGuardband_r16, + { "dl-ReceptionIntraCellGuardband-r16", "nr-rrc.dl_ReceptionIntraCellGuardband_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dl_ReceptionIntraCellGuardband_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_dl_ReceptionLBT_subsetRB_r16, + { "dl-ReceptionLBT-subsetRB-r16", "nr-rrc.dl_ReceptionLBT_subsetRB_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dl_ReceptionLBT_subsetRB_r16_vals), 0, + "T_dl_ReceptionLBT_subsetRB_r16", HFILL }}, { &hf_nr_rrc_areaConfig_r16, { "areaConfig-r16", "nr-rrc.areaConfig_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_AreaConfig_r16_vals), 0, @@ -108284,7 +110378,7 @@ proto_register_nr_rrc(void) { { "delayBudgetReportingConfig", "nr-rrc.delayBudgetReportingConfig", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_delayBudgetReportingConfig_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_110, + { &hf_nr_rrc_setup_113, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -108296,7 +110390,7 @@ proto_register_nr_rrc(void) { { "overheatingAssistanceConfig", "nr-rrc.overheatingAssistanceConfig", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_overheatingAssistanceConfig_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_111, + { &hf_nr_rrc_setup_114, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "OverheatingAssistanceConfig", HFILL }}, @@ -108308,7 +110402,7 @@ proto_register_nr_rrc(void) { { "idc-AssistanceConfig-r16", "nr-rrc.idc_AssistanceConfig_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_idc_AssistanceConfig_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_112, + { &hf_nr_rrc_setup_115, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "IDC_AssistanceConfig_r16", HFILL }}, @@ -108316,7 +110410,7 @@ proto_register_nr_rrc(void) { { "drx-PreferenceConfig-r16", "nr-rrc.drx_PreferenceConfig_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_drx_PreferenceConfig_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_113, + { &hf_nr_rrc_setup_116, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "DRX_PreferenceConfig_r16", HFILL }}, @@ -108324,7 +110418,7 @@ proto_register_nr_rrc(void) { { "maxBW-PreferenceConfig-r16", "nr-rrc.maxBW_PreferenceConfig_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_maxBW_PreferenceConfig_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_114, + { &hf_nr_rrc_setup_117, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "MaxBW_PreferenceConfig_r16", HFILL }}, @@ -108332,7 +110426,7 @@ proto_register_nr_rrc(void) { { "maxCC-PreferenceConfig-r16", "nr-rrc.maxCC_PreferenceConfig_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_maxCC_PreferenceConfig_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_115, + { &hf_nr_rrc_setup_118, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "MaxCC_PreferenceConfig_r16", HFILL }}, @@ -108340,7 +110434,7 @@ proto_register_nr_rrc(void) { { "maxMIMO-LayerPreferenceConfig-r16", "nr-rrc.maxMIMO_LayerPreferenceConfig_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_maxMIMO_LayerPreferenceConfig_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_116, + { &hf_nr_rrc_setup_119, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "MaxMIMO_LayerPreferenceConfig_r16", HFILL }}, @@ -108348,7 +110442,7 @@ proto_register_nr_rrc(void) { { "minSchedulingOffsetPreferenceConfig-r16", "nr-rrc.minSchedulingOffsetPreferenceConfig_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_minSchedulingOffsetPreferenceConfig_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_117, + { &hf_nr_rrc_setup_120, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "MinSchedulingOffsetPreferenceConfig_r16", HFILL }}, @@ -108356,7 +110450,7 @@ proto_register_nr_rrc(void) { { "releasePreferenceConfig-r16", "nr-rrc.releasePreferenceConfig_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_releasePreferenceConfig_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_118, + { &hf_nr_rrc_setup_121, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "ReleasePreferenceConfig_r16", HFILL }}, @@ -108520,7 +110614,7 @@ proto_register_nr_rrc(void) { { "sl-PSBCH-Config-r16", "nr-rrc.sl_PSBCH_Config_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sl_PSBCH_Config_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_119, + { &hf_nr_rrc_setup_122, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "SL_PSBCH_Config_r16", HFILL }}, @@ -108668,7 +110762,7 @@ proto_register_nr_rrc(void) { { "sl-ScheduledConfig-r16", "nr-rrc.sl_ScheduledConfig_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sl_ScheduledConfig_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_120, + { &hf_nr_rrc_setup_123, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "SL_ScheduledConfig_r16", HFILL }}, @@ -108676,7 +110770,7 @@ proto_register_nr_rrc(void) { { "sl-UE-SelectedConfig-r16", "nr-rrc.sl_UE_SelectedConfig_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sl_UE_SelectedConfig_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_121, + { &hf_nr_rrc_setup_124, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "SL_UE_SelectedConfig_r16", HFILL }}, @@ -108724,7 +110818,7 @@ proto_register_nr_rrc(void) { { "sl-CSI-SchedulingRequestId-r16", "nr-rrc.sl_CSI_SchedulingRequestId_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sl_CSI_SchedulingRequestId_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_122, + { &hf_nr_rrc_setup_125, { "setup", "nr-rrc.setup", FT_UINT32, BASE_DEC, NULL, 0, "SchedulingRequestId", HFILL }}, @@ -109200,7 +111294,7 @@ proto_register_nr_rrc(void) { { "sl-PSCCH-Config-r16", "nr-rrc.sl_PSCCH_Config_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sl_PSCCH_Config_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_123, + { &hf_nr_rrc_setup_126, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "SL_PSCCH_Config_r16", HFILL }}, @@ -109208,7 +111302,7 @@ proto_register_nr_rrc(void) { { "sl-PSSCH-Config-r16", "nr-rrc.sl_PSSCH_Config_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sl_PSSCH_Config_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_124, + { &hf_nr_rrc_setup_127, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "SL_PSSCH_Config_r16", HFILL }}, @@ -109216,7 +111310,7 @@ proto_register_nr_rrc(void) { { "sl-PSFCH-Config-r16", "nr-rrc.sl_PSFCH_Config_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sl_PSFCH_Config_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_125, + { &hf_nr_rrc_setup_128, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "SL_PSFCH_Config_r16", HFILL }}, @@ -109228,8 +111322,8 @@ proto_register_nr_rrc(void) { { "sl-SubchannelSize-r16", "nr-rrc.sl_SubchannelSize_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sl_SubchannelSize_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_sl_TimeResource_r16, - { "sl-TimeResource-r16", "nr-rrc.sl_TimeResource_r16", + { &hf_nr_rrc_dummy_15, + { "dummy", "nr-rrc.dummy", FT_UINT32, BASE_DEC, NULL, 0, "INTEGER_10_160", HFILL }}, { &hf_nr_rrc_sl_StartRB_Subchannel_r16, @@ -109320,6 +111414,10 @@ proto_register_nr_rrc(void) { { "sl-MinMaxMCS-List-r16", "nr-rrc.sl_MinMaxMCS_List_r16", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nr_rrc_sl_TimeResource_r16, + { "sl-TimeResource-r16", "nr-rrc.sl_TimeResource_r16", + FT_BYTES, BASE_NONE, NULL, 0, + "BIT_STRING_SIZE_10_160", HFILL }}, { &hf_nr_rrc_sl_ZoneConfigMCR_Index_r16, { "sl-ZoneConfigMCR-Index-r16", "nr-rrc.sl_ZoneConfigMCR_Index_r16", FT_UINT32, BASE_DEC, NULL, 0, @@ -109592,6 +111690,14 @@ proto_register_nr_rrc(void) { { "sl-ConfiguredGrantConfigList-r16", "nr-rrc.sl_ConfiguredGrantConfigList_r16_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nr_rrc_sl_DCI_ToSL_Trans_r16, + { "sl-DCI-ToSL-Trans-r16", "nr-rrc.sl_DCI_ToSL_Trans_r16", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_sl_DCI_ToSL_Trans_r16_item, + { "sl-DCI-ToSL-Trans-r16 item", "nr-rrc.sl_DCI_ToSL_Trans_r16_item", + FT_UINT32, BASE_DEC, NULL, 0, + "INTEGER_1_32", HFILL }}, { &hf_nr_rrc_sl_BSR_Config_r16, { "sl-BSR-Config-r16", "nr-rrc.sl_BSR_Config_r16_element", FT_NONE, BASE_NONE, NULL, 0, @@ -109848,10 +111954,10 @@ proto_register_nr_rrc(void) { { "sl-measResults-r16", "nr-rrc.sl_measResults_r16_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_97, + { &hf_nr_rrc_nonCriticalExtension_100, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, - "T_nonCriticalExtension_52", HFILL }}, + "T_nonCriticalExtension_53", HFILL }}, { &hf_nr_rrc_sl_MeasResult_r16, { "sl-MeasResult-r16", "nr-rrc.sl_MeasResult_r16_element", FT_NONE, BASE_NONE, NULL, 0, @@ -109896,7 +112002,7 @@ proto_register_nr_rrc(void) { { "sl-MeasConfig-r16", "nr-rrc.sl_MeasConfig_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sl_MeasConfig_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_126, + { &hf_nr_rrc_setup_129, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "SL_MeasConfig_r16", HFILL }}, @@ -109904,7 +112010,7 @@ proto_register_nr_rrc(void) { { "sl-CSI-RS-Config-r16", "nr-rrc.sl_CSI_RS_Config_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sl_CSI_RS_Config_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_setup_127, + { &hf_nr_rrc_setup_130, { "setup", "nr-rrc.setup_element", FT_NONE, BASE_NONE, NULL, 0, "SL_CSI_RS_Config_r16", HFILL }}, @@ -109916,10 +112022,10 @@ proto_register_nr_rrc(void) { { "sl-LatencyBoundCSI-Report-r16", "nr-rrc.sl_LatencyBoundCSI_Report_r16", FT_UINT32, BASE_DEC, NULL, 0, "INTEGER_3_160", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_98, + { &hf_nr_rrc_nonCriticalExtension_101, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, - "T_nonCriticalExtension_53", HFILL }}, + "T_nonCriticalExtension_54", HFILL }}, { &hf_nr_rrc_slrb_PC5_ConfigIndex_r16, { "slrb-PC5-ConfigIndex-r16", "nr-rrc.slrb_PC5_ConfigIndex_r16", FT_UINT32, BASE_DEC, NULL, 0, @@ -110012,10 +112118,10 @@ proto_register_nr_rrc(void) { { "criticalExtensionsFuture", "nr-rrc.criticalExtensionsFuture_element", FT_NONE, BASE_NONE, NULL, 0, "T_criticalExtensionsFuture_49", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_99, + { &hf_nr_rrc_nonCriticalExtension_102, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, - "T_nonCriticalExtension_54", HFILL }}, + "T_nonCriticalExtension_55", HFILL }}, { &hf_nr_rrc_criticalExtensions_50, { "criticalExtensions", "nr-rrc.criticalExtensions", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_criticalExtensions_50_vals), 0, @@ -110028,10 +112134,10 @@ proto_register_nr_rrc(void) { { "criticalExtensionsFuture", "nr-rrc.criticalExtensionsFuture_element", FT_NONE, BASE_NONE, NULL, 0, "T_criticalExtensionsFuture_50", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_100, + { &hf_nr_rrc_nonCriticalExtension_103, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, - "T_nonCriticalExtension_55", HFILL }}, + "T_nonCriticalExtension_56", HFILL }}, { &hf_nr_rrc_criticalExtensions_51, { "criticalExtensions", "nr-rrc.criticalExtensions", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_criticalExtensions_51_vals), 0, @@ -110052,10 +112158,10 @@ proto_register_nr_rrc(void) { { "ue-CapabilityInformationSidelink-r16", "nr-rrc.ue_CapabilityInformationSidelink_r16", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_101, + { &hf_nr_rrc_nonCriticalExtension_104, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, - "T_nonCriticalExtension_56", HFILL }}, + "T_nonCriticalExtension_57", HFILL }}, { &hf_nr_rrc_criticalExtensions_52, { "criticalExtensions", "nr-rrc.criticalExtensions", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_criticalExtensions_52_vals), 0, @@ -110076,10 +112182,6 @@ proto_register_nr_rrc(void) { { "pdcp-ParametersSidelink-r16", "nr-rrc.pdcp_ParametersSidelink_r16_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_nr_rrc_rlc_ParametersSidelink_r16_01, - { "rlc-ParametersSidelink-r16", "nr-rrc.rlc_ParametersSidelink_r16_element", - FT_NONE, BASE_NONE, NULL, 0, - "PC5_RLC_ParametersSidelink_r16", HFILL }}, { &hf_nr_rrc_supportedBandCombinationListSidelinkNR_r16, { "supportedBandCombinationListSidelinkNR-r16", "nr-rrc.supportedBandCombinationListSidelinkNR_r16", FT_UINT32, BASE_DEC, NULL, 0, @@ -110087,31 +112189,23 @@ proto_register_nr_rrc(void) { { &hf_nr_rrc_supportedBandListSidelink_r16_01, { "supportedBandListSidelink-r16", "nr-rrc.supportedBandListSidelink_r16", FT_UINT32, BASE_DEC, NULL, 0, - "SEQUENCE_SIZE_1_maxBands_OF_PC5_BandSidelink_r16", HFILL }}, + "SEQUENCE_SIZE_1_maxBands_OF_BandSidelinkPC5_r16", HFILL }}, { &hf_nr_rrc_supportedBandListSidelink_r16_item_01, - { "PC5-BandSidelink-r16", "nr-rrc.PC5_BandSidelink_r16_element", + { "BandSidelinkPC5-r16", "nr-rrc.BandSidelinkPC5_r16_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_nr_rrc_appliedFreqBandListFilter_r16, { "appliedFreqBandListFilter-r16", "nr-rrc.appliedFreqBandListFilter_r16", FT_UINT32, BASE_DEC, NULL, 0, "FreqBandList", HFILL }}, - { &hf_nr_rrc_nonCriticalExtension_102, + { &hf_nr_rrc_nonCriticalExtension_105, { "nonCriticalExtension", "nr-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, - "T_nonCriticalExtension_57", HFILL }}, + "T_nonCriticalExtension_58", HFILL }}, { &hf_nr_rrc_outOfOrderDeliverySidelink_r16, { "outOfOrderDeliverySidelink-r16", "nr-rrc.outOfOrderDeliverySidelink_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_outOfOrderDeliverySidelink_r16_vals), 0, NULL, HFILL }}, - { &hf_nr_rrc_am_WithLongSN_Sidelink_r16_01, - { "am-WithLongSN-Sidelink-r16", "nr-rrc.am_WithLongSN_Sidelink_r16", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_am_WithLongSN_Sidelink_r16_01_vals), 0, - "T_am_WithLongSN_Sidelink_r16_01", HFILL }}, - { &hf_nr_rrc_um_WithLongSN_Sidelink_r16_01, - { "um-WithLongSN-Sidelink-r16", "nr-rrc.um_WithLongSN_Sidelink_r16", - FT_UINT32, BASE_DEC, VALS(nr_rrc_T_um_WithLongSN_Sidelink_r16_01_vals), 0, - "T_um_WithLongSN_Sidelink_r16_01", HFILL }}, { &hf_nr_rrc_BandCombinationListSidelinkNR_r16_item, { "BandCombinationParametersSidelinkNR-r16", "nr-rrc.BandCombinationParametersSidelinkNR_r16", FT_UINT32, BASE_DEC, NULL, 0, @@ -110156,9 +112250,29 @@ proto_register_nr_rrc(void) { { "lowSE-64QAM-MCS-TableSidelink-r16", "nr-rrc.lowSE_64QAM_MCS_TableSidelink_r16", FT_UINT32, BASE_DEC, VALS(nr_rrc_T_lowSE_64QAM_MCS_TableSidelink_r16_01_vals), 0, "T_lowSE_64QAM_MCS_TableSidelink_r16_01", HFILL }}, + { &hf_nr_rrc_csi_ReportSidelink_r16, + { "csi-ReportSidelink-r16", "nr-rrc.csi_ReportSidelink_r16_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_csi_RS_PortsSidelink_r16, + { "csi-RS-PortsSidelink-r16", "nr-rrc.csi_RS_PortsSidelink_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_csi_RS_PortsSidelink_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_rankTwoReception_r16, + { "rankTwoReception-r16", "nr-rrc.rankTwoReception_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_rankTwoReception_r16_vals), 0, + NULL, HFILL }}, + { &hf_nr_rrc_sl_openLoopPC_RSRP_ReportSidelink_r16_01, + { "sl-openLoopPC-RSRP-ReportSidelink-r16", "nr-rrc.sl_openLoopPC_RSRP_ReportSidelink_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sl_openLoopPC_RSRP_ReportSidelink_r16_01_vals), 0, + "T_sl_openLoopPC_RSRP_ReportSidelink_r16_01", HFILL }}, + { &hf_nr_rrc_sl_Rx_256QAM_r16_01, + { "sl-Rx-256QAM-r16", "nr-rrc.sl_Rx_256QAM_r16", + FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sl_Rx_256QAM_r16_01_vals), 0, + "T_sl_Rx_256QAM_r16_01", HFILL }}, /*--- End of included file: packet-nr-rrc-hfarr.c ---*/ -#line 551 "./asn1/nr-rrc/packet-nr-rrc-template.c" +#line 553 "./asn1/nr-rrc/packet-nr-rrc-template.c" { &hf_nr_rrc_serialNumber_gs, { "Geographical Scope", "nr-rrc.serialNumber.gs", @@ -110335,6 +112449,7 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_SEQUENCE_SIZE_1_maxNrofServingCells_1_OF_ARFCN_ValueEUTRA, &ett_nr_rrc_CG_Config_v1610_IEs, &ett_nr_rrc_CG_Config_v1620_IEs, + &ett_nr_rrc_CG_Config_v1630_IEs, &ett_nr_rrc_T_nonCriticalExtension_02, &ett_nr_rrc_PH_TypeListSCG, &ett_nr_rrc_PH_InfoSCG, @@ -110726,6 +112841,9 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_T_uac_AccessCategory1_SelectionAssistanceInfo, &ett_nr_rrc_SEQUENCE_SIZE_2_maxPLMN_OF_UAC_AccessCategory1_SelectionAssistanceInfo, &ett_nr_rrc_SIB1_v1610_IEs, + &ett_nr_rrc_SIB1_v1630_IEs, + &ett_nr_rrc_T_uac_BarringInfo_v1630, + &ett_nr_rrc_SEQUENCE_SIZE_2_maxPLMN_OF_UAC_AC1_SelectAssistInfo_r16, &ett_nr_rrc_T_nonCriticalExtension_36, &ett_nr_rrc_SidelinkUEInformationNR_r16, &ett_nr_rrc_T_criticalExtensions_36, @@ -110961,8 +113079,8 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_CandidateBeamRS_r16, &ett_nr_rrc_T_candidateBeamConfig_r16, &ett_nr_rrc_BetaOffsets, - &ett_nr_rrc_BH_RLC_ChannelConfig_r16, &ett_nr_rrc_BH_LogicalChannelIdentity_r16, + &ett_nr_rrc_BH_RLC_ChannelConfig_r16, &ett_nr_rrc_BSR_Config, &ett_nr_rrc_BWP, &ett_nr_rrc_BWP_Downlink, @@ -111472,6 +113590,7 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_T_dynamicBundling_r16, &ett_nr_rrc_T_pdsch_TimeDomainAllocationList_r16, &ett_nr_rrc_T_repetitionSchemeConfig_r16, + &ett_nr_rrc_T_repetitionSchemeConfig_v1630, &ett_nr_rrc_RateMatchPatternGroup, &ett_nr_rrc_RateMatchPatternGroup_item, &ett_nr_rrc_MinSchedulingOffsetK0_Values_r16, @@ -111701,8 +113820,11 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_RepetitionSchemeConfig_r16, &ett_nr_rrc_T_fdm_TDM_r16, &ett_nr_rrc_T_slotBased_r16, + &ett_nr_rrc_RepetitionSchemeConfig_v1630, + &ett_nr_rrc_T_slotBased_v1630, &ett_nr_rrc_FDM_TDM_r16, &ett_nr_rrc_SlotBased_r16, + &ett_nr_rrc_SlotBased_v1630, &ett_nr_rrc_ReportConfigInterRAT, &ett_nr_rrc_T_reportType_01, &ett_nr_rrc_ReportCGI_EUTRA, @@ -111807,7 +113929,7 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_T_dci_Format2_6_r16, &ett_nr_rrc_T_searchSpaceGroupIdList_r16, &ett_nr_rrc_SecurityAlgorithmConfig, - &ett_nr_rrc_SemiStaticChannelAccessConfig, + &ett_nr_rrc_SemiStaticChannelAccessConfig_r16, &ett_nr_rrc_Sensor_LocationInfo_r16, &ett_nr_rrc_ServingCellConfig, &ett_nr_rrc_SEQUENCE_SIZE_1_maxNrofBWPs_OF_BWP_Id, @@ -111818,16 +113940,19 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_T_lte_CRS_ToMatchAround, &ett_nr_rrc_T_dormantBWP_Config_r16, &ett_nr_rrc_T_ca_SlotOffset_r16, - &ett_nr_rrc_T_channelAccessConfig_r16, + &ett_nr_rrc_T_dummy2_01, &ett_nr_rrc_SEQUENCE_SIZE_1_maxSCSs_OF_IntraCellGuardBandsPerSCS_r16, &ett_nr_rrc_T_lte_CRS_PatternList1_r16, &ett_nr_rrc_T_lte_CRS_PatternList2_r16, + &ett_nr_rrc_T_channelAccessConfig_r16, &ett_nr_rrc_UplinkConfig, &ett_nr_rrc_SEQUENCE_SIZE_1_maxNrofBWPs_OF_BWP_Uplink, &ett_nr_rrc_T_pusch_ServingCellConfig, &ett_nr_rrc_T_carrierSwitching, &ett_nr_rrc_T_uplinkTxSwitching_r16, + &ett_nr_rrc_DummyJ, &ett_nr_rrc_ChannelAccessConfig_r16, + &ett_nr_rrc_T_energyDetectionConfig_r16, &ett_nr_rrc_IntraCellGuardBandsPerSCS_r16, &ett_nr_rrc_SEQUENCE_SIZE_1_4_OF_GuardBand_r16, &ett_nr_rrc_GuardBand_r16, @@ -112008,20 +114133,25 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_BandCombinationList_v1580, &ett_nr_rrc_BandCombinationList_v1590, &ett_nr_rrc_BandCombinationList_v1610, + &ett_nr_rrc_BandCombinationList_v1630, &ett_nr_rrc_BandCombinationList_UplinkTxSwitch_r16, + &ett_nr_rrc_BandCombinationList_UplinkTxSwitch_v1630, &ett_nr_rrc_BandCombination, &ett_nr_rrc_SEQUENCE_SIZE_1_maxSimultaneousBands_OF_BandParameters, &ett_nr_rrc_BandCombination_v1540, &ett_nr_rrc_SEQUENCE_SIZE_1_maxSimultaneousBands_OF_BandParameters_v1540, &ett_nr_rrc_BandCombination_v1550, - &ett_nr_rrc_BandCombination_v1610, - &ett_nr_rrc_SEQUENCE_SIZE_1_maxSimultaneousBands_OF_BandParameters_v1610, &ett_nr_rrc_BandCombination_v1560, &ett_nr_rrc_BandCombination_v1570, &ett_nr_rrc_BandCombination_v1580, &ett_nr_rrc_BandCombination_v1590, + &ett_nr_rrc_BandCombination_v1610, + &ett_nr_rrc_SEQUENCE_SIZE_1_maxSimultaneousBands_OF_BandParameters_v1610, + &ett_nr_rrc_BandCombination_v1630, + &ett_nr_rrc_SEQUENCE_SIZE_1_maxBandComb_OF_ScalingFactorSidelink_r16, &ett_nr_rrc_BandCombination_UplinkTxSwitch_r16, &ett_nr_rrc_SEQUENCE_SIZE_1_maxULTxSwitchingBandPairs_OF_ULTxSwitchingBandPair_r16, + &ett_nr_rrc_BandCombination_UplinkTxSwitch_v1630, &ett_nr_rrc_ULTxSwitchingBandPair_r16, &ett_nr_rrc_BandParameters, &ett_nr_rrc_T_eutra, @@ -112035,12 +114165,16 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_T_srs_TxSwitch, &ett_nr_rrc_BandParameters_v1610, &ett_nr_rrc_T_srs_TxSwitch_v1610, - &ett_nr_rrc_BandParametersSidelink_r16, &ett_nr_rrc_BandCombinationListSidelinkEUTRA_NR_r16, + &ett_nr_rrc_BandCombinationListSidelinkEUTRA_NR_v1630, &ett_nr_rrc_BandCombinationParametersSidelinkEUTRA_NR_r16, + &ett_nr_rrc_BandCombinationParametersSidelinkEUTRA_NR_v1630, &ett_nr_rrc_BandParametersSidelinkEUTRA_NR_r16, &ett_nr_rrc_T_eutra_02, &ett_nr_rrc_T_nr_02, + &ett_nr_rrc_BandParametersSidelinkEUTRA_NR_v1630, + &ett_nr_rrc_T_nr_03, + &ett_nr_rrc_BandParametersSidelink_r16, &ett_nr_rrc_CA_ParametersEUTRA, &ett_nr_rrc_CA_ParametersEUTRA_v1560, &ett_nr_rrc_CA_ParametersEUTRA_v1570, @@ -112055,8 +114189,11 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_T_pdcch_BlindDetectionCA_Mixed_r16, &ett_nr_rrc_T_pdcch_BlindDetectionMCG_UE_Mixed_r16, &ett_nr_rrc_T_pdcch_BlindDetectionSCG_UE_Mixed_r16, + &ett_nr_rrc_CA_ParametersNR_v1630, + &ett_nr_rrc_SimulSRS_ForAntennaSwitching_r16, &ett_nr_rrc_CA_ParametersNRDC, &ett_nr_rrc_CA_ParametersNRDC_v1610, + &ett_nr_rrc_CA_ParametersNRDC_v1630, &ett_nr_rrc_CarrierAggregationVariant, &ett_nr_rrc_CodebookParameters, &ett_nr_rrc_T_type1_02, @@ -112137,7 +114274,7 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_FeatureSetsPerBand, &ett_nr_rrc_FeatureSet, &ett_nr_rrc_T_eutra_03, - &ett_nr_rrc_T_nr_03, + &ett_nr_rrc_T_nr_04, &ett_nr_rrc_FeatureSetDownlink, &ett_nr_rrc_SEQUENCE_SIZE_1_maxNrofServingCells_OF_FeatureSetDownlinkPerCC_Id, &ett_nr_rrc_T_timeDurationForQCL, @@ -112152,8 +114289,8 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_T_pdsch_ProcessingType2_Limited, &ett_nr_rrc_FeatureSetDownlink_v15a0, &ett_nr_rrc_FeatureSetDownlink_v1610, - &ett_nr_rrc_T_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot, - &ett_nr_rrc_T_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot, + &ett_nr_rrc_T_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16, + &ett_nr_rrc_T_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16, &ett_nr_rrc_T_intraFreqDAPS_r16, &ett_nr_rrc_T_pdcch_Monitoring_r16, &ett_nr_rrc_T_pdsch_ProcessingType1_r16, @@ -112180,6 +114317,7 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_SEQUENCE_SIZE_1_maxDownlinkFeatureSets_OF_FeatureSetDownlink_v1610, &ett_nr_rrc_SEQUENCE_SIZE_1_maxUplinkFeatureSets_OF_FeatureSetUplink_v1610, &ett_nr_rrc_SEQUENCE_SIZE_1_maxPerCC_FeatureSets_OF_FeatureSetDownlinkPerCC_v1620, + &ett_nr_rrc_SEQUENCE_SIZE_1_maxUplinkFeatureSets_OF_FeatureSetUplink_v1630, &ett_nr_rrc_FeatureSetUplink, &ett_nr_rrc_SEQUENCE_SIZE_1_maxNrofServingCells_OF_FeatureSetUplinkPerCC_Id, &ett_nr_rrc_T_pusch_ProcessingType1_DifferentTB_PerSlot, @@ -112187,13 +114325,14 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_T_pusch_ProcessingType2, &ett_nr_rrc_FeatureSetUplink_v1610, &ett_nr_rrc_T_pusch_RepetitionTypeB_r16, - &ett_nr_rrc_T_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot, - &ett_nr_rrc_T_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot, + &ett_nr_rrc_T_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16, + &ett_nr_rrc_T_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16, &ett_nr_rrc_T_intraFreqDAPS_UL_r16, &ett_nr_rrc_T_multiPUCCH_r16, &ett_nr_rrc_T_ul_IntraUE_Mux_r16, &ett_nr_rrc_T_crossCarrierSchedulingProcessing_DiffSCS_r16_01, &ett_nr_rrc_T_ul_FullPwrMode2_TPMIGroup_r16, + &ett_nr_rrc_FeatureSetUplink_v1630, &ett_nr_rrc_SRS_AllPosResources_r16, &ett_nr_rrc_SRS_PosResources_r16, &ett_nr_rrc_SRS_PosResourceAP_r16, @@ -112255,6 +114394,7 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_T_singleDCI_SDM_scheme_Parameters_r16, &ett_nr_rrc_T_supportInter_slotTDM_r16, &ett_nr_rrc_T_beamSwitchTiming_r16, + &ett_nr_rrc_T_semi_PersistentL1_SINR_Report_PUCCH_r16, &ett_nr_rrc_DummyG, &ett_nr_rrc_BeamManagementSSB_CSI_RS, &ett_nr_rrc_DummyH, @@ -112272,9 +114412,12 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_MRDC_Parameters_v1590, &ett_nr_rrc_MRDC_Parameters_v1620, &ett_nr_rrc_T_maxUplinkDutyCycle_interBandENDC_TDD_PC2_r16, + &ett_nr_rrc_MRDC_Parameters_v1630, + &ett_nr_rrc_T_maxUplinkDutyCycle_interBandENDC_FDD_TDD_PC2_r16, &ett_nr_rrc_NRDC_Parameters, &ett_nr_rrc_T_dummy_06, &ett_nr_rrc_NRDC_Parameters_v1570, + &ett_nr_rrc_NRDC_Parameters_v15c0, &ett_nr_rrc_NRDC_Parameters_v1610, &ett_nr_rrc_OLPC_SRS_Pos_r16, &ett_nr_rrc_PDCP_Parameters, @@ -112354,6 +114497,8 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_T_fr2_r16_01, &ett_nr_rrc_T_sync_Sidelink_r16, &ett_nr_rrc_T_psfch_FormatZeroSidelink_r16, + &ett_nr_rrc_T_sl_TransmissionMode2_r16, + &ett_nr_rrc_T_congestionControlSidelink_r16, &ett_nr_rrc_SON_Parameters_r16, &ett_nr_rrc_SpatialRelationsSRS_Pos_r16, &ett_nr_rrc_SRS_SwitchingTimeNR, @@ -112386,8 +114531,10 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_UE_NR_Capability_v1550, &ett_nr_rrc_UE_NR_Capability_v1560, &ett_nr_rrc_UE_NR_Capability_v1570, - &ett_nr_rrc_UE_NR_Capability_v1610, + &ett_nr_rrc_UE_NR_Capability_v15c0, &ett_nr_rrc_T_nonCriticalExtension_51, + &ett_nr_rrc_UE_NR_Capability_v1610, + &ett_nr_rrc_T_nonCriticalExtension_52, &ett_nr_rrc_UE_NR_CapabilityAddXDD_Mode, &ett_nr_rrc_UE_NR_CapabilityAddXDD_Mode_v1530, &ett_nr_rrc_UE_NR_CapabilityAddFRX_Mode, @@ -112395,6 +114542,7 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_UE_NR_CapabilityAddFRX_Mode_v1610, &ett_nr_rrc_BAP_Parameters_r16, &ett_nr_rrc_SharedSpectrumChAccessParamsPerBand_r16, + &ett_nr_rrc_SharedSpectrumChAccessParamsPerBand_v1630, &ett_nr_rrc_AreaConfiguration_r16, &ett_nr_rrc_SEQUENCE_SIZE_1_maxFreq_OF_InterFreqTargetInfo_r16, &ett_nr_rrc_AreaConfig_r16, @@ -112560,6 +114708,7 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_T_sl_UM_RLC_r16, &ett_nr_rrc_SL_ScheduledConfig_r16, &ett_nr_rrc_T_sl_PSFCH_ToPUCCH_r16, + &ett_nr_rrc_T_sl_DCI_ToSL_Trans_r16, &ett_nr_rrc_MAC_MainConfigSL_r16, &ett_nr_rrc_SL_ConfiguredGrantConfigList_r16, &ett_nr_rrc_SEQUENCE_SIZE_1_maxNrofCG_SL_r16_OF_SL_ConfigIndexCG_r16, @@ -112590,7 +114739,7 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_T_criticalExtensions_47, &ett_nr_rrc_T_criticalExtensionsFuture_47, &ett_nr_rrc_MeasurementReportSidelink_IEs_r16, - &ett_nr_rrc_T_nonCriticalExtension_52, + &ett_nr_rrc_T_nonCriticalExtension_53, &ett_nr_rrc_SL_MeasResults_r16, &ett_nr_rrc_SL_MeasResult_r16, &ett_nr_rrc_SL_MeasQuantityResult_r16, @@ -112602,7 +114751,7 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_SEQUENCE_SIZE_1_maxNrofSLRB_r16_OF_SLRB_PC5_ConfigIndex_r16, &ett_nr_rrc_T_sl_MeasConfig_r16, &ett_nr_rrc_T_sl_CSI_RS_Config_r16, - &ett_nr_rrc_T_nonCriticalExtension_53, + &ett_nr_rrc_T_nonCriticalExtension_54, &ett_nr_rrc_SLRB_Config_r16, &ett_nr_rrc_SL_SDAP_ConfigPC5_r16, &ett_nr_rrc_SEQUENCE_SIZE_1_maxNrofSL_QFIsPerDest_r16_OF_SL_PQFI_r16, @@ -112618,35 +114767,35 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_T_criticalExtensions_49, &ett_nr_rrc_T_criticalExtensionsFuture_49, &ett_nr_rrc_RRCReconfigurationCompleteSidelink_IEs_r16, - &ett_nr_rrc_T_nonCriticalExtension_54, + &ett_nr_rrc_T_nonCriticalExtension_55, &ett_nr_rrc_RRCReconfigurationFailureSidelink, &ett_nr_rrc_T_criticalExtensions_50, &ett_nr_rrc_T_criticalExtensionsFuture_50, &ett_nr_rrc_RRCReconfigurationFailureSidelink_IEs_r16, - &ett_nr_rrc_T_nonCriticalExtension_55, + &ett_nr_rrc_T_nonCriticalExtension_56, &ett_nr_rrc_UECapabilityEnquirySidelink, &ett_nr_rrc_T_criticalExtensions_51, &ett_nr_rrc_T_criticalExtensionsFuture_51, &ett_nr_rrc_UECapabilityEnquirySidelink_IEs_r16, - &ett_nr_rrc_T_nonCriticalExtension_56, + &ett_nr_rrc_T_nonCriticalExtension_57, &ett_nr_rrc_UECapabilityInformationSidelink, &ett_nr_rrc_T_criticalExtensions_52, &ett_nr_rrc_T_criticalExtensionsFuture_52, &ett_nr_rrc_UECapabilityInformationSidelink_IEs_r16, - &ett_nr_rrc_SEQUENCE_SIZE_1_maxBands_OF_PC5_BandSidelink_r16, - &ett_nr_rrc_T_nonCriticalExtension_57, + &ett_nr_rrc_SEQUENCE_SIZE_1_maxBands_OF_BandSidelinkPC5_r16, + &ett_nr_rrc_T_nonCriticalExtension_58, &ett_nr_rrc_PDCP_ParametersSidelink_r16, - &ett_nr_rrc_PC5_RLC_ParametersSidelink_r16, &ett_nr_rrc_BandCombinationListSidelinkNR_r16, &ett_nr_rrc_BandCombinationParametersSidelinkNR_r16, - &ett_nr_rrc_PC5_BandSidelink_r16, + &ett_nr_rrc_BandSidelinkPC5_r16, &ett_nr_rrc_T_sl_Reception_r16_01, &ett_nr_rrc_T_scs_CP_PatternRxSidelink_r16_01, &ett_nr_rrc_T_fr1_r16_02, &ett_nr_rrc_T_fr2_r16_02, + &ett_nr_rrc_T_csi_ReportSidelink_r16, /*--- End of included file: packet-nr-rrc-ettarr.c ---*/ -#line 689 "./asn1/nr-rrc/packet-nr-rrc-template.c" +#line 691 "./asn1/nr-rrc/packet-nr-rrc-template.c" &ett_nr_rrc_DedicatedNAS_Message, &ett_nr_rrc_targetRAT_MessageContainer, &ett_nr_rrc_nas_Container, @@ -112693,7 +114842,9 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_sl_ParametersEUTRA2_r16, &ett_nr_rrc_sl_ParametersEUTRA3_r16, &ett_nr_rrc_absTimeInfo, - &ett_nr_rrc_assistanceDataSIB_Element_r16 + &ett_nr_rrc_assistanceDataSIB_Element_r16, + &ett_nr_sl_V2X_ConfigCommon_r16, + &ett_nr_tdd_Config_r16 }; static ei_register_info ei[] = { @@ -112733,7 +114884,7 @@ proto_register_nr_rrc(void) { /*--- End of included file: packet-nr-rrc-dis-reg.c ---*/ -#line 755 "./asn1/nr-rrc/packet-nr-rrc-template.c" +#line 759 "./asn1/nr-rrc/packet-nr-rrc-template.c" nr_rrc_etws_cmas_dcs_hash = wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), g_direct_hash, g_direct_equal); diff --git a/epan/dissectors/packet-nr-rrc.h b/epan/dissectors/packet-nr-rrc.h index b3e1653cea..450514aaa6 100644 --- a/epan/dissectors/packet-nr-rrc.h +++ b/epan/dissectors/packet-nr-rrc.h @@ -7,7 +7,7 @@ #line 1 "./asn1/nr-rrc/packet-nr-rrc-template.h" /* packet-nr-rrc-template.h - * Copyright 2018-2019, Pascal Quantin + * Copyright 2018-2021, Pascal Quantin * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> |