LTE RRC: upgrade dissector to v15.5.0

Change-Id: I227db32a59a16c31d7712cb9c48b55fa4aaf28ca
Reviewed-on: https://code.wireshark.org/review/32759
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>

10 files changed, 186 insertions, 35 deletions

diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
index fb643330ec..1e034db0a7 100644
--- a/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
+++ b/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V15.4.0 (2018-12)
+-- 3GPP TS 36.331 V15.5.0 (2019-03)
 --
 EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
 
@@ -42,6 +42,7 @@ IMPORTS
 	SidelinkUEInformation-r12,
 	SL-CommConfig-r12,
 	SL-DiscConfig-r12,
+	SubframeAssignment-r15,
 	RadioResourceConfigDedicated,
 	RadioResourceConfigDedicated-v13c0,
 	RadioResourceConfigDedicated-v1370,
@@ -56,6 +57,7 @@ IMPORTS
 	SCellToAddModListExt-r13,
 	SCellToAddModListExt-v13c0,
 	SCG-ConfigPartSCG-r12,
+	SCG-ConfigPartSCG-v12f0,
 	SCG-ConfigPartSCG-v13c0,
 	SecurityAlgorithmConfig,
 	SCellIndex-r10,
@@ -213,10 +215,15 @@ SCG-Config-r12-IEs ::=				SEQUENCE {
 
 SCG-Config-v12x0-IEs ::=				SEQUENCE {
 	-- Following field is only for late non-critical extensions from REL-12
-	lateNonCriticalExtension			OCTET STRING						OPTIONAL,
+	lateNonCriticalExtension			OCTET STRING (CONTAINING SCG-Config-v12i0-IEs)	OPTIONAL,
 	nonCriticalExtension				SCG-Config-v13c0-IEs				OPTIONAL
 }
 
+SCG-Config-v12i0-IEs ::=				SEQUENCE {
+	scg-RadioConfig-v12i0				SCG-ConfigPartSCG-v12f0			OPTIONAL,	-- Need ON
+	nonCriticalExtension				SEQUENCE {}						OPTIONAL
+}
+
 SCG-Config-v13c0-IEs ::=				SEQUENCE {
 	scg-RadioConfig-v13c0				SCG-ConfigPartSCG-v13c0				OPTIONAL,
 
@@ -429,6 +436,8 @@ AS-Config ::=				SEQUENCE {
 	[[	sourceConfigSCG-r12					SCG-Config-r12		OPTIONAL
 	]],
 	[[	as-ConfigNR-r15						AS-ConfigNR-r15					OPTIONAL
+	]],
+	[[	as-Config-v1550						AS-Config-v1550					OPTIONAL
 	]]
 }
 
@@ -470,6 +479,14 @@ AS-ConfigNR-r15 ::=				SEQUENCE {
 	sourceOtherConfigSN-NR-r15			OCTET STRING			OPTIONAL
 }
 
+AS-Config-v1550 ::=			SEQUENCE {
+	tdm-PatternConfig-r15		SEQUENCE {
+		subframeAssignment-r15		SubframeAssignment-r15,
+		harq-Offset-r15				INTEGER (0.. 9)
+	}												OPTIONAL,
+	p-MaxEUTRA-r15				P-Max		OPTIONAL
+}
+
 
 AS-Context ::=							SEQUENCE {
 	reestablishmentInfo						ReestablishmentInfo			OPTIONAL	-- Cond HO
diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn
index 069fdc6a60..79219dd582 100644
--- a/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn
+++ b/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V15.4.0 (2018-12)
+-- 3GPP TS 36.331 V15.5.0 (2019-03)
 --
 EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
 
@@ -1657,7 +1657,7 @@ RRCConnectionRelease-v1530-IEs ::=	SEQUENCE {
 }
 
 RRCConnectionRelease-v1540-IEs ::=	SEQUENCE {
-	waitTime							INTEGER (1..16)		OPTIONAL, -- Need ON
+	waitTime							INTEGER (1..16)		OPTIONAL, -- Cond 5GC
 	nonCriticalExtension				SEQUENCE {}				OPTIONAL
 }
 
@@ -2956,6 +2956,11 @@ UECapabilityEnquiry-v1510-IEs ::=	SEQUENCE {
 UECapabilityEnquiry-v1530-IEs ::=	SEQUENCE {
 	requestSTTI-SPT-Capability-r15		ENUMERATED {true}					OPTIONAL,
 	eutra-nr-only-r15					ENUMERATED {true}					OPTIONAL,
+	nonCriticalExtension				UECapabilityEnquiry-v1550-IEs		OPTIONAL
+}
+
+UECapabilityEnquiry-v1550-IEs ::=	SEQUENCE {
+	requestedCapabilityNR-r15			OCTET STRING						OPTIONAL,
 	nonCriticalExtension				SEQUENCE {}							OPTIONAL
 }
 
@@ -4550,13 +4555,21 @@ CarrierFreqNR-r15 ::=				SEQUENCE {
 	q-RxLevMinSUL-r15					INTEGER (-70..-22)				OPTIONAL, 		-- Need OR
 	p-MaxNR-r15							P-MaxNR-r15,
 	ns-PmaxListNR-r15					NS-PmaxListNR-r15					OPTIONAL,	-- Need OR
-	q-QualMin-r15						Q-QualMin-r9					OPTIONAL,		-- Need OP
+	q-QualMin-r15						INTEGER (-43..-12)				OPTIONAL,		-- Need OP
 	deriveSSB-IndexFromCell-r15			BOOLEAN,
 	maxRS-IndexCellQual-r15				MaxRS-IndexCellQualNR-r15		OPTIONAL,		-- Need OR
 	threshRS-Index-r15					ThresholdListNR-r15				OPTIONAL,		-- Need OR
-	...
+	...,
+	[[	multiBandNsPmaxListNR-v1550		MultiBandNsPmaxListNR-1-v1550	OPTIONAL,	-- Need OR
+		multiBandNsPmaxListNR-SUL-v1550	MultiBandNsPmaxListNR-v1550		OPTIONAL,	-- Need OR
+		ssb-ToMeasure-r15				SSB-ToMeasure-r15				OPTIONAL		-- Need OR
+	]]
 }
 
+MultiBandNsPmaxListNR-1-v1550	::=	SEQUENCE (SIZE (1.. maxMultiBandsNR-1-r15)) OF NS-PmaxListNR-r15
+
+MultiBandNsPmaxListNR-v1550	::=	SEQUENCE (SIZE (1.. maxMultiBandsNR-r15)) OF NS-PmaxListNR-r15
+
 
 SystemInformationBlockType25-r15 ::=	SEQUENCE {
 	uac-BarringForCommon-r15				UAC-BarringPerCatList-r15				OPTIONAL,	-- Need OP
@@ -5821,7 +5834,8 @@ DRX-Config-v1310 ::=					SEQUENCE {
 
 DRX-Config-r13 ::=					SEQUENCE {
 	onDurationTimer-v1310					ENUMERATED {psf300, psf400, psf500, psf600,
-													psf800, psf1000, psf1200, psf1600}																		OPTIONAL,	--Need OR
+													psf800, psf1000, psf1200, psf1600}
+													OPTIONAL,	--Need OR
 	drx-RetransmissionTimer-v1310			ENUMERATED {psf40, psf64, psf80, psf96, psf112,
 													psf128, psf160, psf320}
 														OPTIONAL,	--Need OR
@@ -6292,7 +6306,7 @@ PhysicalConfigDedicated ::=		SEQUENCE {
 	[[	physicalConfigDedicatedSTTI-r15		PhysicalConfigDedicatedSTTI-r15	OPTIONAL, -- Need ON
 		pdsch-ConfigDedicated-v1530			PDSCH-ConfigDedicated-v1530		OPTIONAL, -- Need ON
 		pusch-ConfigDedicated-v1530		PUSCH-ConfigDedicated-v1530		OPTIONAL,	-- Need ON
-		cqi-ReportConfig-v1530				CQI-ReportConfig-v1530			OPTIONAL,-- Need ON
+		dummy				CQI-ReportConfig-v1530			OPTIONAL,-- Need ON
 		antennaInfo-v1530					AntennaInfoDedicated-v1530		OPTIONAL,-- Need ON
 		csi-RS-Config-v1530				CSI-RS-Config-v1530				OPTIONAL,		-- Need ON
 		uplinkPowerControlDedicated-v1530
@@ -6319,6 +6333,8 @@ PhysicalConfigDedicated ::=		SEQUENCE {
 				mcs-restrictionSlotSubslotPDSCH-Repetitions-r15	ENUMERATED {n0, n1}	OPTIONAL -- Need ON
 			}
 		}														OPTIONAL	 -- Need ON
+	]],
+	[[	spucch-Config-v1550				SPUCCH-Config-v1550			OPTIONAL -- Need ON
 	]]
 }
 
@@ -6479,6 +6495,8 @@ PhysicalConfigDedicatedSCell-r10 ::=		SEQUENCE {
 				mcs-restrictionSlotSubslotPDSCH-Repetitions-r15	ENUMERATED {n0, n1}	OPTIONAL -- Need ON
 			}
 		}														OPTIONAL	 -- Need ON
+	]],
+	[[	spucch-Config-v1550				SPUCCH-Config-v1550			OPTIONAL -- Need ON
 	]]
 }
 
@@ -7360,7 +7378,8 @@ RadioResourceConfigCommonSCell-r10 ::=	SEQUENCE {
 		soundingRS-UL-ConfigCommon-r14		SoundingRS-UL-ConfigCommon,
 		ul-CyclicPrefixLength-r14			UL-CyclicPrefixLength,
 		prach-ConfigSCell-r14					PRACH-ConfigSCell-r10		OPTIONAL,	-- Cond TDD-OR-NoR11		
-		uplinkPowerControlCommonPUSCH-LessCell-v1430												UplinkPowerControlCommonPUSCH-LessCell-v1430	OPTIONAL	-- Need OR
+		uplinkPowerControlCommonPUSCH-LessCell-v1430
+					UplinkPowerControlCommonPUSCH-LessCell-v1430	OPTIONAL	-- Need OR
 }																	OPTIONAL,	-- Cond ULSRS
 	harq-ReferenceConfig-r14					ENUMERATED {sa2,sa4,sa5}	OPTIONAL,		-- Need OR
 	soundingRS-FlexibleTiming-r14 			ENUMERATED {true}			OPTIONAL		-- Need OR
@@ -7575,7 +7594,7 @@ SRB-ToAddMod ::=	SEQUENCE {
 	...,
 	[[	pdcp-verChange-r15				ENUMERATED {true}		OPTIONAL,			-- Cond NR-PDCP
 		rlc-Config-v1530				RLC-Config-v1530		OPTIONAL,			-- Need ON
-		rlc-BearerConfigDupl-r15		RLC-BearerConfig-r15	OPTIONAL,			-- Need ON
+		rlc-BearerConfigSecondary-r15	RLC-BearerConfig-r15	OPTIONAL,			-- Need ON
 		srb-Identity-v1530				INTEGER (4)				OPTIONAL			-- Need ON
 	]]
 }
@@ -7610,7 +7629,7 @@ DRB-ToAddMod ::=	SEQUENCE {
 	[[	rlc-Config-v1510					RLC-Config-v1510		OPTIONAL		-- Need ON
 	]],
 	[[	rlc-Config-v1530					RLC-Config-v1530		OPTIONAL, 		-- Need ON
-		rlc-BearerConfigDupl-r15			RLC-BearerConfig-r15	OPTIONAL,		-- Need ON
+		rlc-BearerConfigSecondary-r15		RLC-BearerConfig-r15	OPTIONAL,		-- Need ON
 		logicalChannelIdentity-r15		INTEGER (32..38)			OPTIONAL		-- Need ON
 	]]
 }
@@ -7633,7 +7652,7 @@ DRB-ToAddModSCG-r12 ::=	SEQUENCE {
 	]],
 	[[	logicalChannelIdentitySCG-r15		INTEGER (32..38)	OPTIONAL,			-- Need ON
 		rlc-Config-v1530					RLC-Config-v1530		OPTIONAL, 		-- Need ON
-		rlc-BearerConfigDupl-r15			RLC-BearerConfig-r15	OPTIONAL		-- Need ON
+		rlc-BearerConfigSecondary-r15		RLC-BearerConfig-r15	OPTIONAL		-- Need ON
 	]]
 }
 
