NRPPa: upgrade dissector to v16.5.0

9 files changed, 52 insertions, 79 deletions

diff --git a/epan/dissectors/asn1/nrppa/NRPPA-CommonDataTypes.asn b/epan/dissectors/asn1/nrppa/NRPPA-CommonDataTypes.asn
index 921616c4e1..c016d04b9b 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 V16.3.0 (2021-04)
+-- 3GPP TS 38.455 V16.5.0 (2021-10)
 -- 9.3.6	Common definitions
 -- **************************************************************
 --
diff --git a/epan/dissectors/asn1/nrppa/NRPPA-Constants.asn b/epan/dissectors/asn1/nrppa/NRPPA-Constants.asn
index 5531ee0d9e..f7a4c8baff 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 V16.3.0 (2021-04)
+-- 3GPP TS 38.455 V16.5.0 (2021-10)
 -- 9.3.7	Constant definitions
 -- **************************************************************
 --
diff --git a/epan/dissectors/asn1/nrppa/NRPPA-Containers.asn b/epan/dissectors/asn1/nrppa/NRPPA-Containers.asn
index 5bd136cd5f..ec8b5cf8ba 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 V16.3.0 (2021-04)
+-- 3GPP TS 38.455 V16.5.0 (2021-10)
 -- 9.3.8	Container definitions
 --
 -- **************************************************************
diff --git a/epan/dissectors/asn1/nrppa/NRPPA-IEs.asn b/epan/dissectors/asn1/nrppa/NRPPA-IEs.asn
index 579ef8c501..389ff4f0ca 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 V16.3.0 (2021-04)
+-- 3GPP TS 38.455 V16.5.0 (2021-10)
 -- 9.3.5	Information Element definitions
 -- **************************************************************
 --
@@ -25,7 +25,6 @@ IMPORTS
 	id-ResultCSI-RSRP,
 	id-ResultCSI-RSRQ,
 	id-AngleOfArrivalNR,
-	id-SRSSpatialRelation,
 	id-ResultNR,
 	id-ResultEUTRA,
 	maxCellinRANnode,
@@ -1709,7 +1708,7 @@ Search-window-information-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= {
 }
 
 
-SFNInitialisationTime ::= BIT STRING (SIZE (64))
+RelativeTime1900 ::= BIT STRING (SIZE (64))
 
 
 SFNInitialisationTime-EUTRA ::= BIT STRING (SIZE (64))
