osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

NR RRC: upgrade dissector to v16.8.0

This commit is contained in:
Pascal Quantin 2022-04-19 12:39:03 +02:00
parent 58af12cac7
commit 43828765c3
7 changed files with 207 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.331 V16.7.0 (2021-12)
-- 3GPP TS 38.331 V16.8.0 (2022-03)
NR-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.331 V16.7.0 (2021-12)
-- 3GPP TS 38.331 V16.8.0 (2022-03)
NR-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -8486,6 +8486,8 @@ BandCombinationList-v1640 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandComb
BandCombinationList-v1650 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-v1650
BandCombinationList-v1680 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-v1680
BandCombinationList-UplinkTxSwitch-r16 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-UplinkTxSwitch-r16
BandCombinationList-UplinkTxSwitch-v1630 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-UplinkTxSwitch-v1630
@ -8569,6 +8571,10 @@ BandCombination-v1650 ::= SEQUENCE {
ca-ParametersNRDC-v1650 CA-ParametersNRDC-v1650 OPTIONAL
}
BandCombination-v1680 ::= SEQUENCE {
intrabandConcurrentOperationPowerClass-r16 SEQUENCE (SIZE (1..maxBandComb)) OF IntraBandPowerClass-r16 OPTIONAL
}
BandCombination-UplinkTxSwitch-r16 ::= SEQUENCE {
bandCombination-r16 BandCombination,
bandCombination-v1540 BandCombination-v1540 OPTIONAL,
@ -8580,7 +8586,10 @@ BandCombination-UplinkTxSwitch-r16 ::= SEQUENCE {
supportedBandPairListNR-r16 SEQUENCE (SIZE (1..maxULTxSwitchingBandPairs)) OF ULTxSwitchingBandPair-r16,
uplinkTxSwitching-OptionSupport-r16 ENUMERATED {switchedUL, dualUL, both} OPTIONAL,
uplinkTxSwitching-PowerBoosting-r16 ENUMERATED {supported} OPTIONAL,
...
...,
[[
uplinkTxSwitching-PUSCH-TransCoherence-r16 ENUMERATED {nonCoherent, fullCoherent} OPTIONAL
]]
}
BandCombination-UplinkTxSwitch-v1630 ::= SEQUENCE {
@ -8644,6 +8653,8 @@ BandParameters-v1610 ::= SEQUENCE {
ScalingFactorSidelink-r16 ::= ENUMERATED {f0p4, f0p75, f0p8, f1}
IntraBandPowerClass-r16 ::= ENUMERATED {pc2, pc3, spare6, spare5, spare4, spare3, spare2, spare1}
-- TAG-BANDCOMBINATIONLIST-STOP
-- TAG-BANDCOMBINATIONLISTSIDELINKEUTRANR-START
@ -10897,6 +10908,9 @@ RF-Parameters ::= SEQUENCE {
]],
[[
supportedBandCombinationList-UplinkTxSwitch-v1670 BandCombinationList-UplinkTxSwitch-v1670 OPTIONAL
]],
[[
supportedBandCombinationList-v1680 BandCombinationList-v1680 OPTIONAL
]]
}
@ -11304,6 +11318,10 @@ BandSidelink-r16 ::= SEQUENCE {
sl-openLoopPC-RSRP-ReportSidelink-r16 ENUMERATED {supported} OPTIONAL,
--13-1
sl-Rx-256QAM-r16 ENUMERATED {supported} OPTIONAL
]],
[[
ue-PowerClassSidelink-r16 ENUMERATED {pc2, pc3, spare6, spare5, spare4, spare3, spare2, spare1}
OPTIONAL
]]
}
@ -13013,8 +13031,7 @@ maxNrofSRS-PosResourceSets-1-r16 INTEGER ::= 15 -- Maximum number of
maxNrofSRS-Resources INTEGER ::= 64 -- Maximum number of SRS resources.
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.
maxNrofSRS-PosResources-1-r16 INTEGER ::= 63 -- Maximum number of SRS Positioning resources minus 1.
maxNrofSRS-ResourcesPerSet INTEGER ::= 16 -- Maximum number of SRS resources in an SRS resource set
maxNrofSRS-TriggerStates-1 INTEGER ::= 3 -- Maximum number of SRS trigger states minus 1, i.e., the largest code point.
maxNrofSRS-TriggerStates-2 INTEGER ::= 2 -- Maximum number of SRS trigger states minus 2.

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.331 V16.7.0 (2021-12)
-- 3GPP TS 38.331 V16.8.0 (2022-03)
NR-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::=

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.331 V16.7.0 (2021-12)
-- 3GPP TS 38.331 V16.8.0 (2022-03)
NR-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.331 V16.7.0 (2021-12)
-- 3GPP TS 38.331 V16.8.0 (2022-03)
PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=

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

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

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

