NRPPa: upgrade dissector to v17.6.0

This commit is contained in:
Pascal Quantin 2024-01-17 09:25:53 +01:00
parent bf909bf93e
commit 524621ca21
9 changed files with 290 additions and 32 deletions

View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.455 V17.4.0 (2023-03)
-- 3GPP TS 38.455 V17.6.0 (2023-12)
-- 9.3.6 Common definitions
-- **************************************************************
--

View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.455 V17.4.0 (2023-03)
-- 3GPP TS 38.455 V17.6.0 (2023-12)
-- 9.3.7 Constant definitions
-- **************************************************************
--
@ -181,7 +181,7 @@ id-MeasurementPeriodicityExtended ProtocolIE-ID ::= 64
id-PRS-Resource-ID ProtocolIE-ID ::= 65
id-PRSTRPList ProtocolIE-ID ::= 66
id-PRSTransmissionTRPList ProtocolIE-ID ::= 67
id-OnDemandPRS ProtocolIE-ID ::= 68
id-OnDemandPRS ProtocolIE-ID ::= 68
id-AoA-SearchWindow ProtocolIE-ID ::= 69
id-TRP-MeasurementUpdateList ProtocolIE-ID ::= 70
id-ZoA ProtocolIE-ID ::= 71
@ -199,7 +199,7 @@ id-NumberOfTRPRxTEG ProtocolIE-ID ::= 82
id-NumberOfTRPRxTxTEG ProtocolIE-ID ::= 83
id-TRPTxTEGAssociation ProtocolIE-ID ::= 84
id-TRPTEGInformation ProtocolIE-ID ::= 85
id-TRP-Rx-TEGInformation ProtocolIE-ID ::= 86
id-TRP-Rx-TEGInformation ProtocolIE-ID ::= 86
id-TRP-PRS-Information-List ProtocolIE-ID ::= 87
id-PRS-Measurements-Info-List ProtocolIE-ID ::= 88
id-PRSConfigRequestType ProtocolIE-ID ::= 89
@ -220,6 +220,12 @@ id-procedure-code-103-not-to-be-used ProtocolIE-ID ::= 103
id-UETxTimingErrorMargin ProtocolIE-ID ::= 104
id-MeasurementPeriodicityNR-AoA ProtocolIE-ID ::= 105
id-SRSTransmissionStatus ProtocolIE-ID ::= 106
id-nrofSymbolsExtended ProtocolIE-ID ::= 107
id-repetitionFactorExtended ProtocolIE-ID ::= 108
id-StartRBHopping ProtocolIE-ID ::= 109
id-StartRBIndex ProtocolIE-ID ::= 110
id-transmissionCombn8 ProtocolIE-ID ::= 111

View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.455 V17.4.0 (2023-03)
-- 3GPP TS 38.455 V17.6.0 (2023-12)
-- 9.3.8 Container definitions
--
-- **************************************************************

