Update to V9.1.0 (2010-03).

svn path=/trunk/; revision=32818

7 files changed, 67 insertions, 14 deletions

diff --git a/asn1/pcap/PCAP-CommonDataTypes.asn b/asn1/pcap/PCAP-CommonDataTypes.asn
index 50a68f4203..689ae83d2a 100644
--- a/asn1/pcap/PCAP-CommonDataTypes.asn
+++ b/asn1/pcap/PCAP-CommonDataTypes.asn
@@ -1,6 +1,6 @@
 -- $Id$
 --
--- 3GPP TS 25.453 V9.0.0 (2009-12)
+-- 3GPP TS 25.453 V9.1.0 (2010-03)
 --
 --9.3.5	Common Definitions
 -- **************************************************************
diff --git a/asn1/pcap/PCAP-Constants.asn b/asn1/pcap/PCAP-Constants.asn
index 9c0ff7af99..4e91e9ac0c 100644
--- a/asn1/pcap/PCAP-Constants.asn
+++ b/asn1/pcap/PCAP-Constants.asn
@@ -1,6 +1,6 @@
 -- $Id$
 --
--- 3GPP TS 25.453 V9.0.0 (2009-12)
+-- 3GPP TS 25.453 V9.1.0 (2010-03)
 --
 -- 9.3.6	Constant Definitions
 -- **************************************************************
@@ -197,7 +197,9 @@ id-GANSS-alm-keplerianGLONASS					ProtocolIE-ID ::= 112
 id-GANSS-alm-ecefSBASAlmanac					ProtocolIE-ID ::= 113
 id-UTRAN-GANSSReferenceTimeResult				ProtocolIE-ID ::= 114
 id-GANSS-Reference-Time-Only					ProtocolIE-ID ::= 115
-id-GANSS-AddADchoices							ProtocolIE-ID ::= 116
+id-GANSS-AddADchoices							ProtocolIE-ID ::= 116 
+id-OTDOA-ReferenceCellInfo						ProtocolIE-ID ::= 117 
+id-DGNSS-ValidityPeriod							ProtocolIE-ID ::= 118
 
 
 END
diff --git a/asn1/pcap/PCAP-Containers.asn b/asn1/pcap/PCAP-Containers.asn
index d107ed349f..1f62655d77 100644
--- a/asn1/pcap/PCAP-Containers.asn
+++ b/asn1/pcap/PCAP-Containers.asn
@@ -1,6 +1,6 @@
 -- $Id$
 --
--- 3GPP TS 25.453 V9.0.0 (2009-12)
+-- 3GPP TS 25.453 V9.1.0 (2010-03)
 --
 -- 9.3.7	Container Definitions
 -- **************************************************************
diff --git a/asn1/pcap/PCAP-IEs.asn b/asn1/pcap/PCAP-IEs.asn
index 7f93105738..b03aa42eba 100644
--- a/asn1/pcap/PCAP-IEs.asn
+++ b/asn1/pcap/PCAP-IEs.asn
@@ -1,6 +1,6 @@
 -- $Id$
 --
--- 3GPP TS 25.453 V9.0.0 (2009-12)
+-- 3GPP TS 25.453 V9.1.0 (2010-03)
 --
 -- 9.3.4	Information Element Definitions
 -- **************************************************************
@@ -108,7 +108,8 @@ IMPORTS
 	id-ganssAddNavigationModel-req,
 	id-ganssAddUTCModel-req,
 	id-ganssAuxInfo-req,
-	id-GANSS-AlmanacModelChoice
+	id-GANSS-AlmanacModelChoice,
+	id-DGNSS-ValidityPeriod
 
 
 
@@ -596,6 +597,18 @@ DGPS-CorrectionSatInfo ::=			SEQUENCE {
 }
 
 DGPS-CorrectionSatInfo-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	{ID id-DGNSS-ValidityPeriod	CRITICALITY	ignore	EXTENSION	DGNSS-ValidityPeriod	PRESENCE	optional},
