LPP: upgrade dissector to v16.5.0

3 files changed, 126 insertions, 123 deletions

diff --git a/epan/dissectors/asn1/lpp/LPP-Broadcast-Definitions.asn b/epan/dissectors/asn1/lpp/LPP-Broadcast-Definitions.asn
index a899c0b9a6..672befc60c 100644
--- a/epan/dissectors/asn1/lpp/LPP-Broadcast-Definitions.asn
+++ b/epan/dissectors/asn1/lpp/LPP-Broadcast-Definitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 37.355 V16.3.0 (2020-12)
+-- 3GPP TS 37.355 V16.5.0 (2021-06)
 
 LPP-Broadcast-Definitions
 
@@ -11,15 +11,15 @@ IMPORTS
 	OTDOA-NeighbourCellInfoList,
 	NR-TRP-LocationInfo-r16,
 	NR-DL-PRS-BeamInfo-r16,
-	NR-RTD-Info-r16
+	NR-RTD-Info-r16	
 FROM LPP-PDU-Definitions;
 
 
 AssistanceDataSIBelement-r15 ::= SEQUENCE {
-	valueTag-r15						INTEGER (0..63)								OPTIONAL,
-	expirationTime-r15					UTCTime										OPTIONAL,
-	cipheringKeyData-r15				CipheringKeyData-r15 						OPTIONAL,
-	segmentationInfo-r15				SegmentationInfo-r15						OPTIONAL,
+	valueTag-r15						INTEGER (0..63)					OPTIONAL, -- Need OP
+	expirationTime-r15					UTCTime							OPTIONAL, -- Need OP
+	cipheringKeyData-r15				CipheringKeyData-r15 			OPTIONAL, -- Need OP
+	segmentationInfo-r15				SegmentationInfo-r15			OPTIONAL, -- Need OP
 	assistanceDataElement-r15			OCTET STRING,
 	...
 }