View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.455 V17.4.0 (2023-03)
-- 3GPP TS 38.455 V17.6.0 (2023-12)
-- 9.3.5 Information Element definitions
-- **************************************************************
--
@ -106,7 +106,12 @@ IMPORTS
id-NR-TADV,
id-pathPower,
id-SRSPortIndex,
id-UETxTimingErrorMargin
id-UETxTimingErrorMargin,
id-nrofSymbolsExtended,
id-repetitionFactorExtended,
id-StartRBHopping,
id-StartRBIndex,
id-transmissionCombn8
@ -143,7 +148,7 @@ AbortTransmission-ExtIEs NRPPA-PROTOCOL-IES ::= {
ActiveULBWP ::= SEQUENCE {
locationAndBandwidth INTEGER (0..37949,...),
subcarrierSpacing ENUMERATED {kHz15, kHz30, kHz60, kHz120,...},
subcarrierSpacing ENUMERATED {kHz15, kHz30, kHz60, kHz120,..., kHz480, kHz960},
cyclicPrefix ENUMERATED {normal, extended},
txDirectCurrentLocation INTEGER (0..3301,...),
shift7dot5kHz ENUMERATED {true, ...} OPTIONAL,
@ -916,6 +921,8 @@ NR-ARFCN ::= INTEGER (0..3279165)
NRCellIdentifier ::= BIT STRING (SIZE (36))
NrofSymbolsExtended ::= ENUMERATED {n8, n10, n12, n14, ...}
NR-PCI ::= INTEGER (0..1007)
NR-PRS-Beam-Information ::= SEQUENCE {
@ -1492,7 +1499,7 @@ PRSResourceSet-Item ::= SEQUENCE {
pointA INTEGER (0..3279165),
combSize ENUMERATED{n2, n4, n6, n12, ...},
cPType ENUMERATED{normal, extended, ...},
resourceSetPeriodicity ENUMERATED{n4,n5,n8,n10,n16,n20,n32,n40,n64,n80,n160,n320,n640,n1280,n2560,n5120,n10240,n20480,n40960, n81920,...},
resourceSetPeriodicity ENUMERATED{n4,n5,n8,n10,n16,n20,n32,n40,n64,n80,n160,n320,n640,n1280,n2560,n5120,n10240,n20480,n40960, n81920,..., n128, n256, n512},
resourceSetSlotOffset INTEGER(0..81919,...),
resourceRepetitionFactor ENUMERATED{rf1,rf2,rf4,rf6,rf8,rf16,rf32,...},
resourceTimeGap ENUMERATED{tg1,tg2,tg4,tg8,tg16,tg32,...},
@ -1674,6 +1681,8 @@ RelativePathDelay-ExtIEs NRPPA-PROTOCOL-IES ::= {
...
}
RepetitionFactorExtended ::= ENUMERATED {n3, n5, n6, n7, n8, n10, n12, n14, ...}
ReportCharacteristics ::= ENUMERATED {
onDemand,
periodic,
@ -1697,7 +1706,7 @@ RequestedDLPRSResourceSet-List ::= SEQUENCE (SIZE (1..maxnoofPRSresourceSet)) OF
RequestedDLPRSResourceSet-Item ::= SEQUENCE {
pRSbandwidth INTEGER(1..63) OPTIONAL,
combSize ENUMERATED{n2, n4, n6, n12, ...} OPTIONAL,
resourceSetPeriodicity ENUMERATED{n4,n5,n8,n10,n16,n20,n32,n40,n64,n80,n160,n320,n640,n1280,n2560,n5120,n10240,n20480,n40960, n81920,...} OPTIONAL,
resourceSetPeriodicity ENUMERATED{n4,n5,n8,n10,n16,n20,n32,n40,n64,n80,n160,n320,n640,n1280,n2560,n5120,n10240,n20480,n40960, n81920,..., n128, n256 ,n512} OPTIONAL,
resourceRepetitionFactor ENUMERATED{rf1,rf2,rf4,rf6,rf8,rf16,rf32,...} OPTIONAL,
resourceNumberofSymbols ENUMERATED{n2,n4,n6,n12,...} OPTIONAL,
requestedDLPRSResource-List RequestedDLPRSResource-List OPTIONAL,
@ -2123,7 +2132,7 @@ RxTxTimingErrorMargin ::= ENUMERATED {tc0dot5, tc1, tc2, tc4, tc8, tc12, tc16, t
SCS-SpecificCarrier ::= SEQUENCE {
offsetToCarrier INTEGER (0..2199,...),
subcarrierSpacing ENUMERATED {kHz15, kHz30, kHz60, kHz120,...},
subcarrierSpacing ENUMERATED {kHz15, kHz30, kHz60, kHz120,..., kHz480, kHz960},
carrierBandwidth INTEGER (1..275,...),
iE-Extensions ProtocolExtensionContainer { { SCS-SpecificCarrier-ExtIEs } } OPTIONAL,
...
@ -2287,6 +2296,11 @@ SRSResource::= SEQUENCE {
}
SRSResource-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= {
{ ID id-nrofSymbolsExtended CRITICALITY ignore EXTENSION NrofSymbolsExtended PRESENCE optional}|
{ ID id-repetitionFactorExtended CRITICALITY ignore EXTENSION RepetitionFactorExtended PRESENCE optional}|
{ ID id-StartRBHopping CRITICALITY ignore EXTENSION StartRBHopping PRESENCE optional}|
{ ID id-StartRBIndex CRITICALITY ignore EXTENSION StartRBIndex PRESENCE optional},
...
}
@ -2405,6 +2419,20 @@ SSB-Index ::= INTEGER(0..63)
SSID ::= OCTET STRING (SIZE(1..32))
StartRBIndex ::= CHOICE{
freqScalingFactor2 INTEGER(0..1),
freqScalingFactor4 INTEGER(0..3),
choice-extension ProtocolIE-Single-Container { { StartRBIndex-ExtIEs} }
}
StartRBIndex-ExtIEs NRPPA-PROTOCOL-IES ::= {
...
}
StartRBHopping ::= ENUMERATED {enable}
StartTimeAndDuration ::= SEQUENCE {
startTime RelativeTime1900 OPTIONAL,
duration INTEGER (0..90060, ...) OPTIONAL,
@ -2480,7 +2508,8 @@ TimingErrorMargin ::= ENUMERATED {tc0, tc2, tc4, tc6, tc8, tc12, tc16, tc20, tc2
TF-Configuration ::= SEQUENCE {
sSB-frequency INTEGER (0..3279165),
sSB-subcarrier-spacing ENUMERATED {kHz15, kHz30, kHz120, kHz240, ..., kHz60},
sSB-subcarrier-spacing ENUMERATED {kHz15, kHz30, kHz120, kHz240, ..., kHz60, kHz480, kHz960},
-- The value kHz60 is not supported in this version of the specification.
sSB-Transmit-power INTEGER (-60..50),
sSB-periodicity ENUMERATED {ms5, ms10, ms20, ms40, ms80, ms160, ...},
sSB-half-frame-offset INTEGER(0..1),
@ -2538,9 +2567,21 @@ TransmissionComb ::= CHOICE {
choice-extension ProtocolIE-Single-Container { { TransmissionComb-ExtIEs} }
}
TransmissionComb-ExtIEs NRPPA-PROTOCOL-IES ::= {
{ ID id-transmissionCombn8 CRITICALITY reject TYPE TransmissionCombn8 PRESENCE mandatory},
...
}
TransmissionCombn8 ::= SEQUENCE {
combOffset-n8 INTEGER (0..7),
cyclicShift-n8 INTEGER (0..5),
iE-Extensions ProtocolExtensionContainer { { TransmissionCombn8-ExtIEs } } OPTIONAL
}
TransmissionCombn8-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= {
...
}
TransmissionCombPos ::= CHOICE {
n2 SEQUENCE {
combOffset-n2 INTEGER (0..1),

View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.455 V17.4.0 (2023-03)
-- 3GPP TS 38.455 V17.6.0 (2023-12)
--9.3.4 PDU Definitions
--
-- **************************************************************

View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.455 V17.4.0 (2023-03)
-- 3GPP TS 38.455 V17.6.0 (2023-12)
--
-- ASN1START
-- **************************************************************

View File

@ -213,6 +213,11 @@ id-procedure-code-103-not-to-be-used ProtocolIE-ID
id-UETxTimingErrorMargin ProtocolIE-ID
id-MeasurementPeriodicityNR-AoA ProtocolIE-ID
id-SRSTransmissionStatus ProtocolIE-ID
id-nrofSymbolsExtended ProtocolIE-ID
id-repetitionFactorExtended ProtocolIE-ID
id-StartRBHopping ProtocolIE-ID
id-StartRBIndex ProtocolIE-ID
id-transmissionCombn8 ProtocolIE-ID
#.REGISTER
#NRPPA-PROTOCOL-IES
@ -319,6 +324,11 @@ TRP-Rx-TEGInformation N nrppa.extension id-TRP-Rx-TEGInform
UL-SRS-RSRPP N nrppa.extension id-pathPower
SRSPortIndex N nrppa.extension id-SRSPortIndex
TimingErrorMargin N nrppa.extension id-UETxTimingErrorMargin
NrofSymbolsExtended N nrppa.extension id-nrofSymbolsExtended
RepetitionFactorExtended N nrppa.extension id-repetitionFactorExtended
StartRBHopping N nrppa.extension id-StartRBHopping
StartRBIndex N nrppa.extension id-StartRBIndex
TransmissionCombn8 N nrppa.extension id-transmissionCombn8
#LPPA-ELEMENTARY-PROCEDURE

View File

@ -8,7 +8,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* Ref 3GPP TS 38.455 V17.4.0 (2023-03)
* Ref 3GPP TS 38.455 V17.6.0 (2023-12)
* http://www.3gpp.org
*/

View File

@ -13,7 +13,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* Ref 3GPP TS 38.455 V17.4.0 (2023-03)
* Ref 3GPP TS 38.455 V17.6.0 (2023-12)
* http://www.3gpp.org
*/
@ -63,6 +63,7 @@ static int hf_nrppa_MeasurementQuantities_Item_PDU; /* MeasurementQuantities_It
static int hf_nrppa_MeasurementTimeOccasion_PDU; /* MeasurementTimeOccasion */
static int hf_nrppa_MeasurementCharacteristicsRequestIndicator_PDU; /* MeasurementCharacteristicsRequestIndicator */
static int hf_nrppa_MultipleULAoA_PDU; /* MultipleULAoA */
static int hf_nrppa_NrofSymbolsExtended_PDU; /* NrofSymbolsExtended */
static int hf_nrppa_NR_TADV_PDU; /* NR_TADV */
static int hf_nrppa_NumberOfTRPRxTEG_PDU; /* NumberOfTRPRxTEG */
static int hf_nrppa_NumberOfTRPRxTxTEG_PDU; /* NumberOfTRPRxTxTEG */
@ -77,6 +78,7 @@ static int hf_nrppa_PRS_Measurements_Info_List_PDU; /* PRS_Measurements_Info_Li
static int hf_nrppa_PRS_Resource_ID_PDU; /* PRS_Resource_ID */
static int hf_nrppa_PRSTRPList_PDU; /* PRSTRPList */
static int hf_nrppa_PRSTransmissionTRPList_PDU; /* PRSTransmissionTRPList */
static int hf_nrppa_RepetitionFactorExtended_PDU; /* RepetitionFactorExtended */
static int hf_nrppa_ReportCharacteristics_PDU; /* ReportCharacteristics */
static int hf_nrppa_RequestedSRSTransmissionCharacteristics_PDU; /* RequestedSRSTransmissionCharacteristics */
static int hf_nrppa_RequestType_PDU; /* RequestType */
@ -97,10 +99,13 @@ static int hf_nrppa_SrsFrequency_PDU; /* SrsFrequency */
static int hf_nrppa_SRSPortIndex_PDU; /* SRSPortIndex */
static int hf_nrppa_SRSResourcetype_PDU; /* SRSResourcetype */
static int hf_nrppa_SRSTransmissionStatus_PDU; /* SRSTransmissionStatus */
static int hf_nrppa_StartRBIndex_PDU; /* StartRBIndex */
static int hf_nrppa_StartRBHopping_PDU; /* StartRBHopping */
static int hf_nrppa_SystemFrameNumber_PDU; /* SystemFrameNumber */
static int hf_nrppa_TDD_Config_EUTRA_Item_PDU; /* TDD_Config_EUTRA_Item */
static int hf_nrppa_TRPTEGInformation_PDU; /* TRPTEGInformation */
static int hf_nrppa_TimingErrorMargin_PDU; /* TimingErrorMargin */
static int hf_nrppa_TransmissionCombn8_PDU; /* TransmissionCombn8 */
static int hf_nrppa_TRPBeamAntennaInformation_PDU; /* TRPBeamAntennaInformation */
static int hf_nrppa_TRPMeasurementQuantities_PDU; /* TRPMeasurementQuantities */
static int hf_nrppa_TRP_MeasurementRequestList_PDU; /* TRP_MeasurementRequestList */
@ -623,6 +628,8 @@ static int hf_nrppa_ssb_index; /* SSB_Index */
static int hf_nrppa_shortBitmap; /* BIT_STRING_SIZE_4 */
static int hf_nrppa_mediumBitmap; /* BIT_STRING_SIZE_8 */
static int hf_nrppa_longBitmap; /* BIT_STRING_SIZE_64 */
static int hf_nrppa_freqScalingFactor2; /* INTEGER_0_1 */
static int hf_nrppa_freqScalingFactor4; /* INTEGER_0_3 */
static int hf_nrppa_startTime; /* RelativeTime1900 */
static int hf_nrppa_duration; /* INTEGER_0_90060_ */
static int hf_nrppa_SystemInformation_item; /* SystemInformation_item */
@ -656,11 +663,11 @@ static int hf_nrppa_cyclicShift_n2; /* INTEGER_0_7 */
static int hf_nrppa_n4; /* T_n4 */
static int hf_nrppa_combOffset_n4; /* INTEGER_0_3 */
static int hf_nrppa_cyclicShift_n4; /* INTEGER_0_11 */
static int hf_nrppa_combOffset_n8; /* INTEGER_0_7 */
static int hf_nrppa_cyclicShift_n8; /* INTEGER_0_5 */
static int hf_nrppa_n2_01; /* T_n2_01 */
static int hf_nrppa_n4_01; /* T_n4_01 */
static int hf_nrppa_n8; /* T_n8 */
static int hf_nrppa_combOffset_n8; /* INTEGER_0_7 */
static int hf_nrppa_cyclicShift_n8; /* INTEGER_0_5 */
static int hf_nrppa_choice_TRP_Beam_Antenna_Info_Item; /* Choice_TRP_Beam_Antenna_Info_Item */
static int hf_nrppa_reference; /* TRP_ID */
static int hf_nrppa_explicit; /* TRP_BeamAntennaExplicitInformation */
@ -982,6 +989,7 @@ static gint ett_nrppa_SEQUENCE_SIZE_1_maxNoSSBs_OF_SSBInfoItem;
static gint ett_nrppa_SSBInfoItem;
static gint ett_nrppa_SSB;
static gint ett_nrppa_SSBBurstPosition;
static gint ett_nrppa_StartRBIndex;
static gint ett_nrppa_StartTimeAndDuration;
static gint ett_nrppa_SystemInformation;
static gint ett_nrppa_SystemInformation_item;
@ -995,6 +1003,7 @@ static gint ett_nrppa_TimeStampSlotIndex;
static gint ett_nrppa_TransmissionComb;
static gint ett_nrppa_T_n2;
static gint ett_nrppa_T_n4;
static gint ett_nrppa_TransmissionCombn8;
static gint ett_nrppa_TransmissionCombPos;
static gint ett_nrppa_T_n2_01;
static gint ett_nrppa_T_n4_01;
@ -1299,7 +1308,12 @@ typedef enum _ProtocolIE_ID_enum {
id_procedure_code_103_not_to_be_used = 103,
id_UETxTimingErrorMargin = 104,
id_MeasurementPeriodicityNR_AoA = 105,
id_SRSTransmissionStatus = 106
id_SRSTransmissionStatus = 106,
id_nrofSymbolsExtended = 107,
id_repetitionFactorExtended = 108,
id_StartRBHopping = 109,
id_StartRBIndex = 110,
id_transmissionCombn8 = 111
} ProtocolIE_ID_enum;
static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *);
@ -1522,6 +1536,11 @@ static const value_string nrppa_ProtocolIE_ID_vals[] = {
{ id_UETxTimingErrorMargin, "id-UETxTimingErrorMargin" },
{ id_MeasurementPeriodicityNR_AoA, "id-MeasurementPeriodicityNR-AoA" },
{ id_SRSTransmissionStatus, "id-SRSTransmissionStatus" },
{ id_nrofSymbolsExtended, "id-nrofSymbolsExtended" },
{ id_repetitionFactorExtended, "id-repetitionFactorExtended" },
{ id_StartRBHopping, "id-StartRBHopping" },
{ id_StartRBIndex, "id-StartRBIndex" },
{ id_transmissionCombn8, "id-transmissionCombn8" },
{ 0, NULL }
};
@ -1846,6 +1865,8 @@ static const value_string nrppa_T_subcarrierSpacing_vals[] = {
{ 1, "kHz30" },
{ 2, "kHz60" },
{ 3, "kHz120" },
{ 4, "kHz480" },
{ 5, "kHz960" },
{ 0, NULL }
};
@ -1853,7 +1874,7 @@ static const value_string nrppa_T_subcarrierSpacing_vals[] = {
static int
dissect_nrppa_T_subcarrierSpacing(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, TRUE, 0, NULL);
4, NULL, TRUE, 2, NULL);
return offset;
}
@ -5867,6 +5888,24 @@ dissect_nrppa_NR_ARFCN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
}
static const value_string nrppa_NrofSymbolsExtended_vals[] = {
{ 0, "n8" },
{ 1, "n10" },
{ 2, "n12" },
{ 3, "n14" },
{ 0, NULL }
};
static int
dissect_nrppa_NrofSymbolsExtended(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, TRUE, 0, NULL);
return offset;
}
static int
dissect_nrppa_NR_PCI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@ -6946,6 +6985,9 @@ static const value_string nrppa_T_resourceSetPeriodicity_vals[] = {
{ 17, "n20480" },
{ 18, "n40960" },
{ 19, "n81920" },
{ 20, "n128" },
{ 21, "n256" },
{ 22, "n512" },
{ 0, NULL }
};
@ -6953,7 +6995,7 @@ static const value_string nrppa_T_resourceSetPeriodicity_vals[] = {
static int
dissect_nrppa_T_resourceSetPeriodicity(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,
20, NULL, TRUE, 0, NULL);
20, NULL, TRUE, 3, NULL);
return offset;
}
@ -7531,6 +7573,9 @@ static const value_string nrppa_T_resourceSetPeriodicity_01_vals[] = {
{ 17, "n20480" },
{ 18, "n40960" },
{ 19, "n81920" },
{ 20, "n128" },
{ 21, "n256" },
{ 22, "n512" },
{ 0, NULL }
};
@ -7538,7 +7583,7 @@ static const value_string nrppa_T_resourceSetPeriodicity_01_vals[] = {
static int
dissect_nrppa_T_resourceSetPeriodicity_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,
20, NULL, TRUE, 0, NULL);
20, NULL, TRUE, 3, NULL);
return offset;
}
@ -7801,6 +7846,28 @@ dissect_nrppa_ReferenceSignal(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
}
static const value_string nrppa_RepetitionFactorExtended_vals[] = {
{ 0, "n3" },
{ 1, "n5" },
{ 2, "n6" },
{ 3, "n7" },
{ 4, "n8" },
{ 5, "n10" },
{ 6, "n12" },
{ 7, "n14" },
{ 0, NULL }
};
static int
dissect_nrppa_RepetitionFactorExtended(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, TRUE, 0, NULL);
return offset;
}
static const value_string nrppa_ReportCharacteristics_vals[] = {
{ 0, "onDemand" },
{ 1, "periodic" },
@ -7926,6 +7993,8 @@ static const value_string nrppa_T_sSB_subcarrier_spacing_vals[] = {
{ 2, "kHz120" },
{ 3, "kHz240" },
{ 4, "kHz60" },
{ 5, "kHz480" },
{ 6, "kHz960" },
{ 0, NULL }
};
@ -7933,7 +8002,7 @@ static const value_string nrppa_T_sSB_subcarrier_spacing_vals[] = {
static int
dissect_nrppa_T_sSB_subcarrier_spacing(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, TRUE, 1, NULL);
4, NULL, TRUE, 3, NULL);
return offset;
}
@ -8515,6 +8584,8 @@ static const value_string nrppa_T_subcarrierSpacing_02_vals[] = {
{ 1, "kHz30" },
{ 2, "kHz60" },
{ 3, "kHz120" },
{ 4, "kHz480" },
{ 5, "kHz960" },
{ 0, NULL }
};
@ -8522,7 +8593,7 @@ static const value_string nrppa_T_subcarrierSpacing_02_vals[] = {
static int
dissect_nrppa_T_subcarrierSpacing_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, TRUE, 0, NULL);
4, NULL, TRUE, 2, NULL);
return offset;
}
@ -8854,6 +8925,45 @@ dissect_nrppa_SSID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot
}
static const value_string nrppa_StartRBIndex_vals[] = {
{ 0, "freqScalingFactor2" },
{ 1, "freqScalingFactor4" },
{ 2, "choice-extension" },
{ 0, NULL }
};
static const per_choice_t StartRBIndex_choice[] = {
{ 0, &hf_nrppa_freqScalingFactor2, ASN1_NO_EXTENSIONS , dissect_nrppa_INTEGER_0_1 },
{ 1, &hf_nrppa_freqScalingFactor4, ASN1_NO_EXTENSIONS , dissect_nrppa_INTEGER_0_3 },
{ 2, &hf_nrppa_choice_extension, ASN1_NO_EXTENSIONS , dissect_nrppa_ProtocolIE_Single_Container },
{ 0, NULL, 0, NULL }
};
static int
dissect_nrppa_StartRBIndex(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_nrppa_StartRBIndex, StartRBIndex_choice,
NULL);
return offset;
}
static const value_string nrppa_StartRBHopping_vals[] = {
{ 0, "enable" },
{ 0, NULL }
};
static int
dissect_nrppa_StartRBHopping(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_nrppa_SystemFrameNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@ -9109,6 +9219,22 @@ dissect_nrppa_TimeStamp(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
}
static const per_sequence_t TransmissionCombn8_sequence[] = {
{ &hf_nrppa_combOffset_n8 , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nrppa_INTEGER_0_7 },
{ &hf_nrppa_cyclicShift_n8, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nrppa_INTEGER_0_5 },
{ &hf_nrppa_iE_Extensions , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_nrppa_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
static int
dissect_nrppa_TransmissionCombn8(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_nrppa_TransmissionCombn8, TransmissionCombn8_sequence);
return offset;
}
static int
dissect_nrppa_INTEGER_0_30(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@ -10960,6 +11086,14 @@ static int dissect_MultipleULAoA_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
offset += 7; offset >>= 3;
return offset;
}
static int dissect_NrofSymbolsExtended_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
offset = dissect_nrppa_NrofSymbolsExtended(tvb, offset, &asn1_ctx, tree, hf_nrppa_NrofSymbolsExtended_PDU);
offset += 7; offset >>= 3;
return offset;
}
static int dissect_NR_TADV_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@ -11072,6 +11206,14 @@ static int dissect_PRSTransmissionTRPList_PDU(tvbuff_t *tvb _U_, packet_info *pi
offset += 7; offset >>= 3;
return offset;
}
static int dissect_RepetitionFactorExtended_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
offset = dissect_nrppa_RepetitionFactorExtended(tvb, offset, &asn1_ctx, tree, hf_nrppa_RepetitionFactorExtended_PDU);
offset += 7; offset >>= 3;
return offset;
}
static int dissect_ReportCharacteristics_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@ -11232,6 +11374,22 @@ static int dissect_SRSTransmissionStatus_PDU(tvbuff_t *tvb _U_, packet_info *pin
offset += 7; offset >>= 3;
return offset;
}
static int dissect_StartRBIndex_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
offset = dissect_nrppa_StartRBIndex(tvb, offset, &asn1_ctx, tree, hf_nrppa_StartRBIndex_PDU);
offset += 7; offset >>= 3;
return offset;
}
static int dissect_StartRBHopping_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
offset = dissect_nrppa_StartRBHopping(tvb, offset, &asn1_ctx, tree, hf_nrppa_StartRBHopping_PDU);
offset += 7; offset >>= 3;
return offset;
}
static int dissect_SystemFrameNumber_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@ -11264,6 +11422,14 @@ static int dissect_TimingErrorMargin_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _
offset += 7; offset >>= 3;
return offset;
}
static int dissect_TransmissionCombn8_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
offset = dissect_nrppa_TransmissionCombn8(tvb, offset, &asn1_ctx, tree, hf_nrppa_TransmissionCombn8_PDU);
offset += 7; offset >>= 3;
return offset;
}
static int dissect_TRPBeamAntennaInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@ -11929,6 +12095,10 @@ void proto_register_nrppa(void) {
{ "MultipleULAoA", "nrppa.MultipleULAoA_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_nrppa_NrofSymbolsExtended_PDU,
{ "NrofSymbolsExtended", "nrppa.NrofSymbolsExtended",
FT_UINT32, BASE_DEC, VALS(nrppa_NrofSymbolsExtended_vals), 0,
NULL, HFILL }},
{ &hf_nrppa_NR_TADV_PDU,
{ "NR-TADV", "nrppa.NR_TADV",
FT_UINT32, BASE_DEC, NULL, 0,
@ -11985,6 +12155,10 @@ void proto_register_nrppa(void) {
{ "PRSTransmissionTRPList", "nrppa.PRSTransmissionTRPList",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_nrppa_RepetitionFactorExtended_PDU,
{ "RepetitionFactorExtended", "nrppa.RepetitionFactorExtended",
FT_UINT32, BASE_DEC, VALS(nrppa_RepetitionFactorExtended_vals), 0,
NULL, HFILL }},
{ &hf_nrppa_ReportCharacteristics_PDU,
{ "ReportCharacteristics", "nrppa.ReportCharacteristics",
FT_UINT32, BASE_DEC, VALS(nrppa_ReportCharacteristics_vals), 0,
@ -12065,6 +12239,14 @@ void proto_register_nrppa(void) {
{ "SRSTransmissionStatus", "nrppa.SRSTransmissionStatus",
FT_UINT32, BASE_DEC, VALS(nrppa_SRSTransmissionStatus_vals), 0,
NULL, HFILL }},
{ &hf_nrppa_StartRBIndex_PDU,
{ "StartRBIndex", "nrppa.StartRBIndex",
FT_UINT32, BASE_DEC, VALS(nrppa_StartRBIndex_vals), 0,
NULL, HFILL }},
{ &hf_nrppa_StartRBHopping_PDU,
{ "StartRBHopping", "nrppa.StartRBHopping",
FT_UINT32, BASE_DEC, VALS(nrppa_StartRBHopping_vals), 0,
NULL, HFILL }},
{ &hf_nrppa_SystemFrameNumber_PDU,
{ "SystemFrameNumber", "nrppa.SystemFrameNumber",
FT_UINT32, BASE_DEC, NULL, 0,
@ -12081,6 +12263,10 @@ void proto_register_nrppa(void) {
{ "TimingErrorMargin", "nrppa.TimingErrorMargin",
FT_UINT32, BASE_DEC, VALS(nrppa_TimingErrorMargin_vals), 0,
NULL, HFILL }},
{ &hf_nrppa_TransmissionCombn8_PDU,
{ "TransmissionCombn8", "nrppa.TransmissionCombn8_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_nrppa_TRPBeamAntennaInformation_PDU,
{ "TRPBeamAntennaInformation", "nrppa.TRPBeamAntennaInformation_element",
FT_NONE, BASE_NONE, NULL, 0,
@ -14169,6 +14355,14 @@ void proto_register_nrppa(void) {
{ "longBitmap", "nrppa.longBitmap",
FT_BYTES, BASE_NONE, NULL, 0,
"BIT_STRING_SIZE_64", HFILL }},
{ &hf_nrppa_freqScalingFactor2,
{ "freqScalingFactor2", "nrppa.freqScalingFactor2",
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER_0_1", HFILL }},
{ &hf_nrppa_freqScalingFactor4,
{ "freqScalingFactor4", "nrppa.freqScalingFactor4",
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER_0_3", HFILL }},
{ &hf_nrppa_startTime,
{ "startTime", "nrppa.startTime",
FT_BYTES, BASE_NONE, NULL, 0,
@ -14301,6 +14495,14 @@ void proto_register_nrppa(void) {
{ "cyclicShift-n4", "nrppa.cyclicShift_n4",
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER_0_11", HFILL }},
{ &hf_nrppa_combOffset_n8,
{ "combOffset-n8", "nrppa.combOffset_n8",
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER_0_7", HFILL }},
{ &hf_nrppa_cyclicShift_n8,
{ "cyclicShift-n8", "nrppa.cyclicShift_n8",
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER_0_5", HFILL }},
{ &hf_nrppa_n2_01,
{ "n2", "nrppa.n2_element",
FT_NONE, BASE_NONE, NULL, 0,
@ -14313,14 +14515,6 @@ void proto_register_nrppa(void) {
{ "n8", "nrppa.n8_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_nrppa_combOffset_n8,
{ "combOffset-n8", "nrppa.combOffset_n8",
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER_0_7", HFILL }},
{ &hf_nrppa_cyclicShift_n8,
{ "cyclicShift-n8", "nrppa.cyclicShift_n8",
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER_0_5", HFILL }},
{ &hf_nrppa_choice_TRP_Beam_Antenna_Info_Item,
{ "choice-TRP-Beam-Antenna-Info-Item", "nrppa.choice_TRP_Beam_Antenna_Info_Item",
FT_UINT32, BASE_DEC, VALS(nrppa_Choice_TRP_Beam_Antenna_Info_Item_vals), 0,
@ -14956,6 +15150,7 @@ void proto_register_nrppa(void) {
&ett_nrppa_SSBInfoItem,
&ett_nrppa_SSB,
&ett_nrppa_SSBBurstPosition,
&ett_nrppa_StartRBIndex,
&ett_nrppa_StartTimeAndDuration,
&ett_nrppa_SystemInformation,
&ett_nrppa_SystemInformation_item,
@ -14969,6 +15164,7 @@ void proto_register_nrppa(void) {
&ett_nrppa_TransmissionComb,
&ett_nrppa_T_n2,
&ett_nrppa_T_n4,
&ett_nrppa_TransmissionCombn8,
&ett_nrppa_TransmissionCombPos,
&ett_nrppa_T_n2_01,
&ett_nrppa_T_n4_01,
@ -15195,6 +15391,11 @@ proto_reg_handoff_nrppa(void)
dissector_add_uint("nrppa.extension", id_pathPower, create_dissector_handle(dissect_UL_SRS_RSRPP_PDU, proto_nrppa));
dissector_add_uint("nrppa.extension", id_SRSPortIndex, create_dissector_handle(dissect_SRSPortIndex_PDU, proto_nrppa));
dissector_add_uint("nrppa.extension", id_UETxTimingErrorMargin, create_dissector_handle(dissect_TimingErrorMargin_PDU, proto_nrppa));
dissector_add_uint("nrppa.extension", id_nrofSymbolsExtended, create_dissector_handle(dissect_NrofSymbolsExtended_PDU, proto_nrppa));
dissector_add_uint("nrppa.extension", id_repetitionFactorExtended, create_dissector_handle(dissect_RepetitionFactorExtended_PDU, proto_nrppa));
dissector_add_uint("nrppa.extension", id_StartRBHopping, create_dissector_handle(dissect_StartRBHopping_PDU, proto_nrppa));
dissector_add_uint("nrppa.extension", id_StartRBIndex, create_dissector_handle(dissect_StartRBIndex_PDU, proto_nrppa));
dissector_add_uint("nrppa.extension", id_transmissionCombn8, create_dissector_handle(dissect_TransmissionCombn8_PDU, proto_nrppa));
dissector_add_uint("nrppa.proc.imsg", id_errorIndication, create_dissector_handle(dissect_ErrorIndication_PDU, proto_nrppa));
dissector_add_uint("nrppa.proc.imsg", id_privateMessage, create_dissector_handle(dissect_PrivateMessage_PDU, proto_nrppa));
dissector_add_uint("nrppa.proc.imsg", id_e_CIDMeasurementInitiation, create_dissector_handle(dissect_E_CIDMeasurementInitiationRequest_PDU, proto_nrppa));