Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 323 insertions, 212 deletions

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