@@ -1861,15 +1860,6 @@ SRSResourceTrigger-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-SRSSpatialRelation ::= SEQUENCE {
-	spatialRelationforResourceID				SpatialRelationforResourceID,
-	iE-Extensions		ProtocolExtensionContainer { {SRSSpatialRelation-ExtIEs} }	OPTIONAL,
-	...
-}
-
-SRSSpatialRelation-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= {
-	...
-}
 
 
 SSBInfo ::= SEQUENCE {
@@ -1962,7 +1952,7 @@ TF-Configuration ::= SEQUENCE {
 	sSB-half-frame-offset		INTEGER(0..1),
 	sSB-SFN-offset				INTEGER(0..15),
 	sSB-BurstPosition			SSBBurstPosition	OPTIONAL,
-	sFN-initialisation-time		SFNInitialisationTime	 OPTIONAL,
+	sFN-initialisation-time		RelativeTime1900	 OPTIONAL,
 	iE-Extensions		ProtocolExtensionContainer { { TF-Configuration-ExtIEs} }	OPTIONAL,
 	...
 }
@@ -1975,7 +1965,7 @@ TF-Configuration-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= {
 TimeStamp ::= SEQUENCE {
 	systemFrameNumber		SystemFrameNumber,
 	slotIndex				TimeStampSlotIndex,
-	measurementTime			SFNInitialisationTime	OPTIONAL,
+	measurementTime			RelativeTime1900	OPTIONAL,
 	iE-Extension			ProtocolExtensionContainer { { TimeStamp-ExtIEs} }	OPTIONAL,
 	...
 }
@@ -2175,7 +2165,7 @@ TRPInformationTypeResponseItem ::= CHOICE {
 	aRFCN										INTEGER (0..3279165), 
 	pRSConfiguration							PRSConfiguration,
 	sSBinformation								SSBInfo,
-	sFNInitialisationTime						SFNInitialisationTime,
+	sFNInitialisationTime						RelativeTime1900,
 	spatialDirectionInformation					SpatialDirectionInformation,
 	geographicalCoordinates						GeographicalCoordinates,
 	choice-extension							ProtocolIE-Single-Container { { TRPInformationTypeResponseItem-ExtIEs } }
@@ -2286,7 +2276,7 @@ TypeOfError ::= ENUMERATED {
 
 UARFCN ::= INTEGER (0..16383, ...)
 
-UE-Measurement-ID ::= INTEGER (1..15, ..., 256)
+UE-Measurement-ID ::= INTEGER (1..15, ..., 16..256)
 
 UTRA-EcN0 ::= INTEGER (0..49, ...)
 
diff --git a/epan/dissectors/asn1/nrppa/NRPPA-PDU-Contents.asn b/epan/dissectors/asn1/nrppa/NRPPA-PDU-Contents.asn
index 45c92d4f79..c1c992716b 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 V16.3.0 (2021-04)
+-- 3GPP TS 38.455 V16.5.0 (2021-10)
 --9.3.4	PDU Definitions
 --
 -- **************************************************************
@@ -53,13 +53,13 @@ IMPORTS
 	MeasurementBeamInfoRequest,
 	PositioningBroadcastCells,
 	SRSResourceSetID,
-	SRSSpatialRelation,
+	SpatialRelationInfo,
 	SRSResourceTrigger,
 	TRPList,
 	AbortTransmission,
 	SystemFrameNumber,
 	SlotNumber,
-	SFNInitialisationTime
+	RelativeTime1900
 
 	
 FROM NRPPA-IEs
@@ -411,7 +411,7 @@ PositioningInformationResponse ::= SEQUENCE {
 
 PositioningInformationResponse-IEs NRPPA-PROTOCOL-IES ::= {
 	{ ID id-SRSConfiguration			CRITICALITY ignore	TYPE SRSConfiguration			PRESENCE optional}|
-	{ ID id-SFNInitialisationTime		CRITICALITY ignore	TYPE SFNInitialisationTime		PRESENCE optional}|
+	{ ID id-SFNInitialisationTime		CRITICALITY ignore	TYPE RelativeTime1900		PRESENCE optional}|
 	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics		PRESENCE optional},
 	...
 }
@@ -446,7 +446,7 @@ PositioningInformationUpdate ::= SEQUENCE {
 
 PositioningInformationUpdate-IEs NRPPA-PROTOCOL-IES ::= {
 	{ ID id-SRSConfiguration			CRITICALITY ignore	TYPE SRSConfiguration			PRESENCE optional}|
-	{ ID id-SFNInitialisationTime		CRITICALITY ignore	TYPE SFNInitialisationTime		PRESENCE optional},
+	{ ID id-SFNInitialisationTime		CRITICALITY ignore	TYPE RelativeTime1900		PRESENCE optional},
 	...
 }
 
@@ -468,7 +468,7 @@ MeasurementRequest-IEs NRPPA-PROTOCOL-IES ::= {
 	{ ID id-MeasurementPeriodicity			CRITICALITY reject	TYPE MeasurementPeriodicity		PRESENCE conditional}|
 -- The IE shall be present if the Report Characteritics IE is set to “periodic” –
 	{ ID id-TRPMeasurementQuantities			CRITICALITY reject	TYPE TRPMeasurementQuantities		PRESENCE mandatory}|
-	{ ID id-SFNInitialisationTime			CRITICALITY ignore	TYPE SFNInitialisationTime		PRESENCE optional}|
+	{ ID id-SFNInitialisationTime			CRITICALITY ignore	TYPE RelativeTime1900		PRESENCE optional}|
 	{ ID id-SRSConfiguration				CRITICALITY ignore	TYPE SRSConfiguration			PRESENCE optional}|
 	{ ID id-MeasurementBeamInfoRequest		CRITICALITY ignore	TYPE MeasurementBeamInfoRequest	PRESENCE optional}|
 	{ ID id-SystemFrameNumber				CRITICALITY ignore	TYPE SystemFrameNumber			PRESENCE optional}|
@@ -652,7 +652,7 @@ PositioningActivationRequest ::= SEQUENCE {
 
 PositioningActivationRequestIEs NRPPA-PROTOCOL-IES ::= {
 	{ ID id-SRSType					CRITICALITY reject	TYPE SRSType					PRESENCE mandatory	} |
-	{ ID id-ActivationTime			CRITICALITY ignore	TYPE SFNInitialisationTime				PRESENCE optional	},
+	{ ID id-ActivationTime			CRITICALITY ignore	TYPE RelativeTime1900				PRESENCE optional	},
 	...
 } 
 
@@ -673,7 +673,7 @@ SemipersistentSRS ::= SEQUENCE {
 }
 
 SemipersistentSRS-ExtIEs NRPPA-PROTOCOL-EXTENSION ::= {		
-{ ID id-SRSSpatialRelation	CRITICALITY ignore	EXTENSION SRSSpatialRelation PRESENCE optional},
+{ ID id-SRSSpatialRelation	CRITICALITY ignore	EXTENSION SpatialRelationInfo PRESENCE optional},
 ...
 }
 
diff --git a/epan/dissectors/asn1/nrppa/NRPPA-PDU-Descriptions.asn b/epan/dissectors/asn1/nrppa/NRPPA-PDU-Descriptions.asn
index a30aff84dc..ef8f525a82 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 V16.3.0 (2021-04)
+-- 3GPP TS 38.455 V16.5.0 (2021-10)
 --
 -- ASN1START
 -- **************************************************************
diff --git a/epan/dissectors/asn1/nrppa/nrppa.cnf b/epan/dissectors/asn1/nrppa/nrppa.cnf
index 5d6d971144..a5be09aa9f 100644
--- a/epan/dissectors/asn1/nrppa/nrppa.cnf
+++ b/epan/dissectors/asn1/nrppa/nrppa.cnf
@@ -205,13 +205,13 @@ 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
-SFNInitialisationTime                      N nrppa.ies id-ActivationTime
+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
-SFNInitialisationTime                      N nrppa.ies id-SFNInitialisationTime
+RelativeTime1900                           N nrppa.ies id-SFNInitialisationTime
 ResultNR                                   N nrppa.ies id-ResultNR
 ResultEUTRA                                N nrppa.ies id-ResultEUTRA
 TRPInformationTypeItem                     N nrppa.ies id-TRPInformationTypeItem
@@ -224,7 +224,7 @@ SrsFrequency                               N nrppa.ies id-SrsFrequency
 #NRPPA-PROTOCOL-EXTENSION
 
 GeographicalCoordinates                    N nrppa.extension id-GeographicalCoordinates
-SRSSpatialRelation                         N nrppa.extension id-SRSSpatialRelation
+SpatialRelationInfo                        N nrppa.extension id-SRSSpatialRelation
 
 
 #LPPA-ELEMENTARY-PROCEDURE
diff --git a/epan/dissectors/asn1/nrppa/packet-nrppa-template.c b/epan/dissectors/asn1/nrppa/packet-nrppa-template.c
index 151ed07246..dc2b0fc5a7 100644
--- a/epan/dissectors/asn1/nrppa/packet-nrppa-template.c
+++ b/epan/dissectors/asn1/nrppa/packet-nrppa-template.c
@@ -8,7 +8,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
- * Ref 3GPP TS 38.455 V16.1.0 (2020-09)
+ * Ref 3GPP TS 38.455 V16.5.0 (2021-10)
  * http://www.3gpp.org
  */
 
diff --git a/epan/dissectors/packet-nrppa.c b/epan/dissectors/packet-nrppa.c
index 017c2ec278..2cf1b19ceb 100644
--- a/epan/dissectors/packet-nrppa.c
+++ b/epan/dissectors/packet-nrppa.c
@@ -16,7 +16,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
- * Ref 3GPP TS 38.455 V16.1.0 (2020-09)
+ * Ref 3GPP TS 38.455 V16.5.0 (2021-10)
  * http://www.3gpp.org
  */
 
@@ -70,12 +70,12 @@ static int hf_nrppa_ResultEUTRA_PDU = -1;         /* ResultEUTRA */
 static int hf_nrppa_ResultSS_RSRP_PDU = -1;       /* ResultSS_RSRP */
 static int hf_nrppa_ResultSS_RSRQ_PDU = -1;       /* ResultSS_RSRQ */
 static int hf_nrppa_ResultNR_PDU = -1;            /* ResultNR */
-static int hf_nrppa_SFNInitialisationTime_PDU = -1;  /* SFNInitialisationTime */
+static int hf_nrppa_RelativeTime1900_PDU = -1;    /* RelativeTime1900 */
 static int hf_nrppa_SFNInitialisationTime_EUTRA_PDU = -1;  /* SFNInitialisationTime_EUTRA */
 static int hf_nrppa_SlotNumber_PDU = -1;          /* SlotNumber */
+static int hf_nrppa_SpatialRelationInfo_PDU = -1;  /* SpatialRelationInfo */
 static int hf_nrppa_SRSConfiguration_PDU = -1;    /* SRSConfiguration */
 static int hf_nrppa_SrsFrequency_PDU = -1;        /* SrsFrequency */
-static int hf_nrppa_SRSSpatialRelation_PDU = -1;  /* SRSSpatialRelation */
 static int hf_nrppa_SystemFrameNumber_PDU = -1;   /* SystemFrameNumber */
 static int hf_nrppa_TDD_Config_EUTRA_Item_PDU = -1;  /* TDD_Config_EUTRA_Item */
 static int hf_nrppa_TRPMeasurementQuantities_PDU = -1;  /* TRPMeasurementQuantities */
@@ -528,10 +528,10 @@ static int hf_nrppa_sSB_periodicity = -1;         /* T_sSB_periodicity */
 static int hf_nrppa_sSB_half_frame_offset = -1;   /* INTEGER_0_1 */
 static int hf_nrppa_sSB_SFN_offset = -1;          /* INTEGER_0_15 */
 static int hf_nrppa_sSB_BurstPosition = -1;       /* SSBBurstPosition */
-static int hf_nrppa_sFN_initialisation_time = -1;  /* SFNInitialisationTime */
+static int hf_nrppa_sFN_initialisation_time = -1;  /* RelativeTime1900 */
 static int hf_nrppa_systemFrameNumber = -1;       /* SystemFrameNumber */
 static int hf_nrppa_slotIndex = -1;               /* TimeStampSlotIndex */
-static int hf_nrppa_measurementTime = -1;         /* SFNInitialisationTime */
+static int hf_nrppa_measurementTime = -1;         /* RelativeTime1900 */
 static int hf_nrppa_iE_Extension = -1;            /* ProtocolExtensionContainer */
 static int hf_nrppa_sCS_15 = -1;                  /* INTEGER_0_9 */
 static int hf_nrppa_sCS_30 = -1;                  /* INTEGER_0_19 */
@@ -579,7 +579,7 @@ static int hf_nrppa_TRPInformationTypeResponseList_item = -1;  /* TRPInformation
 static int hf_nrppa_aRFCN = -1;                   /* INTEGER_0_3279165 */
 static int hf_nrppa_pRSConfiguration = -1;        /* PRSConfiguration */
 static int hf_nrppa_sSBinformation = -1;          /* SSBInfo */
-static int hf_nrppa_sFNInitialisationTime = -1;   /* SFNInitialisationTime */
+static int hf_nrppa_sFNInitialisationTime = -1;   /* RelativeTime1900 */
 static int hf_nrppa_spatialDirectionInformation = -1;  /* SpatialDirectionInformation */
 static int hf_nrppa_geographicalCoordinates = -1;  /* GeographicalCoordinates */
 static int hf_nrppa_TRPInformationTypeListTRPReq_item = -1;  /* ProtocolIE_Single_Container */
@@ -793,7 +793,6 @@ static gint ett_nrppa_SRSResourceSet_List = -1;
 static gint ett_nrppa_SRSResourceID_List = -1;
 static gint ett_nrppa_SRSResourceSet = -1;
 static gint ett_nrppa_SRSResourceTrigger = -1;
-static gint ett_nrppa_SRSSpatialRelation = -1;
 static gint ett_nrppa_SSBInfo = -1;
 static gint ett_nrppa_SEQUENCE_SIZE_1_maxNoSSBs_OF_SSBInfoItem = -1;
 static gint ett_nrppa_SSBInfoItem = -1;
@@ -6510,7 +6509,7 @@ dissect_nrppa_SSBBurstPosition(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 
 
 static int
-dissect_nrppa_SFNInitialisationTime(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nrppa_RelativeTime1900(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
                                      64, 64, FALSE, NULL, 0, NULL, NULL);
 
@@ -6526,7 +6525,7 @@ static const per_sequence_t TF_Configuration_sequence[] = {
   { &hf_nrppa_sSB_half_frame_offset, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nrppa_INTEGER_0_1 },
   { &hf_nrppa_sSB_SFN_offset, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nrppa_INTEGER_0_15 },
   { &hf_nrppa_sSB_BurstPosition, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nrppa_SSBBurstPosition },
-  { &hf_nrppa_sFN_initialisation_time, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nrppa_SFNInitialisationTime },
+  { &hf_nrppa_sFN_initialisation_time, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nrppa_RelativeTime1900 },
   { &hf_nrppa_iE_Extensions , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nrppa_ProtocolExtensionContainer },
   { NULL, 0, 0, NULL }
 };
@@ -7156,21 +7155,6 @@ dissect_nrppa_SRSResourceTrigger(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
 }
 
 
-static const per_sequence_t SRSSpatialRelation_sequence[] = {
-  { &hf_nrppa_spatialRelationforResourceID, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nrppa_SpatialRelationforResourceID },
-  { &hf_nrppa_iE_Extensions , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nrppa_ProtocolExtensionContainer },
-  { NULL, 0, 0, NULL }
-};
-
-static int
-dissect_nrppa_SRSSpatialRelation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
-                                   ett_nrppa_SRSSpatialRelation, SRSSpatialRelation_sequence);
-
-  return offset;
-}
-
-
 
 static int
 dissect_nrppa_SSID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -7288,7 +7272,7 @@ dissect_nrppa_TimeStampSlotIndex(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
 static const per_sequence_t TimeStamp_sequence[] = {
   { &hf_nrppa_systemFrameNumber, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nrppa_SystemFrameNumber },
   { &hf_nrppa_slotIndex     , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nrppa_TimeStampSlotIndex },
-  { &hf_nrppa_measurementTime, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nrppa_SFNInitialisationTime },
+  { &hf_nrppa_measurementTime, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nrppa_RelativeTime1900 },
   { &hf_nrppa_iE_Extension  , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nrppa_ProtocolExtensionContainer },
   { NULL, 0, 0, NULL }
 };
@@ -7584,7 +7568,7 @@ static const per_choice_t TRPInformationTypeResponseItem_choice[] = {
   {   2, &hf_nrppa_aRFCN         , ASN1_NO_EXTENSIONS     , dissect_nrppa_INTEGER_0_3279165 },
   {   3, &hf_nrppa_pRSConfiguration, ASN1_NO_EXTENSIONS     , dissect_nrppa_PRSConfiguration },
   {   4, &hf_nrppa_sSBinformation, ASN1_NO_EXTENSIONS     , dissect_nrppa_SSBInfo },
-  {   5, &hf_nrppa_sFNInitialisationTime, ASN1_NO_EXTENSIONS     , dissect_nrppa_SFNInitialisationTime },
+  {   5, &hf_nrppa_sFNInitialisationTime, ASN1_NO_EXTENSIONS     , dissect_nrppa_RelativeTime1900 },
   {   6, &hf_nrppa_spatialDirectionInformation, ASN1_NO_EXTENSIONS     , dissect_nrppa_SpatialDirectionInformation },
   {   7, &hf_nrppa_geographicalCoordinates, ASN1_NO_EXTENSIONS     , dissect_nrppa_GeographicalCoordinates },
   {   8, &hf_nrppa_choice_extension, ASN1_NO_EXTENSIONS     , dissect_nrppa_ProtocolIE_Single_Container },
@@ -8659,11 +8643,11 @@ static int dissect_ResultNR_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
   offset += 7; offset >>= 3;
   return offset;
 }
-static int dissect_SFNInitialisationTime_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+static int dissect_RelativeTime1900_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
   asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
-  offset = dissect_nrppa_SFNInitialisationTime(tvb, offset, &asn1_ctx, tree, hf_nrppa_SFNInitialisationTime_PDU);
+  offset = dissect_nrppa_RelativeTime1900(tvb, offset, &asn1_ctx, tree, hf_nrppa_RelativeTime1900_PDU);
   offset += 7; offset >>= 3;
   return offset;
 }
@@ -8683,27 +8667,27 @@ static int dissect_SlotNumber_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro
   offset += 7; offset >>= 3;
   return offset;
 }
-static int dissect_SRSConfiguration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+static int dissect_SpatialRelationInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
   asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
-  offset = dissect_nrppa_SRSConfiguration(tvb, offset, &asn1_ctx, tree, hf_nrppa_SRSConfiguration_PDU);
+  offset = dissect_nrppa_SpatialRelationInfo(tvb, offset, &asn1_ctx, tree, hf_nrppa_SpatialRelationInfo_PDU);
   offset += 7; offset >>= 3;
   return offset;
 }
-static int dissect_SrsFrequency_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+static int dissect_SRSConfiguration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
   asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
-  offset = dissect_nrppa_SrsFrequency(tvb, offset, &asn1_ctx, tree, hf_nrppa_SrsFrequency_PDU);
+  offset = dissect_nrppa_SRSConfiguration(tvb, offset, &asn1_ctx, tree, hf_nrppa_SRSConfiguration_PDU);
   offset += 7; offset >>= 3;
   return offset;
 }
-static int dissect_SRSSpatialRelation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+static int dissect_SrsFrequency_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
   asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
-  offset = dissect_nrppa_SRSSpatialRelation(tvb, offset, &asn1_ctx, tree, hf_nrppa_SRSSpatialRelation_PDU);
+  offset = dissect_nrppa_SrsFrequency(tvb, offset, &asn1_ctx, tree, hf_nrppa_SrsFrequency_PDU);
   offset += 7; offset >>= 3;
   return offset;
 }
@@ -9246,8 +9230,8 @@ void proto_register_nrppa(void) {
       { "ResultNR", "nrppa.ResultNR",
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
-    { &hf_nrppa_SFNInitialisationTime_PDU,
-      { "SFNInitialisationTime", "nrppa.SFNInitialisationTime",
+    { &hf_nrppa_RelativeTime1900_PDU,
+      { "RelativeTime1900", "nrppa.RelativeTime1900",
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nrppa_SFNInitialisationTime_EUTRA_PDU,
@@ -9258,6 +9242,10 @@ void proto_register_nrppa(void) {
       { "SlotNumber", "nrppa.SlotNumber",
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
+    { &hf_nrppa_SpatialRelationInfo_PDU,
+      { "SpatialRelationInfo", "nrppa.SpatialRelationInfo_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_nrppa_SRSConfiguration_PDU,
       { "SRSConfiguration", "nrppa.SRSConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -9266,10 +9254,6 @@ void proto_register_nrppa(void) {
       { "SrsFrequency", "nrppa.SrsFrequency",
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
-    { &hf_nrppa_SRSSpatialRelation_PDU,
-      { "SRSSpatialRelation", "nrppa.SRSSpatialRelation_element",
-        FT_NONE, BASE_NONE, NULL, 0,
-        NULL, HFILL }},
     { &hf_nrppa_SystemFrameNumber_PDU,
       { "SystemFrameNumber", "nrppa.SystemFrameNumber",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -11081,7 +11065,7 @@ void proto_register_nrppa(void) {
     { &hf_nrppa_sFN_initialisation_time,
       { "sFN-initialisation-time", "nrppa.sFN_initialisation_time",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "SFNInitialisationTime", HFILL }},
+        "RelativeTime1900", HFILL }},
     { &hf_nrppa_systemFrameNumber,
       { "systemFrameNumber", "nrppa.systemFrameNumber",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -11093,7 +11077,7 @@ void proto_register_nrppa(void) {
     { &hf_nrppa_measurementTime,
       { "measurementTime", "nrppa.measurementTime",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "SFNInitialisationTime", HFILL }},
+        "RelativeTime1900", HFILL }},
     { &hf_nrppa_iE_Extension,
       { "iE-Extension", "nrppa.iE_Extension",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -11285,7 +11269,7 @@ void proto_register_nrppa(void) {
     { &hf_nrppa_sFNInitialisationTime,
       { "sFNInitialisationTime", "nrppa.sFNInitialisationTime",
         FT_BYTES, BASE_NONE, NULL, 0,
-        NULL, HFILL }},
+        "RelativeTime1900", HFILL }},
     { &hf_nrppa_spatialDirectionInformation,
       { "spatialDirectionInformation", "nrppa.spatialDirectionInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -11621,7 +11605,6 @@ void proto_register_nrppa(void) {
     &ett_nrppa_SRSResourceID_List,
     &ett_nrppa_SRSResourceSet,
     &ett_nrppa_SRSResourceTrigger,
-    &ett_nrppa_SRSSpatialRelation,
     &ett_nrppa_SSBInfo,
     &ett_nrppa_SEQUENCE_SIZE_1_maxNoSSBs_OF_SSBInfoItem,
     &ett_nrppa_SSBInfoItem,
@@ -11777,13 +11760,13 @@ proto_reg_handoff_nrppa(void)
   dissector_add_uint("nrppa.ies", id_TRP_MeasurementRequestList, create_dissector_handle(dissect_TRP_MeasurementRequestList_PDU, proto_nrppa));
   dissector_add_uint("nrppa.ies", id_TRP_MeasurementResponseList, create_dissector_handle(dissect_TRP_MeasurementResponseList_PDU, proto_nrppa));
   dissector_add_uint("nrppa.ies", id_SRSType, create_dissector_handle(dissect_SRSType_PDU, proto_nrppa));
-  dissector_add_uint("nrppa.ies", id_ActivationTime, create_dissector_handle(dissect_SFNInitialisationTime_PDU, proto_nrppa));
+  dissector_add_uint("nrppa.ies", id_ActivationTime, create_dissector_handle(dissect_RelativeTime1900_PDU, proto_nrppa));
   dissector_add_uint("nrppa.ies", id_TRPList, create_dissector_handle(dissect_TRPList_PDU, proto_nrppa));
   dissector_add_uint("nrppa.ies", id_SystemFrameNumber, create_dissector_handle(dissect_SystemFrameNumber_PDU, proto_nrppa));
   dissector_add_uint("nrppa.ies", id_SlotNumber, create_dissector_handle(dissect_SlotNumber_PDU, proto_nrppa));
   dissector_add_uint("nrppa.ies", id_TRPMeasurementQuantities, create_dissector_handle(dissect_TRPMeasurementQuantities_PDU, proto_nrppa));
   dissector_add_uint("nrppa.ies", id_AbortTransmission, create_dissector_handle(dissect_AbortTransmission_PDU, proto_nrppa));
-  dissector_add_uint("nrppa.ies", id_SFNInitialisationTime, create_dissector_handle(dissect_SFNInitialisationTime_PDU, proto_nrppa));
+  dissector_add_uint("nrppa.ies", id_SFNInitialisationTime, create_dissector_handle(dissect_RelativeTime1900_PDU, proto_nrppa));
   dissector_add_uint("nrppa.ies", id_ResultNR, create_dissector_handle(dissect_ResultNR_PDU, proto_nrppa));
   dissector_add_uint("nrppa.ies", id_ResultEUTRA, create_dissector_handle(dissect_ResultEUTRA_PDU, proto_nrppa));
   dissector_add_uint("nrppa.ies", id_TRPInformationTypeItem, create_dissector_handle(dissect_TRPInformationTypeItem_PDU, proto_nrppa));
@@ -11792,7 +11775,7 @@ proto_reg_handoff_nrppa(void)
   dissector_add_uint("nrppa.ies", id_Cell_ID, create_dissector_handle(dissect_CGI_NR_PDU, proto_nrppa));
   dissector_add_uint("nrppa.ies", id_SrsFrequency, create_dissector_handle(dissect_SrsFrequency_PDU, proto_nrppa));
   dissector_add_uint("nrppa.extension", id_GeographicalCoordinates, create_dissector_handle(dissect_GeographicalCoordinates_PDU, proto_nrppa));
-  dissector_add_uint("nrppa.extension", id_SRSSpatialRelation, create_dissector_handle(dissect_SRSSpatialRelation_PDU, proto_nrppa));
+  dissector_add_uint("nrppa.extension", id_SRSSpatialRelation, create_dissector_handle(dissect_SpatialRelationInfo_PDU, proto_nrppa));
   dissector_add_uint("nrppa.proc.imsg", id_errorIndication, create_dissector_handle(dissect_ErrorIndication_PDU, proto_nrppa));
   dissector_add_uint("nrppa.proc.imsg", id_privateMessage, create_dissector_handle(dissect_PrivateMessage_PDU, proto_nrppa));
   dissector_add_uint("nrppa.proc.imsg", id_e_CIDMeasurementInitiation, create_dissector_handle(dissect_E_CIDMeasurementInitiationRequest_PDU, proto_nrppa));