@@ -8468,8 +8487,17 @@ SPUCCH-Config-r15 ::= CHOICE {
 	setup							SEQUENCE {
 		spucch-Set-r15					SPUCCH-Set-r15		OPTIONAL, -- Need ON
 		twoAntennaPortActivatedSPUCCH-Format1a1b-r15	ENUMERATED {true}	OPTIONAL,	-- Need OR
-		twoAntennaPortActivatedSPUCCH-Format3-r15		SEQUENCE {								
-			n3SPUCCH-AN-List-r15	SEQUENCE (SIZE (1..4)) OF INTEGER (0..549)
+		dummy							SEQUENCE {
+			n3SPUCCH-AN-List-r15			SEQUENCE (SIZE (1..4)) OF INTEGER (0..549)
+		}
+	}
+}
+
+SPUCCH-Config-v1550 ::= CHOICE {
+	release							NULL,
+	setup							SEQUENCE {
+		twoAntennaPortActivatedSPUCCH-Format3-v1550		SEQUENCE {
+			n3SPUCCH-AN-List-v1550		SEQUENCE (SIZE (1..4)) OF INTEGER (0..549)
 		}
 	}
 }
@@ -8502,8 +8530,9 @@ SRS-TPC-PDCCH-Config-r14 ::=					CHOICE {
 	release								NULL,
 	setup								SEQUENCE {
 		srs-TPC-RNTI-r14									BIT STRING (SIZE (16)),
-	startingBitOfFormat3B-r14							INTEGER (0..31),				fieldTypeFormat3B-r14								INTEGER (1..4),
-		srs-CC-SetIndexlist-r14									SEQUENCE (SIZE(1..4)) OF SRS-CC-SetIndex-r14	OPTIONAL	-- Cond SRS-Trigger-TypeA		
+		startingBitOfFormat3B-r14							INTEGER (0..31),
+		fieldTypeFormat3B-r14								INTEGER (1..4),
+		srs-CC-SetIndexlist-r14							SEQUENCE (SIZE(1..4)) OF SRS-CC-SetIndex-r14	OPTIONAL	-- Cond SRS-Trigger-TypeA
 
 	}
 }
@@ -9780,7 +9809,12 @@ RS-ConfigSSB-NR-r15 ::=			SEQUENCE {
 	measTimingConfig-r15			MTC-SSB-NR-r15,
 
 	subcarrierSpacingSSB-r15	ENUMERATED {kHz15, kHz30, kHz120, kHz240},
-	...
+	...,
+	[[	ssb-ToMeasure-r15			CHOICE {
+			release						NULL,
+			setup						SSB-ToMeasure-r15
+		}											OPTIONAL	-- Need ON
+	]]
 }
 
 CellsToAddModListNR-r15 ::=			SEQUENCE (SIZE (1..maxCellMeas)) OF CellsToAddModNR-r15
@@ -10638,6 +10672,13 @@ SS-RSSI-Measurement-r15 ::=			SEQUENCE {
 }
 
 
+SSB-ToMeasure-r15 ::= 		CHOICE {
+	shortBitmap-r15				BIT STRING (SIZE (4)),
+	mediumBitmap-r15				BIT STRING (SIZE (8)),
+	longBitmap-r15					BIT STRING (SIZE (64))
+}
+
+
 TimeToTrigger ::=					ENUMERATED {
 										ms0, ms40, ms64, ms80, ms100, ms128, ms160, ms256,
 										ms320, ms480, ms512, ms640, ms1024, ms1280, ms2560,
@@ -10649,7 +10690,8 @@ UL-DelayConfig-r13 ::=					CHOICE {
 		setup								SEQUENCE {
 			delayThreshold-r13							ENUMERATED {
 												ms30, ms40, ms50, ms60, ms70, ms80,
-												ms90,ms100, ms150, ms300, ms500, ms750, spare4,												spare3, spare2, spare1}
+												ms90,ms100, ms150, ms300, ms500, ms750, spare4,
+												spare3, spare2, spare1}
 		}
 }
 
@@ -11068,8 +11110,13 @@ UE-EUTRA-Capability-v1470-IEs ::= SEQUENCE {
 	mbms-Parameters-v1470				MBMS-Parameters-v1470					OPTIONAL,
 	phyLayerParameters-v1470			PhyLayerParameters-v1470				OPTIONAL,
 	rf-Parameters-v1470					RF-Parameters-v1470						OPTIONAL,
+	nonCriticalExtension				UE-EUTRA-Capability-v14a0-IEs			OPTIONAL
+}
+
+UE-EUTRA-Capability-v14a0-IEs ::= SEQUENCE {
+	phyLayerParameters-v14a0				PhyLayerParameters-v14a0,
 	-- Following field is only to be used for late REL-14 extensions
-	nonCriticalExtension				SEQUENCE {}								OPTIONAL
+	nonCriticalExtension					SEQUENCE {}								OPTIONAL
 }
 
 -- Regular non critical extensions
@@ -11324,6 +11371,15 @@ UE-EUTRA-Capability-v1540-IEs ::= SEQUENCE {
 	tdd-Add-UE-EUTRA-Capabilities-v1540		UE-EUTRA-CapabilityAddXDD-Mode-v1540	OPTIONAL,
 	sl-Parameters-v1540						SL-Parameters-v1540						OPTIONAL,
 	irat-ParametersNR-v1540					IRAT-ParametersNR-v1540					OPTIONAL,
+	nonCriticalExtension					UE-EUTRA-Capability-v1550-IEs			OPTIONAL
+}
+
+UE-EUTRA-Capability-v1550-IEs ::= SEQUENCE {
+	neighCellSI-AcquisitionParameters-v1550	NeighCellSI-AcquisitionParameters-v1550	OPTIONAL,
+	phyLayerParameters-v1550				PhyLayerParameters-v1550,
+	mac-Parameters-v1550					MAC-Parameters-v1550,
+	fdd-Add-UE-EUTRA-Capabilities-v1550		UE-EUTRA-CapabilityAddXDD-Mode-v1550,
+	tdd-Add-UE-EUTRA-Capabilities-v1550		UE-EUTRA-CapabilityAddXDD-Mode-v1550,
 	nonCriticalExtension					SEQUENCE {}								OPTIONAL
 }
 
@@ -11400,6 +11456,10 @@ UE-EUTRA-CapabilityAddXDD-Mode-v1540 ::=	SEQUENCE {
 	irat-ParametersNR-v1540						IRAT-ParametersNR-v1540			OPTIONAL
 }
 
+UE-EUTRA-CapabilityAddXDD-Mode-v1550 ::=	SEQUENCE {
+	neighCellSI-AcquisitionParameters-v1550	NeighCellSI-AcquisitionParameters-v1550	OPTIONAL
+}
+
 AccessStratumRelease ::=			ENUMERATED {
 										rel8, rel9, rel10, rel11, rel12, rel13,
 										rel14, rel15, ...}
@@ -11409,7 +11469,10 @@ FeatureSetsEUTRA-r15 ::=	SEQUENCE {
 	featureSetsDL-PerCC-r15		SEQUENCE (SIZE (1..maxPerCC-FeatureSets-r15)) OF FeatureSetDL-PerCC-r15		OPTIONAL,
 	featureSetsUL-r15			SEQUENCE (SIZE (1..maxFeatureSets-r15)) OF FeatureSetUL-r15		OPTIONAL,
 	featureSetsUL-PerCC-r15		SEQUENCE (SIZE (1..maxPerCC-FeatureSets-r15)) OF FeatureSetUL-PerCC-r15		OPTIONAL,
-	...
+	...,
+	[[	featureSetsDL-v1550		SEQUENCE (SIZE (1..maxFeatureSets-r15)) OF FeatureSetDL-v1550	OPTIONAL
+	]]
+
 }
 
 MobilityParameters-r14 ::=			SEQUENCE {
@@ -11461,6 +11524,10 @@ MAC-Parameters-v1530 ::=		SEQUENCE {
 	sps-ServingCell-r15					ENUMERATED {supported}							OPTIONAL
 }
 
+MAC-Parameters-v1550 ::=				SEQUENCE {
+	eLCID-Support-r15					ENUMERATED {supported}			OPTIONAL
+}
+
 ProcessingTimelineSet-r15 ::=		ENUMERATED {set1, set2}
 
 RLC-Parameters-r12 ::=				SEQUENCE {
@@ -11640,6 +11707,10 @@ PhyLayerParameters-v1470 ::=			SEQUENCE {
 	srs-UpPTS-6sym-r14						ENUMERATED {supported}			OPTIONAL
 }
 
+PhyLayerParameters-v14a0 ::=			SEQUENCE {
+	ssp10-TDD-Only-r14						ENUMERATED {supported}			OPTIONAL
+}
+
 PhyLayerParameters-v1530 ::=			SEQUENCE {
 	stti-SPT-Capabilities-r15 				SEQUENCE {
 		aperiodicCsi-ReportingSTTI-r15			ENUMERATED {supported}			OPTIONAL,
@@ -11727,6 +11798,10 @@ PhyLayerParameters-v1540 ::=			SEQUENCE {
 	cch-IM-RefRecTypeA-OneRX-Port-v1540		ENUMERATED {supported}			OPTIONAL
 }
 
+PhyLayerParameters-v1550 ::=			SEQUENCE {
+	dmrs-OverheadReduction-r15				ENUMERATED {supported}			OPTIONAL
+}
+
 MIMO-UE-Parameters-r13 ::=				SEQUENCE {
 	parametersTM9-r13						MIMO-UE-ParametersPerTM-r13		OPTIONAL,
 	parametersTM10-r13						MIMO-UE-ParametersPerTM-r13		OPTIONAL,
@@ -12290,6 +12365,10 @@ FeatureSetDL-r15 ::=	SEQUENCE {
 	featureSetPerCC-ListDL-r15	SEQUENCE (SIZE (1..maxServCell-r13)) OF FeatureSetDL-PerCC-Id-r15
 }
 
+FeatureSetDL-v1550 ::=	SEQUENCE {
+	dl-1024QAM-r15				ENUMERATED {supported}			OPTIONAL
+}
+
 FeatureSetDL-PerCC-r15 ::=	SEQUENCE {
 	fourLayerTM3-TM4-r15						ENUMERATED {supported}				OPTIONAL,
 	supportedMIMO-CapabilityDL-MRDC-r15		MIMO-CapabilityDL-r10					OPTIONAL,
@@ -12669,22 +12748,28 @@ IRAT-ParametersWLAN-r13 ::=		SEQUENCE {
 }
 
 CSG-ProximityIndicationParameters-r9 ::=	SEQUENCE {
-	intraFreqProximityIndication-r9	ENUMERATED {supported}			OPTIONAL,
-	interFreqProximityIndication-r9	ENUMERATED {supported}			OPTIONAL,
+	intraFreqProximityIndication-r9		ENUMERATED {supported}			OPTIONAL,
+	interFreqProximityIndication-r9		ENUMERATED {supported}			OPTIONAL,
 	utran-ProximityIndication-r9		ENUMERATED {supported}			OPTIONAL
 }
 
 NeighCellSI-AcquisitionParameters-r9 ::=	SEQUENCE {
-	intraFreqSI-AcquisitionForHO-r9	ENUMERATED {supported}			OPTIONAL,
-	interFreqSI-AcquisitionForHO-r9	ENUMERATED {supported}			OPTIONAL,
+	intraFreqSI-AcquisitionForHO-r9		ENUMERATED {supported}			OPTIONAL,
+	interFreqSI-AcquisitionForHO-r9		ENUMERATED {supported}			OPTIONAL,
 	utran-SI-AcquisitionForHO-r9		ENUMERATED {supported}			OPTIONAL
 }
 
 NeighCellSI-AcquisitionParameters-v1530 ::=	SEQUENCE {
-	reportCGI-NR-EN-DC-r15				ENUMERATED {supported}			OPTIONAL,
+	reportCGI-NR-EN-DC-r15					ENUMERATED {supported}			OPTIONAL,
 	reportCGI-NR-NoEN-DC-r15				ENUMERATED {supported}			OPTIONAL
 }
 
+NeighCellSI-AcquisitionParameters-v1550 ::=	SEQUENCE {
+	eutra-CGI-Reporting-ENDC-r15				ENUMERATED {supported}			OPTIONAL,
+	utra-GERAN-CGI-Reporting-ENDC-r15			ENUMERATED {supported}			OPTIONAL
+}
+
+
 SON-Parameters-r9 ::=				SEQUENCE {
 	rach-Report-r9						ENUMERATED {supported}			OPTIONAL
 }
@@ -14286,6 +14371,7 @@ maxMultiBands				INTEGER ::= 8	-- Maximum number of additional frequency bands
 											-- that a cell belongs to
 maxMultiBandsNR-r15			INTEGER ::= 32	-- Maximum number of additional NR frequency bands
 											-- that a cell belongs to
+maxMultiBandsNR-1-r15		INTEGER ::= 31
 maxNS-Pmax-r10				INTEGER ::= 8	-- Maximum number of NS and P-Max values per band
 maxNAICS-Entries-r12		INTEGER ::= 8	-- Maximum number of supported NAICS combination(s)
 maxNeighCell-r12			INTEGER ::= 8	-- Maximum number of neighbouring cells in NAICS
diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn
index 8db48ece08..f801e893ce 100644
--- a/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn
+++ b/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V15.4.0 (2018-12)
+-- 3GPP TS 36.331 V15.5.0 (2019-03)
 --
 EUTRA-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::=
 
diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn
index 3bfce2aa3e..1d7e7e1cb4 100644
--- a/epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn
+++ b/epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V15.4.0 (2018-12)
+-- 3GPP TS 36.331 V15.5.0 (2019-03)
 --
 EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
 
diff --git a/epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn b/epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn
index 23c2ed7715..70f68b6e79 100644
--- a/epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn
+++ b/epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V15.4.0 (2018-12)
+-- 3GPP TS 36.331 V15.5.0 (2019-03)
 --
 NBIOT-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
 
@@ -15,6 +15,7 @@ FROM EUTRA-RRC-Definitions
 FROM EUTRA-InterNodeDefinitions
 
 	CarrierFreq-NB-r13,
+	CarrierFreq-NB-v1550,
 	RadioResourceConfigDedicated-NB-r13,
 	UECapabilityInformation-NB,
 	UE-Capability-NB-r13,
@@ -117,7 +118,9 @@ AS-Config-NB ::=					SEQUENCE {
 	sourceSecurityAlgorithmConfig-r13		SecurityAlgorithmConfig,
 	sourceUE-Identity-r13					C-RNTI,
 	sourceDl-CarrierFreq-r13				CarrierFreq-NB-r13,
-	...
+	...,
+	[[	sourceDL-CarrierFreq-v1550			CarrierFreq-NB-v1550	OPTIONAL	-- Cond TDD
+	]]
 }
 
 
diff --git a/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn b/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn
index aa21c0f249..5bf33c8fee 100644
--- a/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn
+++ b/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V15.4.0 (2018-12)
+-- 3GPP TS 36.331 V15.5.0 (2019-03)
 --
 NBIOT-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
 
@@ -485,7 +485,12 @@ RRCConnectionRelease-NB-v1430-IEs ::=	SEQUENCE {
 RRCConnectionRelease-NB-v1530-IEs ::=	SEQUENCE {
 	drb-ContinueROHC-r15					ENUMERATED {true}			OPTIONAL,	-- Cond UP-EDT
 	nextHopChainingCount-r15				NextHopChainingCount		OPTIONAL,	-- Cond UP-EDT
-	nonCriticalExtension				SEQUENCE {}						OPTIONAL
+	nonCriticalExtension				RRCConnectionRelease-NB-v1550-IEs	OPTIONAL
+}
+
+RRCConnectionRelease-NB-v1550-IEs ::=	SEQUENCE {
+	redirectedCarrierInfo-v1550			RedirectedCarrierInfo-NB-v1550	OPTIONAL,	-- Cond Redirection-TDD
+	nonCriticalExtension				SEQUENCE {}		OPTIONAL
 }
 
 ReleaseCause-NB-r13 ::=					ENUMERATED {loadBalancingTAUrequired, other,
@@ -501,6 +506,8 @@ RedirectedCarrierInfo-NB-v1430	::=		SEQUENCE {
 												spare1}
 }
 
+RedirectedCarrierInfo-NB-v1550::=		CarrierFreq-NB-v1550
+
 
 RRCConnectionRequest-NB ::=		SEQUENCE {
 	criticalExtensions					CHOICE {
@@ -986,6 +993,8 @@ OPTIONAL,	--	Need OP
 	]],
 	[[	nsss-RRM-Config-r15				NSSS-RRM-Config-NB-r15	OPTIONAL,	-- Need OR
 		interFreqNeighCellList-v1530	InterFreqNeighCellList-NB-v1530	OPTIONAL -- Need OR
+	]],
+	[[	dl-CarrierFreq-v1550			CarrierFreq-NB-v1550	OPTIONAL -- Cond TDD
 	]]
 }
 
@@ -1226,6 +1235,8 @@ DL-CarrierConfigDedicated-NB-r13 ::=	SEQUENCE {
 									OPTIONAL	-- Need ON
 	]],
 	[[	dl-GapNonAnchor-v1530				DL-GapConfig-NB-v1530	OPTIONAL 	-- Cond TDD1
+	]],
+	[[	dl-CarrierFreq-v1550				CarrierFreq-NB-v1550	OPTIONAL 	-- Cond TDD1
 	]]
 }
 
@@ -1245,6 +1256,10 @@ CarrierFreq-NB-r13 ::=		SEQUENCE {
 									}	OPTIONAL	-- Need ON
 }
 
+CarrierFreq-NB-v1550	::=		SEQUENCE {
+	carrierFreqOffset-v1550		ENUMERATED {v-8dot5, v-4dot5, v3dot5, v7dot5}
+}
+
 
 ChannelRasterOffset-NB-r13 ::= ENUMERATED {khz-7dot5, khz-2dot5, khz2dot5, khz7dot5}
 
@@ -1282,6 +1297,8 @@ DL-CarrierConfigCommon-NB-r14 ::=	SEQUENCE {
 													dB-4, dB-2, dB0, dB3}	DEFAULT dB0,
 	...,
 	[[	dl-GapNonAnchor-v1530			DL-GapConfig-NB-v1530	OPTIONAL 	-- Cond TDD
+	]],
+	[[	dl-CarrierFreq-v1550			CarrierFreq-NB-v1550	OPTIONAL 	-- Cond TDD
 	]]
 }
 
@@ -1404,7 +1421,7 @@ NPRACH-ConfigSIB-NB-v1530 ::=		SEQUENCE {
 	tdd-Parameters-r15					SEQUENCE {
 		nprach-PreambleFormat-r15			ENUMERATED {
 												fmt0, fmt1, fmt2, fmt0-a, fmt1-a},
-		numRepetitionsPerPreambleAttempt-r15 ENUMERATED {
+		dummy								ENUMERATED {
 												n1, n2, n4, n8, n16, n32, n64, n128,
 												n256, n512, n1024},
 		nprach-ParametersListTDD-r15		NPRACH-ParametersListTDD-NB-r15
@@ -1420,6 +1437,12 @@ NPRACH-ConfigSIB-NB-v1530 ::=		SEQUENCE {
 	}	OPTIONAL		-- Cond EDT1
 }
 
+NPRACH-ConfigSIB-NB-v1550 ::=		SEQUENCE {
+	tdd-Parameters-v1550				SEQUENCE {
+		nprach-ParametersListTDD-v1550		NPRACH-ParametersListTDD-NB-v1550
+	}
+}
+
 NPRACH-ParametersList-NB-r13 ::=	SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF NPRACH-Parameters-NB-r13
 
 NPRACH-ParametersList-NB-v1330 ::=	SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF NPRACH-Parameters-NB-v1330
@@ -1514,6 +1537,15 @@ NPRACH-ParametersTDD-NB-r15 ::=		SEQUENCE {
 	}	OPTIONAL	-- Need OR
 }
 
+NPRACH-ParametersListTDD-NB-v1550 ::=	SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF
+												NPRACH-ParametersTDD-NB-v1550
+
+NPRACH-ParametersTDD-NB-v1550 ::=	SEQUENCE {
+	maxNumPreambleAttemptCE-v1550			ENUMERATED {n3, n4, n5, n6, n7, n8, n10, spare1},
+	numRepetitionsPerPreambleAttempt-v1550	ENUMERATED {n1, n2, n4, n8, n16, n32, n64, n128,
+															 n256, n512, n1024}
+}
+
 NPRACH-ParametersListFmt2-NB-r15 ::=	SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF NPRACH-ParametersFmt2-NB-r15
 
 NPRACH-ParametersFmt2-NB-r15 ::=		SEQUENCE {
@@ -1695,6 +1727,8 @@ RadioResourceConfigCommonSIB-NB-r13 ::=	SEQUENCE {
 	[[	nprach-Config-v1530					NPRACH-ConfigSIB-NB-v1530	OPTIONAL,	-- Need OR
 		dl-Gap-v1530						DL-GapConfig-NB-v1530		OPTIONAL, 	-- Cond TDD
 		wus-Config-r15						WUS-Config-NB-r15			OPTIONAL	-- Need OR
+	]],
+	[[	nprach-Config-v1550					NPRACH-ConfigSIB-NB-v1550	OPTIONAL	-- Cond TDD1
 	]]
 }
 
diff --git a/epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn b/epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn
index 9571e37002..db438e6b75 100644
--- a/epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn
+++ b/epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V15.4.0 (2018-12)
+-- 3GPP TS 36.331 V15.5.0 (2019-03)
 --
 NBIOT-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
 
diff --git a/epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn b/epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn
index 8506a62e64..a84b3e657a 100644
--- a/epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn
+++ b/epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V15.4.0 (2018-12)
+-- 3GPP TS 36.331 V15.5.0 (2019-03)
 --
 PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
 
diff --git a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
index 19962ed52b..a4ca746606 100644
--- a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
+++ b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
@@ -205,6 +205,14 @@ SI-OrPSI-GERAN TYPE_PREFIX
     dissect_nr_rrc_FreqBandList_PDU(freq_band_list_tvb, actx->pinfo, subtree, NULL);
   }
 
+#.FN_BODY UECapabilityEnquiry-v1550-IEs/requestedCapabilityNR-r15 VAL_PTR = &ue_cap_req_filter_nr_tvb
+  tvbuff_t *ue_cap_req_filter_nr_tvb = NULL;
+%(DEFAULT_BODY)s
+  if (ue_cap_req_filter_nr_tvb) {
+    proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_requestedFreqBandsNR_MRDC_r15);
+    dissect_nr_rrc_UE_CapabilityRequestFilterNR_PDU(ue_cap_req_filter_nr_tvb, actx->pinfo, subtree, NULL);
+  }
+
 #.FN_BODY UE-CapabilityRAT-Container
   /* Initialise to invalid value */
   private_data_set_rat_type(actx, 0xFF);
@@ -1337,6 +1345,9 @@ CarrierFreqNR-r15/q-RxLevMin-r15 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=&lte_r
 CarrierFreqNR-r15/q-RxLevMinSUL-r15 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=&lte_rrc_q_RxLevMin_vals_ext
 
 #.TYPE_ATTR
+CarrierFreqNR-r15/q-QualMin-r15 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
+
+#.TYPE_ATTR
 Q-OffsetRangeInterRAT DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
 
 #.TYPE_ATTR
diff --git a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
index c98aab9a66..7deeef4867 100644
--- a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
+++ b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
@@ -1,7 +1,7 @@
 /* packet-lte-rrc-template.c
  * Routines for Evolved Universal Terrestrial Radio Access (E-UTRA);
  * Radio Resource Control (RRC) protocol specification
- * (3GPP TS 36.331 V15.4.0 Release 15) packet dissection
+ * (3GPP TS 36.331 V15.5.0 Release 15) packet dissection
  * Copyright 2008, Vincent Helfre
  * Copyright 2009-2019, Pascal Quantin
  *