LTE RRC: upgrade dissector to v15.3.0

Change-Id: I8ca861fb8cffe457780165c64dc3e6fcbc47ba8b
Reviewed-on: https://code.wireshark.org/review/29900
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

1 files changed, 492 insertions, 33 deletions

diff --git a/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn b/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn
index abe8111703..2b0029ba7b 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.2.2 (2018-06)
+-- 3GPP TS 36.331 V15.3.0 (2018-09)
 --
 NBIOT-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
 
@@ -12,6 +12,7 @@ IMPORTS
 	AdditionalSpectrumEmission,
 	ARFCN-ValueEUTRA-r9,
 	CellIdentity,
+	C-RNTI,
 	DedicatedInfoNAS,
 	DRB-Identity,
 	InitialUE-Identity,
@@ -20,6 +21,7 @@ IMPORTS
 	maxBands,
 	maxCellBlack,
 	maxCellInter,
+	maxCellIntra,
 	maxFBI2,
 	maxFreq,
 	maxMultiBands,
@@ -69,6 +71,14 @@ BCCH-BCH-MessageType-NB::=	MasterInformationBlock-NB
 
 
 
+BCCH-BCH-Message-TDD-NB ::= SEQUENCE {
+	message					BCCH-BCH-MessageType-TDD-NB-r15
+}
+
+
+BCCH-BCH-MessageType-TDD-NB-r15 ::=	MasterInformationBlock-TDD-NB-r15
+
+
 BCCH-DL-SCH-Message-NB ::= SEQUENCE {
 	message					BCCH-DL-SCH-MessageType-NB
 }
@@ -104,7 +114,8 @@ DL-CCCH-MessageType-NB ::= CHOICE {
 		rrcConnectionReestablishmentReject-r13	RRCConnectionReestablishmentReject,
 		rrcConnectionReject-r13					RRCConnectionReject-NB,
 		rrcConnectionSetup-r13					RRCConnectionSetup-NB,
-		spare4 NULL, spare3 NULL, spare2 NULL, spare1 NULL
+		rrcEarlyDataComplete-r15				RRCEarlyDataComplete-NB-r15,
+		spare3 NULL, spare2 NULL, spare1 NULL
 	},
 	messageClassExtension	SEQUENCE {}
 }
@@ -138,7 +149,7 @@ UL-CCCH-MessageType-NB ::= CHOICE {
 		rrcConnectionReestablishmentRequest-r13	RRCConnectionReestablishmentRequest-NB,
 		rrcConnectionRequest-r13				RRCConnectionRequest-NB,
 		rrcConnectionResumeRequest-r13			RRCConnectionResumeRequest-NB,
-		spare1 NULL
+		rrcEarlyDataRequest-r15				RRCEarlyDataRequest-NB-r15
 	},
 	messageClassExtension	SEQUENCE {}
 }
@@ -209,11 +220,10 @@ MasterInformationBlock-NB ::=	SEQUENCE {
 		guardband-r13					Guardband-NB-r13,
 		standalone-r13					Standalone-NB-r13
 	},
-	spare							BIT STRING (SIZE (11))
+	additionalTransmissionSIB1-r15	BOOLEAN,
+	spare							BIT STRING (SIZE (10))
 }
 