diff --git a/epan/dissectors/asn1/lpp/LPP-PDU-Definitions.asn b/epan/dissectors/asn1/lpp/LPP-PDU-Definitions.asn
index d79243ea0d..f1b67516f6 100644
--- a/epan/dissectors/asn1/lpp/LPP-PDU-Definitions.asn
+++ b/epan/dissectors/asn1/lpp/LPP-PDU-Definitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 37.355 V16.3.0 (2020-12)
+-- 3GPP TS 37.355 V16.5.0 (2021-06)
 
 LPP-PDU-Definitions {
 itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
@@ -81,9 +81,9 @@ RequestCapabilities-r9-IEs ::= SEQUENCE {
 	]],
 	[[	nr-ECID-RequestCapabilities-r16	NR-ECID-RequestCapabilities-r16		OPTIONAL,	-- Need ON
 		nr-Multi-RTT-RequestCapabilities-r16
-										NR-Multi-RTT-RequestCapabilities-r16
+										NR-Multi-RTT-RequestCapabilities-r16	
 																			OPTIONAL,	-- Need ON
-		nr-DL-AoD-RequestCapabilities-r16
+		nr-DL-AoD-RequestCapabilities-r16	
 										NR-DL-AoD-RequestCapabilities-r16	OPTIONAL,	-- Need ON
 		nr-DL-TDOA-RequestCapabilities-r16
 										NR-DL-TDOA-RequestCapabilities-r16	OPTIONAL,	-- Need ON
@@ -115,7 +115,7 @@ ProvideCapabilities-r9-IEs ::= SEQUENCE {
 		bt-ProvideCapabilities-r13		BT-ProvideCapabilities-r13				OPTIONAL
 	]],
 	[[	nr-ECID-ProvideCapabilities-r16	NR-ECID-ProvideCapabilities-r16			OPTIONAL,
-		nr-Multi-RTT-ProvideCapabilities-r16
+		nr-Multi-RTT-ProvideCapabilities-r16	
 										NR-Multi-RTT-ProvideCapabilities-r16	OPTIONAL,
 		nr-DL-AoD-ProvideCapabilities-r16
 										NR-DL-AoD-ProvideCapabilities-r16		OPTIONAL,
@@ -259,7 +259,7 @@ ProvideLocationInformation-r9-IEs ::= SEQUENCE {
 									NR-ECID-ProvideLocationInformation-r16		OPTIONAL,
 		nr-Multi-RTT-ProvideLocationInformation-r16
 									NR-Multi-RTT-ProvideLocationInformation-r16 OPTIONAL,
-		nr-DL-AoD-ProvideLocationInformation-r16
+		nr-DL-AoD-ProvideLocationInformation-r16	
 									NR-DL-AoD-ProvideLocationInformation-r16	OPTIONAL,
 		nr-DL-TDOA-ProvideLocationInformation-r16
 									NR-DL-TDOA-ProvideLocationInformation-r16	OPTIONAL
@@ -512,8 +512,10 @@ LocationCoordinateTypes ::= SEQUENCE {
 	ellipsoidArc											BOOLEAN,
 	...,
 	[[
-		highAccuracyEllipsoidPointWithUncertaintyEllipse-r15				BOOLEAN		OPTIONAL,
-		highAccuracyEllipsoidPointWithAltitudeAndUncertaintyEllipsoid-r15	BOOLEAN		OPTIONAL
+		highAccuracyEllipsoidPointWithUncertaintyEllipse-r15
+															BOOLEAN		OPTIONAL, -- Need ON
+		highAccuracyEllipsoidPointWithAltitudeAndUncertaintyEllipsoid-r15
+															BOOLEAN		OPTIONAL  -- Need ON
 	]]
 }
 
@@ -532,7 +534,7 @@ PeriodicAssistanceDataControlParameters-r15 ::= SEQUENCE {
 	periodicSessionID-r15			PeriodicSessionID-r15,
 	...,
 	[[
-		updateCapabilities-r15		UpdateCapabilities-r15		OPTIONAL
+		updateCapabilities-r15		UpdateCapabilities-r15		OPTIONAL	 -- Need ON
 	]]
 }
 
@@ -677,7 +679,7 @@ QoS ::= SEQUENCE {
 	verticalCoordinateRequest	BOOLEAN,
 	verticalAccuracy			VerticalAccuracy		OPTIONAL,	-- Need ON
 	responseTime				ResponseTime			OPTIONAL,	-- Need ON
-	velocityRequest				BOOLEAN,
+	velocityRequest				BOOLEAN,				
 	...,
 	[[	responseTimeNB-r14		ResponseTimeNB-r14		OPTIONAL	-- Need ON
 	]],
@@ -712,7 +714,7 @@ VerticalAccuracyExt-r15 ::= SEQUENCE {
 
 ResponseTime ::= SEQUENCE {
 	time								INTEGER (1..128),
-	...,
+	...,	
 	[[	responseTimeEarlyFix-r12		INTEGER (1..128)		OPTIONAL		-- Need ON
 	]],
 	[[	unit-r15				ENUMERATED { ten-seconds, ... }	OPTIONAL		-- Need ON
@@ -837,8 +839,10 @@ CommonIEsError ::= SEQUENCE {
 DL-PRS-ID-Info-r16 ::= SEQUENCE {
 	dl-PRS-ID-r16					INTEGER (0..255),
 	nr-DL-PRS-ResourceID-List-r16	SEQUENCE (SIZE (1..nrMaxResourceIDs-r16)) OF
-													NR-DL-PRS-ResourceID-r16			OPTIONAL,
-	nr-DL-PRS-ResourceSetID-r16		NR-DL-PRS-ResourceSetID-r16 						OPTIONAL
+													NR-DL-PRS-ResourceID-r16
+																			OPTIONAL, -- Need ON
+	nr-DL-PRS-ResourceSetID-r16		NR-DL-PRS-ResourceSetID-r16
+																			OPTIONAL  -- Need ON
 }
 
 
@@ -869,7 +873,7 @@ NR-DL-PRS-AssistanceData-r16 ::= SEQUENCE {
 }
 
 NR-DL-PRS-AssistanceDataPerFreq-r16 ::= SEQUENCE {
-	nr-DL-PRS-PositioningFrequencyLayer-r16
+	nr-DL-PRS-PositioningFrequencyLayer-r16	
 										NR-DL-PRS-PositioningFrequencyLayer-r16,
 	nr-DL-PRS-AssistanceDataPerFreq-r16 SEQUENCE (SIZE (1..nrMaxTRPsPerFreq-r16)) OF
 														NR-DL-PRS-AssistanceDataPerTRP-r16,
@@ -883,7 +887,7 @@ NR-DL-PRS-AssistanceDataPerTRP-r16 ::= SEQUENCE {
 	nr-ARFCN-r16					ARFCN-ValueNR-r15			OPTIONAL,	-- Need ON
 	nr-DL-PRS-SFN0-Offset-r16		NR-DL-PRS-SFN0-Offset-r16,
 	nr-DL-PRS-ExpectedRSTD-r16		INTEGER (-3841..3841),
-	nr-DL-PRS-ExpectedRSTD-Uncertainty-r16
+	nr-DL-PRS-ExpectedRSTD-Uncertainty-r16	
 									INTEGER (0..246),
 	nr-DL-PRS-Info-r16				NR-DL-PRS-Info-r16,
 	...
@@ -916,14 +920,14 @@ NR-DL-PRS-BeamInfoPerTRP-r16 ::= SEQUENCE {
 	nr-PhysCellID-r16					NR-PhysCellID-r16		OPTIONAL,	-- Need ON
 	nr-CellGlobalID-r16					NCGI-r15				OPTIONAL,	-- Need ON
 	nr-ARFCN-r16						ARFCN-ValueNR-r15		OPTIONAL,	-- Need ON
-	associated-DL-PRS-ID-r16			INTEGER (0..255)		OPTIONAL,
-	lcs-GCS-TranslationParameter-r16	LCS-GCS-TranslationParameter-r16
+	associated-DL-PRS-ID-r16			INTEGER (0..255)		OPTIONAL,	-- Need OP
+	lcs-GCS-TranslationParameter-r16	LCS-GCS-TranslationParameter-r16	
 																OPTIONAL,	-- Need OP
-	dl-PRS-BeamInfoSet-r16				DL-PRS-BeamInfoSet-r16	OPTIONAL,
+	dl-PRS-BeamInfoSet-r16				DL-PRS-BeamInfoSet-r16	OPTIONAL,	-- Need OP
 	...
 }
 
-DL-PRS-BeamInfoSet-r16 ::= SEQUENCE (SIZE(1..nrMaxSetsPerTrp-r16)) OF
+DL-PRS-BeamInfoSet-r16 ::= SEQUENCE (SIZE(1..nrMaxSetsPerTrpPerFreqLayer-r16)) OF
 																DL-PRS-BeamInfoResourceSet-r16
 
 DL-PRS-BeamInfoResourceSet-r16 ::= SEQUENCE (SIZE(1..nrMaxResourcesPerSet-r16)) OF
@@ -949,7 +953,7 @@ LCS-GCS-TranslationParameter-r16 ::= SEQUENCE {
 
 
 NR-DL-PRS-Info-r16 ::= SEQUENCE {
-	nr-DL-PRS-ResourceSetList-r16		SEQUENCE (SIZE (1..nrMaxSetsPerTrp-r16)) OF
+	nr-DL-PRS-ResourceSetList-r16		SEQUENCE (SIZE (1..nrMaxSetsPerTrpPerFreqLayer-r16)) OF
 																	NR-DL-PRS-ResourceSet-r16,
 	...
 }
@@ -965,7 +969,7 @@ NR-DL-PRS-ResourceSet-r16 ::= SEQUENCE {
 	dl-PRS-NumSymbols-r16				ENUMERATED {n2, n4, n6, n12, ...},
 	dl-PRS-MutingOption1-r16			DL-PRS-MutingOption1-r16			OPTIONAL,	-- Need OP
 	dl-PRS-MutingOption2-r16			DL-PRS-MutingOption2-r16			OPTIONAL,	-- Need OP
-	dl-PRS-ResourcePower-r16			INTEGER (-60..50),
+	dl-PRS-ResourcePower-r16			INTEGER (-60..50),	
 	dl-PRS-ResourceList-r16				SEQUENCE (SIZE (1..nrMaxResourcesPerSet-r16)) OF
 																	NR-DL-PRS-Resource-r16,
 	...
@@ -1005,7 +1009,7 @@ NR-DL-PRS-Resource-r16 ::= SEQUENCE {
 	},
 	dl-PRS-ResourceSlotOffset-r16		INTEGER (0..nrMaxResourceOffsetValue-1-r16),
 	dl-PRS-ResourceSymbolOffset-r16		INTEGER (0..12),
-	dl-PRS-QCL-Info-r16					DL-PRS-QCL-Info-r16					OPTIONAL,
+	dl-PRS-QCL-Info-r16					DL-PRS-QCL-Info-r16		OPTIONAL,	--Need ON
 	...
 }
 
@@ -1127,7 +1131,7 @@ PRS-ProcessingCapabilityPerBand-r16 ::= SEQUENCE {
 		durationOfPRS-ProcessingSymbols-r16	ENUMERATED {nDot125, nDot25, nDot5, n1,
 															 n2, n4, n6, n8, n12, n16, n20, n25,
 															 n30, n32, n35, n40, n45, n50},
-		durationOfPRS-ProcessingSymbolsInEveryTms-r16
+		durationOfPRS-ProcessingSymbolsInEveryTms-r16	
 												ENUMERATED {n8, n16, n20, n30, n40, n80,
 															 n160,n320, n640, n1280},
 		...
@@ -1165,7 +1169,7 @@ NR-DL-PRS-ResourceID-r16 ::= INTEGER (0..nrMaxNumDL-PRS-ResourcesPerSet-1-r16)
 
 
 NR-DL-PRS-ResourcesCapability-r16 ::= SEQUENCE {
-	maxNrOfDL-PRS-ResourceSetPerTrpPerFrequencyLayer-r16
+	maxNrOfDL-PRS-ResourceSetPerTrpPerFrequencyLayer-r16	
 												INTEGER (1..2),
 	maxNrOfTRP-AcrossFreqs-r16					ENUMERATED { n4, n6, n12, n16, n32,
 															 n64, n128, n256, ...},
@@ -1179,7 +1183,7 @@ NR-DL-PRS-ResourcesCapability-r16 ::= SEQUENCE {
 DL-PRS-ResourcesCapabilityPerBand-r16 ::= SEQUENCE {
 	freqBandIndicatorNR-r16						FreqBandIndicatorNR-r16,
 	maxNrOfDL-PRS-ResourcesPerResourceSet-r16	ENUMERATED { n1, n2, n4, n8, n16, n32, n64, ...},
-	maxNrOfDL-PRS-ResourcesPerPositioningFrequencylayer-r16
+	maxNrOfDL-PRS-ResourcesPerPositioningFrequencylayer-r16	
 												ENUMERATED { n6, n24, n32, n64, n96, n128,
 															 n256, n512, n1024, ...},
 	...
@@ -1191,7 +1195,7 @@ DL-PRS-ResourcesBandCombinationList-r16 ::=	SEQUENCE (SIZE (1..maxBandComb-r16))
 DL-PRS-ResourcesBandCombination-r16 ::=	SEQUENCE {
 	bandList-r16							SEQUENCE (SIZE (1..maxSimultaneousBands-r16)) OF
 															FreqBandIndicatorNR-r16,
-	maxNrOfDL-PRS-ResourcesAcrossAllFL-TRP-ResourceSet-r16
+	maxNrOfDL-PRS-ResourcesAcrossAllFL-TRP-ResourceSet-r16	
 											CHOICE {
 		fr1-Only-r16							ENUMERATED {n6, n24, n64, n128, n192,
 															 n256, n512, n1024, n2048},
@@ -1268,14 +1272,14 @@ NR-SelectedDL-PRS-PerFreq-r16 ::= SEQUENCE {
 
 NR-SelectedDL-PRS-IndexPerTRP-r16 ::= SEQUENCE {
 	nr-SelectedTRP-Index-r16					INTEGER (0..nrMaxTRPsPerFreq-1-r16),
-	dl-SelectedPRS-ResourceSetIndexList-r16		SEQUENCE (SIZE (1..nrMaxSetsPerTrp-r16)) OF
+	dl-SelectedPRS-ResourceSetIndexList-r16		SEQUENCE (SIZE (1..nrMaxSetsPerTrpPerFreqLayer-r16)) OF
 														DL-SelectedPRS-ResourceSetIndex-r16
 																			OPTIONAL,	--Need ON
 	...
 }
 
 DL-SelectedPRS-ResourceSetIndex-r16 ::= SEQUENCE {
-	nr-DL-SelectedPRS-ResourceSetIndex-r16		INTEGER (0..nrMaxSetsPerTrp-1-r16),
+	nr-DL-SelectedPRS-ResourceSetIndex-r16		INTEGER (0..nrMaxSetsPerTrpPerFreqLayer-1-r16),
 	dl-SelectedPRS-ResourceIndexList-r16		SEQUENCE (SIZE (1..nrMaxResourcesPerSet-r16)) OF
 														DL-SelectedPRS-ResourceIndex-r16
 																			OPTIONAL	--Need ON
@@ -1342,9 +1346,9 @@ TRP-LocationInfoElement-r16 ::= SEQUENCE {
 	nr-PhysCellID-r16				NR-PhysCellID-r16			OPTIONAL,	-- Need ON
 	nr-CellGlobalID-r16				NCGI-r15					OPTIONAL,	-- Need ON
 	nr-ARFCN-r16					ARFCN-ValueNR-r15			OPTIONAL,	-- Need ON
-	associated-DL-PRS-ID-r16		INTEGER (0..255)			OPTIONAL,
+	associated-DL-PRS-ID-r16		INTEGER (0..255)			OPTIONAL,	-- Need OP
 	trp-Location-r16				RelativeLocation-r16					OPTIONAL,	-- Need OP
-	trp-DL-PRS-ResourceSets-r16		SEQUENCE (SIZE(1..nrMaxSetsPerTrp-r16)) OF
+	trp-DL-PRS-ResourceSets-r16		SEQUENCE (SIZE(1..nrMaxSetsPerTrpPerFreqLayer-r16)) OF
 										DL-PRS-ResourceSets-TRP-Element-r16	OPTIONAL,	-- Need OP
 	...
 }
@@ -1367,9 +1371,9 @@ NR-UL-SRS-Capability-r16 ::= SEQUENCE {
 													SRS-CapabilityPerBand-r16,
 	srs-PosResourceConfigCA-BandList-r16		SEQUENCE (SIZE (1..nrMaxConfiguredBands-r16)) OF
 													SRS-PosResourcesPerBand-r16			OPTIONAL,
-	maxNumberSRS-PosPathLossEstimateAllServingCells-r16
+	maxNumberSRS-PosPathLossEstimateAllServingCells-r16	
 												ENUMERATED {n1, n4, n8, n16}			OPTIONAL,
-	maxNumberSRS-PosSpatialRelationsAllServingCells-r16
+	maxNumberSRS-PosSpatialRelationsAllServingCells-r16	
 												ENUMERATED {n0, n1, n2, n4, n8, n16}	OPTIONAL,
 	...
 }
@@ -1482,13 +1486,13 @@ OTDOA-ReferenceCellInfo ::= SEQUENCE {
 	[[ earfcnRef-v9a0			ARFCN-ValueEUTRA-v9a0		OPTIONAL		-- Cond NotSameAsServ2
 	]],
 	[[	tpId-r14				INTEGER (0..4095)			OPTIONAL,		-- Need ON
-		cpLengthCRS-r14			ENUMERATED { normal, extended, ... }
+		cpLengthCRS-r14			ENUMERATED { normal, extended, ... }	
 															OPTIONAL,		-- Cond CRS
 		sameMBSFNconfigRef-r14	BOOLEAN						OPTIONAL,		-- Need ON
 		dlBandwidth-r14			ENUMERATED {n6, n15, n25, n50, n75, n100}
 															OPTIONAL,		-- Cond NotSameAsServ3
 		addPRSconfigRef-r14		SEQUENCE (SIZE (1..maxAddPRSconfig-r14)) OF PRS-Info
-															OPTIONAL		-- Need ON
+															OPTIONAL		-- Need ON	
 	]],
 	[[
 		nr-LTE-SFN-Offset-r15	INTEGER (0..1023)			OPTIONAL		-- Cond NR
@@ -1562,7 +1566,7 @@ OTDOA-NeighbourCellInfoElement ::= SEQUENCE {
 	]],
 	[[	tpId-r14					INTEGER (0..4095)		OPTIONAL,		-- Need ON
 		prs-only-tp-r14				ENUMERATED { true }		OPTIONAL,		-- Cond TBS
-		cpLengthCRS-r14				ENUMERATED { normal, extended, ... }
+		cpLengthCRS-r14				ENUMERATED { normal, extended, ... }	
 															OPTIONAL,		-- Cond CRS
 		sameMBSFNconfigNeighbour-r14	BOOLEAN				OPTIONAL,		-- Need ON
 		dlBandwidth-r14				ENUMERATED {n6, n15, n25, n50, n75, n100}
@@ -1612,7 +1616,7 @@ NPRS-Info-r14 ::= SEQUENCE {
 	partA-r14					SEQUENCE {
 		nprsBitmap-r14			CHOICE {
 			subframePattern10-r14	BIT STRING (SIZE (10)),
-			subframePattern40-r14 	BIT STRING (SIZE (40))
+			subframePattern40-r14 	BIT STRING (SIZE (40))	
 		},
 		nprs-MutingInfoA-r14	CHOICE {
 			po2-r14					BIT STRING (SIZE(2)),
@@ -1647,7 +1651,7 @@ NPRS-Info-r14 ::= SEQUENCE {
 		nprsBitmap-r15			CHOICE {
 			subframePattern10-TDD-r15	BIT STRING (SIZE (8)),
 			subframePattern40-TDD-r15 	BIT STRING (SIZE (32)),
-			...
+			...	
 		},
 		nprs-MutingInfoA-r15	CHOICE {
 			po2-r15					BIT STRING (SIZE(2)),
@@ -1674,7 +1678,7 @@ OTDOA-NeighbourCellInfoNB-r14 ::= SEQUENCE {
 	earfcn-r14						ARFCN-ValueEUTRA-r14	OPTIONAL,		-- Cond Inband
 	eutra-NumCRS-Ports-r14			ENUMERATED {ports-1-or-2, ports-4, ...}
 															OPTIONAL, 		-- Cond NotsameAsRef2
-	otdoa-SIB1-NB-repetitions-r14	ENUMERATED { r4, r8, r16 }
+	otdoa-SIB1-NB-repetitions-r14	ENUMERATED { r4, r8, r16 }	
 															OPTIONAL,		-- Cond	NotSameAsRef3
 	nprsInfo-r14					PRS-Info-NB-r14			OPTIONAL,		-- Cond NotsameAsRef4
 	nprs-slotNumberOffset-r14		INTEGER (0..19)			OPTIONAL,		-- Cond NotsameAsRef5
@@ -1729,7 +1733,7 @@ OTDOA-SignalMeasurementInformation ::= SEQUENCE {
 	]],
 	[[ tpIdRef-r14			INTEGER (0..4095)		OPTIONAL,		-- Cond ProvidedByServer0
 		prsIdRef-r14		INTEGER (0..4095)		OPTIONAL,		-- Cond ProvidedByServer1
-		additionalPathsRef-r14
+		additionalPathsRef-r14	
 							AdditionalPathList-r14	OPTIONAL,
 		nprsIdRef-r14		INTEGER (0..4095)		OPTIONAL,		-- Cond ProvidedByServer2
 		carrierFreqOffsetNB-Ref-r14
@@ -1755,7 +1759,7 @@ NeighbourMeasurementElement ::= SEQUENCE {
 	[[ tpIdNeighbour-r14	INTEGER (0..4095)		OPTIONAL,		-- Cond ProvidedByServer0
 		prsIdNeighbour-r14	INTEGER (0..4095)		OPTIONAL,		-- Cond ProvidedByServer1
 		delta-rstd-r14		INTEGER (0..5)			OPTIONAL,
-		additionalPathsNeighbour-r14
+		additionalPathsNeighbour-r14	
 							AdditionalPathList-r14	OPTIONAL,
 		nprsIdNeighbour-r14	INTEGER (0..4095)		OPTIONAL,		-- Cond ProvidedByServer2
 		carrierFreqOffsetNB-Neighbour-r14
@@ -1803,7 +1807,7 @@ NeighbourMeasurementElement-NB-r14 ::= SEQUENCE {
 	tpIdNeighbour-r14			INTEGER (0..4095)		OPTIONAL,		-- Cond ProvidedByServer0
 	prsIdNeighbour-r14			INTEGER (0..4095)		OPTIONAL,		-- Cond ProvidedByServer1
 	delta-rstd-r14				INTEGER (0..5)			OPTIONAL,
-	additionalPathsNeighbour-r14
+	additionalPathsNeighbour-r14	
 								AdditionalPathList-r14	OPTIONAL,
 	nprsIdNeighbour-r14			INTEGER (0..4095)		OPTIONAL,		-- Cond ProvidedByServer2
 	carrierFreqOffsetNB-Neighbour-r14
@@ -1937,7 +1941,7 @@ GNSS-CommonAssistData ::= SEQUENCE {
 	[[
 		gnss-RTK-ReferenceStationInfo-r15
 									GNSS-RTK-ReferenceStationInfo-r15	OPTIONAL,	-- Need ON
-		gnss-RTK-CommonObservationInfo-r15
+		gnss-RTK-CommonObservationInfo-r15	
 									GNSS-RTK-CommonObservationInfo-r15	OPTIONAL,	-- Cond RTK
 		gnss-RTK-AuxiliaryStationData-r15
 									GNSS-RTK-AuxiliaryStationData-r15	OPTIONAL	-- Need ON
@@ -1965,7 +1969,7 @@ GNSS-GenericAssistDataElement ::= SEQUENCE {
 	gnss-AuxiliaryInformation		GNSS-AuxiliaryInformation		OPTIONAL,	-- Need ON
 	...,
 	[[
-		bds-DifferentialCorrections-r12
+		bds-DifferentialCorrections-r12	
 									BDS-DifferentialCorrections-r12	OPTIONAL,	-- Cond	GNSS-ID-BDS
 		bds-GridModel-r12			BDS-GridModelParameter-r12		OPTIONAL	-- Cond	GNSS-ID-BDS
 	]],
@@ -1986,9 +1990,9 @@ GNSS-GenericAssistDataElement ::= SEQUENCE {
 	[[
 		gnss-SSR-URA-r16					GNSS-SSR-URA-r16		OPTIONAL,	-- Need ON
 		gnss-SSR-PhaseBias-r16				GNSS-SSR-PhaseBias-r16	OPTIONAL,	-- Need ON
-		gnss-SSR-STEC-Correction-r16		GNSS-SSR-STEC-Correction-r16
+		gnss-SSR-STEC-Correction-r16		GNSS-SSR-STEC-Correction-r16	
 																	OPTIONAL,	-- Need ON
-		gnss-SSR-GriddedCorrection-r16		GNSS-SSR-GriddedCorrection-r16
+		gnss-SSR-GriddedCorrection-r16		GNSS-SSR-GriddedCorrection-r16	
 																	OPTIONAL,	-- Need ON
 		navic-DifferentialCorrections-r16	NavIC-DifferentialCorrections-r16
 																OPTIONAL,	-- Cond	GNSS-ID-NavIC
@@ -2028,7 +2032,7 @@ GNSS-ReferenceTime ::= SEQUENCE {
 	...
 }
 
-GNSS-ReferenceTimeForOneCell ::= SEQUENCE {
+GNSS-ReferenceTimeForOneCell ::= SEQUENCE {	
 	networkTime				NetworkTime,
 	referenceTimeUnc			INTEGER (0..127),
 	bsAlign						ENUMERATED {true}	OPTIONAL,
@@ -2335,11 +2339,11 @@ DGNSS-SatList ::= SEQUENCE (SIZE (1..64)) OF DGNSS-CorrectionsElement
 DGNSS-CorrectionsElement ::= SEQUENCE {
 	svID				SV-ID,
 	iod				BIT STRING (SIZE(11)),
-	udre				INTEGER (0..3),
+	udre				INTEGER (0..3),		
 	pseudoRangeCor		INTEGER (-2047..2047),
 	rangeRateCor		INTEGER (-127..127),
 	udreGrowthRate		INTEGER (0..7)			OPTIONAL,	-- Need ON
-	udreValidityTime	INTEGER (0..7)			OPTIONAL,	-- Need ON
+	udreValidityTime	INTEGER (0..7)			OPTIONAL,	-- Need ON	
 	...
 }
 
@@ -2354,8 +2358,8 @@ GNSS-NavModelSatelliteList ::= SEQUENCE (SIZE(1..64)) OF GNSS-NavModelSatelliteE
 
 GNSS-NavModelSatelliteElement ::= SEQUENCE {
 	svID				SV-ID,
-	svHealth			BIT STRING (SIZE(8)),
-	iod					BIT STRING (SIZE(11)),
+	svHealth			BIT STRING (SIZE(8)),	
+	iod					BIT STRING (SIZE(11)),	
 	gnss-ClockModel		GNSS-ClockModel,
 	gnss-OrbitModel		GNSS-OrbitModel,
 	...,
@@ -2669,7 +2673,7 @@ GNSS-RealTimeIntegrity ::= SEQUENCE {
 GNSS-BadSignalList ::= SEQUENCE (SIZE(1..64)) OF BadSignalElement
 
 BadSignalElement ::= SEQUENCE {
-	badSVID			SV-ID,
+	badSVID			SV-ID,						
 	badSignalID		GNSS-SignalIDs	OPTIONAL,	-- Need OP
 	...
 }
@@ -2717,7 +2721,7 @@ GNSS-AcquisitionAssistElement ::= SEQUENCE {
 	intCodePhase				INTEGER (0..127),
 	codePhaseSearchWindow		INTEGER (0..31),
 	azimuth						INTEGER (0..511),
-	elevation					INTEGER (0..127),
+	elevation					INTEGER (0..127),		
 	...,
 	codePhase1023				BOOLEAN				OPTIONAL,	-- Need OP
 	dopplerUncertaintyExt-r10	ENUMERATED {	d60,
@@ -2874,7 +2878,7 @@ AlmanacBDS-AlmanacSet-r12 ::= SEQUENCE {
 
 AlmanacNavIC-AlmanacSet-r16	 ::= SEQUENCE {
 	svID-r16					SV-ID,
-	navic-AlmToa-r16			INTEGER (0..65535)			OPTIONAL,	-- Cond NotSameForAllSV
+	navic-AlmToa-r16			INTEGER (0..65535)			OPTIONAL,	-- Cond NotSameForAllSV		
 	navic-AlmE-r16				INTEGER (0..65535),
 	navic-AlmOMEGADOT-r16		INTEGER (-32768..32767),
 	navic-AlmSqrtA-r16			INTEGER (0..16777215),
@@ -2985,7 +2989,7 @@ GNSS-ID-GLONASS-SatElement ::= SEQUENCE {
 	signalsAvailable	GNSS-SignalIDs,
 	channelNumber		INTEGER (-7..13)		OPTIONAL,		-- Cond FDMA
 	...
-}
+}	
 
 GNSS-ID-BDS-r16 ::= SEQUENCE	(SIZE(1..64)) OF GNSS-ID-BDS-SatElement-r16
 
@@ -3097,7 +3101,7 @@ RTK-CorrectionDifferencesList-r15 ::= SEQUENCE (SIZE (1..32)) OF
 RTK-CorrectionDifferencesElement-r15 ::= SEQUENCE {
 	epochTime-r15							GNSS-SystemTime,
 	auxiliary-referenceStationID-r15		GNSS-ReferenceStationID-r15,
-	geometric-ionospheric-corrections-differences-r15
+	geometric-ionospheric-corrections-differences-r15	
 											Geometric-Ionospheric-Corrections-Differences-r15,
 	...
 }
@@ -3178,9 +3182,9 @@ SSR-OrbitCorrectionSatelliteElement-r15 ::= SEQUENCE {
 	delta-radial-r15					INTEGER (-2097152..2097151),
 	delta-AlongTrack-r15				INTEGER (-524288..524287),
 	delta-CrossTrack-r15				INTEGER (-524288..524287),
-	dot-delta-radial-r15				INTEGER (-1048576..1048575)				OPTIONAL,
-	dot-delta-AlongTrack-r15			INTEGER (-262144..262143) 				OPTIONAL,
-	dot-delta-CrossTrack-r15			INTEGER (-262144..262143) 				OPTIONAL,
+	dot-delta-radial-r15				INTEGER (-1048576..1048575)		OPTIONAL, -- Need ON
+	dot-delta-AlongTrack-r15			INTEGER (-262144..262143) 		OPTIONAL, -- Need ON
+	dot-delta-CrossTrack-r15			INTEGER (-262144..262143) 		OPTIONAL, -- Need ON
 	...
 }
 
@@ -3198,8 +3202,8 @@ SSR-ClockCorrectionList-r15 ::= SEQUENCE (SIZE(1..64)) OF SSR-ClockCorrectionSat
 SSR-ClockCorrectionSatelliteElement-r15 ::= SEQUENCE {
 	svID-r15							SV-ID,
 	delta-Clock-C0-r15					INTEGER (-2097152..2097151),
-	delta-Clock-C1-r15					INTEGER (-1048576..1048575)			OPTIONAL,
-	delta-Clock-C2-r15					INTEGER (-67108864..67108863)		OPTIONAL,
+	delta-Clock-C1-r15					INTEGER (-1048576..1048575)			OPTIONAL, -- Need ON
+	delta-Clock-C2-r15					INTEGER (-67108864..67108863)		OPTIONAL, -- Need ON
 	...
 }
 
@@ -3288,9 +3292,9 @@ STEC-SatElement-r16 ::= SEQUENCE {
 	svID-r16							SV-ID,
 	stecQualityIndicator-r16			BIT STRING (SIZE(6)),
 	stec-C00-r16						INTEGER (-8192..8191),
-	stec-C01-r16						INTEGER (-2048..2047)				OPTIONAL,
-	stec-C10-r16						INTEGER (-2048..2047)				OPTIONAL,
-	stec-C11-r16						INTEGER (-512..511)					OPTIONAL,
+	stec-C01-r16						INTEGER (-2048..2047)				OPTIONAL, -- Need ON
+	stec-C10-r16						INTEGER (-2048..2047)				OPTIONAL, -- Need ON
+	stec-C11-r16						INTEGER (-512..511)					OPTIONAL, -- Need ON
 	...
 }
 
@@ -3308,8 +3312,8 @@ GNSS-SSR-GriddedCorrection-r16 ::= SEQUENCE {
 GridList-r16 ::= SEQUENCE (SIZE(1..64)) OF GridElement-r16
 
 GridElement-r16 ::= SEQUENCE {
-	tropospericDelayCorrection-r16			TropospericDelayCorrection-r16	OPTIONAL,
-	stec-ResidualSatList-r16				STEC-ResidualSatList-r16		OPTIONAL,
+	tropospericDelayCorrection-r16	TropospericDelayCorrection-r16	OPTIONAL, -- Need ON
+	stec-ResidualSatList-r16		STEC-ResidualSatList-r16		OPTIONAL, -- Need ON
 	...
 }
 
@@ -3424,17 +3428,17 @@ A-GNSS-RequestAssistanceData ::= SEQUENCE {
 
 
 GNSS-CommonAssistDataReq ::= SEQUENCE {
-	gnss-ReferenceTimeReq				GNSS-ReferenceTimeReq
+	gnss-ReferenceTimeReq				GNSS-ReferenceTimeReq				
 																OPTIONAL, -- Cond RefTimeReq
-	gnss-ReferenceLocationReq			GNSS-ReferenceLocationReq
+	gnss-ReferenceLocationReq			GNSS-ReferenceLocationReq			
 																OPTIONAL, -- Cond RefLocReq
-	gnss-IonosphericModelReq			GNSS-IonosphericModelReq
+	gnss-IonosphericModelReq			GNSS-IonosphericModelReq				
 																OPTIONAL, -- Cond IonoModReq
-	gnss-EarthOrientationParametersReq	GNSS-EarthOrientationParametersReq
+	gnss-EarthOrientationParametersReq	GNSS-EarthOrientationParametersReq	
 																OPTIONAL, -- Cond EOPReq
 	...,
 	[[
-		gnss-RTK-ReferenceStationInfoReq-r15
+		gnss-RTK-ReferenceStationInfoReq-r15	
 										GNSS-RTK-ReferenceStationInfoReq-r15
 																OPTIONAL, -- Cond ARPReq
 		gnss-RTK-AuxiliaryStationDataReq-r15
@@ -3465,7 +3469,7 @@ GNSS-GenericAssistDataReqElement ::= SEQUENCE {
 	gnss-AuxiliaryInformationReq	GNSS-AuxiliaryInformationReq	OPTIONAL, -- Cond AuxInfoReq
 	...,
 	[[
-		bds-DifferentialCorrectionsReq-r12
+		bds-DifferentialCorrectionsReq-r12	
 									BDS-DifferentialCorrectionsReq-r12
 																	OPTIONAL,	-- Cond DBDS-Req
 		bds-GridModelReq-r12		BDS-GridModelReq-r12			OPTIONAL	-- Cond BDS-GridModReq
@@ -3473,7 +3477,7 @@ GNSS-GenericAssistDataReqElement ::= SEQUENCE {
 	[[
 		gnss-RTK-ObservationsReq-r15
 									GNSS-RTK-ObservationsReq-r15	OPTIONAL,	-- Cond RTK-OSR-Req
-		glo-RTK-BiasInformationReq-r15
+		glo-RTK-BiasInformationReq-r15	
 									GLO-RTK-BiasInformationReq-r15	OPTIONAL,	-- Cond GLO-CPB-Req
 		gnss-RTK-MAC-CorrectionDifferencesReq-r15
 									GNSS-RTK-MAC-CorrectionDifferencesReq-r15
@@ -3496,7 +3500,7 @@ GNSS-GenericAssistDataReqElement ::= SEQUENCE {
 									GNSS-SSR-STEC-CorrectionReq-r16	OPTIONAL,	-- Cond STEC-Req
 		gnss-SSR-GriddedCorrectionReq-r16	GNSS-SSR-GriddedCorrectionReq-r16
 																	OPTIONAL,	-- Cond Grid-Req
-		navic-DifferentialCorrectionsReq-r16
+		navic-DifferentialCorrectionsReq-r16	
 									NavIC-DifferentialCorrectionsReq-r16
 																OPTIONAL,	-- Cond DNavIC-Req
 		navic-GridModelReq-r16		NavIC-GridModelReq-r16		OPTIONAL	-- Cond NavIC-GridModReq
@@ -3521,14 +3525,14 @@ GNSS-PeriodicAssistDataReq-r15 ::= SEQUENCE {
 	gnss-SSR-PeriodicURA-Req-r16			GNSS-PeriodicControlParam-r15	OPTIONAL, -- Cond pURA
 	gnss-SSR-PeriodicPhaseBiasReq-r16		GNSS-PeriodicControlParam-r15	OPTIONAL, -- Cond pPB
 	gnss-SSR-PeriodicSTEC-CorrectionReq-r16	GNSS-PeriodicControlParam-r15	OPTIONAL, -- Cond pSTEC
-	gnss-SSR-PeriodicGriddedCorrectionReq-r16
+	gnss-SSR-PeriodicGriddedCorrectionReq-r16	
 											GNSS-PeriodicControlParam-r15	OPTIONAL  -- Cond pGrid
 	]]
 }
 
 
 GNSS-ReferenceTimeReq ::= SEQUENCE {
-	gnss-TimeReqPrefList	SEQUENCE (SIZE (1..8)) OF GNSS-ID,
+	gnss-TimeReqPrefList	SEQUENCE (SIZE (1..8)) OF GNSS-ID,			
 	gps-TOW-assistReq		BOOLEAN								OPTIONAL, -- Cond gps
 	notOfLeapSecReq			BOOLEAN								OPTIONAL, -- Cond glonass
 	...
@@ -3613,14 +3617,14 @@ SatListRelatedDataElement ::= SEQUENCE {
 	svID				SV-ID,
 	iod				BIT STRING (SIZE(11)),
 	clockModelID		INTEGER (1..8)			OPTIONAL,
-orbitModelID		INTEGER (1..8)			OPTIONAL,
+orbitModelID		INTEGER (1..8)			OPTIONAL,			
 	...
 }
 
 ReqNavListInfo ::=	SEQUENCE {
 	svReqList				BIT STRING (SIZE (64)),
 	clockModelID-PrefList	SEQUENCE (SIZE (1..8)) OF	INTEGER (1..8)		OPTIONAL,
-	orbitModelID-PrefList	SEQUENCE (SIZE (1..8)) OF	INTEGER (1..8)		OPTIONAL,
+	orbitModelID-PrefList	SEQUENCE (SIZE (1..8)) OF	INTEGER (1..8)		OPTIONAL,	
 	addNavparamReq			BOOLEAN				OPTIONAL,	-- Cond orbitModelID-2
 	...
 }
@@ -3797,8 +3801,8 @@ GNSS-SignalMeasurementInformation ::= SEQUENCE {
 
 MeasurementReferenceTime ::= SEQUENCE {
 	gnss-TOD-msec		INTEGER (0..3599999),
-	gnss-TOD-frac		INTEGER (0..3999)			OPTIONAL,
-	gnss-TOD-unc		INTEGER (0..127)			OPTIONAL,
+	gnss-TOD-frac		INTEGER (0..3999)			OPTIONAL,		
+	gnss-TOD-unc		INTEGER (0..127)			OPTIONAL,		
 	gnss-TimeID			GNSS-ID,
 	networkTime			CHOICE {
 		eUTRA	SEQUENCE {
@@ -3850,7 +3854,7 @@ MeasurementReferenceTime ::= SEQUENCE {
 				nr-sfn-r15			BIT STRING (SIZE (10)),
 				...
 				}
-		}		OPTIONAL,
+		}		OPTIONAL,												
 	...
 }
 
@@ -3878,10 +3882,10 @@ GNSS-SatMeasElement ::= SEQUENCE {
 	svID				SV-ID,
 	cNo					INTEGER (0..63),
 	mpathDet			ENUMERATED {notMeasured (0), low (1), medium (2), high (3), ...},
-	carrierQualityInd	INTEGER (0..3)				OPTIONAL,
+	carrierQualityInd	INTEGER (0..3)				OPTIONAL,	
 	codePhase			INTEGER (0..2097151),
 	integerCodePhase	INTEGER (0..127)			OPTIONAL,
-	codePhaseRMSError	INTEGER (0..63),
+	codePhaseRMSError	INTEGER (0..63),						
 	doppler				INTEGER (-32768..32767)	OPTIONAL,
 	adr					INTEGER (0..33554431)		OPTIONAL,
 	...,
@@ -3896,7 +3900,7 @@ GNSS-SatMeasElement ::= SEQUENCE {
 
 GNSS-LocationInformation ::= SEQUENCE {
 	measurementReferenceTime		MeasurementReferenceTime,
-	agnss-List						GNSS-ID-Bitmap,
+	agnss-List						GNSS-ID-Bitmap,					
 	...
 }
 
@@ -3908,7 +3912,7 @@ A-GNSS-RequestLocationInformation ::= SEQUENCE {
 
 
 GNSS-PositioningInstructions ::= SEQUENCE {
-	gnss-Methods				GNSS-ID-Bitmap,
+	gnss-Methods				GNSS-ID-Bitmap,	
 	fineTimeAssistanceMeasReq	BOOLEAN,
 	adrMeasReq					BOOLEAN,
 	multiFreqMeasReq			BOOLEAN,
@@ -3928,7 +3932,7 @@ A-GNSS-ProvideCapabilities ::= SEQUENCE {
 	...,
 	[[ periodicalReportingNotSupported-r14
 								PositioningModes				OPTIONAL,
-		idleStateForMeasurements-r14
+		idleStateForMeasurements-r14		
 								ENUMERATED { required }			OPTIONAL
 	]],
 	[[ periodicAssistanceData-r15
@@ -3967,17 +3971,17 @@ AssistanceDataSupportList ::= SEQUENCE {
 
 
 GNSS-CommonAssistanceDataSupport ::= SEQUENCE {
-	gnss-ReferenceTimeSupport				GNSS-ReferenceTimeSupport
+	gnss-ReferenceTimeSupport				GNSS-ReferenceTimeSupport				
 																OPTIONAL, -- Cond RefTimeSup
-	gnss-ReferenceLocationSupport			GNSS-ReferenceLocationSupport
+	gnss-ReferenceLocationSupport			GNSS-ReferenceLocationSupport			
 																OPTIONAL, -- Cond RefLocSup
-	gnss-IonosphericModelSupport			GNSS-IonosphericModelSupport
+	gnss-IonosphericModelSupport			GNSS-IonosphericModelSupport				
 																OPTIONAL, -- Cond IonoModSup
-	gnss-EarthOrientationParametersSupport	GNSS-EarthOrientationParametersSupport
+	gnss-EarthOrientationParametersSupport	GNSS-EarthOrientationParametersSupport	
 																OPTIONAL, -- Cond EOPSup
 	...,
 	[[
-		gnss-RTK-ReferenceStationInfoSupport-r15
+		gnss-RTK-ReferenceStationInfoSupport-r15	
 											GNSS-RTK-ReferenceStationInfoSupport-r15
 																OPTIONAL, -- Cond ARPSup
 		gnss-RTK-AuxiliaryStationDataSupport-r15
@@ -4058,8 +4062,8 @@ GNSS-GenericAssistDataSupportElement ::= SEQUENCE {
 		gnss-RTK-ObservationsSupport-r15
 										GNSS-RTK-ObservationsSupport-r15
 																	OPTIONAL,	-- Cond RTK-OSR-Sup
-		glo-RTK-BiasInformationSupport-r15
-										GLO-RTK-BiasInformationSupport-r15
+		glo-RTK-BiasInformationSupport-r15	
+										GLO-RTK-BiasInformationSupport-r15	
 																	OPTIONAL,	-- Cond GLO-CPB-Sup
 		gnss-RTK-MAC-CorrectionDifferencesSupport-r15
 										GNSS-RTK-MAC-CorrectionDifferencesSupport-r15
@@ -4080,7 +4084,7 @@ GNSS-GenericAssistDataSupportElement ::= SEQUENCE {
 	]],
 	[[
 		gnss-SSR-URA-Support-r16		GNSS-SSR-URA-Support-r16	OPTIONAL,	-- Cond URA-Sup
-		gnss-SSR-PhaseBiasSupport-r16	GNSS-SSR-PhaseBiasSupport-r16
+		gnss-SSR-PhaseBiasSupport-r16	GNSS-SSR-PhaseBiasSupport-r16		
 																	OPTIONAL,	-- Cond PB-Sup
 		gnss-SSR-STEC-CorrectionSupport-r16
 										GNSS-SSR-STEC-CorrectionSupport-r16
@@ -4278,7 +4282,7 @@ A-GNSS-Error ::= CHOICE {
 
 
 GNSS-LocationServerErrorCauses ::= SEQUENCE {
-	cause		ENUMERATED	{
+	cause		ENUMERATED	{	
 					undefined,
 					undeliveredAssistanceDataIsNotSupportedByServer,
 					undeliveredAssistanceDataIsSupportedButCurrentlyNotAvailableByServer,								undeliveredAssistanceDataIsPartlyNotSupportedAndPartlyNotAvailableByServer,
@@ -4319,7 +4323,7 @@ GNSS-ID ::= SEQUENCE {
 
 
 GNSS-ID-Bitmap ::= SEQUENCE {
-	gnss-ids			BIT STRING {	gps			(0),
+	gnss-ids			BIT STRING {	gps			(0),	
 										sbas		(1),
 										qzss		(2),
 										galileo		(3),
@@ -4363,7 +4367,7 @@ GNSS-PeriodicControlParam-r15 ::= SEQUENCE {
 
 GNSS-ReferenceStationID-r15 ::= SEQUENCE {
 	referenceStationID-r15			INTEGER (0..65535),
-	providerName-r15				VisibleString (SIZE (1..32))		OPTIONAL,
+	providerName-r15				VisibleString (SIZE (1..32))		OPTIONAL, -- Need ON
 	...
 }
 
@@ -4372,7 +4376,7 @@ GNSS-SignalID	::= SEQUENCE {
 	gnss-SignalID		INTEGER (0 .. 7),
 	...,
 	[[
-		gnss-SignalID-Ext-r15	INTEGER (8..23)			OPTIONAL
+		gnss-SignalID-Ext-r15	INTEGER (8..23)			OPTIONAL	-- Need ON
 	]]
 }
 
@@ -4381,7 +4385,7 @@ GNSS-SignalIDs	::= SEQUENCE {
 	gnss-SignalIDs		BIT STRING (SIZE(8)),
 	...,
 	[[
-		gnss-SignalIDs-Ext-r15	BIT STRING (SIZE(16))			OPTIONAL
+		gnss-SignalIDs-Ext-r15	BIT STRING (SIZE(16))			OPTIONAL	-- Need ON
 	]]
 }
 
@@ -4399,7 +4403,7 @@ SBAS-ID ::= SEQUENCE {
 
 
 SBAS-IDs ::= SEQUENCE {
-	sbas-IDs		BIT STRING {	waas		(0),
+	sbas-IDs		BIT STRING {	waas		(0),	
 									egnos		(1),
 									msas		(2),
 									gagan		(3)	} (SIZE (1..8)),
@@ -4490,7 +4494,7 @@ ECID-Error ::= CHOICE {
 
 
 ECID-LocationServerErrorCauses ::= SEQUENCE {
-	cause		ENUMERATED	{	undefined,
+	cause		ENUMERATED	{	undefined,								
 								...
 							},
 	...
@@ -4889,7 +4893,7 @@ WLAN-RTT-r13 ::= SEQUENCE {
 
 
 WLAN-RequestLocationInformation-r13 ::= SEQUENCE {
-	requestedMeasurements-r13	BIT STRING {
+	requestedMeasurements-r13	BIT STRING {	
 											rssi		(0),
 											rtt			(1)} (SIZE(1..8)),
 	...,
@@ -4902,11 +4906,11 @@ WLAN-ProvideCapabilities-r13 ::= SEQUENCE {
 	wlan-Modes-r13			BIT STRING	{	standalone		(0),
 											ue-assisted		(1),
 											ue-based		(2)}	(SIZE (1..8)),
-	wlan-MeasSupported-r13	BIT STRING	{
+	wlan-MeasSupported-r13	BIT STRING	{	
 											rssi-r13		(0),
 											rtt-r13			(1)}	(SIZE(1..8)),
 	...	,
-	[[	wlan-AP-AD-Supported-r14
+	[[	wlan-AP-AD-Supported-r14	
 							BIT STRING {	ap-identifier	(0),
 											ap-location		(1)}	(SIZE (1..8))
 																					OPTIONAL,
@@ -4930,7 +4934,7 @@ WLAN-Error-r13 ::= CHOICE {
 
 
 WLAN-LocationServerErrorCauses-r13 ::= SEQUENCE {
-	cause-r13								ENUMERATED	{undefined,
+	cause-r13								ENUMERATED	{undefined,	
 														...,
 														requestedADNotAvailable-v1420,
 														notAllrequestedADAvailable-v1420
@@ -5040,7 +5044,7 @@ WLAN-RequestAssistanceData-r14 ::= SEQUENCE {
 BT-ProvideLocationInformation-r13 ::= SEQUENCE {
 	bt-MeasurementInformation-r13		BT-MeasurementInformation-r13	OPTIONAL,
 	bt-Error-r13						BT-Error-r13					OPTIONAL,
-	...
+	...	
 }
 
 
@@ -5061,7 +5065,7 @@ BT-MeasurementElement-r13 ::= SEQUENCE {
 
 
 BT-RequestLocationInformation-r13 ::= SEQUENCE {
-	requestedMeasurements-r13	BIT STRING {
+	requestedMeasurements-r13	BIT STRING {	
 											rssi		(0)} (SIZE(1..8)),
 	...
 }
@@ -5075,7 +5079,7 @@ BT-ProvideCapabilities-r13 ::= SEQUENCE {
 	[[
 	idleStateForMeasurements-r14
 							ENUMERATED {	required	}							OPTIONAL,
-	periodicalReportingSupported-r14
+	periodicalReportingSupported-r14	
 							PositioningModes										OPTIONAL
 	]]
 }
@@ -5172,7 +5176,7 @@ ResultsPerCSI-RS-Index-r16 ::= SEQUENCE {
 NR-ECID-RequestLocationInformation-r16 ::= SEQUENCE {
 	requestedMeasurements-r16		BIT STRING {	ssrsrpReq		(0),
 													ssrsrqReq		(1),
-													csirsrpReq		(2),
+													csirsrpReq		(2),				
 													csirsrqReq		(3)} (SIZE(1..8)),
 	...
 }
@@ -5243,11 +5247,11 @@ NR-DL-TDOA-RequestAssistanceData-r16 ::= SEQUENCE {
 
 
 NR-DL-TDOA-ProvideLocationInformation-r16 ::= SEQUENCE {
-	nr-DL-TDOA-SignalMeasurementInformation-r16
+	nr-DL-TDOA-SignalMeasurementInformation-r16	
 											NR-DL-TDOA-SignalMeasurementInformation-r16
 																			OPTIONAL,
 	nr-dl-tdoa-LocationInformation-r16		NR-DL-TDOA-LocationInformation-r16
-																			OPTIONAL, -- Cond UEB
+																			OPTIONAL,
 	nr-DL-TDOA-Error-r16					NR-DL-TDOA-Error-r16			OPTIONAL,
 	...
 }
@@ -5415,7 +5419,7 @@ NR-DL-AoD-ProvideLocationInformation-r16 ::= SEQUENCE {
 											NR-DL-AoD-SignalMeasurementInformation-r16
 																			OPTIONAL,
 	nr-dl-AoD-LocationInformation-r16		NR-DL-AoD-LocationInformation-r16
-																			OPTIONAL, -- Cond UEB
+																			OPTIONAL,
 	nr-DL-AoD-Error-r16						NR-DL-AoD-Error-r16				OPTIONAL,
 	...
 }
@@ -5437,7 +5441,7 @@ NR-DL-AoD-MeasElement-r16 ::= SEQUENCE {
 	nr-DL-PRS-ResourceSetID-r16		NR-DL-PRS-ResourceSetID-r16 			OPTIONAL,
 	nr-TimeStamp-r16				NR-TimeStamp-r16,
 	nr-DL-PRS-RSRP-Result-r16		INTEGER (0..126),
-	nr-DL-PRS-RxBeamIndex-r16		INTEGER (1..8)							OPTIONAL, -- Cond SameRx
+	nr-DL-PRS-RxBeamIndex-r16		INTEGER (1..8)							OPTIONAL,
 	nr-DL-AoD-AdditionalMeasurements-r16
 									NR-DL-AoD-AdditionalMeasurements-r16	OPTIONAL,
 	...
@@ -5451,7 +5455,7 @@ NR-DL-AoD-AdditionalMeasurementElement-r16 ::= SEQUENCE {
 	nr-DL-PRS-ResourceSetID-r16		NR-DL-PRS-ResourceSetID-r16 			OPTIONAL,
 	nr-TimeStamp-r16				NR-TimeStamp-r16,
 	nr-DL-PRS-RSRP-ResultDiff-r16	INTEGER (0..30),
-	nr-DL-PRS-RxBeamIndex-r16		INTEGER (1..8)							OPTIONAL, -- Cond SameRx
+	nr-DL-PRS-RxBeamIndex-r16		INTEGER (1..8)							OPTIONAL,
 	...
 }
 
@@ -5473,7 +5477,7 @@ NR-DL-AoD-RequestLocationInformation-r16 ::= SEQUENCE {
 }
 
 NR-DL-AoD-ReportConfig-r16 ::= SEQUENCE {
-	maxDL-PRS-RSRP-MeasurementsPerTRP-r16		INTEGER (1..8)					OPTIONAL,
+	maxDL-PRS-RSRP-MeasurementsPerTRP-r16		INTEGER (1..8)			OPTIONAL, -- Need ON
 	...
 }
 
@@ -5718,8 +5722,8 @@ nrMaxNumDL-PRS-ResourceSetsPerTRP-1-r16	INTEGER ::= 7
 nrMaxResourceIDs-r16					INTEGER ::= 64		-- Max Resource IDs
 nrMaxResourceOffsetValue-1-r16 			INTEGER ::= 511
 nrMaxResourcesPerSet-r16				INTEGER ::= 64		-- Maximum resources for one set
-nrMaxSetsPerTrp-r16						INTEGER ::= 2		-- Maximum resource sets for one TRP
-nrMaxSetsPerTrp-1-r16					INTEGER ::= 1
+nrMaxSetsPerTrpPerFreqLayer-r16			INTEGER ::= 2		-- Maximum resource sets for one TRP
+nrMaxSetsPerTrpPerFreqLayer-1-r16		INTEGER ::= 1
 nrMaxTRPs-r16							INTEGER ::= 256		-- Max TRPs per UE
 nrMaxTRPsPerFreq-r16					INTEGER ::= 64		-- Max TRPs per freq layers
 nrMaxTRPsPerFreq-1-r16					INTEGER ::= 63
@@ -5730,4 +5734,3 @@ nrMaxConfiguredBands-r16				INTEGER ::= 16
 
 
 END
-
diff --git a/epan/dissectors/asn1/lpp/packet-lpp-template.c b/epan/dissectors/asn1/lpp/packet-lpp-template.c
index 226ca71ec2..b7b2af9101 100644
--- a/epan/dissectors/asn1/lpp/packet-lpp-template.c
+++ b/epan/dissectors/asn1/lpp/packet-lpp-template.c
@@ -8,7 +8,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
- * Ref 3GPP TS 37.355 version 16.3.0 Release 16
+ * Ref 3GPP TS 37.355 version 16.5.0 Release 16
  * http://www.3gpp.org
  */