@ -9,7 +9,7 @@
/* packet-nr-rrc-template.c
* NR;
* Radio Resource Control (RRC) protocol specification
* (3GPP TS 38.331 V16.7.0 Release 16) packet dissection
* (3GPP TS 38.331 V16.8.0 Release 16) packet dissection
* Copyright 2018-2022, Pascal Quantin
*
* Wireshark - Network traffic analyzer
@ -4402,6 +4402,7 @@ static int hf_nr_rrc_BandCombinationList_v1610_item = -1; /* BandCombination_v1
static int hf_nr_rrc_BandCombinationList_v1630_item = -1; /* BandCombination_v1630 */
static int hf_nr_rrc_BandCombinationList_v1640_item = -1; /* BandCombination_v1640 */
static int hf_nr_rrc_BandCombinationList_v1650_item = -1; /* BandCombination_v1650 */
static int hf_nr_rrc_BandCombinationList_v1680_item = -1; /* BandCombination_v1680 */
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_BandCombinationList_UplinkTxSwitch_v1640_item = -1; /* BandCombination_UplinkTxSwitch_v1640 */
@ -4450,6 +4451,8 @@ static int hf_nr_rrc_scalingFactorRxSidelink_r16_item = -1; /* ScalingFactorSid
static int hf_nr_rrc_ca_ParametersNR_v1640 = -1; /* CA_ParametersNR_v1640 */
static int hf_nr_rrc_ca_ParametersNRDC_v1640 = -1; /* CA_ParametersNRDC_v1640 */
static int hf_nr_rrc_ca_ParametersNRDC_v1650 = -1; /* CA_ParametersNRDC_v1650 */
static int hf_nr_rrc_intrabandConcurrentOperationPowerClass_r16 = -1; /* SEQUENCE_SIZE_1_maxBandComb_OF_IntraBandPowerClass_r16 */
static int hf_nr_rrc_intrabandConcurrentOperationPowerClass_r16_item = -1; /* IntraBandPowerClass_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 */
@ -4461,6 +4464,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_uplinkTxSwitching_PUSCH_TransCoherence_r16 = -1; /* T_uplinkTxSwitching_PUSCH_TransCoherence_r16 */
static int hf_nr_rrc_bandCombination_v1630 = -1; /* BandCombination_v1630 */
static int hf_nr_rrc_bandCombination_v1640 = -1; /* BandCombination_v1640 */
static int hf_nr_rrc_bandCombination_v1650 = -1; /* BandCombination_v1650 */
@ -5624,6 +5628,7 @@ static int hf_nr_rrc_supportedBandCombinationList_v1650 = -1; /* BandCombinatio
static int hf_nr_rrc_supportedBandCombinationList_UplinkTxSwitch_v1650 = -1; /* BandCombinationList_UplinkTxSwitch_v1650 */
static int hf_nr_rrc_extendedBand_n77_r16 = -1; /* T_extendedBand_n77_r16 */
static int hf_nr_rrc_supportedBandCombinationList_UplinkTxSwitch_v1670 = -1; /* BandCombinationList_UplinkTxSwitch_v1670 */
static int hf_nr_rrc_supportedBandCombinationList_v1680 = -1; /* BandCombinationList_v1680 */
static int hf_nr_rrc_supportedBandCombinationList_v15g0 = -1; /* BandCombinationList_v15g0 */
static int hf_nr_rrc_modifiedMPR_Behaviour = -1; /* BIT_STRING_SIZE_8 */
static int hf_nr_rrc_mimo_ParametersPerBand = -1; /* MIMO_ParametersPerBand */
@ -5819,6 +5824,7 @@ static int hf_nr_rrc_cbr_CR_TimeLimitSidelink_r16 = -1; /* T_cbr_CR_TimeLimitSi
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_ue_PowerClassSidelink_r16 = -1; /* T_ue_PowerClassSidelink_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 */
@ -8345,6 +8351,7 @@ static gint ett_nr_rrc_BandCombinationList_v1610 = -1;
static gint ett_nr_rrc_BandCombinationList_v1630 = -1;
static gint ett_nr_rrc_BandCombinationList_v1640 = -1;
static gint ett_nr_rrc_BandCombinationList_v1650 = -1;
static gint ett_nr_rrc_BandCombinationList_v1680 = -1;
static gint ett_nr_rrc_BandCombinationList_UplinkTxSwitch_r16 = -1;
static gint ett_nr_rrc_BandCombinationList_UplinkTxSwitch_v1630 = -1;
static gint ett_nr_rrc_BandCombinationList_UplinkTxSwitch_v1640 = -1;
@ -8366,6 +8373,8 @@ 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_v1640 = -1;
static gint ett_nr_rrc_BandCombination_v1650 = -1;
static gint ett_nr_rrc_BandCombination_v1680 = -1;
static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxBandComb_OF_IntraBandPowerClass_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;
@ -69712,6 +69721,70 @@ dissect_nr_rrc_BandCombinationList_v1650(tvbuff_t *tvb _U_, int offset _U_, asn1
}
static const value_string nr_rrc_IntraBandPowerClass_r16_vals[] = {
{ 0, "pc2" },
{ 1, "pc3" },
{ 2, "spare6" },
{ 3, "spare5" },
{ 4, "spare4" },
{ 5, "spare3" },
{ 6, "spare2" },
{ 7, "spare1" },
{ 0, NULL }
};
static int
dissect_nr_rrc_IntraBandPowerClass_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 SEQUENCE_SIZE_1_maxBandComb_OF_IntraBandPowerClass_r16_sequence_of[1] = {
{ &hf_nr_rrc_intrabandConcurrentOperationPowerClass_r16_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_IntraBandPowerClass_r16 },
};
static int
dissect_nr_rrc_SEQUENCE_SIZE_1_maxBandComb_OF_IntraBandPowerClass_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_IntraBandPowerClass_r16, SEQUENCE_SIZE_1_maxBandComb_OF_IntraBandPowerClass_r16_sequence_of,
1, maxBandComb, FALSE);
return offset;
}
static const per_sequence_t BandCombination_v1680_sequence[] = {
{ &hf_nr_rrc_intrabandConcurrentOperationPowerClass_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_SEQUENCE_SIZE_1_maxBandComb_OF_IntraBandPowerClass_r16 },
{ NULL, 0, 0, NULL }
};
static int
dissect_nr_rrc_BandCombination_v1680(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_v1680, BandCombination_v1680_sequence);
return offset;
}
static const per_sequence_t BandCombinationList_v1680_sequence_of[1] = {
{ &hf_nr_rrc_BandCombinationList_v1680_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BandCombination_v1680 },
};
static int
dissect_nr_rrc_BandCombinationList_v1680(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_v1680, BandCombinationList_v1680_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_) {
@ -69812,6 +69885,35 @@ dissect_nr_rrc_T_uplinkTxSwitching_PowerBoosting_r16(tvbuff_t *tvb _U_, int offs
}
static const value_string nr_rrc_T_uplinkTxSwitching_PUSCH_TransCoherence_r16_vals[] = {
{ 0, "nonCoherent" },
{ 1, "fullCoherent" },
{ 0, NULL }
};
static int
dissect_nr_rrc_T_uplinkTxSwitching_PUSCH_TransCoherence_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 BandCombination_UplinkTxSwitch_r16_eag_1_sequence[] = {
{ &hf_nr_rrc_uplinkTxSwitching_PUSCH_TransCoherence_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_uplinkTxSwitching_PUSCH_TransCoherence_r16 },
{ NULL, 0, 0, NULL }
};
static int
dissect_nr_rrc_BandCombination_UplinkTxSwitch_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, BandCombination_UplinkTxSwitch_r16_eag_1_sequence);
return offset;
}
static const per_sequence_t BandCombination_UplinkTxSwitch_r16_sequence[] = {
{ &hf_nr_rrc_bandCombination_r16, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BandCombination },
{ &hf_nr_rrc_bandCombination_v1540, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_BandCombination_v1540 },
@ -69823,6 +69925,7 @@ static const per_sequence_t BandCombination_UplinkTxSwitch_r16_sequence[] = {
{ &hf_nr_rrc_supportedBandPairListNR_r16, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_nr_rrc_SEQUENCE_SIZE_1_maxULTxSwitchingBandPairs_OF_ULTxSwitchingBandPair_r16 },
{ &hf_nr_rrc_uplinkTxSwitching_OptionSupport_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_uplinkTxSwitching_OptionSupport_r16 },
{ &hf_nr_rrc_uplinkTxSwitching_PowerBoosting_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_nr_rrc_T_uplinkTxSwitching_PowerBoosting_r16 },
{ &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_BandCombination_UplinkTxSwitch_r16_eag_1 },
{ NULL, 0, 0, NULL }
};
@ -87434,6 +87537,19 @@ dissect_nr_rrc_RF_Parameters_eag_9(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
}
static const per_sequence_t RF_Parameters_eag_10_sequence[] = {
{ &hf_nr_rrc_supportedBandCombinationList_v1680, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_BandCombinationList_v1680 },
{ NULL, 0, 0, NULL }
};
static int
dissect_nr_rrc_RF_Parameters_eag_10(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_10_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 },
@ -87447,6 +87563,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_7 },
{ &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_RF_Parameters_eag_8 },
{ &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_RF_Parameters_eag_9 },
{ &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_RF_Parameters_eag_10 },
{ NULL, 0, 0, NULL }
};
@ -88608,6 +88725,41 @@ dissect_nr_rrc_BandSidelink_r16_eag_1(tvbuff_t *tvb _U_, int offset _U_, asn1_ct
}
static const value_string nr_rrc_T_ue_PowerClassSidelink_r16_vals[] = {
{ 0, "pc2" },
{ 1, "pc3" },
{ 2, "spare6" },
{ 3, "spare5" },
{ 4, "spare4" },
{ 5, "spare3" },
{ 6, "spare2" },
{ 7, "spare1" },
{ 0, NULL }
};
static int
dissect_nr_rrc_T_ue_PowerClassSidelink_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 BandSidelink_r16_eag_2_sequence[] = {
{ &hf_nr_rrc_ue_PowerClassSidelink_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nr_rrc_T_ue_PowerClassSidelink_r16 },
{ NULL, 0, 0, NULL }
};
static int
dissect_nr_rrc_BandSidelink_r16_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, BandSidelink_r16_eag_2_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 },
@ -88618,6 +88770,7 @@ static const per_sequence_t BandSidelink_r16_sequence[] = {
{ &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 },
{ &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_BandSidelink_r16_eag_2 },
{ NULL, 0, 0, NULL }
};
@ -108285,6 +108438,10 @@ proto_register_nr_rrc(void) {
{ "BandCombination-v1650", "nr-rrc.BandCombination_v1650_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_nr_rrc_BandCombinationList_v1680_item,
{ "BandCombination-v1680", "nr-rrc.BandCombination_v1680_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,
@ -108477,6 +108634,14 @@ proto_register_nr_rrc(void) {
{ "ca-ParametersNRDC-v1650", "nr-rrc.ca_ParametersNRDC_v1650_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_nr_rrc_intrabandConcurrentOperationPowerClass_r16,
{ "intrabandConcurrentOperationPowerClass-r16", "nr-rrc.intrabandConcurrentOperationPowerClass_r16",
FT_UINT32, BASE_DEC, NULL, 0,
"SEQUENCE_SIZE_1_maxBandComb_OF_IntraBandPowerClass_r16", HFILL }},
{ &hf_nr_rrc_intrabandConcurrentOperationPowerClass_r16_item,
{ "IntraBandPowerClass-r16", "nr-rrc.IntraBandPowerClass_r16",
FT_UINT32, BASE_DEC, VALS(nr_rrc_IntraBandPowerClass_r16_vals), 0,
NULL, HFILL }},
{ &hf_nr_rrc_bandCombination_r16,
{ "bandCombination-r16", "nr-rrc.bandCombination_r16_element",
FT_NONE, BASE_NONE, NULL, 0,
@ -108521,6 +108686,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_uplinkTxSwitching_PUSCH_TransCoherence_r16,
{ "uplinkTxSwitching-PUSCH-TransCoherence-r16", "nr-rrc.uplinkTxSwitching_PUSCH_TransCoherence_r16",
FT_UINT32, BASE_DEC, VALS(nr_rrc_T_uplinkTxSwitching_PUSCH_TransCoherence_r16_vals), 0,
NULL, HFILL }},
{ &hf_nr_rrc_bandCombination_v1630,
{ "bandCombination-v1630", "nr-rrc.bandCombination_v1630_element",
FT_NONE, BASE_NONE, NULL, 0,
@ -113173,6 +113342,10 @@ proto_register_nr_rrc(void) {
{ "supportedBandCombinationList-UplinkTxSwitch-v1670", "nr-rrc.supportedBandCombinationList_UplinkTxSwitch_v1670",
FT_UINT32, BASE_DEC, NULL, 0,
"BandCombinationList_UplinkTxSwitch_v1670", HFILL }},
{ &hf_nr_rrc_supportedBandCombinationList_v1680,
{ "supportedBandCombinationList-v1680", "nr-rrc.supportedBandCombinationList_v1680",
FT_UINT32, BASE_DEC, NULL, 0,
"BandCombinationList_v1680", HFILL }},
{ &hf_nr_rrc_supportedBandCombinationList_v15g0,
{ "supportedBandCombinationList-v15g0", "nr-rrc.supportedBandCombinationList_v15g0",
FT_UINT32, BASE_DEC, NULL, 0,
@ -113953,6 +114126,10 @@ proto_register_nr_rrc(void) {
{ "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_ue_PowerClassSidelink_r16,
{ "ue-PowerClassSidelink-r16", "nr-rrc.ue_PowerClassSidelink_r16",
FT_UINT32, BASE_DEC, VALS(nr_rrc_T_ue_PowerClassSidelink_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,
@ -118769,6 +118946,7 @@ proto_register_nr_rrc(void) {
&ett_nr_rrc_BandCombinationList_v1630,
&ett_nr_rrc_BandCombinationList_v1640,
&ett_nr_rrc_BandCombinationList_v1650,
&ett_nr_rrc_BandCombinationList_v1680,
&ett_nr_rrc_BandCombinationList_UplinkTxSwitch_r16,
&ett_nr_rrc_BandCombinationList_UplinkTxSwitch_v1630,
&ett_nr_rrc_BandCombinationList_UplinkTxSwitch_v1640,
@ -118790,6 +118968,8 @@ proto_register_nr_rrc(void) {
&ett_nr_rrc_SEQUENCE_SIZE_1_maxBandComb_OF_ScalingFactorSidelink_r16,
&ett_nr_rrc_BandCombination_v1640,
&ett_nr_rrc_BandCombination_v1650,
&ett_nr_rrc_BandCombination_v1680,
&ett_nr_rrc_SEQUENCE_SIZE_1_maxBandComb_OF_IntraBandPowerClass_r16,
&ett_nr_rrc_BandCombination_UplinkTxSwitch_r16,
&ett_nr_rrc_SEQUENCE_SIZE_1_maxULTxSwitchingBandPairs_OF_ULTxSwitchingBandPair_r16,
&ett_nr_rrc_BandCombination_UplinkTxSwitch_v1630,