+	...
+}
+
+DGNSS-ValidityPeriod ::= 			SEQUENCE {
+	udreGrowthRate						UDREGrowthRate,
+	udreValidityTime					UDREValidityTime,
+	iE-Extensions						ProtocolExtensionContainer { { DGNSS-ValidityPeriod-ExtIEs } }		OPTIONAL,
+	...
+}
+
+DGNSS-ValidityPeriod-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -605,6 +618,26 @@ UDRE ::=							ENUMERATED {
 										between4-and-8,
 										over8 }
 
+UDREGrowthRate ::=					ENUMERATED { 	
+										growth-1-point-5, 
+										growth-2,
+										growth-4,
+										growth-6,
+										growth-8,
+										growth-10,
+										growth-12,
+										growth-16	}
+
+UDREValidityTime	::=					ENUMERATED {
+											val-20sec,
+											val-40sec,
+											val-80sec,
+											val-160sec,
+											val-320sec,
+											val-640sec,
+											val-1280sec,
+											val-2560sec	}
+
 PRC ::=								INTEGER (-2047..2047)
 
 RRC ::=								INTEGER (-127..127)
@@ -1014,7 +1047,7 @@ DGANSS-SignalInformationItem ::= SEQUENCE {
 	...
 }
 
-DGANSS-SignalInformationItem-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+DGANSS-SignalInformationItem-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {	{ID id-DGNSS-ValidityPeriod	CRITICALITY	ignore	EXTENSION	DGNSS-ValidityPeriod	PRESENCE	OPTIONAL},
 	...
 }
 
@@ -2942,6 +2975,16 @@ OTDOA-ReferenceCellInfo-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+OTDOA-ReferenceCellInfoSAS-centric ::=			SEQUENCE {
+	uC-ID								UC-ID,
+	iE-Extensions						ProtocolExtensionContainer { { OTDOA-ReferenceCellInfoSAS-centric-ExtIEs } }		OPTIONAL,
+	...
+}
+
+OTDOA-ReferenceCellInfoSAS-centric-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 OTDOA-NeighbourCellInfoList ::=			SEQUENCE (SIZE (1..maxNrOfMeasNCell)) OF
 	OTDOA-NeighbourCellInfo
 
diff --git a/asn1/pcap/PCAP-PDU-Contents.asn b/asn1/pcap/PCAP-PDU-Contents.asn
index 9a9300af99..ce0bec522e 100644
--- a/asn1/pcap/PCAP-PDU-Contents.asn
+++ b/asn1/pcap/PCAP-PDU-Contents.asn
@@ -1,6 +1,6 @@
 -- $Id$
 --
--- 3GPP TS 25.453 V9.0.0 (2009-12)
+-- 3GPP TS 25.453  V9.1.0 (2010-03)
 --
 --9.3.3	PDU Definitions
 -- **************************************************************
@@ -68,7 +68,8 @@ IMPORTS
 	GANSSPositioning,
 	GANSS-UTRAN-TRU,
 	AdditionalGPSAssistDataRequired,
-	AdditionalGanssAssistDataRequired
+	AdditionalGanssAssistDataRequired,
+	OTDOA-ReferenceCellInfoSAS-centric
 
 FROM PCAP-IEs
 
@@ -136,7 +137,8 @@ FROM PCAP-Containers
 	id-GANSSPositioning,
 	id-GANSS-UTRAN-TRU,
 	id-AdditionalGPSAssistDataRequired,
-	id-AdditionalGanssAssistDataRequired
+	id-AdditionalGanssAssistDataRequired,
+	id-OTDOA-ReferenceCellInfo
 
 FROM PCAP-Constants;
 
@@ -480,7 +482,8 @@ PositionActivationResponseExtensions PCAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-MeasInstructionsUsed					CRITICALITY ignore	EXTENSION MeasInstructionsUsed						PRESENCE optional} |
 	{ ID id-GANSS-MeasuredResultsList				CRITICALITY reject	EXTENSION GANSS-MeasuredResultsList				PRESENCE optional } |
 	{ ID id-AdditionalGPSAssistDataRequired			CRITICALITY ignore	EXTENSION AdditionalGPSAssistDataRequired		PRESENCE optional } |
