Upgrade LPP dissector to v11.2.0

svn path=/trunk/; revision=48443

2 files changed, 42 insertions, 13 deletions

diff --git a/asn1/lpp/LPP.asn b/asn1/lpp/LPP.asn
index 9fbe55b70e..0a7941a673 100644
--- a/asn1/lpp/LPP.asn
+++ b/asn1/lpp/LPP.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.355 V11.1.0 (2012-12)
+-- 3GPP TS 36.355 V11.2.0 (2013-03)
 -- $Id$
 --
 
@@ -216,7 +216,15 @@ AccessTypes ::= SEQUENCE {
 }
 
 
-ARFCN-ValueEUTRA ::= INTEGER (0.. 65535) 
+ARFCN-ValueEUTRA ::= INTEGER (0..maxEARFCN) 
+
+ARFCN-ValueEUTRA-v9a0 ::=	INTEGER (maxEARFCN-Plus1..maxEARFCN2)
+
+maxEARFCN					INTEGER ::= 65535	-- Maximum value of EUTRA carrier frequency 
+
+maxEARFCN-Plus1				INTEGER ::= 65536	-- Lowest value extended EARFCN range
+
+maxEARFCN2					INTEGER ::= 262143	-- Highest value extended EARFCN range
 
 
 ARFCN-ValueUTRA ::=	INTEGER (0..16383)
@@ -586,7 +594,9 @@ OTDOA-ReferenceCellInfo ::= SEQUENCE {
 															OPTIONAL,		-- Cond NotSameAsServ1
 	cpLength					ENUMERATED { normal, extended, ... },
 	prsInfo						PRS-Info					OPTIONAL,		-- Cond PRS
-	...	
+	...,
+	[[ earfcnRef-v9a0			ARFCN-ValueEUTRA-v9a0		OPTIONAL		-- Cond NotSameAsServ2
+	]]
 }
 
 
@@ -621,7 +631,9 @@ OTDOA-NeighbourCellInfoElement ::= SEQUENCE {
 	prs-SubframeOffset					INTEGER (0..1279)	OPTIONAL,		-- Cond InterFreq
 	expectedRSTD						INTEGER (0..16383),
 	expectedRSTD-Uncertainty			INTEGER (0..1023),
-	...
+	...,
+	[[ earfcn-v9a0					ARFCN-ValueEUTRA-v9a0	OPTIONAL		-- Cond NotSameAsRef5
+	]]
 }
 
 maxFreqLayers	INTEGER ::= 3
@@ -644,10 +656,12 @@ OTDOA-SignalMeasurementInformation ::= SEQUENCE {
 	systemFrameNumber		BIT STRING (SIZE (10)),
 	physCellIdRef			INTEGER (0..503),
 	cellGlobalIdRef			ECGI					OPTIONAL,
-	earfcnRef				ARFCN-ValueEUTRA		OPTIONAL,
+	earfcnRef				ARFCN-ValueEUTRA		OPTIONAL,		-- Cond NotSameAsRef0
 	referenceQuality		OTDOA-MeasQuality		OPTIONAL,
 	neighbourMeasurementList	NeighbourMeasurementList,
-	...
+	...,
+	[[ earfcnRef-v9a0		ARFCN-ValueEUTRA-v9a0	OPTIONAL		-- Cond NotSameAsRef1
+	]]
 }
 
 NeighbourMeasurementList ::= SEQUENCE (SIZE(1..24)) OF NeighbourMeasurementElement
@@ -655,10 +669,12 @@ NeighbourMeasurementList ::= SEQUENCE (SIZE(1..24)) OF NeighbourMeasurementEleme
 NeighbourMeasurementElement ::= SEQUENCE {
 	physCellIdNeighbor		INTEGER (0..503),
 	cellGlobalIdNeighbour	ECGI					OPTIONAL,
-	earfcnNeighbour			ARFCN-ValueEUTRA		OPTIONAL,
+	earfcnNeighbour			ARFCN-ValueEUTRA		OPTIONAL,		-- Cond NotSameAsRef2
 	rstd					INTEGER (0..12711),
 	rstd-Quality			OTDOA-MeasQuality,
-	...
+	...,
+	[[ earfcnNeighbour-v9a0	ARFCN-ValueEUTRA-v9a0	OPTIONAL		-- Cond NotSameAsRef3
+	]]
 }
 
 
@@ -679,15 +695,24 @@ OTDOA-RequestLocationInformation ::= SEQUENCE {
 OTDOA-ProvideCapabilities ::= SEQUENCE {
 	otdoa-Mode		BIT STRING { 	ue-assisted (0) } (SIZE (1..8)),
 	...,
-	supportedBandListEUTRA 		SEQUENCE (SIZE (1..maxBands)) OF SupportedBandEUTRA		OPTIONAL
+	supportedBandListEUTRA 		SEQUENCE (SIZE (1..maxBands)) OF SupportedBandEUTRA		OPTIONAL,
+	supportedBandListEUTRA-v9a0	SEQUENCE (SIZE (1..maxBands)) OF SupportedBandEUTRA-v9a0	OPTIONAL
 }
 
 maxBands INTEGER ::= 64
 
 SupportedBandEUTRA ::= SEQUENCE {
-	bandEUTRA							INTEGER (1..64)
+	bandEUTRA							INTEGER (1..maxFBI)
+}
+
+SupportedBandEUTRA-v9a0 ::=		SEQUENCE {
+	bandEUTRA-v9a0						INTEGER (maxFBI-Plus1..maxFBI2)		OPTIONAL
 }
 
+maxFBI								INTEGER	::=	64	-- Maximum value of frequency band indicator
+maxFBI-Plus1						INTEGER ::= 65	-- lowest value extended FBI range
+maxFBI2								INTEGER ::= 256	-- highest value extended FBI range
+
 
 OTDOA-RequestCapabilities ::= SEQUENCE {
 	...
@@ -806,7 +831,9 @@ NetworkTime ::= SEQUENCE {
 							physCellId			INTEGER (0..503),
 							cellGlobalIdEUTRA	CellGlobalIdEUTRA-AndUTRA	OPTIONAL,	-- Need ON
 							earfcn				ARFCN-ValueEUTRA,
-							...
+							...,
+							[[ earfcn-v9a0		ARFCN-ValueEUTRA-v9a0 OPTIONAL	-- Cond EARFCN-max 
+							]]
 							},
 				uTRA		SEQUENCE {
 							mode 	CHOICE {
@@ -1962,7 +1989,9 @@ MeasuredResultsElement ::= SEQUENCE {
 	rsrp-Result		INTEGER (0..97)						OPTIONAL,
 	rsrq-Result		INTEGER (0..34)						OPTIONAL,
 	ue-RxTxTimeDiff	INTEGER (0..4095)					OPTIONAL,
-	...
+	...,
+	[[ arfcnEUTRA-v9a0		ARFCN-ValueEUTRA-v9a0 		OPTIONAL		-- Cond EARFCN-max 
+	]]
 }
 
 
diff --git a/asn1/lpp/packet-lpp-template.c b/asn1/lpp/packet-lpp-template.c
index d940242952..b25339a6be 100644
--- a/asn1/lpp/packet-lpp-template.c
+++ b/asn1/lpp/packet-lpp-template.c
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Ref 3GPP TS 36.355 version 11.1.0 Release 11
+ * Ref 3GPP TS 36.355 version 11.2.0 Release 11
  * http://www.3gpp.org
  */