-ChannelRasterOffset-NB-r13 ::= ENUMERATED {khz-7dot5, khz-2dot5, khz2dot5, khz7dot5}
-
 Guardband-NB-r13 ::=			SEQUENCE {
 	rasterOffset-r13				ChannelRasterOffset-NB-r13,
 	spare							BIT STRING (SIZE (3))
@@ -234,6 +244,67 @@ Standalone-NB-r13 ::=			SEQUENCE {
 }
 
 
+MasterInformationBlock-TDD-NB-r15 ::=	SEQUENCE {
+	systemFrameNumber-MSB-r15				BIT STRING (SIZE (4)),
+	hyperSFN-LSB-r15						BIT STRING (SIZE (2)),
+	schedulingInfoSIB1-r15					INTEGER (0..15),
+	systemInfoValueTag-r15					INTEGER (0..31),
+	ab-Enabled-r15							BOOLEAN,
+	operationModeInfo-r15				CHOICE {
+		inband-SamePCI-r15					Inband-SamePCI-TDD-NB-r15,
+		inband-DifferentPCI-r15				Inband-DifferentPCI-TDD-NB-r15,
+		guardband-r15						GuardbandTDD-NB-r15,
+		standalone-r15						StandaloneTDD-NB-r15
+	},
+	sib1-CarrierInfo-r15					ENUMERATED {anchor, non-anchor},
+	spare									BIT STRING (SIZE (9))
+}
+
+GuardbandTDD-NB-r15 ::=				SEQUENCE {
+	rasterOffset-r15					ChannelRasterOffset-NB-r13,
+	sib-GuardbandInfo-r15				CHOICE {
+		sib-GuardbandAnchor-r15				SIB-GuardbandAnchorTDD-NB-r15,
+		sib-GuardbandGuardband-r15			SIB-GuardbandGuardbandTDD-NB-r15,
+		sib-GuardbandInbandSamePCI-r15		SIB-GuardbandInbandSamePCI-TDD-NB-r15,
+		sib-GuardbandinbandDiffPCI-r15		SIB-GuardbandInbandDiffPCI-TDD-NB-r15
+	},	
+	eutra-Bandwitdh-r15					ENUMERATED {bw5or10, bw15or20}
+}
+
+Inband-SamePCI-TDD-NB-r15 ::=		SEQUENCE {
+	eutra-CRS-SequenceInfo-r15			INTEGER (0..31),
+	sib-InbandLocation-r15				ENUMERATED {lower, higher}
+}
+
+Inband-DifferentPCI-TDD-NB-r15 ::=		SEQUENCE {
+	eutra-NumCRS-Ports-r15					ENUMERATED {same, four},
+	rasterOffset-r15						ChannelRasterOffset-NB-r13,
+	sib-InbandLocation-r15					ENUMERATED {lower, higher},
+	spare									BIT STRING (SIZE (2))
+}
+
+StandaloneTDD-NB-r15 ::=				SEQUENCE {
+	sib-StandaloneLocation-r15				ENUMERATED {lower, higher},
+	spare									BIT STRING (SIZE (5))
+}
+
+SIB-GuardbandAnchorTDD-NB-r15 ::= 		SEQUENCE {
+	spare									BIT STRING (SIZE (1))
+}
+
+SIB-GuardbandGuardbandTDD-NB-r15 ::= 	SEQUENCE {
+	sib-GuardbandGuardbandLocation-r15		ENUMERATED {same, opposite}
+}
+
+SIB-GuardbandInbandSamePCI-TDD-NB-r15 ::= SEQUENCE {
+	spare									BIT STRING (SIZE (1))
+}
+
+SIB-GuardbandInbandDiffPCI-TDD-NB-r15 ::= SEQUENCE {
+	sib-EUTRA-NumCRS-Ports-r15				ENUMERATED {same, four}
+}
+
+
 Paging-NB ::=						SEQUENCE {
 	pagingRecordList-r13				PagingRecordList-NB-r13		OPTIONAL,	-- Need ON
 	systemInfoModification-r13			ENUMERATED {true}				OPTIONAL,	-- Need ON
@@ -408,6 +479,12 @@ RRCConnectionRelease-NB-r13-IEs ::=	SEQUENCE {
 RRCConnectionRelease-NB-v1430-IEs ::=	SEQUENCE {
 	redirectedCarrierInfo-v1430			RedirectedCarrierInfo-NB-v1430	OPTIONAL,	-- Cond Redirection
 	extendedWaitTime-CPdata-r14		INTEGER (1..1800)	OPTIONAL,	-- Cond NoExtendedWaitTime
+	nonCriticalExtension				RRCConnectionRelease-NB-v1530-IEs	OPTIONAL
+}
+
+RRCConnectionRelease-NB-v1530-IEs ::=	SEQUENCE {
+	drb-ContinueROHC-r15					ENUMERATED {true}			OPTIONAL,	-- Cond UP-EDT
+	nextHopChainingCount-r15				NextHopChainingCount		OPTIONAL,	-- Cond UP-EDT
 	nonCriticalExtension				SEQUENCE {}						OPTIONAL
 }
 
@@ -437,8 +514,8 @@ RRCConnectionRequest-NB-r13-IEs ::=		SEQUENCE {
 	establishmentCause-r13					EstablishmentCause-NB-r13,
 	multiToneSupport-r13					ENUMERATED {true}				OPTIONAL,
 	multiCarrierSupport-r13					ENUMERATED {true}				OPTIONAL,
-	cqi-NPDCCH-r14							CQI-NPDCCH-NB-r14,
 	earlyContentionResolution-r14			BOOLEAN,
+	cqi-NPDCCH-r14							CQI-NPDCCH-NB-r14,
 	spare									BIT STRING (SIZE (17))
 }
 
@@ -495,8 +572,8 @@ RRCConnectionResumeRequest-NB-r13-IEs ::=	SEQUENCE {
 	resumeID-r13								ResumeIdentity-r13,
 	shortResumeMAC-I-r13						ShortMAC-I,
 	resumeCause-r13								EstablishmentCause-NB-r13,
-	cqi-NPDCCH-r14								CQI-NPDCCH-NB-r14,
 	earlyContentionResolution-r14				BOOLEAN,
+	cqi-NPDCCH-r14								CQI-NPDCCH-NB-r14,
 	spare										BIT STRING (SIZE (4))
 }
 
@@ -550,6 +627,39 @@ RRCConnectionSetupComplete-NB-v1470-IEs ::= SEQUENCE {
 }
 
 
+RRCEarlyDataComplete-NB-r15 ::=		SEQUENCE {
+	criticalExtensions					CHOICE {
+		rrcEarlyDataComplete-r15			RRCEarlyDataComplete-NB-r15-IEs,
+		criticalExtensionsFuture			SEQUENCE {}
+	}
+}
+
+RRCEarlyDataComplete-NB-r15-IEs ::=	SEQUENCE {
+	dedicatedInfoNAS-r15				DedicatedInfoNAS				OPTIONAL,	-- Need ON
+	extendedWaitTime-r15				INTEGER (1..1800)				OPTIONAL,	-- Need ON
+	redirectedCarrierInfo-r15 			RedirectedCarrierInfo-NB-r13	OPTIONAL, 	-- Need ON
+	redirectedCarrierInfoExt-r15		RedirectedCarrierInfo-NB-v1430	OPTIONAL,	-- Cond Redirection
+	nonCriticalExtension				SEQUENCE {}						OPTIONAL
+}
+
+
+RRCEarlyDataRequest-NB-r15 ::=		SEQUENCE {
+	criticalExtensions					CHOICE {
+		rrcEarlyDataRequest-r15				RRCEarlyDataRequest-NB-r15-IEs,
+		criticalExtensionsFuture			SEQUENCE {}
+	}
+}
+
+RRCEarlyDataRequest-NB-r15-IEs ::=	SEQUENCE {
+	s-TMSI-r15							S-TMSI,
+	establishmentCause-r15				ENUMERATED {mo-Data-r15, mo-ExceptionData-r15,
+											delayTolerantAccess-r15, spare1},
+	cqi-NPDCCH-r15						CQI-NPDCCH-NB-r14 			OPTIONAL,
+	dedicatedInfoNAS-r15				DedicatedInfoNAS,
+	nonCriticalExtension				SEQUENCE {}					OPTIONAL
+}
+
+
 SCPTMConfiguration-NB-r14 ::=	SEQUENCE {
 	sc-mtch-InfoList-r14			SC-MTCH-InfoList-NB-r14,
 	scptm-NeighbourCellList-r14		SCPTM-NeighbourCellList-NB-r14		OPTIONAL,	-- Need OP
@@ -575,7 +685,8 @@ SystemInformation-NB-r13-IEs ::=	SEQUENCE {
 		...,
 		sib15-v1430							SystemInformationBlockType15-NB-r14,
 		sib20-v1430							SystemInformationBlockType20-NB-r14,
-		sib22-v1430							SystemInformationBlockType22-NB-r14
+		sib22-v1430							SystemInformationBlockType22-NB-r14,
+		sib23-v1530							SystemInformationBlockType23-NB-r15
 	},
 	lateNonCriticalExtension			OCTET STRING						OPTIONAL,
 	nonCriticalExtension				SEQUENCE {}							OPTIONAL
@@ -599,7 +710,7 @@ SystemInformationBlockType1-NB ::=	SEQUENCE {
 	freqBandIndicator-r13				FreqBandIndicator-NB-r13,
 	freqBandInfo-r13					NS-PmaxList-NB-r13				OPTIONAL,	-- Need OR
 	multiBandInfoList-r13				MultiBandInfoList-NB-r13		OPTIONAL,	-- Need OR
-	downlinkBitmap-r13					DL-Bitmap-NB-r13				OPTIONAL,	-- Need OP,	
+	downlinkBitmap-r13					DL-Bitmap-NB-r13				OPTIONAL,	-- Cond SIB1
 	eutraControlRegionSize-r13			ENUMERATED {n1, n2, n3}			OPTIONAL,	-- Cond inband
 	nrs-CRS-PowerOffset-r13				ENUMERATED {dB-6,      dB-4dot77, dB-3,
 													dB-1dot77, dB0,       dB1,
@@ -633,7 +744,17 @@ SystemInformationBlockType1-NB-v1450 ::= SEQUENCE {
 													dB4,       dB4dot23,  dB5,
 													dB6,       dB7,       dB8,
 													dB9}		OPTIONAL,	-- Cond inband-SamePCI-ExceptAnchor
-	nonCriticalExtension				SEQUENCE {}					OPTIONAL
+	nonCriticalExtension				SystemInformationBlockType1-NB-v1530					OPTIONAL
+}
+
+SystemInformationBlockType1-NB-v1530 ::= SEQUENCE {
+	tdd-Parameters-r15						SEQUENCE {
+		tdd-Config-r15							TDD-Config-NB-r15,
+		tdd-SI-CarrierInfo-r15					ENUMERATED {anchor, non-anchor},
+		tdd-SI-SubframesBitmap-r15				DL-Bitmap-NB-r13		OPTIONAL	-- Cond TDD-SI-NonAnchor
+	}	OPTIONAL, 	-- Cond TDD
+	schedulingInfoList-v1530 			SchedulingInfoList-NB-v1530		OPTIONAL,	-- Need OR
+	nonCriticalExtension				SEQUENCE {}						OPTIONAL
 }
 
 PLMN-IdentityList-NB-r13 ::=		SEQUENCE (SIZE (1..maxPLMN-r11)) OF PLMN-IdentityInfo-NB-r13
@@ -646,6 +767,8 @@ PLMN-IdentityInfo-NB-r13 ::=		SEQUENCE {
 
 SchedulingInfoList-NB-r13 ::= SEQUENCE (SIZE (1..maxSI-Message-NB-r13)) OF SchedulingInfo-NB-r13
 
+SchedulingInfoList-NB-v1530 ::= SEQUENCE (SIZE (1..maxSI-Message-NB-r13)) OF SchedulingInfo-NB-v1530
+
 SchedulingInfo-NB-r13::=		SEQUENCE {
 	si-Periodicity-r13				ENUMERATED {rf64, rf128, rf256, rf512,
 												rf1024, rf2048, rf4096, spare},
@@ -654,16 +777,26 @@ SchedulingInfo-NB-r13::=		SEQUENCE {
 	si-TB-r13						ENUMERATED {b56, b120, b208, b256, b328, b440, b552, b680}
 }
 
+SchedulingInfo-NB-v1530::=		SEQUENCE {
+	sib-MappingInfo-v1530				SIB-MappingInfo-NB-v1530	OPTIONAL	-- Need OR
+}
+
 SystemInfoValueTagList-NB-r13 ::=	SEQUENCE (SIZE (1.. maxSI-Message-NB-r13)) OF
 										SystemInfoValueTagSI-r13
 
 SIB-MappingInfo-NB-r13 ::=			SEQUENCE (SIZE (0..maxSIB-1)) OF SIB-Type-NB-r13
 
+SIB-MappingInfo-NB-v1530 ::=		SEQUENCE (SIZE (1..8)) OF SIB-Type-NB-v1530
+
 SIB-Type-NB-r13 ::=					ENUMERATED {
 										sibType3-NB-r13, sibType4-NB-r13, sibType5-NB-r13,
 										sibType14-NB-r13, sibType16-NB-r13, sibType15-NB-r14,
 										sibType20-NB-r14, sibType22-NB-r14}
 
+SIB-Type-NB-v1530 ::=				ENUMERATED {
+										sibType23-NB-r15, spare7, spare6, spare5,
+										spare4, spare3, spare2, spare1}
+
 CellSelectionInfo-NB-v1350 ::=		SEQUENCE {
 	delta-RxLevMin-v1350				INTEGER (-8..-1)
 }
@@ -739,8 +872,15 @@ SystemInformationBlockType2-NB-r13 ::=	SEQUENCE {
 	...,
 	[[	cp-Reestablishment-r14				ENUMERATED {true}				OPTIONAL		-- Need OP
 	]],
-	[[	cqi-Reporting-r14					ENUMERATED {true} 				OPTIONAL,		-- Need OR
-		servingCellMeasInfo-r14				ENUMERATED {true} 				OPTIONAL		-- Need OR
+	[[	servingCellMeasInfo-r14				ENUMERATED {true} 				OPTIONAL,		-- Need OR
+		cqi-Reporting-r14					ENUMERATED {true} 				OPTIONAL		-- Need OR
+	]],
+	[[	enhancedPHR-r15						ENUMERATED {true}		OPTIONAL,	-- Need OR
+		freqInfo-v1530						SEQUENCE {
+			tdd-UL-DL-AlignmentOffset-r15		TDD-UL-DL-AlignmentOffset-NB-r15
+		}	OPTIONAL,		-- Cond TDD
+		cp-EDT-r15							ENUMERATED {true}		OPTIONAL,	-- Need OR
+		up-EDT-r15							ENUMERATED {true}		OPTIONAL	-- Need OR
 	]]
 }
 
@@ -774,6 +914,9 @@ SystemInformationBlockType3-NB-r13 ::=	SEQUENCE {
 	[[	intraFreqCellReselectionInfo-v1430	IntraFreqCellReselectionInfo-NB-v1430 OPTIONAL	-- Need OR
 	]],
 	[[	cellReselectionInfoCommon-v1450		CellReselectionInfoCommon-NB-v1450	OPTIONAL	-- Need OR
+	]],
+	[[	nsss-RRM-Config-r15					NSSS-RRM-Config-NB-r15	OPTIONAL,	-- Need OR
+		npbch-RRM-Config-r15				ENUMERATED {enabled}	OPTIONAL	-- Need OR
 	]]
 }
 
@@ -799,9 +942,17 @@ SystemInformationBlockType4-NB-r13 ::=		SEQUENCE {
 	intraFreqNeighCellList-r13			IntraFreqNeighCellList	OPTIONAL,	-- Need OR
 	intraFreqBlackCellList-r13			IntraFreqBlackCellList	OPTIONAL,	-- Need OR
 	lateNonCriticalExtension			OCTET STRING			OPTIONAL,
-	...
+	...,
+	[[	nsss-RRM-Config-r15				NSSS-RRM-Config-NB-r15	OPTIONAL,	-- Need OR
+		intraFreqNeighCellList-v1530	IntraFreqNeighCellList-NB-v1530	OPTIONAL	-- Need OR
+	]]
 }
 
+IntraFreqNeighCellList-NB-v1530 ::=		SEQUENCE (SIZE (1..maxCellIntra)) OF IntraFreqNeighCellInfo-NB-v1530
+
+IntraFreqNeighCellInfo-NB-v1530 ::=		SEQUENCE {
+	nsss-RRM-Config-r15						NSSS-RRM-Config-NB-r15 	OPTIONAL	-- Cond NSSS-RRM
+}
 
 
 SystemInformationBlockType5-NB-r13 ::=	SEQUENCE {
@@ -832,14 +983,21 @@ InterFreqCarrierFreqInfo-NB-r13 ::=	SEQUENCE {
 	[[	powerClass14dBm-Offset-r14		ENUMERATED {dB-6, dB-3, dB3, dB6, dB9, dB12}
 OPTIONAL,	--	Need OP
 		ce-AuthorisationOffset-r14		ENUMERATED {dB5, dB10, dB15, dB20, dB25, dB30, dB35}	OPTIONAL	-- Need OP
+	]],
+	[[	nsss-RRM-Config-r15				NSSS-RRM-Config-NB-r15	OPTIONAL,	-- Need OR
+		interFreqNeighCellList-v1530	InterFreqNeighCellList-NB-v1530	OPTIONAL -- Need OR
 	]]
 }
 
 InterFreqNeighCellList-NB-r13 ::=		SEQUENCE (SIZE (1..maxCellInter)) OF PhysCellId
 
+InterFreqNeighCellList-NB-v1530 ::=		SEQUENCE (SIZE (1..maxCellInter)) OF InterFreqNeighCellInfo-NB-v1530
 
-InterFreqBlackCellList-NB-r13 ::=		SEQUENCE (SIZE (1..maxCellBlack)) OF PhysCellId
+InterFreqNeighCellInfo-NB-v1530 ::=		SEQUENCE {
+	nsss-RRM-Config-r15						NSSS-RRM-Config-NB-r15 	OPTIONAL 	-- Cond NSSS-RRM
+}
 
+InterFreqBlackCellList-NB-r13 ::=		SEQUENCE (SIZE (1..maxCellBlack)) OF PhysCellId
 
 
 SystemInformationBlockType14-NB-r13 ::=	SEQUENCE {
@@ -848,7 +1006,9 @@ SystemInformationBlockType14-NB-r13 ::=	SEQUENCE {
 		ab-PerPLMN-List-r13				SEQUENCE (SIZE (1..maxPLMN-r11)) OF AB-ConfigPLMN-NB-r13
 	}															OPTIONAL, -- Need OR
 	lateNonCriticalExtension		OCTET STRING				OPTIONAL,
-	...
+	...,
+	[[	ab-PerNRSRP-r15				ENUMERATED {thresh1, thresh2}	OPTIONAL	--	Need OR
+	]]
 }
 
 AB-ConfigPLMN-NB-r13 ::=	SEQUENCE {
@@ -946,7 +1106,15 @@ SystemInformationBlockType22-NB-r14 ::=	SEQUENCE {
 	pagingWeightAnchor-r14				PagingWeight-NB-r14			OPTIONAL,	-- Cond pcch-config
 	nprach-ProbabilityAnchorList-r14	NPRACH-ProbabilityAnchorList-NB-r14	OPTIONAL,	-- Cond nprach-config
 	lateNonCriticalExtension			OCTET STRING					OPTIONAL,
-	...
+	...,
+	[[	mixedOperationModeConfig-r15	SEQUENCE {
+			dl-ConfigListMixed-r15			DL-ConfigCommonList-NB-r14	OPTIONAL,	-- Need OR
+			ul-ConfigListMixed-r15			UL-ConfigCommonList-NB-r14	OPTIONAL,	-- Need OR
+			pagingDistribution-r15			ENUMERATED {true}			OPTIONAL,	-- Need OR
+			nprach-Distribution-r15			ENUMERATED {true}			OPTIONAL 	-- Need OR
+		}																OPTIONAL,	-- Need OR
+		ul-ConfigList-r15				UL-ConfigCommonListTDD-NB-r15	OPTIONAL	-- Cond TDD
+	]]
 }
 
 DL-ConfigCommonList-NB-r14 ::=		SEQUENCE (SIZE (1.. maxNonAnchorCarriers-NB-r14)) OF
@@ -955,11 +1123,15 @@ DL-ConfigCommonList-NB-r14 ::=		SEQUENCE (SIZE (1.. maxNonAnchorCarriers-NB-r14)
 UL-ConfigCommonList-NB-r14 ::=		SEQUENCE (SIZE (1.. maxNonAnchorCarriers-NB-r14)) OF
 											UL-ConfigCommon-NB-r14
 
+UL-ConfigCommonListTDD-NB-r15 ::=	SEQUENCE (SIZE (1.. maxNonAnchorCarriers-NB-r14)) OF
+											UL-ConfigCommonTDD-NB-r15
 
 DL-ConfigCommon-NB-r14 ::=			SEQUENCE {
 	dl-CarrierConfig-r14				DL-CarrierConfigCommon-NB-r14,
 	pcch-Config-r14 					PCCH-Config-NB-r14			OPTIONAL, -- Need OR
-	...
+	...,
+	[[	wus-Config-r15					WUS-ConfigPerCarrier-NB-r15		OPTIONAL	-- Cond WUS
+	]]
 }
 
 PCCH-Config-NB-r14 ::=				SEQUENCE {
@@ -977,6 +1149,14 @@ PagingWeight-NB-r14	::=			ENUMERATED {w1, w2, w3, w4, w5, w6, w7, w8,
 UL-ConfigCommon-NB-r14 ::=			SEQUENCE {
 	ul-CarrierFreq-r14					CarrierFreq-NB-r13,
 	nprach-ParametersList-r14 			NPRACH-ParametersList-NB-r14	OPTIONAL, -- Need OR
+	...,
+	[[	nprach-ParametersListEDT-r15	NPRACH-ParametersList-NB-r14	OPTIONAL -- Cond EDT
+	]]
+}
+
+UL-ConfigCommonTDD-NB-r15 ::=		SEQUENCE {
+	tdd-UL-DL-AlignmentOffset-r15		TDD-UL-DL-AlignmentOffset-NB-r15,
+	nprach-ParametersListTDD-r15 		NPRACH-ParametersListTDD-NB-r15	OPTIONAL, -- Need OR
 	...
 }
 
@@ -1008,7 +1188,7 @@ NPRACH-Parameters-NB-r14 ::=			SEQUENCE {
 													OPTIONAL,	-- NEED OP
 		nprach-NumCBRA-StartSubcarriers-r14		ENUMERATED {n8, n10, n11, n12, n20, n22, n23, n24,
 															n32, n34, n35, n36, n40, n44, n46, n48}
-													OPTIONAL,	-- NEED OP 
+													OPTIONAL,	-- NEED OP
 		npdcch-CarrierIndex-r14					INTEGER (1..maxNonAnchorCarriers-NB-r14)
 													OPTIONAL,	-- Need OP
 		...
@@ -1028,6 +1208,23 @@ NPRACH-ProbabilityAnchor-NB-r14 ::=		SEQUENCE {
 }
 
 
+SystemInformationBlockType23-NB-r15 ::=	SEQUENCE {
+	ul-ConfigList-v1530 					UL-ConfigCommonList-NB-v1530	OPTIONAL,	-- Need OR
+	ul-ConfigListMixed-v1530 				UL-ConfigCommonList-NB-v1530	OPTIONAL,	-- Need OR
+	lateNonCriticalExtension				OCTET STRING					OPTIONAL,
+	...
+}
+
+UL-ConfigCommonList-NB-v1530 ::=		SEQUENCE (SIZE (1.. maxNonAnchorCarriers-NB-r14)) OF
+											UL-ConfigCommon-NB-v1530
+
+UL-ConfigCommon-NB-v1530 ::=			SEQUENCE {
+	nprach-ParametersListFmt2-r15 			NPRACH-ParametersListFmt2-NB-r15	OPTIONAL, -- Need OR
+	nprach-ParametersListFmt2EDT-r15 		NPRACH-ParametersListFmt2-NB-r15	OPTIONAL, -- Cond EDT
+	...
+}
+
+
 CarrierConfigDedicated-NB-r13 ::=		SEQUENCE {
 	dl-CarrierConfig-r13		DL-CarrierConfigDedicated-NB-r13,
 	ul-CarrierConfig-r13		UL-CarrierConfigDedicated-NB-r13
@@ -1055,19 +1252,23 @@ DL-CarrierConfigDedicated-NB-r13 ::=	SEQUENCE {
 			differentPCI-r13						SEQUENCE {
 				eutra-NumCRS-Ports-r13					ENUMERATED {same, four}
 			}
-		}							OPTIONAL,		-- Cond anchor-guardband
+		}							OPTIONAL,		-- Cond anchor-guardband-or-standalone
 		eutraControlRegionSize-r13				ENUMERATED {n1, n2, n3}	
 	}								OPTIONAL,		-- Cond non-anchor-inband
 	...,
 	[[	nrs-PowerOffsetNonAnchor-v1330		ENUMERATED {dB-12, dB-10, dB-8, dB-6,
 														dB-4, dB-2, dB0, dB3}	
 									OPTIONAL	-- Need ON
+	]],
+	[[	dl-GapNonAnchor-v1530				DL-GapConfig-NB-v1530	OPTIONAL 	-- Cond TDD1
 	]]
 }
 
 UL-CarrierConfigDedicated-NB-r13 ::=	SEQUENCE {
 	ul-CarrierFreq-r13			CarrierFreq-NB-r13		OPTIONAL,	-- Need OP
-	...
+	...,
+	[[	tdd-UL-DL-AlignmentOffset-r15		TDD-UL-DL-AlignmentOffset-NB-r15		OPTIONAL		-- Cond TDD
+	]]
 }
 
 
@@ -1080,6 +1281,9 @@ CarrierFreq-NB-r13 ::=		SEQUENCE {
 }
 
 
+ChannelRasterOffset-NB-r13 ::= ENUMERATED {khz-7dot5, khz-2dot5, khz2dot5, khz7dot5}
+
+
 DL-Bitmap-NB-r13 ::=			CHOICE {
 	subframePattern10-r13			BIT STRING (SIZE (10)),
 	subframePattern40-r13			BIT STRING (SIZE (40))
@@ -1106,12 +1310,14 @@ DL-CarrierConfigCommon-NB-r14 ::=	SEQUENCE {
 			differentPCI-r14					SEQUENCE {
 				eutra-NumCRS-Ports-r14				ENUMERATED {same, four}
 			}
-		}	OPTIONAL,		-- Cond anchor-guardband
+		}	OPTIONAL,		-- Cond anchor-guardband-or-standalone
 		eutraControlRegionSize-r14			ENUMERATED {n1, n2, n3}	
 	}	OPTIONAL,		-- Cond non-anchor-inband
 	nrs-PowerOffsetNonAnchor-r14		ENUMERATED {dB-12, dB-10, dB-8, dB-6,
 													dB-4, dB-2, dB0, dB3}	DEFAULT dB0,
-	...
+	...,
+	[[	dl-GapNonAnchor-v1530				DL-GapConfig-NB-v1530	OPTIONAL 	-- Cond TDD
+	]]
 }
 
 
@@ -1122,6 +1328,10 @@ DL-GapConfig-NB-r13	::=		SEQUENCE {
 	dl-GapDurationCoeff-r13		ENUMERATED {oneEighth, oneFourth, threeEighth, oneHalf}
 }
 
+DL-GapConfig-NB-v1530	::=	SEQUENCE {
+	dl-GapPeriodicity-v1530		ENUMERATED {sf1024}
+}
+
 
 LogicalChannelConfig-NB-r13 ::=		SEQUENCE {
 	priority-r13						INTEGER (1..16)			OPTIONAL,		-- Cond UL
@@ -1200,6 +1410,10 @@ NPDCCH-ConfigDedicated-NB-r13 ::=	SEQUENCE {
 	npdcch-Offset-USS-r13				ENUMERATED {zero, oneEighth, oneFourth, threeEighth}
 }
 
+NPDCCH-ConfigDedicated-NB-v1530 ::=	SEQUENCE {
+	npdcch-StartSF-USS-v1530			ENUMERATED {v96, v128}
+}
+
 
 
 NPDSCH-ConfigCommon-NB-r13 ::=	SEQUENCE {
@@ -1209,7 +1423,7 @@ NPDSCH-ConfigCommon-NB-r13 ::=	SEQUENCE {
 
 NPRACH-ConfigSIB-NB-r13 ::=			SEQUENCE {
 	nprach-CP-Length-r13				ENUMERATED {us66dot7, us266dot7},
-	rsrp-ThresholdsPrachInfoList-r13	RSRP-ThresholdsNPRACH-InfoList-NB-r13	OPTIONAL,	-- need OR
+	rsrp-ThresholdsPrachInfoList-r13	RSRP-ThresholdsNPRACH-InfoList-NB-r13	OPTIONAL,	-- Need OR
 	nprach-ParametersList-r13		NPRACH-ParametersList-NB-r13
 }
 
@@ -1221,6 +1435,26 @@ NPRACH-ConfigSIB-NB-v1450 ::=		SEQUENCE {
 	maxNumPreambleAttemptCE-r14			ENUMERATED {n3, n4, n5, n6, n7, n8, n10, spare1}
 }
 
+NPRACH-ConfigSIB-NB-v1530 ::=		SEQUENCE {
+	tdd-Parameters-r15					SEQUENCE {
+		nprach-PreambleFormat-r15			ENUMERATED {
+												fmt0, fmt1, fmt2, fmt0-a, fmt1-a},
+		numRepetitionsPerPreambleAttempt-r15 ENUMERATED {
+												n1, n2, n4, n8, n16, n32, n64, n128,
+												n256, n512, n1024},
+		nprach-ParametersListTDD-r15		NPRACH-ParametersListTDD-NB-r15
+	}	OPTIONAL,		-- Cond TDD
+	fmt2-Parameters-r15					SEQUENCE {
+		nprach-ParametersListFmt2-r15		NPRACH-ParametersListFmt2-NB-r15 OPTIONAL,	-- Need OR
+		nprach-ParametersListFmt2EDT-r15	NPRACH-ParametersListFmt2-NB-r15 OPTIONAL	-- Cond EDT2
+	}	OPTIONAL,		-- Need OR
+	edt-Parameters-r15					SEQUENCE {
+		edt-SmallTBS-Subset-r15				ENUMERATED {true}				OPTIONAL,	-- Need OR
+		edt-TBS-InfoList-r15				EDT-TBS-InfoList-NB-r15,
+		nprach-ParametersListEDT-r15		NPRACH-ParametersList-NB-r14	OPTIONAL	-- Need OR
+	}	OPTIONAL		-- Cond EDT
+}
+
 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
@@ -1247,8 +1481,84 @@ NPRACH-Parameters-NB-v1330 ::=		SEQUENCE {
 														n32, n34, n35, n36, n40, n44, n46, n48}
 }
 
+NPRACH-ParametersListTDD-NB-r15 ::=	SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF
+											NPRACH-ParametersTDD-NB-r15
+
+NPRACH-ParametersTDD-NB-r15 ::=		SEQUENCE {
+	nprach-Parameters-r15					SEQUENCE {
+		nprach-Periodicity-r15					ENUMERATED {ms80, ms160, ms320, ms640,
+															ms1280, ms2560, ms5120, ms10240}
+													OPTIONAL,	-- NEED OP
+		nprach-StartTime-r15					ENUMERATED {ms10, ms20, ms40, ms80,
+															ms160, ms320, ms640, ms1280,
+															ms2560, ms5120, spare6, spare5,
+															spare4, spare3, spare2, spare1}
+													OPTIONAL,	-- NEED OP
+		nprach-SubcarrierOffset-r15				ENUMERATED {n0, n12, n24, n36, n2, n18, n34, spare1}
+													OPTIONAL,	-- NEED OP
+		nprach-NumSubcarriers-r15				ENUMERATED {n12, n24, n36, n48}
+													OPTIONAL,	-- NEED OP
+		nprach-SubcarrierMSG3-RangeStart-r15	ENUMERATED {zero, oneThird, twoThird, one}
+													OPTIONAL,	-- NEED OP
+		npdcch-NumRepetitions-RA-r15			ENUMERATED {r1, r2, r4, r8, r16, r32, r64, r128,
+															r256, r512, r1024, r2048,
+															spare4, spare3, spare2, spare1}
+													OPTIONAL,	-- NEED OP
+		npdcch-StartSF-CSS-RA-r15				ENUMERATED {v4, v8, v16, v32, v48, v64, v96, v128}
+														OPTIONAL,	-- NEED OP
+		npdcch-Offset-RA-r15					ENUMERATED {zero, oneEighth, oneFourth, threeEighth}
+													OPTIONAL,	-- NEED OP
+		nprach-NumCBRA-StartSubcarriers-r15		ENUMERATED {n8, n10, n11, n12, n20, n22, n23, n24,
+															n32, n34, n35, n36, n40, n44, n46, n48}
+													OPTIONAL,	-- NEED OP
+		...
+	}	OPTIONAL	-- Need OR
+}
+
+NPRACH-ParametersListFmt2-NB-r15 ::=	SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF NPRACH-ParametersFmt2-NB-r15
+
+NPRACH-ParametersFmt2-NB-r15 ::=		SEQUENCE {
+	nprach-Parameters-r15					SEQUENCE {
+		nprach-Periodicity-r15					ENUMERATED {ms40, ms80, ms160, ms320,
+															ms640, ms1280, ms2560, ms5120}
+													OPTIONAL,	-- NEED OP
+		nprach-StartTime-r15					ENUMERATED {ms8, ms16, ms32, ms64,
+															ms128, ms256, ms512, ms1024}
+													OPTIONAL,	-- NEED OP
+		nprach-SubcarrierOffset-r15				ENUMERATED {n0, n36, n72, n108, n6, n54, n102, n42,
+															n78, n90, n12, n24, n48, n84, n60, n18}
+													OPTIONAL,	-- NEED OP
+		nprach-NumSubcarriers-r15				ENUMERATED {n36, n72, n108, n144}
+													OPTIONAL,	-- NEED OP
+		nprach-SubcarrierMSG3-RangeStart-r15	ENUMERATED {zero, oneThird, twoThird, one}
+													OPTIONAL,	-- NEED OP
+		npdcch-NumRepetitions-RA-r15			ENUMERATED {r1, r2, r4, r8, r16, r32, r64, r128,
+															r256, r512, r1024, r2048,
+															spare4, spare3, spare2, spare1}
+													OPTIONAL,	-- NEED OP
+		npdcch-StartSF-CSS-RA-r15				ENUMERATED {v1dot5, v2, v4, v8, v16, v32, v48, v64}
+														OPTIONAL,	-- NEED OP
+		npdcch-Offset-RA-r15					ENUMERATED {zero, oneEighth, oneFourth, threeEighth}
+													OPTIONAL,	-- NEED OP
+		nprach-NumCBRA-StartSubcarriers-r15		ENUMERATED {
+													n24, n30, n33, n36, n60, n66, n69, n72,
+													n96, n102, n105, n108, n120, n132, n138, n144}
+													OPTIONAL,	-- NEED OP
+		npdcch-CarrierIndex-r15					INTEGER (1..maxNonAnchorCarriers-NB-r14)
+													OPTIONAL,	-- Need OP
+		...
+	}	OPTIONAL	-- Need OR
+}
+
 RSRP-ThresholdsNPRACH-InfoList-NB-r13 ::= SEQUENCE (SIZE(1..2)) OF RSRP-Range
 
+EDT-TBS-InfoList-NB-r15 ::=	SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF EDT-TBS-NB-r15
+
+EDT-TBS-NB-r15 ::=	SEQUENCE {
+	edt-SmallTBS-Enabled-r15		BOOLEAN,
+	edt-TBS-r15			ENUMERATED {b328, b408, b504, b584, b680, b808, b936, b1000}
+}
+
 
 NPUSCH-ConfigCommon-NB-r13 ::=		SEQUENCE {
 	ack-NACK-NumRepetitions-Msg4-r13	SEQUENCE (SIZE(1.. maxNPRACH-Resources-NB-r13)) OF
@@ -1316,6 +1626,8 @@ PhysicalConfigDedicated-NB-r13 ::=	SEQUENCE {
 	[[	twoHARQ-ProcessesConfig-r14		ENUMERATED {true}	OPTIONAL	-- Need OR
 	]],
 	[[	interferenceRandomisationConfig-r14	ENUMERATED {true}	OPTIONAL	-- Need OR
+	]],
+	[[	npdcch-ConfigDedicated-v1530	NPDCCH-ConfigDedicated-NB-v1530		OPTIONAL	-- Cond TDD
 	]]
 }
 
@@ -1327,11 +1639,15 @@ RACH-ConfigCommon-NB-r13 ::=		SEQUENCE {
 	connEstFailOffset-r13				INTEGER (0..15)					OPTIONAL,	-- Need OP
 	...,
 	[[	powerRampingParameters-v1450	PowerRampingParameters-NB-v1450	OPTIONAL	-- Need OR
+	]],
+	[[ rach-InfoList-v1530				RACH-InfoList-NB-v1530	OPTIONAL -- Cond EDT
 	]]
 }
 
 RACH-InfoList-NB-r13 ::=	SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF RACH-Info-NB-r13
 
+RACH-InfoList-NB-v1530 ::=	SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF RACH-Info-NB-v1530
+
 RACH-Info-NB-r13	::=		SEQUENCE {
 	ra-ResponseWindowSize-r13			ENUMERATED {
 											pp2, pp3, pp4, pp5, pp6, pp7, pp8, pp10},
@@ -1339,6 +1655,11 @@ RACH-Info-NB-r13	::=		SEQUENCE {
 											pp1, pp2, pp3, pp4, pp8, pp16, pp32, pp64}
 }
 
+RACH-Info-NB-v1530 ::=		SEQUENCE {
+	mac-ContentionResolutionTimer-r15	ENUMERATED {
+											pp1, pp2, pp3, pp4, pp8, pp16, pp32, pp64}
+}
+
 PowerRampingParameters-NB-v1450 ::=		SEQUENCE {
 	preambleInitialReceivedTargetPower-v1450		ENUMERATED {
 													dBm-130, dBm-128, dBm-126, dBm-124, dBm-122,
@@ -1369,6 +1690,10 @@ RadioResourceConfigCommonSIB-NB-r13 ::=	SEQUENCE {
 	[[	nprach-Config-v1330					NPRACH-ConfigSIB-NB-v1330	OPTIONAL		-- Need OR
 	]],
 	[[	nprach-Config-v1450					NPRACH-ConfigSIB-NB-v1450	OPTIONAL		-- Cond EnhPowerControl
+	]],
+	[[	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
 	]]
 }
 
@@ -1376,7 +1701,6 @@ BCCH-Config-NB-r13 ::=					SEQUENCE {
 	modificationPeriodCoeff-r13				ENUMERATED {n16, n32, n64, n128}
 }
 
-
 PCCH-Config-NB-r13 ::=					SEQUENCE {
 	defaultPagingCycle-r13					ENUMERATED {rf128, rf256, rf512, rf1024},
 	nB-r13									ENUMERATED {
@@ -1401,7 +1725,9 @@ RadioResourceConfigDedicated-NB-r13 ::=	SEQUENCE {
 	}																		OPTIONAL,	-- Need ON
 	physicalConfigDedicated-r13				PhysicalConfigDedicated-NB-r13	OPTIONAL,	-- Need ON
 	rlf-TimersAndConstants-r13				RLF-TimersAndConstants-NB-r13	OPTIONAL,	-- Need ON
-	...
+	...,
+	[[	schedulingRequestConfig-r15			SchedulingRequestConfig-NB-r15	OPTIONAL	-- Need ON
+	]]
 }
 
 SRB-ToAddModList-NB-r13 ::=			SEQUENCE (SIZE (1)) OF SRB-ToAddMod-NB-r13
@@ -1442,7 +1768,11 @@ RLC-Config-NB-r13 ::=	CHOICE	{
 		ul-AM-RLC-r13				UL-AM-RLC-NB-r13,
 		dl-AM-RLC-r13				DL-AM-RLC-NB-r13
 	},
-	...
+	...,
+	[[	um-Bi-Directional-r15		NULL,
+		um-Uni-Directional-UL-r15	NULL,
+		um-Uni-Directional-DL-r15	NULL
+	]]
 }
 
 RLC-Config-NB-v1430 ::=	SEQUENCE {
@@ -1461,7 +1791,7 @@ DL-AM-RLC-NB-r13 ::=		SEQUENCE {
 T-PollRetransmit-NB-r13 ::=	ENUMERATED {
 									ms250,	ms500,	ms1000,	ms2000,	ms3000,	ms4000,
 									ms6000, ms10000, ms15000, ms25000, ms40000, ms60000,
-									ms90000, ms120000, ms180000, spare1}
+									ms90000, ms120000, ms180000, ms300000-v1530}
 
 
 
@@ -1485,11 +1815,65 @@ RLF-TimersAndConstants-NB-r13 ::=	CHOICE {
 		[[ t311-v1350						ENUMERATED {
 												ms40000, ms60000, ms90000, ms120000}
 														OPTIONAL	-- Need OR
+		]],
+		[[	t301-v1530						ENUMERATED {
+												ms80000, ms100000, ms120000}
+														OPTIONAL,	-- Cond TDD
+			t311-v1530						ENUMERATED {
+												ms160000, ms200000}
+														OPTIONAL	-- Cond TDD
 		]]
 	}
 }
 
 
+SchedulingRequestConfig-NB-r15 ::=	SEQUENCE {
+	sr-WithHARQ-ACK-Config-r15			ENUMERATED {true}	OPTIONAL,
+	sr-WithoutHARQ-ACK-Config-r15			SR-WithoutHARQ-ACK-Config-NB-r15	OPTIONAL,	-- Need ON
+	sr-SPS-BSR-Config-r15				SR-SPS-BSR-Config-NB-r15			OPTIONAL,	-- Need ON
+	...
+}
+
+SR-WithoutHARQ-ACK-Config-NB-r15 ::= CHOICE {
+	release								NULL,
+	setup								SEQUENCE {
+		sr-ProhibitTimer-r15				INTEGER (0..7)	OPTIONAL,	-- Need ON
+		sr-NPRACH-Resource-r15				SR-NPRACH-Resource-NB-r15	OPTIONAL -- Need ON
+	}
+}
+
+SR-NPRACH-Resource-NB-r15		::=	SEQUENCE {
+	nprach-CarrierIndex-r15				INTEGER (0..maxNonAnchorCarriers-NB-r14),
+	nprach-ResourceIndex-r15			INTEGER (1..maxNPRACH-Resources-NB-r13),
+	nprach-SubCarrierIndex-r15			CHOICE {
+		nprach-Fmt0Fmt1-r15					INTEGER (0..47),
+		nprach-Fmt2-r15						INTEGER (0..143)
+	},
+	p0-SR-r15							INTEGER (-126..24),
+	alpha-r15							ENUMERATED {al0, al04, al05, al06, al07, al08, al09, al1}}
+
+SR-SPS-BSR-Config-NB-r15	 ::= CHOICE {
+	release								NULL,
+	setup								SEQUENCE {
+		semiPersistSchedC-RNTI-r15			C-RNTI,
+		semiPersistSchedIntervalUL-r15		ENUMERATED {sf128, sf256, sf512, sf1024,
+														sf1280, sf2048, sf2560, sf5120}
+	}
+}
+
+
+TDD-Config-NB-r15 ::=					SEQUENCE {
+	subframeAssignment-r15					ENUMERATED {
+												sa1, sa2, sa3, sa4, sa5},
+	specialSubframePatterns-r15				ENUMERATED {
+												ssp0, ssp1, ssp2, ssp3, ssp4, ssp5, ssp6, ssp7,
+												ssp8, ssp9, ssp10, ssp10-CRS-LessDwPTS}
+}
+
+
+TDD-UL-DL-AlignmentOffset-NB-r15 ::=				ENUMERATED {	khz-7dot5, khz0, khz7dot5}
+
+
 
 UplinkPowerControlCommon-NB-r13 ::=	SEQUENCE {
 	p0-NominalNPUSCH-r13				INTEGER (-126..24),
@@ -1502,6 +1886,23 @@ UplinkPowerControlDedicated-NB-r13 ::=	SEQUENCE {
 }
 
 
+WUS-Config-NB-r15 ::=			SEQUENCE {
+	maxDurationFactor-r15			WUS-MaxDurationFactor-NB-r15,
+	numPOs-r15						ENUMERATED {n1, n2, n4}		DEFAULT n1,	
+	numDRX-CyclesRelaxed-r15			ENUMERATED {n1, n2, n4, n8},	
+	timeOffsetDRX-r15				ENUMERATED {ms40, ms80, ms160, ms240},
+	timeOffset-eDRX-Short-r15		ENUMERATED {ms40, ms80, ms160, ms240},
+	timeOffset-eDRX-Long-r15		ENUMERATED {ms1000, ms2000}	OPTIONAL,	-- Need OP
+	...	
+}
+
+WUS-ConfigPerCarrier-NB-r15 ::=	SEQUENCE {
+	maxDurationFactor-r15			WUS-MaxDurationFactor-NB-r15
+}
+
+WUS-MaxDurationFactor-NB-r15 ::= ENUMERATED {one128th, one64th, one32th, one16th,
+											oneEighth, oneQuarter, oneHalf}
+
 AdditionalBandInfoList-NB-r14 ::=	SEQUENCE (SIZE (1..maxMultiBands)) OF FreqBandIndicator-NB-r13
 
 
@@ -1531,9 +1932,9 @@ T-Reselection-NB-r13 ::=		ENUMERATED {s0, s3, s6, s9, s12, s15, s18, s21}
 
 
 CQI-NPDCCH-NB-r14 ::=	ENUMERATED {
-							noMeasurements, candidateRep-A, candidateRep-B, candidateRep-C, 
-							candidateRep-D, candidateRep-E, candidateRep-F, candidateRep-G, 
-							candidateRep-H, candidateRep-I, candidateRep-J, candidateRep-K, 
+							noMeasurements, candidateRep-A, candidateRep-B, candidateRep-C,
+							candidateRep-D, candidateRep-E, candidateRep-F, candidateRep-G,
+							candidateRep-H, candidateRep-I, candidateRep-J, candidateRep-K,
 							candidateRep-L}
 
 
@@ -1553,6 +1954,11 @@ NRSRP-Range-NB-r14 ::=				INTEGER(0..113)
 NRSRQ-Range-NB-r14 ::=				INTEGER(-30..46)
 
 
+NSSS-RRM-Config-NB-r15	::=				SEQUENCE {
+	nsss-RRM-PowerOffset-r15			ENUMERATED {dB-3, db0, dB3},
+	nsss-NumOccDiffPrecoders-r15		ENUMERATED {n1, n2, n4, n8}	OPTIONAL 	-- 	Need OP
+}
+
 EstablishmentCause-NB-r13 ::=			ENUMERATED {
 											mt-Access, mo-Signalling, mo-Data, mo-ExceptionData,
 											delayTolerantAccess-v1330, spare3, spare2, spare1}
@@ -1578,10 +1984,32 @@ UE-Capability-NB-Ext-r14-IEs ::=		SEQUENCE {
 
 UE-Capability-NB-v1440-IEs ::=		SEQUENCE {
 	phyLayerParameters-v1440			PhyLayerParameters-NB-v1440		OPTIONAL,
-	nonCriticalExtension				SEQUENCE {}						OPTIONAL
+	nonCriticalExtension				UE-Capability-NB-v14x0-IEs		OPTIONAL
+}
+
+UE-Capability-NB-v14x0-IEs ::=		SEQUENCE {
+-- Following field is only to be used for late REL-14 extensions
+	lateNonCriticalExtension			OCTET STRING					OPTIONAL,
+	nonCriticalExtension				UE-Capability-NB-v1530-IEs		OPTIONAL
 }
 
-AccessStratumRelease-NB-r13 ::=		ENUMERATED {rel13, rel14, spare6, spare5, spare4, spare3, spare2, spare1, ...}
+UE-Capability-NB-v1530-IEs ::=		SEQUENCE {
+	earlyData-UP-r15					ENUMERATED {supported}			OPTIONAL,
+	rlc-Parameters-r15					RLC-Parameters-NB-r15,
+	mac-Parameters-v1530				MAC-Parameters-NB-v1530,
+	phyLayerParameters-v1530			PhyLayerParameters-NB-v1530		OPTIONAL,
+	tdd-UE-Capability-r15				TDD-UE-Capability-NB-r15		OPTIONAL,	nonCriticalExtension				SEQUENCE {}						OPTIONAL
+}
+
+TDD-UE-Capability-NB-r15 ::=		SEQUENCE {
+	ue-Category-NB-r15					ENUMERATED {nb2}				OPTIONAL,
+	phyLayerParametersRel13-r15			PhyLayerParameters-NB-r13		OPTIONAL,
+	phyLayerParametersRel14-r15			PhyLayerParameters-NB-v1430		OPTIONAL,
+	phyLayerParameters-v1530			PhyLayerParameters-NB-v1530		OPTIONAL,
+	...
+}
+
+AccessStratumRelease-NB-r13 ::=		ENUMERATED {rel13, rel14, rel15, spare5, spare4, spare3, spare2, spare1, ...}
 
 PDCP-Parameters-NB-r13		::= SEQUENCE {
 	supportedROHC-Profiles-r13			SEQUENCE {
@@ -1597,11 +2025,19 @@ PDCP-Parameters-NB-r13		::= SEQUENCE {
 	...
 }
 
+RLC-Parameters-NB-r15		::=		SEQUENCE {
+	rlc-UM-r15							ENUMERATED {supported}				OPTIONAL
+}
+
 MAC-Parameters-NB-r14		::=		SEQUENCE {
 	dataInactMon-r14					ENUMERATED {supported}					OPTIONAL,
 	rai-Support-r14						ENUMERATED {supported}				OPTIONAL
 }
 
+MAC-Parameters-NB-v1530		::=		SEQUENCE {
+	sr-SPS-BSR-r15						ENUMERATED {supported}			OPTIONAL
+}
+
 PhyLayerParameters-NB-r13	::=		SEQUENCE {
 	multiTone-r13						ENUMERATED {supported}			OPTIONAL,
 	multiCarrier-r13						ENUMERATED {supported}			OPTIONAL
@@ -1616,6 +2052,15 @@ PhyLayerParameters-NB-v1440	::=		SEQUENCE {
 	interferenceRandomisation-r14		ENUMERATED {supported}			OPTIONAL
 }
 
+PhyLayerParameters-NB-v1530	::=		SEQUENCE {
+	mixedOperationMode-r15				ENUMERATED {supported}			OPTIONAL,
+	sr-WithHARQ-ACK-r15					ENUMERATED {supported}			OPTIONAL,
+	sr-WithoutHARQ-ACK-r15				ENUMERATED {supported}			OPTIONAL,
+	nprach-Format2-r15					ENUMERATED {supported}			OPTIONAL,
+	additionalTransmissionSIB1-r15		ENUMERATED {supported}			OPTIONAL,
+	npusch-3dot75kHz-SCS-TDD-r15		ENUMERATED {supported}			OPTIONAL
+}
+
 RF-Parameters-NB-r13	::=			SEQUENCE {
 	supportedBandList-r13				SupportedBandList-NB-r13,
 	multiNS-Pmax-r13					ENUMERATED {supported}		OPTIONAL
@@ -1637,6 +2082,11 @@ UE-RadioPagingInfo-NB-r13 ::=		SEQUENCE {
 	ue-Category-NB-r13				ENUMERATED {nb1}			OPTIONAL,
 	...,
 	[[ multiCarrierPaging-r14		ENUMERATED {true}			OPTIONAL
+	]],
+	[[	mixedOperationMode-r15		ENUMERATED {supported}		OPTIONAL,
+		wakeUpSignal-r15			ENUMERATED {true}			OPTIONAL,
+		wakeUpSignalMinGap-eDRX-r15	ENUMERATED {ms40, ms240, ms1000, ms2000}	OPTIONAL,
+		multiCarrierPagingTDD-r15	ENUMERATED {true}			OPTIONAL
 	]]
 }
 
@@ -1661,6 +2111,15 @@ UE-TimersAndConstants-NB-r13 ::=	SEQUENCE {
 	[[ t311-v1350						ENUMERATED {
 											ms40000, ms60000, ms90000, ms120000}
 														OPTIONAL	-- Need OR
+	]],
+	[[	t300-v1530						ENUMERATED {
+											ms80000, ms100000, ms120000}	OPTIONAL,	-- Cond TDD
+		t301-v1530						ENUMERATED {
+											ms80000, ms100000, ms120000}	OPTIONAL,	-- Cond TDD
+		t311-v1530						ENUMERATED {
+											ms160000, ms200000}				OPTIONAL,	-- Cond TDD
+		t300-r15						ENUMERATED {ms6000, ms10000, ms15000, ms25000, ms40000,
+											ms60000, ms80000, ms120000}	OPTIONAL		-- Cond EDT
 	]]
 }