diff options
Diffstat (limited to 'epan/dissectors/asn1/nrppa')
| -rw-r--r-- | epan/dissectors/asn1/nrppa/NRPPA-CommonDataTypes.asn | 2 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nrppa/NRPPA-Constants.asn | 72 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nrppa/NRPPA-Containers.asn | 2 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nrppa/NRPPA-IEs.asn | 597 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nrppa/NRPPA-PDU-Contents.asn | 75 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nrppa/NRPPA-PDU-Descriptions.asn | 17 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nrppa/nrppa.cnf | 535 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nrppa/packet-nrppa-template.c | 28 |
8 files changed, 1038 insertions, 290 deletions
diff --git a/epan/dissectors/asn1/nrppa/NRPPA-CommonDataTypes.asn b/epan/dissectors/asn1/nrppa/NRPPA-CommonDataTypes.asn index 1bd32594..6380fac9 100644 --- a/epan/dissectors/asn1/nrppa/NRPPA-CommonDataTypes.asn +++ b/epan/dissectors/asn1/nrppa/NRPPA-CommonDataTypes.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.455 V17.4.0 (2023-03) +-- 3GPP TS 38.455 V18.2.0 (2024-06) -- 9.3.6 Common definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/nrppa/NRPPA-Constants.asn b/epan/dissectors/asn1/nrppa/NRPPA-Constants.asn index 16541392..7fa4959a 100644 --- a/epan/dissectors/asn1/nrppa/NRPPA-Constants.asn +++ b/epan/dissectors/asn1/nrppa/NRPPA-Constants.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.455 V17.4.0 (2023-03) +-- 3GPP TS 38.455 V18.2.0 (2024-06) -- 9.3.7 Constant definitions -- ************************************************************** -- @@ -48,6 +48,8 @@ id-positioningDeactivation ProcedureCode ::= 18 id-pRSConfigurationExchange ProcedureCode ::= 19 id-measurementPreconfiguration ProcedureCode ::= 20 id-measurementActivation ProcedureCode ::= 21 +id-sRSInformationReservationNotification ProcedureCode ::= 22 + -- ************************************************************** -- @@ -106,6 +108,16 @@ maxNumResourcesPerAngle INTEGER ::= 24 maxnoAzimuthAngles INTEGER ::= 3600 maxnoElevationAngles INTEGER ::= 1801 maxnoPRSTRPs INTEGER ::= 256 +maxnoVACell INTEGER ::= 32 +maxnoaggregatedPosSRS-Resources INTEGER ::= 3 +maxnoaggregatedPosSRS-ResourceSets INTEGER ::= 48 +maxnoAggPosPRSResourceSets INTEGER ::= 3 +maxnoofTimeWindowSRS INTEGER ::= 16 +maxnoofTimeWindowMeas INTEGER ::= 16 +maxnoPreconfiguredSRS INTEGER ::= 16 +maxnoofHopsMinusOne INTEGER ::= 5 +maxnoAggCombinations INTEGER ::= 2 + @@ -181,7 +193,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 +211,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 +232,60 @@ 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 +id-ExtendedResourceSymbolOffset ProtocolIE-ID ::= 112 +id-NewNRCGI ProtocolIE-ID ::= 113 +id-Mobile-TRP-LocationInformation ProtocolIE-ID ::= 114 +id-Mobile-IAB-MT-UE-ID ProtocolIE-ID ::= 115 +id-MobileAccessPointLocation ProtocolIE-ID ::= 116 +id-CommonTAParameters ProtocolIE-ID ::= 117 +id-UE-Rx-Tx-Time-Diff ProtocolIE-ID ::= 118 +id-SCS-480 ProtocolIE-ID ::= 119 +id-SCS-960 ProtocolIE-ID ::= 120 +id-Bandwidth-Aggregation-Request-Indication ProtocolIE-ID ::= 121 +id-PosSRSResourceSet-Aggregation-List ProtocolIE-ID ::= 122 +id-TimingReportingGranularityFactorExtended ProtocolIE-ID ::= 123 +id-TimeWindowInformation-SRS-List ProtocolIE-ID ::= 124 +id-TimeWindowInformation-Measurement-List ProtocolIE-ID ::= 125 +id-UL-RSCPMeas ProtocolIE-ID ::= 126 +id-SymbolIndex ProtocolIE-ID ::= 127 +id-PosValidityAreaCellList ProtocolIE-ID ::= 128 +id-SRSReservationType ProtocolIE-ID ::= 129 +id-PRSBWAggregationRequestIndication ProtocolIE-ID ::= 130 +id-AggregatedPosSRSResourceID-List ProtocolIE-ID ::= 131 +id-AggregatedPRSResourceSetList ProtocolIE-ID ::= 132 +id-TRPPhaseQuality ProtocolIE-ID ::= 133 +id-NewCellIdentity ProtocolIE-ID ::= 134 +id-ValidityAreaSpecificSRSInformation ProtocolIE-ID ::= 135 +id-RequestedSRSPreconfigurationCharacteristics-List ProtocolIE-ID ::= 136 +id-SRSPreconfiguration-List ProtocolIE-ID ::= 137 +id-SRSInformation ProtocolIE-ID ::= 138 +id-TxHoppingConfiguration ProtocolIE-ID ::= 139 +id-MeasuredFrequencyHops ProtocolIE-ID ::= 140 +id-ReportingGranularitykminus1 ProtocolIE-ID ::= 141 +id-ReportingGranularitykminus2 ProtocolIE-ID ::= 142 +id-ReportingGranularitykminus3 ProtocolIE-ID ::= 143 +id-ReportingGranularitykminus4 ProtocolIE-ID ::= 144 +id-ReportingGranularitykminus5 ProtocolIE-ID ::= 145 +id-ReportingGranularitykminus6 ProtocolIE-ID ::= 146 +id-ReportingGranularitykminus1AdditionalPath ProtocolIE-ID ::= 147 +id-ReportingGranularitykminus2AdditionalPath ProtocolIE-ID ::= 148 +id-ReportingGranularitykminus3AdditionalPath ProtocolIE-ID ::= 149 +id-ReportingGranularitykminus4AdditionalPath ProtocolIE-ID ::= 150 +id-ReportingGranularitykminus5AdditionalPath ProtocolIE-ID ::= 151 +id-ReportingGranularitykminus6AdditionalPath ProtocolIE-ID ::= 152 +id-MeasuredResultsAssociatedInfoList ProtocolIE-ID ::= 153 +id-PointA ProtocolIE-ID ::= 154 +id-NR-PCI ProtocolIE-ID ::= 155 +id-SCS-SpecificCarrier ProtocolIE-ID ::= 156 +id-MeasBasedOnAggregatedResources ProtocolIE-ID ::= 157 + + + diff --git a/epan/dissectors/asn1/nrppa/NRPPA-Containers.asn b/epan/dissectors/asn1/nrppa/NRPPA-Containers.asn index fbb24742..8f256f1e 100644 --- a/epan/dissectors/asn1/nrppa/NRPPA-Containers.asn +++ b/epan/dissectors/asn1/nrppa/NRPPA-Containers.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.455 V17.4.0 (2023-03) +-- 3GPP TS 38.455 V18.2.0 (2024-06) -- 9.3.8 Container definitions -- -- ************************************************************** diff --git a/epan/dissectors/asn1/nrppa/NRPPA-IEs.asn b/epan/dissectors/asn1/nrppa/NRPPA-IEs.asn index dda9b4d3..a2649567 100644 --- a/epan/dissectors/asn1/nrppa/NRPPA-IEs.asn +++ b/epan/dissectors/asn1/nrppa/NRPPA-IEs.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.455 V17.4.0 (2023-03) +-- 3GPP TS 38.455 V18.2.0 (2024-06) -- 9.3.5 Information Element definitions -- ************************************************************** -- @@ -81,6 +81,15 @@ IMPORTS maxNumResourcesPerAngle, maxnoAzimuthAngles, maxnoElevationAngles, + maxnoVACell, + maxnoaggregatedPosSRS-Resources, + maxnoaggregatedPosSRS-ResourceSets, + maxnoAggPosPRSResourceSets, + maxnoofTimeWindowSRS, + maxnoofTimeWindowMeas, + maxnoPreconfiguredSRS, + maxnoofHopsMinusOne, + maxnoAggCombinations, id-Cell-ID, id-TRPInformationTypeItem, id-SrsFrequency, @@ -106,7 +115,50 @@ IMPORTS id-NR-TADV, id-pathPower, id-SRSPortIndex, - id-UETxTimingErrorMargin + id-UETxTimingErrorMargin, + id-nrofSymbolsExtended, + id-repetitionFactorExtended, + id-StartRBHopping, + id-StartRBIndex, + id-transmissionCombn8, + id-ExtendedResourceSymbolOffset, + id-Mobile-TRP-LocationInformation, + id-Mobile-IAB-MT-UE-ID, + id-MobileAccessPointLocation, + id-CommonTAParameters, + id-UE-Rx-Tx-Time-Diff, + id-SCS-480, + id-SCS-960, + id-UL-RSCPMeas, + id-Bandwidth-Aggregation-Request-Indication, + id-PosSRSResourceSet-Aggregation-List, + id-ReportingGranularitykminus1, + id-ReportingGranularitykminus2, + id-ReportingGranularitykminus3, + id-ReportingGranularitykminus4, + id-ReportingGranularitykminus5, + id-ReportingGranularitykminus6, + id-SymbolIndex, + id-TimingReportingGranularityFactorExtended, + id-PosValidityAreaCellList, + id-PRSBWAggregationRequestIndication, + id-AggregatedPosSRSResourceID-List, + id-AggregatedPRSResourceSetList, + id-TRPPhaseQuality, + id-ValidityAreaSpecificSRSInformation, + id-TxHoppingConfiguration, + id-MeasuredFrequencyHops, + id-ReportingGranularitykminus1AdditionalPath, + id-ReportingGranularitykminus2AdditionalPath, + id-ReportingGranularitykminus3AdditionalPath, + id-ReportingGranularitykminus4AdditionalPath, + id-ReportingGranularitykminus5AdditionalPath, + id-ReportingGranularitykminus6AdditionalPath, + id-MeasuredResultsAssociatedInfoList, + id-PointA, + id-NR-PCI, + id-SCS-SpecificCarrier, + id-MeasBasedOnAggregatedResources @@ -143,7 +195,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, @@ -173,6 +225,47 @@ AdditionalPathListItem-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { ... } +AggregatedPosSRSResourceID-List ::= SEQUENCE (SIZE (2..maxnoaggregatedPosSRS-Resources)) OF AggregatedPosSRSResourceID-Item + +AggregatedPosSRSResourceID-Item ::= SEQUENCE { + sRSPosResource-ID SRSPosResourceID, + iE-Extensions ProtocolExtensionContainer { { AggregatedPosSRSResourceID-Item-ExtIEs} } OPTIONAL, + ... +} + +AggregatedPosSRSResourceID-Item-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + { ID id-PointA CRITICALITY ignore EXTENSION PointA PRESENCE mandatory}| + { ID id-SCS-SpecificCarrier CRITICALITY ignore EXTENSION SCS-SpecificCarrier PRESENCE mandatory}| + { ID id-NR-PCI CRITICALITY ignore EXTENSION NR-PCI PRESENCE optional}, + ... +} + + +AggregatedPRSResourceSetList ::= SEQUENCE (SIZE (1..maxnoAggCombinations)) OF AggregatedPRSResourceSet-Item + +AggregatedPRSResourceSet-Item ::= SEQUENCE { + dl-PRS-ResourceSet-List DL-PRS-ResourceSet-List, + iE-Extensions ProtocolExtensionContainer { { AggregatedPRSResourceSet-Item-ExtIEs} } OPTIONAL, + ... +} + +AggregatedPRSResourceSet-Item-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + ... +} + +DL-PRS-ResourceSet-List ::= SEQUENCE (SIZE (1..maxnoAggPosPRSResourceSets)) OF DL-PRS-ResourceSet-Item + +DL-PRS-ResourceSet-Item ::= SEQUENCE { + dl-prs-ResourceSetIndex INTEGER (1..8), + iE-Extensions ProtocolExtensionContainer { { DL-PRS-ResourceSet-Item-ExtIEs} } OPTIONAL, + ... +} + +DL-PRS-ResourceSet-Item-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + ... +} + + ExtendedAdditionalPathList ::= SEQUENCE (SIZE (1.. maxNoPathExtended)) OF ExtendedAdditionalPathList-Item @@ -320,8 +413,8 @@ AssistanceInformationMetaData-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { -- B BandwidthSRS ::= CHOICE { - fR1 ENUMERATED {mHz5, mHz10, mHz20, mHz40, mHz50, mHz80, mHz100, ...}, - fR2 ENUMERATED {mHz50, mHz100, mHz200, mHz400, ...}, + fR1 ENUMERATED {mHz5, mHz10, mHz20, mHz40, mHz50, mHz80, mHz100, ... ,mHz160, mHz200}, + fR2 ENUMERATED {mHz50, mHz100, mHz200, mHz400, ..., mHz600, mhz800, mHz1600, mHz2000 }, choice-extension ProtocolIE-Single-Container { { BandwidthSRS-ExtIEs } } } @@ -329,6 +422,8 @@ BandwidthSRS-ExtIEs NRPPA-PROTOCOL-IES ::= { ... } +Bandwidth-Aggregation-Request-Indication ::= ENUMERATED { true, ...} + BCCH ::= INTEGER (0..1023, ...) Broadcast ::= ENUMERATED { @@ -462,6 +557,17 @@ CriticalityDiagnostics-IE-List-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { ... } +CommonTAParameters ::= SEQUENCE { + epochTime OCTET STRING, + taInfo OCTET STRING, + iE-Extensions ProtocolExtensionContainer {{ CommonTAParameters-ExtIEs}} OPTIONAL, + ... +} + +CommonTAParameters-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + ... +} + -- D @@ -476,7 +582,7 @@ DL-Bandwidth-EUTRA ::= ENUMERATED { } DL-PRS ::= SEQUENCE { - prsid INTEGER (0..255), + prsid PRS-ID, dl-PRSResourceSetID PRS-Resource-Set-ID, dl-PRSResourceID PRS-Resource-ID OPTIONAL, iE-Extensions ProtocolExtensionContainer { {DL-PRS-ExtIEs} } OPTIONAL, @@ -568,7 +674,9 @@ E-CID-MeasurementResult ::= SEQUENCE { } E-CID-MeasurementResult-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { - { ID id-GeographicalCoordinates CRITICALITY ignore EXTENSION GeographicalCoordinates PRESENCE optional}, + { ID id-GeographicalCoordinates CRITICALITY ignore EXTENSION GeographicalCoordinates PRESENCE optional}| + { ID id-MobileAccessPointLocation CRITICALITY ignore EXTENSION Mobile-TRP-LocationInformation PRESENCE optional }| + { ID id-MeasuredResultsAssociatedInfoList CRITICALITY ignore EXTENSION MeasuredResultsAssociatedInfoList PRESENCE optional}, ... } @@ -625,6 +733,12 @@ GNBRxTxTimeDiffMeas ::= CHOICE { } GNBRxTxTimeDiffMeas-ExtIEs NRPPA-PROTOCOL-IES ::= { + {ID id-ReportingGranularitykminus1 CRITICALITY ignore TYPE ReportingGranularitykminus1 PRESENCE mandatory}| + {ID id-ReportingGranularitykminus2 CRITICALITY ignore TYPE ReportingGranularitykminus2 PRESENCE mandatory}| + {ID id-ReportingGranularitykminus3 CRITICALITY ignore TYPE ReportingGranularitykminus3 PRESENCE mandatory}| + {ID id-ReportingGranularitykminus4 CRITICALITY ignore TYPE ReportingGranularitykminus4 PRESENCE mandatory}| + {ID id-ReportingGranularitykminus5 CRITICALITY ignore TYPE ReportingGranularitykminus5 PRESENCE mandatory}| + {ID id-ReportingGranularitykminus6 CRITICALITY ignore TYPE ReportingGranularitykminus6 PRESENCE mandatory}, ... } @@ -698,6 +812,8 @@ LoS-NLoSInformation-ExtIEs NRPPA-PROTOCOL-IES ::= { -- M +MeasBasedOnAggregatedResources ::= ENUMERATED { true, ... } + Measurement-ID ::= INTEGER (1.. 65536, ...) MeasurementAmount ::= ENUMERATED {ma0, ma1, ma2, ma4, ma8, ma16, ma32, ma64} @@ -799,7 +915,8 @@ MeasurementQuantitiesValue ::= ENUMERATED { cSI-RSRP, cSI-RSRQ, angleOfArrivalNR, - timingAdvanceNR + timingAdvanceNR, + uE-Rx-Tx-Time-Diff } MeasurementTimeOccasion ::= ENUMERATED {o1, o4, ...} @@ -808,6 +925,19 @@ MeasurementCharacteristicsRequestIndicator ::= BIT STRING (SIZE (16)) MeasuredResults ::= SEQUENCE (SIZE (1.. maxNoMeas)) OF MeasuredResultsValue +MeasuredResultsAssociatedInfoList ::= SEQUENCE (SIZE (1..maxNoMeas)) OF MeasuredResultsAssociatedInfoItem + +MeasuredResultsAssociatedInfoItem ::= SEQUENCE { + timeStamp TimeStamp OPTIONAL, + measurementQuality TrpMeasurementQuality OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { MeasuredResultsAssociatedInfoItem-ExtIEs} } OPTIONAL, + ... +} + +MeasuredResultsAssociatedInfoItem-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + ... +} + MeasuredResultsValue ::= CHOICE { valueAngleOfArrival-EUTRA INTEGER (0..719), valueTimingAdvanceType1-EUTRA INTEGER (0..7690), @@ -823,10 +953,25 @@ MeasuredResultsValue-ExtensionIE NRPPA-PROTOCOL-IES ::= { { ID id-ResultCSI-RSRP CRITICALITY ignore TYPE ResultCSI-RSRP PRESENCE mandatory }| { ID id-ResultCSI-RSRQ CRITICALITY ignore TYPE ResultCSI-RSRQ PRESENCE mandatory }| { ID id-AngleOfArrivalNR CRITICALITY ignore TYPE UL-AoA PRESENCE mandatory }| - { ID id-NR-TADV CRITICALITY ignore TYPE NR-TADV PRESENCE mandatory }, + { ID id-NR-TADV CRITICALITY ignore TYPE NR-TADV PRESENCE mandatory }| + { ID id-UE-Rx-Tx-Time-Diff CRITICALITY ignore TYPE UE-Rx-Tx-Time-Diff PRESENCE optional }, + ... +} + +Mobile-TRP-LocationInformation ::= SEQUENCE { + location-Information OCTET STRING, + velocity-Information OCTET STRING OPTIONAL, + location-time-stamp TimeStamp OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { Mobile-TRP-LocationInformation-ExtIEs} } OPTIONAL, ... } +Mobile-TRP-LocationInformation-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + ... +} + +Mobile-IAB-MT-UE-ID ::= OCTET STRING + MultipleULAoA ::= SEQUENCE { multipleULAoA MultipleULAoA-List, iE-Extensions ProtocolExtensionContainer { { MultipleULAoA-ExtIEs} } OPTIONAL, @@ -849,6 +994,7 @@ MultipleULAoA-Item-ExtIEs NRPPA-PROTOCOL-IES ::= { ... } +MeasuredFrequencyHops ::= ENUMERATED {singleHop, multiHop, ...} -- N @@ -916,6 +1062,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 { @@ -1206,8 +1354,22 @@ PosSIB-Type ::= ENUMERATED { posSibType1-10, posSibType6-4, posSibType6-5, - posSibType6-6 -} + posSibType6-6, + posSibType1-11, + posSibType1-12, + posSibType2-17a, + posSibType2-18a, + posSibType2-20a, + posSibType2-26, + posSibType2-27, + posSibType6-7, + posSibType7-1, + posSibType7-2, + posSibType7-3, + posSibType7-4 +} + +PRSBWAggregationRequestIndication ::= ENUMERATED {true, ...} PosSRSResource-List ::= SEQUENCE (SIZE (1..maxnoSRS-PosResources)) OF PosSRSResource-Item @@ -1227,6 +1389,7 @@ PosSRSResource-Item ::= SEQUENCE { } PosSRSResource-Item-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + { ID id-TxHoppingConfiguration CRITICALITY ignore EXTENSION TxHoppingConfiguration PRESENCE optional}, ... } @@ -1247,9 +1410,26 @@ PosSRSResourceSet-Item ::= SEQUENCE { } PosSRSResourceSet-Item-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + { ID id-PosSRSResourceSet-Aggregation-List CRITICALITY ignore EXTENSION PosSRSResourceSet-Aggregation-List PRESENCE optional }, + ... +} + +PosSRSResourceSet-Aggregation-List ::= SEQUENCE (SIZE (1.. maxnoaggregatedPosSRS-ResourceSets)) OF PosSRSResourceSet-Aggregation-Item + + +PosSRSResourceSet-Aggregation-Item ::= SEQUENCE { + pointA INTEGER (0..3279165), + pCI-NR INTEGER(0..1007) OPTIONAL, + possrsResourceSetID INTEGER(0..15), + iE-Extensions ProtocolExtensionContainer { { PosSRSResourceSet-Aggregation-Item-ExtIEs} } OPTIONAL, + ... +} + +PosSRSResourceSet-Aggregation-Item-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { ... } + PosResourceSetType ::= CHOICE { periodic PosResourceSetTypePeriodic, semi-persistent PosResourceSetTypeSemi-persistent, @@ -1319,9 +1499,9 @@ PRSAngleItem-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { } PRSInformationPos ::= SEQUENCE { - pRS-IDPos INTEGER(0..255), - pRS-Resource-Set-IDPos INTEGER(0..7), - pRS-Resource-IDPos INTEGER(0..63) OPTIONAL, + pRS-IDPos PRS-ID, + pRS-Resource-Set-IDPos PRS-Resource-Set-ID, + pRS-Resource-IDPos PRS-Resource-ID OPTIONAL, iE-Extensions ProtocolExtensionContainer { { PRSInformationPos-ExtIEs} } OPTIONAL, ... } @@ -1339,6 +1519,7 @@ PRSConfiguration ::= SEQUENCE { } PRSConfiguration-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + { ID id-AggregatedPRSResourceSetList CRITICALITY ignore EXTENSION AggregatedPRSResourceSetList PRESENCE optional }, ... } @@ -1446,9 +1627,12 @@ PRSResource-Item ::= SEQUENCE { ... } PRSResource-Item-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + { ID id-ExtendedResourceSymbolOffset CRITICALITY ignore EXTENSION ExtendedResourceSymbolOffset PRESENCE optional}, ... } +ExtendedResourceSymbolOffset ::= INTEGER (0..13,...) + PRSResource-QCLInfo ::= CHOICE { qCLSourceSSB PRSResource-QCLSourceSSB, qCLSourcePRS PRSResource-QCLSourcePRS, @@ -1492,11 +1676,11 @@ 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,...}, - resourceNumberofSymbols ENUMERATED{n2,n4,n6,n12,...}, + resourceNumberofSymbols ENUMERATED{n2,n4,n6,n12,...,n1}, pRSMuting PRSMuting OPTIONAL, pRSResourceTransmitPower INTEGER(-60..50), pRSResource-List PRSResource-List, @@ -1575,9 +1759,9 @@ PRSTRPList ::= SEQUENCE (SIZE(1.. maxnoTRPs)) OF PRSTRPItem PRSTRPItem ::= SEQUENCE { tRP-ID TRP-ID, requestedDLPRSTransmissionCharacteristics RequestedDLPRSTransmissionCharacteristics OPTIONAL, --- The IE shall be present if the PRS Configuration Request Type IE is set to “configure” -- +-- The IE shall be present if the PRS Configuration Request Type IE is set to the value “configure” -- pRSTransmissionOffInformation PRSTransmissionOffInformation OPTIONAL, --- The IE shall be present if the PRS Configuration Request Type IE is set to “off” -- +-- The IE shall be present if the PRS Configuration Request Type IE is set to the value “off” -- iE-Extensions ProtocolExtensionContainer { { PRSTRPItem-ExtIEs} } OPTIONAL, ... } @@ -1601,6 +1785,21 @@ PRSTransmissionTRPItem-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { ... } +PosValidityAreaCellList ::= SEQUENCE (SIZE (1..maxnoVACell)) OF PosValidityAreaCell-Item + + +PosValidityAreaCell-Item ::= SEQUENCE { + nR-CGI CGI-NR, + nR-PCI NR-PCI OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { PosValidityAreaCell-Item-ExtIEs} } OPTIONAL, + ... +} + +PosValidityAreaCell-Item-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + ... +} + +PointA ::= INTEGER (0..3279165) -- Q @@ -1664,22 +1863,44 @@ RelativePathDelay ::= CHOICE { k0 INTEGER(0..16351), k1 INTEGER(0..8176), k2 INTEGER(0..4088), - k3 INTEGER(0..2044), + k3 INTEGER(0..2044), k4 INTEGER(0..1022), k5 INTEGER(0..511), choice-Extension ProtocolIE-Single-Container { { RelativePathDelay-ExtIEs} } } RelativePathDelay-ExtIEs NRPPA-PROTOCOL-IES ::= { + {ID id-ReportingGranularitykminus1AdditionalPath CRITICALITY ignore TYPE ReportingGranularitykminus1AdditionalPath PRESENCE mandatory}| + {ID id-ReportingGranularitykminus2AdditionalPath CRITICALITY ignore TYPE ReportingGranularitykminus2AdditionalPath PRESENCE mandatory}| + {ID id-ReportingGranularitykminus3AdditionalPath CRITICALITY ignore TYPE ReportingGranularitykminus3AdditionalPath PRESENCE mandatory}| + {ID id-ReportingGranularitykminus4AdditionalPath CRITICALITY ignore TYPE ReportingGranularitykminus4AdditionalPath PRESENCE mandatory}| + {ID id-ReportingGranularitykminus5AdditionalPath CRITICALITY ignore TYPE ReportingGranularitykminus5AdditionalPath PRESENCE mandatory}| + {ID id-ReportingGranularitykminus6AdditionalPath CRITICALITY ignore TYPE ReportingGranularitykminus6AdditionalPath PRESENCE mandatory}, ... } +RepetitionFactorExtended ::= ENUMERATED {n3, n5, n6, n7, n8, n10, n12, n14, ...} + ReportCharacteristics ::= ENUMERATED { onDemand, periodic, ... } +ReportingGranularitykminus1 ::= INTEGER(0..3940097)ReportingGranularitykminus2 ::= INTEGER(0..7880193) +ReportingGranularitykminus3 ::= INTEGER(0..15760385) +ReportingGranularitykminus4 ::= INTEGER(0..31520769) +ReportingGranularitykminus5 ::= INTEGER(0..63041537) +ReportingGranularitykminus6 ::= INTEGER(0..126083073) + +ReportingGranularitykminus1AdditionalPath ::= INTEGER(0..32701) +ReportingGranularitykminus2AdditionalPath ::= INTEGER(0..65401) +ReportingGranularitykminus3AdditionalPath ::= INTEGER(0..130801) +ReportingGranularitykminus4AdditionalPath ::= INTEGER(0..261601) +ReportingGranularitykminus5AdditionalPath ::= INTEGER(0..523201) +ReportingGranularitykminus6AdditionalPath ::= INTEGER(0..1046401) + + RequestedDLPRSTransmissionCharacteristics ::= SEQUENCE { requestedDLPRSResourceSet-List RequestedDLPRSResourceSet-List, numberofFrequencyLayers INTEGER(1..4) OPTIONAL, @@ -1689,6 +1910,7 @@ RequestedDLPRSTransmissionCharacteristics ::= SEQUENCE { } RequestedDLPRSTransmissionCharacteristics-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + { ID id-PRSBWAggregationRequestIndication CRITICALITY ignore EXTENSION PRSBWAggregationRequestIndication PRESENCE optional}, ... } @@ -1697,9 +1919,9 @@ 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, + resourceNumberofSymbols ENUMERATED{n2,n4,n6,n12,...,n1} OPTIONAL, requestedDLPRSResource-List RequestedDLPRSResource-List OPTIONAL, resourceSetStartTimeAndDuration StartTimeAndDuration OPTIONAL, iE-Extensions ProtocolExtensionContainer { { RequestedDLPRSResourceSet-Item-ExtIEs} } OPTIONAL, @@ -1725,7 +1947,7 @@ RequestedDLPRSResource-Item-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { RequestedSRSTransmissionCharacteristics ::= SEQUENCE { numberOfTransmissions INTEGER (0..500,...) OPTIONAL, --- The IE shall be present if the Resource Type IE is set to “periodic” -- +-- The IE shall be present if the Resource Type IE is set to the value “periodic” -- resourceType ENUMERATED {periodic, semi-persistent, aperiodic, ...}, bandwidth BandwidthSRS, listOfSRSResourceSet SEQUENCE (SIZE (1.. maxnoSRS-ResourceSets)) OF SRSResourceSet-Item OPTIONAL, @@ -1735,7 +1957,35 @@ RequestedSRSTransmissionCharacteristics ::= SEQUENCE { } RequestedSRSTransmissionCharacteristics-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { - { ID id-SrsFrequency CRITICALITY ignore EXTENSION SrsFrequency PRESENCE optional }, + { ID id-SrsFrequency CRITICALITY ignore EXTENSION SrsFrequency PRESENCE optional }| + { ID id-Bandwidth-Aggregation-Request-Indication CRITICALITY ignore EXTENSION Bandwidth-Aggregation-Request-Indication PRESENCE optional }| + { ID id-PosValidityAreaCellList CRITICALITY ignore EXTENSION PosValidityAreaCellList PRESENCE optional }| + { ID id-ValidityAreaSpecificSRSInformation CRITICALITY ignore EXTENSION ValidityAreaSpecificSRSInformation PRESENCE optional }, + ... +} + + +ResourceMapping ::= SEQUENCE { + startPosition INTEGER (0..13), + nrofSumbols ENUMERATED {n1, n2, n4, n8, n12}, + iE-Extensions ProtocolExtensionContainer { { ResourceMapping-ExtIEs} } OPTIONAL, + ... +} + +ResourceMapping-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + ... +} + + +RequestedSRSPreconfigurationCharacteristics-List ::= SEQUENCE (SIZE (1..maxnoPreconfiguredSRS)) OF RequestedSRSPreconfigurationCharacteristics-Item + +RequestedSRSPreconfigurationCharacteristics-Item ::= SEQUENCE { + requestedSRSTransmissionCharacteristics RequestedSRSTransmissionCharacteristics, + iE-Extensions ProtocolExtensionContainer {{ RequestedSRSPreconfigurationCharacteristics-Item-ExtIEs}} OPTIONAL, + ... +} + +RequestedSRSPreconfigurationCharacteristics-Item-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { ... } @@ -1855,7 +2105,7 @@ ResourceTypePos-ExtIEs NRPPA-PROTOCOL-IES ::= { } ResourceTypePeriodicPos ::= SEQUENCE { -periodicity ENUMERATED{slot1, slot2, slot4, slot5, slot8, slot10, slot16, slot20, slot32, slot40, slot64, slot80, slot160, slot320, slot640, slot1280, slot2560, slot5120, slot10240, slot40960, slot81920, ..., slot128, slot256, slot512, slot20480}, +sRSPeriodicity SRSPeriodicity, offset INTEGER(0..81919, ...), iE-Extensions ProtocolExtensionContainer { { ResourceTypePeriodicPos-ExtIEs} } OPTIONAL, ... @@ -1866,7 +2116,7 @@ ResourceTypePeriodicPos-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { } ResourceTypeSemi-persistentPos ::= SEQUENCE { -periodicity ENUMERATED{slot1, slot2, slot4, slot5, slot8, slot10, slot16, slot20, slot32, slot40, slot64, slot80, slot160, slot320, slot640, slot1280, slot2560, slot5120, slot10240, slot40960, slot81920, ..., slot128, slot256, slot512, slot20480}, +sRSPeriodicity SRSPeriodicity, offset INTEGER(0..81919, ...), iE-Extensions ProtocolExtensionContainer { { ResourceTypeSemi-persistentPos-ExtIEs} } OPTIONAL, ... @@ -2121,9 +2371,13 @@ RxTxTimingErrorMargin ::= ENUMERATED {tc0dot5, tc1, tc2, tc4, tc8, tc12, tc16, t -- S +SCS-480 ::= INTEGER(0..319) + +SCS-960 ::= INTEGER(0..639) + 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, ... @@ -2153,6 +2407,65 @@ SFNInitialisationTime-EUTRA ::= BIT STRING (SIZE (64)) SlotNumber ::= INTEGER (0..79) +SlotOffsetForRemainingHopsList ::= SEQUENCE (SIZE (1..maxnoofHopsMinusOne)) OF SlotOffsetForRemainingHopsItem + +SlotOffsetForRemainingHopsItem ::= SEQUENCE { + slotOffsetRemainingHops SlotOffsetRemainingHops, + iE-Extensions ProtocolExtensionContainer { { SlotOffsetForRemainingHopsItem-ExtIEs} } OPTIONAL, + ... +} + +SlotOffsetForRemainingHopsItem-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + ... +} + +SlotOffsetRemainingHops ::= CHOICE { + aperiodic SlotOffsetRemainingHopsAperiodic, + semi-persistent SlotOffsetRemainingHopsSemiPersistent, + periodic SlotOffsetRemainingHopsPeriodic, + choice-extension ProtocolIE-Single-Container {{ SlotOffsetRemainingHops-ExtIEs }} +} + +SlotOffsetRemainingHops-ExtIEs NRPPA-PROTOCOL-IES ::= { + ... +} + +SlotOffsetRemainingHopsAperiodic ::= SEQUENCE { + slotOffset INTEGER (1..32) OPTIONAL, + startPosition INTEGER (0..13) OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { SlotOffsetRemainingHopsAperiodic-ExtIEs} } OPTIONAL, + ... +} + +SlotOffsetRemainingHopsAperiodic-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + ... +} + +SlotOffsetRemainingHopsSemiPersistent ::= SEQUENCE { + sRSperiodicity SRSPeriodicity, + offset INTEGER(0..81919, ...), + startPosition INTEGER (0..13) OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { SlotOffsetRemainingHopsSemiPersistent-ExtIEs} } OPTIONAL, + ... +} + +SlotOffsetRemainingHopsSemiPersistent-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + ... +} + +SlotOffsetRemainingHopsPeriodic ::= SEQUENCE { + sRSperiodicity SRSPeriodicity, + offset INTEGER(0..81919, ...), + startPosition INTEGER (0..13) OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { SlotOffsetRemainingHopsSemiPeriodic-ExtIEs} } OPTIONAL, + ... +} + +SlotOffsetRemainingHopsSemiPeriodic-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + ... +} + + SpatialDirectionInformation ::= SEQUENCE { nR-PRS-Beam-Information NR-PRS-Beam-Information, iE-Extensions ProtocolExtensionContainer { { SpatialDirectionInformation-ExtIEs } } OPTIONAL, @@ -2287,6 +2600,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}, + ... } @@ -2299,7 +2617,7 @@ SRSResourceSet-List ::= SEQUENCE (SIZE (1..maxnoSRS-ResourceSets)) OF SRSResourc SRSResourceID-List::= SEQUENCE (SIZE (1..maxnoSRS-ResourcePerSet)) OF SRSResourceID SRSResourceSet::= SEQUENCE { - sRSResourceSetID INTEGER(0..15), + sRSResourceSetID1 INTEGER(0..15), sRSResourceID-List SRSResourceID-List, resourceSetType ResourceSetType, iE-Extensions ProtocolExtensionContainer { { SRSResourceSet-ExtIEs } } OPTIONAL, @@ -2405,6 +2723,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, @@ -2416,6 +2748,9 @@ StartTimeAndDuration-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { ... } + +SymbolIndex ::= INTEGER (0..13) + SystemFrameNumber ::= INTEGER (0..1023) SystemInformation ::= SEQUENCE (SIZE (1.. maxNrOfPosSImessage)) OF SEQUENCE { @@ -2429,6 +2764,24 @@ SystemInformation-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { ... } +SRSReservationType::= ENUMERATED {reserve, release, ...} + + +SRSPreconfiguration-List ::= SEQUENCE (SIZE (1.. maxnoPreconfiguredSRS)) OF SRSPreconfiguration-Item + +SRSPreconfiguration-Item ::= SEQUENCE { + sRSConfiguration SRSConfiguration, + posValidityAreaCellList PosValidityAreaCellList, + iE-Extensions ProtocolExtensionContainer {{ SRSPreconfiguration-Item-ExtIEs}} OPTIONAL, + ... +} + +SRSPreconfiguration-Item-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + ... +} + +SRSPeriodicity ::= ENUMERATED {slot1, slot2, slot4, slot5, slot8, slot10, slot16, slot20, slot32, slot40, slot64, slot80, slot160, slot320, slot640, slot1280, slot2560, slot5120, slot10240, slot40960, slot81920, ..., slot128, slot256, slot512, slot20480} + -- T @@ -2480,7 +2833,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), @@ -2505,6 +2859,7 @@ TimeStamp ::= SEQUENCE { } TimeStamp-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + { ID id-SymbolIndex CRITICALITY ignore EXTENSION SymbolIndex PRESENCE optional }, ... } @@ -2517,9 +2872,82 @@ TimeStampSlotIndex ::= CHOICE { } TimeStampSlotIndex-ExtIEs NRPPA-PROTOCOL-IES ::= { + { ID id-SCS-480 CRITICALITY reject TYPE SCS-480 PRESENCE mandatory}| + { ID id-SCS-960 CRITICALITY reject TYPE SCS-960 PRESENCE mandatory}, + + ... +} + +TimeWindowDurationMeasurement ::= CHOICE { + durationSlots ENUMERATED {n1, n2, n4, n6, n8, n12, n16, ...}, + choice-extension ProtocolIE-Single-Container { { TimeWindowDurationMeasurement-ExtIEs} } +} + +TimeWindowDurationMeasurement-ExtIEs NRPPA-PROTOCOL-IES ::= { + ... +} + +TimeWindowDurationSRS ::= CHOICE { + durationSymbols ENUMERATED {n1, n2, n4, n8, n12, ...}, + durationSlots ENUMERATED {n1, n2, n4, n6, n8, n12, n16, ...}, + choice-extension ProtocolIE-Single-Container { { TimeWindowDurationSRS-ExtIEs} } +} + +TimeWindowDurationSRS-ExtIEs NRPPA-PROTOCOL-IES ::= { + ... +} + +TimeWindowPeriodicityMeasurement ::= ENUMERATED {ms160, ms320, ms640, ms1280, ms2560, ms5120, ms10240, ms20480, ms40960, ms61440, ms81920, ms368640, ms737280, ms1843200, ...} + +TimeWindowPeriodicitySRS ::= ENUMERATED {ms0dot125, ms0dot25, ms0dot5, ms0dot625, ms1, ms1dot25, ms2, ms2dot5, ms4, ms5, ms8, ms10, ms16, ms20, ms32, ms40, ms64, ms80, ms160, ms320, ms640, ms1280, ms2560, ms5120, ms10240, ...} + +TimeWindowStartSRS ::= SEQUENCE { + systemFrameNumber SystemFrameNumber, + slotNumber SlotNumber, + symbolIndex INTEGER (0..13), + iE-Extension ProtocolExtensionContainer { { TimeWindowStartSRS-ExtIEs} } OPTIONAL, + ... +} + +TimeWindowStartSRS-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + ... +} + + +TimingReportingGranularityFactorExtended ::=INTEGER(-6..-1, ...) + +TimeWindowInformation-Measurement-List ::= SEQUENCE (SIZE (1.. maxnoofTimeWindowMeas)) OF TimeWindowInformation-Measurement-Item + +TimeWindowInformation-Measurement-Item ::= SEQUENCE { + timeWindowDurationMeasurement TimeWindowDurationMeasurement, + timeWindowType ENUMERATED {single, periodic, ...}, + timeWindowPeriodicityMeasurement TimeWindowPeriodicityMeasurement OPTIONAL, +-- This IE shall be present if the Time Window Type IE is set to the value “periodic”. -- + iE-Extension ProtocolExtensionContainer { { TimeWindowInformation-Measurement-Item-ExtIEs} } OPTIONAL, + ... +} + +TimeWindowInformation-Measurement-Item-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + ... +} + +TimeWindowInformation-SRS-List ::= SEQUENCE (SIZE (1.. maxnoofTimeWindowSRS)) OF TimeWindowInformation-SRS-Item + +TimeWindowInformation-SRS-Item ::= SEQUENCE { + timeWindowStartSRS TimeWindowStartSRS, + timeWindowDurationSRS TimeWindowDurationSRS, + timeWindowType ENUMERATED {single, periodic, ...}, + timeWindowPeriodicitySRS TimeWindowPeriodicitySRS OPTIONAL, +-- This IE shall be present if the Time Window Type IE is set to the value “periodic”. -- + iE-Extension ProtocolExtensionContainer { { TimeWindowInformation-SRS-Item-ExtIEs} } OPTIONAL, ... } +TimeWindowInformation-SRS-Item-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + ... +} + + TP-ID-EUTRA ::= INTEGER (0..4095, ...) @@ -2538,9 +2966,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), @@ -2635,24 +3075,26 @@ TRP-Beam-Power-Item-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { TRPMeasurementQuantities ::= SEQUENCE (SIZE (1..maxnoPosMeas)) OF TRPMeasurementQuantitiesList-Item TRPMeasurementQuantitiesList-Item ::= SEQUENCE { - tRPMeasurementQuantities-Item TRPMeasurementQuantities-Item, + tRPMeasurementQuantities-Item TRPMeasurementType, timingReportingGranularityFactor INTEGER (0..5) OPTIONAL, iE-Extensions ProtocolExtensionContainer {{ TRPMeasurementQuantitiesList-Item-ExtIEs}} OPTIONAL, ... } TRPMeasurementQuantitiesList-Item-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + {ID id-TimingReportingGranularityFactorExtended CRITICALITY ignore EXTENSION TimingReportingGranularityFactorExtended PRESENCE optional}, ... } -TRPMeasurementQuantities-Item ::= ENUMERATED { +TRPMeasurementType::= ENUMERATED { gNB-RxTxTimeDiff, uL-SRS-RSRP, uL-AoA, uL-RTOA, ..., multiple-UL-AoA, - uL-SRS-RSRPP + uL-SRS-RSRPP, + ul-RSCP } TrpMeasurementResult ::= SEQUENCE (SIZE (1.. maxnoPosMeas)) OF TrpMeasurementResultItem @@ -2668,7 +3110,11 @@ TrpMeasurementResultItem ::= SEQUENCE { TrpMeasurementResultItem-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { { ID id-SRSResourcetype CRITICALITY ignore EXTENSION SRSResourcetype PRESENCE optional}| { ID id-ARP-ID CRITICALITY ignore EXTENSION ARP-ID PRESENCE optional}| - { ID id-LoS-NLoSInformation CRITICALITY ignore EXTENSION LoS-NLoSInformation PRESENCE optional }, + { ID id-LoS-NLoSInformation CRITICALITY ignore EXTENSION LoS-NLoSInformation PRESENCE optional }| + { ID id-Mobile-TRP-LocationInformation CRITICALITY ignore EXTENSION Mobile-TRP-LocationInformation PRESENCE optional }| + { ID id-MeasuredFrequencyHops CRITICALITY ignore EXTENSION MeasuredFrequencyHops PRESENCE optional }| + { ID id-AggregatedPosSRSResourceID-List CRITICALITY ignore EXTENSION AggregatedPosSRSResourceID-List PRESENCE optional }| + { ID id-MeasBasedOnAggregatedResources CRITICALITY ignore EXTENSION MeasBasedOnAggregatedResources PRESENCE optional }, ... } @@ -2683,7 +3129,8 @@ TrpMeasuredResultsValue ::= CHOICE { TrpMeasuredResultsValue-ExtIEs NRPPA-PROTOCOL-IES ::= { { ID id-ZoA CRITICALITY reject TYPE ZoA PRESENCE mandatory}| { ID id-MultipleULAoA CRITICALITY reject TYPE MultipleULAoA PRESENCE mandatory}| - { ID id-UL-SRS-RSRPP CRITICALITY reject TYPE UL-SRS-RSRPP PRESENCE mandatory}, + { ID id-UL-SRS-RSRPP CRITICALITY reject TYPE UL-SRS-RSRPP PRESENCE mandatory}| + { ID id-UL-RSCPMeas CRITICALITY reject TYPE UL-RSCPMeas PRESENCE mandatory}, ... } @@ -2695,6 +3142,7 @@ TrpMeasurementQuality ::= CHOICE { } TrpMeasurementQuality-ExtIEs NRPPA-PROTOCOL-IES ::= { + {ID id-TRPPhaseQuality CRITICALITY ignore TYPE TRPPhaseQuality PRESENCE mandatory }, ... } @@ -2721,6 +3169,17 @@ TrpMeasurementAngleQuality-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { ... } +TRPPhaseQuality ::= SEQUENCE { + phaseQualityIndex INTEGER(0..179), + resolution ENUMERATED {deg0dot1, deg1, ...}, + iE-extensions ProtocolExtensionContainer { { TRPPhaseQuality-ExtIEs } } OPTIONAL, + ... +} + +TRPPhaseQuality-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + ... +} + TRP-MeasurementRequestList ::= SEQUENCE (SIZE (1..maxNoOfMeasTRPs)) OF TRP-MeasurementRequestItem TRP-MeasurementRequestItem ::= SEQUENCE { @@ -2787,6 +3246,8 @@ TRPInformation ::= SEQUENCE { } TRPInformation-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + { ID id-Mobile-IAB-MT-UE-ID CRITICALITY reject EXTENSION Mobile-IAB-MT-UE-ID PRESENCE optional}, +--This IE shall be present if the TRP type IE is set to the value "mobile trp" ... } @@ -2805,10 +3266,12 @@ TRPInformationTypeResponseItem ::= CHOICE { } TRPInformationTypeResponseItem-ExtIEs NRPPA-PROTOCOL-IES ::= { - { ID id-TRPType CRITICALITY reject TYPE TRPType PRESENCE mandatory }| - { ID id-OnDemandPRS CRITICALITY reject TYPE OnDemandPRS-Info PRESENCE mandatory}| - { ID id-TRPTxTEGAssociation CRITICALITY reject TYPE TRPTxTEGAssociation PRESENCE mandatory}| - { ID id-TRPBeamAntennaInformation CRITICALITY reject TYPE TRPBeamAntennaInformation PRESENCE mandatory }, + { ID id-TRPType CRITICALITY reject TYPE TRPType PRESENCE mandatory }| + { ID id-OnDemandPRS CRITICALITY reject TYPE OnDemandPRS-Info PRESENCE mandatory}| + { ID id-TRPTxTEGAssociation CRITICALITY reject TYPE TRPTxTEGAssociation PRESENCE mandatory}| + { ID id-TRPBeamAntennaInformation CRITICALITY reject TYPE TRPBeamAntennaInformation PRESENCE mandatory }| + { ID id-Mobile-TRP-LocationInformation CRITICALITY ignore TYPE Mobile-TRP-LocationInformation PRESENCE mandatory }| + { ID id-CommonTAParameters CRITICALITY reject TYPE CommonTAParameters PRESENCE mandatory }, ... } @@ -2835,19 +3298,22 @@ TRPInformationTypeItem ::= ENUMERATED { trp-type, ondemandPRSInfo, trpTxTeg, - beam-antenna-info + beam-antenna-info, + mobile-trp-location-info, + commonTA } TRPList ::= SEQUENCE (SIZE(1.. maxnoTRPs)) OF TRPItem TRPItem ::= SEQUENCE { - tRP-ID TRP-ID, + tRP-ID TRP-ID, iE-Extensions ProtocolExtensionContainer { {TRPItem-ExtIEs} } OPTIONAL, ... } TRPItem-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { - ... + { ID id-PRSBWAggregationRequestIndication CRITICALITY ignore EXTENSION PRSBWAggregationRequestIndication PRESENCE optional}, + ... } TRP-ID ::= INTEGER (1.. maxnoTRPs, ...) @@ -2985,7 +3451,8 @@ TRPType ::= ENUMERATED { tp, rp, trp, - ... + ..., + mobile-trp } @@ -2995,6 +3462,20 @@ TypeOfError ::= ENUMERATED { ... } +TxHoppingConfiguration ::= SEQUENCE { + overlapValue ENUMERATED {rb0, rb1, rb2, rb4}, + numberOfHops INTEGER (1..6), + slotOffsetForRemainingHopsList SlotOffsetForRemainingHopsList, + iE-extensions ProtocolExtensionContainer { { TxHoppingConfiguration-ExtIEs } } OPTIONAL, + ... +} + +TxHoppingConfiguration-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + ... +} + + + -- U UARFCN ::= INTEGER (0..16383, ...) @@ -3012,6 +3493,8 @@ UEReportingInformation-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { ... } +UE-Rx-Tx-Time-Diff ::= INTEGER (0..61565) + UE-TEG-ReportingPeriodicity ::= ENUMERATED { ms160, ms320, @@ -3082,6 +3565,17 @@ UL-RTOAMeasurement-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { ... } +UL-RSCPMeas ::= SEQUENCE { + uLRSCP INTEGER (0..3599), + iE-extensions ProtocolExtensionContainer { { UL-RSCPMeas-ExtIEs } } OPTIONAL, + ... +} + +UL-RSCPMeas-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + ... +} + + ULRTOAMeas::= CHOICE { k0 INTEGER (0.. 1970049), k1 INTEGER (0.. 985025), @@ -3092,6 +3586,12 @@ ULRTOAMeas::= CHOICE { choice-extension ProtocolIE-Single-Container { { ULRTOAMeas-ExtIEs } } } ULRTOAMeas-ExtIEs NRPPA-PROTOCOL-IES ::= { + {ID id-ReportingGranularitykminus1 CRITICALITY ignore TYPE ReportingGranularitykminus1 PRESENCE mandatory}| + {ID id-ReportingGranularitykminus2 CRITICALITY ignore TYPE ReportingGranularitykminus2 PRESENCE mandatory}| + {ID id-ReportingGranularitykminus3 CRITICALITY ignore TYPE ReportingGranularitykminus3 PRESENCE mandatory}| + {ID id-ReportingGranularitykminus4 CRITICALITY ignore TYPE ReportingGranularitykminus4 PRESENCE mandatory}| + {ID id-ReportingGranularitykminus5 CRITICALITY ignore TYPE ReportingGranularitykminus5 PRESENCE mandatory}| + {ID id-ReportingGranularitykminus6 CRITICALITY ignore TYPE ReportingGranularitykminus6 PRESENCE mandatory}, ... } @@ -3125,6 +3625,21 @@ ValueRSRP-NR ::= INTEGER (0..127) ValueRSRQ-NR ::= INTEGER (0..127) +ValidityAreaSpecificSRSInformation ::= SEQUENCE { + transmissionCombPos TransmissionCombPos OPTIONAL, + resourceMapping ResourceMapping OPTIONAL, + freqDomainShift INTEGER (0..268) OPTIONAL, + c-SRS INTEGER (0..63) OPTIONAL, + resourceTypePos ResourceTypePos OPTIONAL, + sequenceIDPos INTEGER (0..65535) OPTIONAL, + iE-extensions ProtocolExtensionContainer { { ValidityAreaSpecificSRSInformation-ExtIEs } } OPTIONAL, + ... +} + +ValidityAreaSpecificSRSInformation-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= { + ... +} + -- W diff --git a/epan/dissectors/asn1/nrppa/NRPPA-PDU-Contents.asn b/epan/dissectors/asn1/nrppa/NRPPA-PDU-Contents.asn index e43a7658..09ed5fcb 100644 --- a/epan/dissectors/asn1/nrppa/NRPPA-PDU-Contents.asn +++ b/epan/dissectors/asn1/nrppa/NRPPA-PDU-Contents.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.455 V17.4.0 (2023-03) +-- 3GPP TS 38.455 V18.2.0 (2024-06) --9.3.4 PDU Definitions -- -- ************************************************************** @@ -79,7 +79,17 @@ IMPORTS RequestType, UE-TEG-ReportingPeriodicity, MeasurementPeriodicityNR-AoA, - SRSTransmissionStatus + SRSTransmissionStatus, + CGI-NR, + TimeWindowInformation-SRS-List, + TimeWindowInformation-Measurement-List, + PosValidityAreaCellList, + SRSReservationType, + RequestedSRSPreconfigurationCharacteristics-List, + SRSPreconfiguration-List, + PosSRSResourceSet-Aggregation-List + + FROM NRPPA-IEs @@ -158,7 +168,18 @@ FROM NRPPA-Containers id-RequestType, id-UE-TEG-ReportingPeriodicity, id-MeasurementPeriodicityNR-AoA, - id-SRSTransmissionStatus + id-SRSTransmissionStatus, + id-NewNRCGI, + id-TimeWindowInformation-SRS-List, + id-TimeWindowInformation-Measurement-List, + id-PosValidityAreaCellList, + id-SRSReservationType, + id-NewCellIdentity, + id-RequestedSRSPreconfigurationCharacteristics-List, + id-SRSPreconfiguration-List, + id-SRSInformation, + id-PosSRSResourceSet-Aggregation-List + @@ -180,12 +201,12 @@ E-CIDMeasurementInitiationRequest-IEs NRPPA-PROTOCOL-IES ::= { { ID id-LMF-UE-Measurement-ID CRITICALITY reject TYPE UE-Measurement-ID PRESENCE mandatory}| { ID id-ReportCharacteristics CRITICALITY reject TYPE ReportCharacteristics PRESENCE mandatory}| { ID id-MeasurementPeriodicity CRITICALITY reject TYPE MeasurementPeriodicity PRESENCE conditional}| --- The IE shall be present if the Report Characteritics IE is set to “periodic” -- +-- The IE shall be present if the Report Characteritics IE is set to the value “periodic” -- { ID id-MeasurementQuantities CRITICALITY reject TYPE MeasurementQuantities PRESENCE mandatory}| { ID id-OtherRATMeasurementQuantities CRITICALITY ignore TYPE OtherRATMeasurementQuantities PRESENCE optional}| { ID id-WLANMeasurementQuantities CRITICALITY ignore TYPE WLANMeasurementQuantities PRESENCE optional}| { ID id-MeasurementPeriodicityNR-AoA CRITICALITY reject TYPE MeasurementPeriodicityNR-AoA PRESENCE conditional}, --- The IE shall be present if the Report Characteritics IE is set to “periodic” and the MeasurementQuantities-Item IE in the MeasurementQuantities IE is set to the value "angleOfArrivalNR" -- +-- The IE shall be present if the Report Characteritics IE is set to the value “periodic” and the Measurement Quantities Value IE in the Measurement Quantities IE is set to the value "NR Angle of Arrival" -- ... } @@ -271,7 +292,7 @@ E-CIDMeasurementReport-IEs NRPPA-PROTOCOL-IES ::= { -- ************************************************************** -- --- E-CID MEASUREMENT TERMINATION +-- E-CID MEASUREMENT TERMINATION COMMAND -- -- ************************************************************** @@ -440,8 +461,10 @@ PositioningInformationRequest-IEs NRPPA-PROTOCOL-IES ::= { { ID id-RequestedSRSTransmissionCharacteristics CRITICALITY ignore TYPE RequestedSRSTransmissionCharacteristics PRESENCE optional }| { ID id-UEReportingInformation CRITICALITY ignore TYPE UEReportingInformation PRESENCE optional }| { ID id-UE-TEG-Info-Request CRITICALITY ignore TYPE UE-TEG-Info-Request PRESENCE optional }| - { ID id-UE-TEG-ReportingPeriodicity CRITICALITY reject TYPE UE-TEG-ReportingPeriodicity PRESENCE conditional }, --- The IE shall be present if the UE TEG Info Request IE is set to “periodic” + { ID id-UE-TEG-ReportingPeriodicity CRITICALITY reject TYPE UE-TEG-ReportingPeriodicity PRESENCE conditional }| +-- This IE shall be present if the UE TEG Information Request IE is set to the value "periodic". + { ID id-TimeWindowInformation-SRS-List CRITICALITY reject TYPE TimeWindowInformation-SRS-List PRESENCE optional }| + { ID id-RequestedSRSPreconfigurationCharacteristics-List CRITICALITY ignore TYPE RequestedSRSPreconfigurationCharacteristics-List PRESENCE optional }, ... } @@ -457,10 +480,13 @@ PositioningInformationResponse ::= SEQUENCE { } PositioningInformationResponse-IEs NRPPA-PROTOCOL-IES ::= { - { ID id-SRSConfiguration CRITICALITY ignore TYPE SRSConfiguration PRESENCE optional}| + { ID id-SRSConfiguration CRITICALITY ignore TYPE SRSConfiguration PRESENCE optional}| { ID id-SFNInitialisationTime CRITICALITY ignore TYPE RelativeTime1900 PRESENCE optional}| { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}| - { ID id-UETxTEGAssociationList CRITICALITY ignore TYPE UETxTEGAssociationList PRESENCE optional}, + { ID id-UETxTEGAssociationList CRITICALITY ignore TYPE UETxTEGAssociationList PRESENCE optional}| + { ID id-NewNRCGI CRITICALITY ignore TYPE CGI-NR PRESENCE optional}| + { ID id-PosValidityAreaCellList CRITICALITY ignore TYPE PosValidityAreaCellList PRESENCE optional}| + { ID id-SRSPreconfiguration-List CRITICALITY ignore TYPE SRSPreconfiguration-List PRESENCE optional}, ... } @@ -496,7 +522,8 @@ PositioningInformationUpdate-IEs NRPPA-PROTOCOL-IES ::= { { ID id-SRSConfiguration CRITICALITY ignore TYPE SRSConfiguration PRESENCE optional}| { ID id-SFNInitialisationTime CRITICALITY ignore TYPE RelativeTime1900 PRESENCE optional}| { ID id-UETxTEGAssociationList CRITICALITY ignore TYPE UETxTEGAssociationList PRESENCE optional}| - { ID id-SRSTransmissionStatus CRITICALITY ignore TYPE SRSTransmissionStatus PRESENCE optional}, + { ID id-SRSTransmissionStatus CRITICALITY ignore TYPE SRSTransmissionStatus PRESENCE optional}| + { ID id-NewCellIdentity CRITICALITY ignore TYPE CGI-NR PRESENCE optional}, ... } @@ -516,7 +543,7 @@ MeasurementRequest-IEs NRPPA-PROTOCOL-IES ::= { { ID id-TRP-MeasurementRequestList CRITICALITY reject TYPE TRP-MeasurementRequestList PRESENCE mandatory}| { ID id-ReportCharacteristics CRITICALITY reject TYPE ReportCharacteristics PRESENCE mandatory}| { ID id-MeasurementPeriodicity CRITICALITY reject TYPE MeasurementPeriodicity PRESENCE conditional}| --- The IE shall be present if the Report Characteritics IE is set to “periodic” – +-- The IE shall be present if the Report Characteritics IE is set to the value “periodic” – { ID id-TRPMeasurementQuantities CRITICALITY reject TYPE TRPMeasurementQuantities PRESENCE mandatory}| { ID id-SFNInitialisationTime CRITICALITY ignore TYPE RelativeTime1900 PRESENCE optional}| { ID id-SRSConfiguration CRITICALITY ignore TYPE SRSConfiguration PRESENCE optional}| @@ -528,7 +555,8 @@ MeasurementRequest-IEs NRPPA-PROTOCOL-IES ::= { { ID id-ResponseTime CRITICALITY ignore TYPE ResponseTime PRESENCE optional}| { ID id-MeasurementCharacteristicsRequestIndicator CRITICALITY ignore TYPE MeasurementCharacteristicsRequestIndicator PRESENCE optional}| { ID id-MeasurementTimeOccasion CRITICALITY ignore TYPE MeasurementTimeOccasion PRESENCE optional}| - { ID id-MeasurementAmount CRITICALITY ignore TYPE MeasurementAmount PRESENCE optional}, + { ID id-MeasurementAmount CRITICALITY ignore TYPE MeasurementAmount PRESENCE optional}| + { ID id-TimeWindowInformation-Measurement-List CRITICALITY ignore TYPE TimeWindowInformation-Measurement-List PRESENCE optional }, ... } @@ -711,7 +739,8 @@ PositioningActivationRequest ::= SEQUENCE { PositioningActivationRequestIEs NRPPA-PROTOCOL-IES ::= { { ID id-SRSType CRITICALITY reject TYPE SRSType PRESENCE mandatory } | - { ID id-ActivationTime CRITICALITY ignore TYPE RelativeTime1900 PRESENCE optional }, + { ID id-ActivationTime CRITICALITY ignore TYPE RelativeTime1900 PRESENCE optional }| + { ID id-PosSRSResourceSet-Aggregation-List CRITICALITY ignore TYPE PosSRSResourceSet-Aggregation-List PRESENCE optional }, ... } @@ -923,5 +952,23 @@ MeasurementActivation-IEs NRPPA-PROTOCOL-IES ::= { ... } +-- ************************************************************** +-- +-- SRS INFORMATION RESERVATION NOTIFICATION +-- +-- ************************************************************** + +SRSInformationReservationNotification ::= SEQUENCE { + protocolIEs ProtocolIE-Container {{ SRSInformationReservationNotification-IEs}}, + ... +} + +SRSInformationReservationNotification-IEs NRPPA-PROTOCOL-IES ::= { + { ID id-SRSReservationType CRITICALITY ignore TYPE SRSReservationType PRESENCE mandatory}| + { ID id-SRSInformation CRITICALITY ignore TYPE RequestedSRSTransmissionCharacteristics PRESENCE optional }, + ... +} + + END diff --git a/epan/dissectors/asn1/nrppa/NRPPA-PDU-Descriptions.asn b/epan/dissectors/asn1/nrppa/NRPPA-PDU-Descriptions.asn index ec0ea63c..3044a718 100644 --- a/epan/dissectors/asn1/nrppa/NRPPA-PDU-Descriptions.asn +++ b/epan/dissectors/asn1/nrppa/NRPPA-PDU-Descriptions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.455 V17.4.0 (2023-03) +-- 3GPP TS 38.455 V18.2.0 (2024-06) -- -- ASN1START -- ************************************************************** @@ -66,7 +66,8 @@ FROM NRPPA-CommonDataTypes MeasurementPreconfigurationRequired, MeasurementPreconfigurationConfirm, MeasurementPreconfigurationRefuse, - MeasurementActivation + MeasurementActivation, + SRSInformationReservationNotification FROM NRPPA-PDU-Contents @@ -92,7 +93,8 @@ FROM NRPPA-PDU-Contents id-positioningDeactivation, id-pRSConfigurationExchange, id-measurementPreconfiguration, - id-measurementActivation + id-measurementActivation, + id-sRSInformationReservationNotification @@ -193,7 +195,8 @@ NRPPA-ELEMENTARY-PROCEDURES-CLASS-2 NRPPA-ELEMENTARY-PROCEDURE ::= { measurementAbort | measurementFailureIndication | positioningDeactivation | - measurementActivation, + measurementActivation | + sRSInformationReservationNotification, ... } @@ -356,5 +359,11 @@ measurementActivation NRPPA-ELEMENTARY-PROCEDURE ::= { CRITICALITY ignore } +sRSInformationReservationNotification NRPPA-ELEMENTARY-PROCEDURE ::= { + INITIATING MESSAGE SRSInformationReservationNotification + PROCEDURE CODE id-sRSInformationReservationNotification + CRITICALITY reject +} + END diff --git a/epan/dissectors/asn1/nrppa/nrppa.cnf b/epan/dissectors/asn1/nrppa/nrppa.cnf index 5064df05..64af4450 100644 --- a/epan/dissectors/asn1/nrppa/nrppa.cnf +++ b/epan/dissectors/asn1/nrppa/nrppa.cnf @@ -14,15 +14,16 @@ ProtocolIE-ID #.OMIT_ASSIGNMENT Presence ProtocolIE-ContainerList -PRS-ID SRSResourceID-Item #.EXPORTS Assistance-Information_PDU +SRSConfiguration_PDU #.PDU Assistance-Information NRPPA-PDU +SRSConfiguration #.TYPE_RENAME InitiatingMessage/value InitiatingMessage_value @@ -39,15 +40,17 @@ ProtocolExtensionField/id ext_id #.FN_PARS ProtocolIE-ID VAL_PTR=&ProtocolIE_ID #.FN_FTR ProtocolIE-ID if (tree) { - proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str(ProtocolIE_ID, VALS(nrppa_ProtocolIE_ID_vals), "unknown (%d)")); + proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), + ": %s", + val_to_str(ProtocolIE_ID, VALS(nrppa_ProtocolIE_ID_vals), "unknown (%d)")); } #.END #.FN_PARS ProcedureCode VAL_PTR = &ProcedureCode #.FN_FTR ProcedureCode - col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", - val_to_str(ProcedureCode, nrppa_ProcedureCode_vals, - "unknown message")); + col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", + val_to_str_const(ProcedureCode, nrppa_ProcedureCode_vals, + "unknown message")); #.END #.FN_PARS ProtocolIE-Field/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldValue @@ -83,220 +86,301 @@ TAC TYPE = FT_UINT24 DISPLAY = BASE_DEC_HEX #.TYPE_ATTR # ProcedureCode -id-errorIndication ProcedureCode -id-privateMessage ProcedureCode -id-e-CIDMeasurementInitiation ProcedureCode -id-e-CIDMeasurementFailureIndication ProcedureCode -id-e-CIDMeasurementReport ProcedureCode -id-e-CIDMeasurementTermination ProcedureCode -id-oTDOAInformationExchange ProcedureCode -id-assistanceInformationControl ProcedureCode -id-assistanceInformationFeedback ProcedureCode -id-positioningInformationExchange ProcedureCode -id-positioningInformationUpdate ProcedureCode -id-Measurement ProcedureCode -id-MeasurementReport ProcedureCode -id-MeasurementUpdate ProcedureCode -id-MeasurementAbort ProcedureCode -id-MeasurementFailureIndication ProcedureCode -id-tRPInformationExchange ProcedureCode -id-positioningActivation ProcedureCode -id-positioningDeactivation ProcedureCode -id-pRSConfigurationExchange ProcedureCode -id-measurementPreconfiguration ProcedureCode -id-measurementActivation ProcedureCode +id-errorIndication ProcedureCode +id-privateMessage ProcedureCode +id-e-CIDMeasurementInitiation ProcedureCode +id-e-CIDMeasurementFailureIndication ProcedureCode +id-e-CIDMeasurementReport ProcedureCode +id-e-CIDMeasurementTermination ProcedureCode +id-oTDOAInformationExchange ProcedureCode +id-assistanceInformationControl ProcedureCode +id-assistanceInformationFeedback ProcedureCode +id-positioningInformationExchange ProcedureCode +id-positioningInformationUpdate ProcedureCode +id-Measurement ProcedureCode +id-MeasurementReport ProcedureCode +id-MeasurementUpdate ProcedureCode +id-MeasurementAbort ProcedureCode +id-MeasurementFailureIndication ProcedureCode +id-tRPInformationExchange ProcedureCode +id-positioningActivation ProcedureCode +id-positioningDeactivation ProcedureCode +id-pRSConfigurationExchange ProcedureCode +id-measurementPreconfiguration ProcedureCode +id-measurementActivation ProcedureCode +id-sRSInformationReservationNotification ProcedureCode # ProtocolIE-ID -id-Cause ProtocolIE-ID -id-CriticalityDiagnostics ProtocolIE-ID -id-LMF-UE-Measurement-ID ProtocolIE-ID -id-ReportCharacteristics ProtocolIE-ID -id-MeasurementPeriodicity ProtocolIE-ID -id-MeasurementQuantities ProtocolIE-ID -id-RAN-UE-Measurement-ID ProtocolIE-ID -id-E-CID-MeasurementResult ProtocolIE-ID -id-OTDOACells ProtocolIE-ID -id-OTDOA-Information-Type-Group ProtocolIE-ID -id-OTDOA-Information-Type-Item ProtocolIE-ID -id-MeasurementQuantities-Item ProtocolIE-ID -id-RequestedSRSTransmissionCharacteristics ProtocolIE-ID -id-Cell-Portion-ID ProtocolIE-ID -id-OtherRATMeasurementQuantities ProtocolIE-ID -id-OtherRATMeasurementQuantities-Item ProtocolIE-ID -id-OtherRATMeasurementResult ProtocolIE-ID -id-WLANMeasurementQuantities ProtocolIE-ID -id-WLANMeasurementQuantities-Item ProtocolIE-ID -id-WLANMeasurementResult ProtocolIE-ID -id-TDD-Config-EUTRA-Item ProtocolIE-ID -id-Assistance-Information ProtocolIE-ID -id-Broadcast ProtocolIE-ID -id-AssistanceInformationFailureList ProtocolIE-ID -id-SRSConfiguration ProtocolIE-ID -id-MeasurementResult ProtocolIE-ID -id-TRP-ID ProtocolIE-ID -id-TRPInformationTypeListTRPReq ProtocolIE-ID -id-TRPInformationListTRPResp ProtocolIE-ID -id-MeasurementBeamInfoRequest ProtocolIE-ID -id-ResultSS-RSRP ProtocolIE-ID -id-ResultSS-RSRQ ProtocolIE-ID -id-ResultCSI-RSRP ProtocolIE-ID -id-ResultCSI-RSRQ ProtocolIE-ID -id-AngleOfArrivalNR ProtocolIE-ID -id-GeographicalCoordinates ProtocolIE-ID -id-PositioningBroadcastCells ProtocolIE-ID -id-LMF-Measurement-ID ProtocolIE-ID -id-RAN-Measurement-ID ProtocolIE-ID -id-TRP-MeasurementRequestList ProtocolIE-ID -id-TRP-MeasurementResponseList ProtocolIE-ID -id-TRP-MeasurementReportList ProtocolIE-ID -id-SRSType ProtocolIE-ID -id-ActivationTime ProtocolIE-ID -id-SRSResourceSetID ProtocolIE-ID -id-TRPList ProtocolIE-ID -id-SRSSpatialRelation ProtocolIE-ID -id-SystemFrameNumber ProtocolIE-ID -id-SlotNumber ProtocolIE-ID -id-SRSResourceTrigger ProtocolIE-ID -id-TRPMeasurementQuantities ProtocolIE-ID -id-AbortTransmission ProtocolIE-ID -id-SFNInitialisationTime ProtocolIE-ID -id-ResultNR ProtocolIE-ID -id-ResultEUTRA ProtocolIE-ID -id-TRPInformationTypeItem ProtocolIE-ID -id-CGI-NR ProtocolIE-ID -id-SFNInitialisationTime-NR ProtocolIE-ID -id-Cell-ID ProtocolIE-ID -id-SrsFrequency ProtocolIE-ID -id-TRPType ProtocolIE-ID -id-SRSSpatialRelationPerSRSResource ProtocolIE-ID -id-MeasurementPeriodicityExtended ProtocolIE-ID -id-PRS-Resource-ID ProtocolIE-ID -id-PRSTRPList ProtocolIE-ID -id-PRSTransmissionTRPList ProtocolIE-ID -id-OnDemandPRS ProtocolIE-ID -id-AoA-SearchWindow ProtocolIE-ID -id-TRP-MeasurementUpdateList ProtocolIE-ID -id-ZoA ProtocolIE-ID -id-ResponseTime ProtocolIE-ID -id-UEReportingInformation ProtocolIE-ID -id-MultipleULAoA ProtocolIE-ID -id-UL-SRS-RSRPP ProtocolIE-ID -id-SRSResourcetype ProtocolIE-ID -id-ExtendedAdditionalPathList ProtocolIE-ID -id-ARPLocationInfo ProtocolIE-ID -id-ARP-ID ProtocolIE-ID -id-LoS-NLoSInformation ProtocolIE-ID -id-UETxTEGAssociationList ProtocolIE-ID -id-NumberOfTRPRxTEG ProtocolIE-ID -id-NumberOfTRPRxTxTEG ProtocolIE-ID -id-TRPTxTEGAssociation ProtocolIE-ID -id-TRPTEGInformation ProtocolIE-ID -id-TRP-Rx-TEGInformation ProtocolIE-ID -id-TRP-PRS-Information-List ProtocolIE-ID -id-PRS-Measurements-Info-List ProtocolIE-ID -id-PRSConfigRequestType ProtocolIE-ID -id-UE-TEG-Info-Request ProtocolIE-ID -id-MeasurementTimeOccasion ProtocolIE-ID -id-MeasurementCharacteristicsRequestIndicator ProtocolIE-ID -id-TRPBeamAntennaInformation ProtocolIE-ID -id-NR-TADV ProtocolIE-ID -id-MeasurementAmount ProtocolIE-ID -id-pathPower ProtocolIE-ID -id-PreconfigurationResult ProtocolIE-ID -id-RequestType ProtocolIE-ID -id-UE-TEG-ReportingPeriodicity ProtocolIE-ID -id-SRSPortIndex ProtocolIE-ID -id-procedure-code-101-not-to-be-used ProtocolIE-ID -id-procedure-code-102-not-to-be-used ProtocolIE-ID -id-procedure-code-103-not-to-be-used ProtocolIE-ID -id-UETxTimingErrorMargin ProtocolIE-ID -id-MeasurementPeriodicityNR-AoA ProtocolIE-ID -id-SRSTransmissionStatus ProtocolIE-ID +id-Cause ProtocolIE-ID +id-CriticalityDiagnostics ProtocolIE-ID +id-LMF-UE-Measurement-ID ProtocolIE-ID +id-ReportCharacteristics ProtocolIE-ID +id-MeasurementPeriodicity ProtocolIE-ID +id-MeasurementQuantities ProtocolIE-ID +id-RAN-UE-Measurement-ID ProtocolIE-ID +id-E-CID-MeasurementResult ProtocolIE-ID +id-OTDOACells ProtocolIE-ID +id-OTDOA-Information-Type-Group ProtocolIE-ID +id-OTDOA-Information-Type-Item ProtocolIE-ID +id-MeasurementQuantities-Item ProtocolIE-ID +id-RequestedSRSTransmissionCharacteristics ProtocolIE-ID +id-Cell-Portion-ID ProtocolIE-ID +id-OtherRATMeasurementQuantities ProtocolIE-ID +id-OtherRATMeasurementQuantities-Item ProtocolIE-ID +id-OtherRATMeasurementResult ProtocolIE-ID +id-WLANMeasurementQuantities ProtocolIE-ID +id-WLANMeasurementQuantities-Item ProtocolIE-ID +id-WLANMeasurementResult ProtocolIE-ID +id-TDD-Config-EUTRA-Item ProtocolIE-ID +id-Assistance-Information ProtocolIE-ID +id-Broadcast ProtocolIE-ID +id-AssistanceInformationFailureList ProtocolIE-ID +id-SRSConfiguration ProtocolIE-ID +id-MeasurementResult ProtocolIE-ID +id-TRP-ID ProtocolIE-ID +id-TRPInformationTypeListTRPReq ProtocolIE-ID +id-TRPInformationListTRPResp ProtocolIE-ID +id-MeasurementBeamInfoRequest ProtocolIE-ID +id-ResultSS-RSRP ProtocolIE-ID +id-ResultSS-RSRQ ProtocolIE-ID +id-ResultCSI-RSRP ProtocolIE-ID +id-ResultCSI-RSRQ ProtocolIE-ID +id-AngleOfArrivalNR ProtocolIE-ID +id-GeographicalCoordinates ProtocolIE-ID +id-PositioningBroadcastCells ProtocolIE-ID +id-LMF-Measurement-ID ProtocolIE-ID +id-RAN-Measurement-ID ProtocolIE-ID +id-TRP-MeasurementRequestList ProtocolIE-ID +id-TRP-MeasurementResponseList ProtocolIE-ID +id-TRP-MeasurementReportList ProtocolIE-ID +id-SRSType ProtocolIE-ID +id-ActivationTime ProtocolIE-ID +id-SRSResourceSetID ProtocolIE-ID +id-TRPList ProtocolIE-ID +id-SRSSpatialRelation ProtocolIE-ID +id-SystemFrameNumber ProtocolIE-ID +id-SlotNumber ProtocolIE-ID +id-SRSResourceTrigger ProtocolIE-ID +id-TRPMeasurementQuantities ProtocolIE-ID +id-AbortTransmission ProtocolIE-ID +id-SFNInitialisationTime ProtocolIE-ID +id-ResultNR ProtocolIE-ID +id-ResultEUTRA ProtocolIE-ID +id-TRPInformationTypeItem ProtocolIE-ID +id-CGI-NR ProtocolIE-ID +id-SFNInitialisationTime-NR ProtocolIE-ID +id-Cell-ID ProtocolIE-ID +id-SrsFrequency ProtocolIE-ID +id-TRPType ProtocolIE-ID +id-SRSSpatialRelationPerSRSResource ProtocolIE-ID +id-MeasurementPeriodicityExtended ProtocolIE-ID +id-PRS-Resource-ID ProtocolIE-ID +id-PRSTRPList ProtocolIE-ID +id-PRSTransmissionTRPList ProtocolIE-ID +id-OnDemandPRS ProtocolIE-ID +id-AoA-SearchWindow ProtocolIE-ID +id-TRP-MeasurementUpdateList ProtocolIE-ID +id-ZoA ProtocolIE-ID +id-ResponseTime ProtocolIE-ID +id-UEReportingInformation ProtocolIE-ID +id-MultipleULAoA ProtocolIE-ID +id-UL-SRS-RSRPP ProtocolIE-ID +id-SRSResourcetype ProtocolIE-ID +id-ExtendedAdditionalPathList ProtocolIE-ID +id-ARPLocationInfo ProtocolIE-ID +id-ARP-ID ProtocolIE-ID +id-LoS-NLoSInformation ProtocolIE-ID +id-UETxTEGAssociationList ProtocolIE-ID +id-NumberOfTRPRxTEG ProtocolIE-ID +id-NumberOfTRPRxTxTEG ProtocolIE-ID +id-TRPTxTEGAssociation ProtocolIE-ID +id-TRPTEGInformation ProtocolIE-ID +id-TRP-Rx-TEGInformation ProtocolIE-ID +id-TRP-PRS-Information-List ProtocolIE-ID +id-PRS-Measurements-Info-List ProtocolIE-ID +id-PRSConfigRequestType ProtocolIE-ID +id-UE-TEG-Info-Request ProtocolIE-ID +id-MeasurementTimeOccasion ProtocolIE-ID +id-MeasurementCharacteristicsRequestIndicator ProtocolIE-ID +id-TRPBeamAntennaInformation ProtocolIE-ID +id-NR-TADV ProtocolIE-ID +id-MeasurementAmount ProtocolIE-ID +id-pathPower ProtocolIE-ID +id-PreconfigurationResult ProtocolIE-ID +id-RequestType ProtocolIE-ID +id-UE-TEG-ReportingPeriodicity ProtocolIE-ID +id-SRSPortIndex ProtocolIE-ID +id-procedure-code-101-not-to-be-used ProtocolIE-ID +id-procedure-code-102-not-to-be-used ProtocolIE-ID +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 +id-ExtendedResourceSymbolOffset ProtocolIE-ID +id-NewNRCGI ProtocolIE-ID +id-Mobile-TRP-LocationInformation ProtocolIE-ID +id-Mobile-IAB-MT-UE-ID ProtocolIE-ID +id-MobileAccessPointLocation ProtocolIE-ID +id-CommonTAParameters ProtocolIE-ID +id-UE-Rx-Tx-Time-Diff ProtocolIE-ID +id-SCS-480 ProtocolIE-ID +id-SCS-960 ProtocolIE-ID +id-Bandwidth-Aggregation-Request-Indication ProtocolIE-ID +id-PosSRSResourceSet-Aggregation-List ProtocolIE-ID +id-TimingReportingGranularityFactorExtended ProtocolIE-ID +id-TimeWindowInformation-SRS-List ProtocolIE-ID +id-TimeWindowInformation-Measurement-List ProtocolIE-ID +id-UL-RSCPMeas ProtocolIE-ID +id-SymbolIndex ProtocolIE-ID +id-PosValidityAreaCellList ProtocolIE-ID +id-SRSReservationType ProtocolIE-ID +id-PRSBWAggregationRequestIndication ProtocolIE-ID +id-AggregatedPosSRSResourceID-List ProtocolIE-ID +id-AggregatedPRSResourceSetList ProtocolIE-ID +id-TRPPhaseQuality ProtocolIE-ID +id-NewCellIdentity ProtocolIE-ID +id-ValidityAreaSpecificSRSInformation ProtocolIE-ID +id-RequestedSRSPreconfigurationCharacteristics-List ProtocolIE-ID +id-SRSPreconfiguration-List ProtocolIE-ID +id-SRSInformation ProtocolIE-ID +id-TxHoppingConfiguration ProtocolIE-ID +id-MeasuredFrequencyHops ProtocolIE-ID +id-ReportingGranularitykminus1 ProtocolIE-ID +id-ReportingGranularitykminus2 ProtocolIE-ID +id-ReportingGranularitykminus3 ProtocolIE-ID +id-ReportingGranularitykminus4 ProtocolIE-ID +id-ReportingGranularitykminus5 ProtocolIE-ID +id-ReportingGranularitykminus6 ProtocolIE-ID +id-ReportingGranularitykminus1AdditionalPath ProtocolIE-ID +id-ReportingGranularitykminus2AdditionalPath ProtocolIE-ID +id-ReportingGranularitykminus3AdditionalPath ProtocolIE-ID +id-ReportingGranularitykminus4AdditionalPath ProtocolIE-ID +id-ReportingGranularitykminus5AdditionalPath ProtocolIE-ID +id-ReportingGranularitykminus6AdditionalPath ProtocolIE-ID +id-MeasuredResultsAssociatedInfoList ProtocolIE-ID +id-PointA ProtocolIE-ID +id-NR-PCI ProtocolIE-ID +id-SCS-SpecificCarrier ProtocolIE-ID +id-MeasBasedOnAggregatedResources ProtocolIE-ID #.REGISTER #NRPPA-PROTOCOL-IES -Cause N nrppa.ies id-Cause -CriticalityDiagnostics N nrppa.ies id-CriticalityDiagnostics -UE-Measurement-ID N nrppa.ies id-LMF-UE-Measurement-ID -ReportCharacteristics N nrppa.ies id-ReportCharacteristics -MeasurementPeriodicity N nrppa.ies id-MeasurementPeriodicity -MeasurementQuantities N nrppa.ies id-MeasurementQuantities -UE-Measurement-ID N nrppa.ies id-RAN-UE-Measurement-ID -E-CID-MeasurementResult N nrppa.ies id-E-CID-MeasurementResult -OTDOACells N nrppa.ies id-OTDOACells -OTDOA-Information-Type N nrppa.ies id-OTDOA-Information-Type-Group -OTDOA-Information-Type-Item N nrppa.ies id-OTDOA-Information-Type-Item -MeasurementQuantities-Item N nrppa.ies id-MeasurementQuantities-Item -RequestedSRSTransmissionCharacteristics N nrppa.ies id-RequestedSRSTransmissionCharacteristics -Cell-Portion-ID N nrppa.ies id-Cell-Portion-ID -OtherRATMeasurementQuantities N nrppa.ies id-OtherRATMeasurementQuantities -OtherRATMeasurementQuantities-Item N nrppa.ies id-OtherRATMeasurementQuantities-Item -OtherRATMeasurementResult N nrppa.ies id-OtherRATMeasurementResult -WLANMeasurementQuantities N nrppa.ies id-WLANMeasurementQuantities -WLANMeasurementQuantities-Item N nrppa.ies id-WLANMeasurementQuantities-Item -WLANMeasurementResult N nrppa.ies id-WLANMeasurementResult -TDD-Config-EUTRA-Item N nrppa.ies id-TDD-Config-EUTRA-Item -Assistance-Information N nrppa.ies id-Assistance-Information -Broadcast N nrppa.ies id-Broadcast -AssistanceInformationFailureList N nrppa.ies id-AssistanceInformationFailureList -SRSConfiguration N nrppa.ies id-SRSConfiguration -TRPInformationTypeListTRPReq N nrppa.ies id-TRPInformationTypeListTRPReq -TRPInformationListTRPResp N nrppa.ies id-TRPInformationListTRPResp -MeasurementBeamInfoRequest N nrppa.ies id-MeasurementBeamInfoRequest -ResultSS-RSRP N nrppa.ies id-ResultSS-RSRP -ResultSS-RSRQ N nrppa.ies id-ResultSS-RSRQ -ResultCSI-RSRP N nrppa.ies id-ResultCSI-RSRP -ResultCSI-RSRQ N nrppa.ies id-ResultCSI-RSRQ -UL-AoA N nrppa.ies id-AngleOfArrivalNR -PositioningBroadcastCells N nrppa.ies id-PositioningBroadcastCells -Measurement-ID N nrppa.ies id-LMF-Measurement-ID -Measurement-ID N nrppa.ies id-RAN-Measurement-ID -TRP-MeasurementRequestList N nrppa.ies id-TRP-MeasurementRequestList -TRP-MeasurementResponseList N nrppa.ies id-TRP-MeasurementResponseList -SRSType N nrppa.ies id-SRSType -RelativeTime1900 N nrppa.ies id-ActivationTime -TRPList N nrppa.ies id-TRPList -SystemFrameNumber N nrppa.ies id-SystemFrameNumber -SlotNumber N nrppa.ies id-SlotNumber -TRPMeasurementQuantities N nrppa.ies id-TRPMeasurementQuantities -AbortTransmission N nrppa.ies id-AbortTransmission -RelativeTime1900 N nrppa.ies id-SFNInitialisationTime -ResultNR N nrppa.ies id-ResultNR -ResultEUTRA N nrppa.ies id-ResultEUTRA -TRPInformationTypeItem N nrppa.ies id-TRPInformationTypeItem -CGI-NR N nrppa.ies id-CGI-NR -SFNInitialisationTime-EUTRA N nrppa.ies id-SFNInitialisationTime-NR -CGI-NR N nrppa.ies id-Cell-ID -SrsFrequency N nrppa.ies id-SrsFrequency -TRPType N nrppa.ies id-TRPType -MeasurementPeriodicityExtended N nrppa.ies id-MeasurementPeriodicityExtended -PRSTRPList N nrppa.ies id-PRSTRPList -PRSTransmissionTRPList N nrppa.ies id-PRSTransmissionTRPList -OnDemandPRS-Info N nrppa.ies id-OnDemandPRS -TRP-MeasurementUpdateList N nrppa.ies id-TRP-MeasurementUpdateList -ZoA N nrppa.ies id-ZoA -ResponseTime N nrppa.ies id-ResponseTime -UEReportingInformation N nrppa.ies id-UEReportingInformation -MultipleULAoA N nrppa.ies id-MultipleULAoA -UL-SRS-RSRPP N nrppa.ies id-UL-SRS-RSRPP -UETxTEGAssociationList N nrppa.ies id-UETxTEGAssociationList -TRPTxTEGAssociation N nrppa.ies id-TRPTxTEGAssociation -TRP-PRS-Information-List N nrppa.ies id-TRP-PRS-Information-List -PRS-Measurements-Info-List N nrppa.ies id-PRS-Measurements-Info-List -PRSConfigRequestType N nrppa.ies id-PRSConfigRequestType -UE-TEG-Info-Request N nrppa.ies id-UE-TEG-Info-Request -MeasurementTimeOccasion N nrppa.ies id-MeasurementTimeOccasion -MeasurementCharacteristicsRequestIndicator N nrppa.ies id-MeasurementCharacteristicsRequestIndicator -TRPBeamAntennaInformation N nrppa.ies id-TRPBeamAntennaInformation -NR-TADV N nrppa.ies id-NR-TADV -MeasurementAmount N nrppa.ies id-MeasurementAmount -PreconfigurationResult N nrppa.ies id-PreconfigurationResult -RequestType N nrppa.ies id-RequestType -UE-TEG-ReportingPeriodicity N nrppa.ies id-UE-TEG-ReportingPeriodicity -MeasurementPeriodicityNR-AoA N nrppa.ies id-MeasurementPeriodicityNR-AoA -SRSTransmissionStatus N nrppa.ies id-SRSTransmissionStatus +Cause N nrppa.ies id-Cause +CriticalityDiagnostics N nrppa.ies id-CriticalityDiagnostics +UE-Measurement-ID N nrppa.ies id-LMF-UE-Measurement-ID +ReportCharacteristics N nrppa.ies id-ReportCharacteristics +MeasurementPeriodicity N nrppa.ies id-MeasurementPeriodicity +MeasurementQuantities N nrppa.ies id-MeasurementQuantities +UE-Measurement-ID N nrppa.ies id-RAN-UE-Measurement-ID +E-CID-MeasurementResult N nrppa.ies id-E-CID-MeasurementResult +OTDOACells N nrppa.ies id-OTDOACells +OTDOA-Information-Type N nrppa.ies id-OTDOA-Information-Type-Group +OTDOA-Information-Type-Item N nrppa.ies id-OTDOA-Information-Type-Item +MeasurementQuantities-Item N nrppa.ies id-MeasurementQuantities-Item +RequestedSRSTransmissionCharacteristics N nrppa.ies id-RequestedSRSTransmissionCharacteristics +Cell-Portion-ID N nrppa.ies id-Cell-Portion-ID +OtherRATMeasurementQuantities N nrppa.ies id-OtherRATMeasurementQuantities +OtherRATMeasurementQuantities-Item N nrppa.ies id-OtherRATMeasurementQuantities-Item +OtherRATMeasurementResult N nrppa.ies id-OtherRATMeasurementResult +WLANMeasurementQuantities N nrppa.ies id-WLANMeasurementQuantities +WLANMeasurementQuantities-Item N nrppa.ies id-WLANMeasurementQuantities-Item +WLANMeasurementResult N nrppa.ies id-WLANMeasurementResult +TDD-Config-EUTRA-Item N nrppa.ies id-TDD-Config-EUTRA-Item +Assistance-Information N nrppa.ies id-Assistance-Information +Broadcast N nrppa.ies id-Broadcast +AssistanceInformationFailureList N nrppa.ies id-AssistanceInformationFailureList +SRSConfiguration N nrppa.ies id-SRSConfiguration +TRPInformationTypeListTRPReq N nrppa.ies id-TRPInformationTypeListTRPReq +TRPInformationListTRPResp N nrppa.ies id-TRPInformationListTRPResp +MeasurementBeamInfoRequest N nrppa.ies id-MeasurementBeamInfoRequest +ResultSS-RSRP N nrppa.ies id-ResultSS-RSRP +ResultSS-RSRQ N nrppa.ies id-ResultSS-RSRQ +ResultCSI-RSRP N nrppa.ies id-ResultCSI-RSRP +ResultCSI-RSRQ N nrppa.ies id-ResultCSI-RSRQ +UL-AoA N nrppa.ies id-AngleOfArrivalNR +PositioningBroadcastCells N nrppa.ies id-PositioningBroadcastCells +Measurement-ID N nrppa.ies id-LMF-Measurement-ID +Measurement-ID N nrppa.ies id-RAN-Measurement-ID +TRP-MeasurementRequestList N nrppa.ies id-TRP-MeasurementRequestList +TRP-MeasurementResponseList N nrppa.ies id-TRP-MeasurementResponseList +SRSType N nrppa.ies id-SRSType +RelativeTime1900 N nrppa.ies id-ActivationTime +TRPList N nrppa.ies id-TRPList +SystemFrameNumber N nrppa.ies id-SystemFrameNumber +SlotNumber N nrppa.ies id-SlotNumber +TRPMeasurementQuantities N nrppa.ies id-TRPMeasurementQuantities +AbortTransmission N nrppa.ies id-AbortTransmission +RelativeTime1900 N nrppa.ies id-SFNInitialisationTime +ResultNR N nrppa.ies id-ResultNR +ResultEUTRA N nrppa.ies id-ResultEUTRA +TRPInformationTypeItem N nrppa.ies id-TRPInformationTypeItem +CGI-NR N nrppa.ies id-CGI-NR +SFNInitialisationTime-EUTRA N nrppa.ies id-SFNInitialisationTime-NR +CGI-NR N nrppa.ies id-Cell-ID +SrsFrequency N nrppa.ies id-SrsFrequency +TRPType N nrppa.ies id-TRPType +MeasurementPeriodicityExtended N nrppa.ies id-MeasurementPeriodicityExtended +PRSTRPList N nrppa.ies id-PRSTRPList +PRSTransmissionTRPList N nrppa.ies id-PRSTransmissionTRPList +OnDemandPRS-Info N nrppa.ies id-OnDemandPRS +TRP-MeasurementUpdateList N nrppa.ies id-TRP-MeasurementUpdateList +ZoA N nrppa.ies id-ZoA +ResponseTime N nrppa.ies id-ResponseTime +UEReportingInformation N nrppa.ies id-UEReportingInformation +MultipleULAoA N nrppa.ies id-MultipleULAoA +UL-SRS-RSRPP N nrppa.ies id-UL-SRS-RSRPP +UETxTEGAssociationList N nrppa.ies id-UETxTEGAssociationList +TRPTxTEGAssociation N nrppa.ies id-TRPTxTEGAssociation +TRP-PRS-Information-List N nrppa.ies id-TRP-PRS-Information-List +PRS-Measurements-Info-List N nrppa.ies id-PRS-Measurements-Info-List +PRSConfigRequestType N nrppa.ies id-PRSConfigRequestType +UE-TEG-Info-Request N nrppa.ies id-UE-TEG-Info-Request +MeasurementTimeOccasion N nrppa.ies id-MeasurementTimeOccasion +MeasurementCharacteristicsRequestIndicator N nrppa.ies id-MeasurementCharacteristicsRequestIndicator +TRPBeamAntennaInformation N nrppa.ies id-TRPBeamAntennaInformation +NR-TADV N nrppa.ies id-NR-TADV +MeasurementAmount N nrppa.ies id-MeasurementAmount +PreconfigurationResult N nrppa.ies id-PreconfigurationResult +RequestType N nrppa.ies id-RequestType +UE-TEG-ReportingPeriodicity N nrppa.ies id-UE-TEG-ReportingPeriodicity +MeasurementPeriodicityNR-AoA N nrppa.ies id-MeasurementPeriodicityNR-AoA +SRSTransmissionStatus N nrppa.ies id-SRSTransmissionStatus +CGI-NR N nrppa.ies id-NewNRCGI +Mobile-TRP-LocationInformation N nrppa.ies id-Mobile-TRP-LocationInformation +CommonTAParameters N nrppa.ies id-CommonTAParameters +UE-Rx-Tx-Time-Diff N nrppa.ies id-UE-Rx-Tx-Time-Diff +SCS-480 N nrppa.ies id-SCS-480 +SCS-960 N nrppa.ies id-SCS-960 +PosSRSResourceSet-Aggregation-List N nrppa.ies id-PosSRSResourceSet-Aggregation-List +TimeWindowInformation-SRS-List N nrppa.ies id-TimeWindowInformation-SRS-List +TimeWindowInformation-Measurement-List N nrppa.ies id-TimeWindowInformation-Measurement-List +UL-RSCPMeas N nrppa.ies id-UL-RSCPMeas +PosValidityAreaCellList N nrppa.ies id-PosValidityAreaCellList +SRSReservationType N nrppa.ies id-SRSReservationType +TRPPhaseQuality N nrppa.ies id-TRPPhaseQuality +CGI-NR N nrppa.ies id-NewCellIdentity +RequestedSRSPreconfigurationCharacteristics-List N nrppa.ies id-RequestedSRSPreconfigurationCharacteristics-List +SRSPreconfiguration-List N nrppa.ies id-SRSPreconfiguration-List +RequestedSRSTransmissionCharacteristics N nrppa.ies id-SRSInformation +ReportingGranularitykminus1 N nrppa.ies id-ReportingGranularitykminus1 +ReportingGranularitykminus2 N nrppa.ies id-ReportingGranularitykminus2 +ReportingGranularitykminus3 N nrppa.ies id-ReportingGranularitykminus3 +ReportingGranularitykminus4 N nrppa.ies id-ReportingGranularitykminus4 +ReportingGranularitykminus5 N nrppa.ies id-ReportingGranularitykminus5 +ReportingGranularitykminus6 N nrppa.ies id-ReportingGranularitykminus6 +ReportingGranularitykminus1AdditionalPath N nrppa.ies id-ReportingGranularitykminus1AdditionalPath +ReportingGranularitykminus2AdditionalPath N nrppa.ies id-ReportingGranularitykminus2AdditionalPath +ReportingGranularitykminus3AdditionalPath N nrppa.ies id-ReportingGranularitykminus3AdditionalPath +ReportingGranularitykminus4AdditionalPath N nrppa.ies id-ReportingGranularitykminus4AdditionalPath +ReportingGranularitykminus5AdditionalPath N nrppa.ies id-ReportingGranularitykminus5AdditionalPath +ReportingGranularitykminus6AdditionalPath N nrppa.ies id-ReportingGranularitykminus6AdditionalPath #NRPPA-PROTOCOL-EXTENSION @@ -319,6 +403,31 @@ 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 +ExtendedResourceSymbolOffset N nrppa.extension id-ExtendedResourceSymbolOffset +Mobile-TRP-LocationInformation N nrppa.extension id-Mobile-TRP-LocationInformation +Mobile-IAB-MT-UE-ID N nrppa.extension id-Mobile-IAB-MT-UE-ID +Mobile-TRP-LocationInformation N nrppa.extension id-MobileAccessPointLocation +Bandwidth-Aggregation-Request-Indication N nrppa.extension id-Bandwidth-Aggregation-Request-Indication +PosSRSResourceSet-Aggregation-List N nrppa.extension id-PosSRSResourceSet-Aggregation-List +TimingReportingGranularityFactorExtended N nrppa.extension id-TimingReportingGranularityFactorExtended +SymbolIndex N nrppa.extension id-SymbolIndex +PosValidityAreaCellList N nrppa.extension id-PosValidityAreaCellList +PRSBWAggregationRequestIndication N nrppa.extension id-PRSBWAggregationRequestIndication +AggregatedPosSRSResourceID-List N nrppa.extension id-AggregatedPosSRSResourceID-List +AggregatedPRSResourceSetList N nrppa.extension id-AggregatedPRSResourceSetList +ValidityAreaSpecificSRSInformation N nrppa.extension id-ValidityAreaSpecificSRSInformation +TxHoppingConfiguration N nrppa.extension id-TxHoppingConfiguration +MeasuredFrequencyHops N nrppa.extension id-MeasuredFrequencyHops +MeasuredResultsAssociatedInfoList N nrppa.extension id-MeasuredResultsAssociatedInfoList +PointA N nrppa.extension id-PointA +NR-PCI N nrppa.extension id-NR-PCI +SCS-SpecificCarrier N nrppa.extension id-SCS-SpecificCarrier +MeasBasedOnAggregatedResources N nrppa.extension id-MeasBasedOnAggregatedResources #LPPA-ELEMENTARY-PROCEDURE @@ -381,3 +490,5 @@ MeasurementPreconfigurationConfirm N nrppa.proc.sout id-measurementPreco MeasurementPreconfigurationRefuse N nrppa.proc.uout id-measurementPreconfiguration MeasurementActivation N nrppa.proc.imsg id-measurementActivation + +SRSInformationReservationNotification N nrppa.proc.imsg id-sRSInformationReservationNotification diff --git a/epan/dissectors/asn1/nrppa/packet-nrppa-template.c b/epan/dissectors/asn1/nrppa/packet-nrppa-template.c index 44087784..5af19da0 100644 --- a/epan/dissectors/asn1/nrppa/packet-nrppa-template.c +++ b/epan/dissectors/asn1/nrppa/packet-nrppa-template.c @@ -8,14 +8,15 @@ * * SPDX-License-Identifier: GPL-2.0-or-later * - * Ref 3GPP TS 38.455 V17.4.0 (2023-03) - * http://www.3gpp.org + * Ref 3GPP TS 38.455 V18.2.0 (2024-06) + * https://www.3gpp.org */ #include "config.h" #include <epan/packet.h> #include <epan/asn1.h> +#include <wsutil/array.h> #include "packet-per.h" #include "packet-nrppa.h" @@ -28,17 +29,17 @@ void proto_register_nrppa(void); void proto_reg_handoff_nrppa(void); /* Initialize the protocol and registered fields */ -static int proto_nrppa = -1; +static int proto_nrppa; #include "packet-nrppa-hf.c" /* Initialize the subtree pointers */ -static gint ett_nrppa = -1; +static int ett_nrppa; #include "packet-nrppa-ett.c" /* Global variables */ -static guint32 ProcedureCode; -static guint32 ProtocolIE_ID; +static uint32_t ProcedureCode; +static uint32_t ProtocolIE_ID; /* Dissector tables */ static dissector_table_t nrppa_ies_dissector_table; @@ -60,27 +61,27 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - return (dissector_try_uint_new(nrppa_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint_new(nrppa_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, false, NULL)) ? tvb_captured_length(tvb) : 0; } static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - return (dissector_try_uint_new(nrppa_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint_new(nrppa_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, false, NULL)) ? tvb_captured_length(tvb) : 0; } static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - return (dissector_try_uint_new(nrppa_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint_new(nrppa_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, false, NULL)) ? tvb_captured_length(tvb) : 0; } static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - return (dissector_try_uint_new(nrppa_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint_new(nrppa_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, false, NULL)) ? tvb_captured_length(tvb) : 0; } static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - return (dissector_try_uint_new(nrppa_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint_new(nrppa_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, false, NULL)) ? tvb_captured_length(tvb) : 0; } /*--- proto_register_nrppa -------------------------------------------*/ @@ -88,13 +89,12 @@ void proto_register_nrppa(void) { /* List of fields */ static hf_register_info hf[] = { - #include "packet-nrppa-hfarr.c" }; /* List of subtrees */ - static gint *ett[] = { - &ett_nrppa, + static int *ett[] = { + &ett_nrppa, #include "packet-nrppa-ettarr.c" }; |