-	{ ID id-AdditionalGanssAssistDataRequired		CRITICALITY ignore	EXTENSION AdditionalGanssAssistDataRequired		PRESENCE optional },
+	{ ID id-AdditionalGanssAssistDataRequired		CRITICALITY ignore	EXTENSION AdditionalGanssAssistDataRequired		PRESENCE optional } |
+	{ ID id-OTDOA-ReferenceCellInfo					CRITICALITY reject	EXTENSION OTDOA-ReferenceCellInfoSAS-centric	PRESENCE optional },
 	...
 }
 
@@ -700,7 +703,8 @@ PositionPeriodicReport-IEs PCAP-PROTOCOL-IES ::= {
 PositionPeriodicReport-Extensions PCAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-GANSS-MeasuredResultsList				CRITICALITY ignore	EXTENSION GANSS-MeasuredResultsList				PRESENCE optional } |
 	{ ID id-AdditionalGPSAssistDataRequired			CRITICALITY ignore	EXTENSION AdditionalGPSAssistDataRequired		PRESENCE optional } |
-	{ ID id-AdditionalGanssAssistDataRequired		CRITICALITY ignore	EXTENSION AdditionalGanssAssistDataRequired		PRESENCE optional },
+	{ ID id-AdditionalGanssAssistDataRequired		CRITICALITY ignore	EXTENSION AdditionalGanssAssistDataRequired		PRESENCE optional } |
+	{ ID id-OTDOA-ReferenceCellInfo					CRITICALITY reject	EXTENSION OTDOA-ReferenceCellInfoSAS-centric	PRESENCE optional },
 	...
 }
 
@@ -750,4 +754,3 @@ PositionPeriodicTermination-Extensions PCAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 END
-
diff --git a/asn1/pcap/PCAP-PDU-Descriptions.asn b/asn1/pcap/PCAP-PDU-Descriptions.asn
index d66f509df3..4d48cb1c05 100644
--- a/asn1/pcap/PCAP-PDU-Descriptions.asn
+++ b/asn1/pcap/PCAP-PDU-Descriptions.asn
@@ -1,6 +1,6 @@
 -- $Id$
 --
--- 3GPP TS 25.453 V9.0.0 (2009-12)
+-- 3GPP TS 25.453 V9.1.0 (2010-03)
 --
 -- 9.3.2	Elementary Procedure Definitions
 -- **************************************************************
diff --git a/asn1/pcap/pcap.cnf b/asn1/pcap/pcap.cnf
index b436907e74..d11c6d1ccb 100644
--- a/asn1/pcap/pcap.cnf
+++ b/asn1/pcap/pcap.cnf
@@ -253,6 +253,8 @@ id-ganssAddNavigationModel-req					ProtocolIE-ID
 id-ganssAddUTCModel-req							ProtocolIE-ID
 id-ganssAuxInfo-req								ProtocolIE-ID
 id-GANSS-AlmanacModelChoice						ProtocolIE-ID
+id-OTDOA-ReferenceCellInfo						ProtocolIE-ID
+id-DGNSS-ValidityPeriod							ProtocolIE-ID
 #.END
 
 #.REGISTER_NEW
@@ -356,6 +358,9 @@ GANSS-AddNavigationModel-Req					N pcap.extension id-ganssAddNavigationModel-req
 GANSS-AddUTCModel-Req							N pcap.extension id-ganssAddUTCModel-req
 GANSS-AuxInfo-req								N pcap.extension id-ganssAuxInfo-req
 #N pcap.extension id-GANSS-AlmanacModelChoice Not used?
+OTDOA-ReferenceCellInfoSAS-centric				N pcap.extension id-OTDOA-ReferenceCellInfo
+DGNSS-ValidityPeriod							N pcap.extension id-DGNSS-ValidityPeriod
+
 #PCAP-ELEMENTARY-PROCEDURE
 
 PositionCalculationRequest						N pcap.proc.imsg id-PositionCalculation