Upate to spec. 11.0.0

- fix problem with extension dissection.

svn path=/trunk/; revision=49294

8 files changed, 204 insertions, 51 deletions

diff --git a/asn1/pcap/PCAP-CommonDataTypes.asn b/asn1/pcap/PCAP-CommonDataTypes.asn
index 028997839d..520dc340d2 100644
--- a/asn1/pcap/PCAP-CommonDataTypes.asn
+++ b/asn1/pcap/PCAP-CommonDataTypes.asn
@@ -1,6 +1,6 @@
 -- $Id$
 --
--- 3GPP TS 25.453 V9.2.0 (2010-09)
+-- 3GPP TS 25.453 V11.0.0 (2012-09)
 --
 --9.3.5	Common Definitions
 -- **************************************************************
diff --git a/asn1/pcap/PCAP-Constants.asn b/asn1/pcap/PCAP-Constants.asn
index baa04d8304..017dc5cee9 100644
--- a/asn1/pcap/PCAP-Constants.asn
+++ b/asn1/pcap/PCAP-Constants.asn
@@ -1,6 +1,6 @@
 -- $Id$
 --
--- 3GPP TS 25.453 V9.1.0 (2010-03)
+-- 3GPP TS 25.453 V11.0.0 (2012-09)
 --
 -- 9.3.6	Constant Definitions
 -- **************************************************************
@@ -83,7 +83,8 @@ maxGANSSSet							INTEGER ::= 9
 maxGANSSSatAlmanac					INTEGER ::= 36
 maxGANSSClockMod					INTEGER ::= 4
 maxGANSS-1							INTEGER ::= 7
-
+maxNrOfIRATMeasurements				INTEGER ::= 16
+maxReportedGERANCells				INTEGER ::= 6
 
 -- **************************************************************
 --
@@ -145,10 +146,6 @@ id-UTRAN-GPS-DriftRate							ProtocolIE-ID ::= 48
 id-OTDOA-AddMeasuredResultsInfo					ProtocolIE-ID ::= 49
 id-GPS-ReferenceLocation						ProtocolIE-ID ::= 50
 id-OTDOA-MeasuredResultsSets					ProtocolIE-ID ::= 51
--- WS extension
-id-Unknown-52									ProtocolIE-ID ::= 52
-id-Unknown-53									ProtocolIE-ID ::= 53
-id-Unknown-54									ProtocolIE-ID ::= 54
 id-rxTimingDeviation384extInfo					ProtocolIE-ID ::= 55
 id-ExtendedRoundTripTime						ProtocolIE-ID ::= 56
 id-PeriodicPosCalcInfo							ProtocolIE-ID ::= 57
@@ -211,9 +208,17 @@ 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-OTDOA-ReferenceCellInfo						ProtocolIE-ID ::= 117 
+id-GANSS-AddADchoices							ProtocolIE-ID ::= 116
+id-OTDOA-ReferenceCellInfo						ProtocolIE-ID ::= 117
 id-DGNSS-ValidityPeriod							ProtocolIE-ID ::= 118
-
+id-AzimuthAndElevationLSB						ProtocolIE-ID ::= 119
+id-completeAlmanacProvided						ProtocolIE-ID ::= 120
+id-GPS-Week-Cycle								ProtocolIE-ID ::= 121
+id-GANSS-Day-Cycle								ProtocolIE-ID ::= 122
+id-ganss-Delta-T								ProtocolIE-ID ::= 123
+id-requestedCellIDGERANMeasurements				ProtocolIE-ID ::= 124
+id-CellId-IRATMeasuredResultsSets				ProtocolIE-ID ::= 125
+id-IMSI											ProtocolIE-ID ::= 126
+id-IMEI											ProtocolIE-ID ::= 127
 
 END
diff --git a/asn1/pcap/PCAP-Containers.asn b/asn1/pcap/PCAP-Containers.asn
index 1f62655d77..bc1a0ed5c2 100644
--- a/asn1/pcap/PCAP-Containers.asn
+++ b/asn1/pcap/PCAP-Containers.asn
@@ -1,6 +1,6 @@
 -- $Id$
 --
--- 3GPP TS 25.453 V9.1.0 (2010-03)
+-- 3GPP TS 25.453  V11.0.0 (2012-09)
 --
 -- 9.3.7	Container Definitions
 -- **************************************************************
diff --git a/asn1/pcap/PCAP-IEs.asn b/asn1/pcap/PCAP-IEs.asn
index 64e5bc6f73..21f4d4204d 100644
--- a/asn1/pcap/PCAP-IEs.asn
+++ b/asn1/pcap/PCAP-IEs.asn
@@ -1,6 +1,6 @@
 -- $Id$
 --
--- 3GPP TS 25.453 V9.2.0 (2010-09)
+-- 3GPP TS 25.453 V11.0.0 (2012-09)
 --
 -- 9.3.4	Information Element Definitions
 -- **************************************************************
@@ -50,7 +50,8 @@ IMPORTS
 	maxGANSSSatAlmanac,
 	maxGANSSClockMod,
 	maxGANSS-1,
-
+	maxNrOfIRATMeasurements,
+	maxReportedGERANCells,
 
 
 	id-UTRAN-GPSReferenceTime,
@@ -109,10 +110,13 @@ IMPORTS
 	id-ganssAddUTCModel-req,
 	id-ganssAuxInfo-req,
 	id-GANSS-AlmanacModelChoice,
-	id-DGNSS-ValidityPeriod
-
-
-
+	id-DGNSS-ValidityPeriod,
+	id-AzimuthAndElevationLSB,
+	id-completeAlmanacProvided,
+	id-GPS-Week-Cycle,
+	id-GANSS-Day-Cycle,
+	id-ganss-Delta-T,
+	id-requestedCellIDGERANMeasurements
 
 
 FROM PCAP-Constants
@@ -434,19 +438,81 @@ TimingAdvance768 ::=					INTEGER (0..511)
 TimingAdvance384ext ::=					INTEGER (0..255)
 
 Pathloss ::=							INTEGER (46..158)
--- Unit: dB; as defined in [4] subclause 10.3.7.3
+-- Unit: dB; as defined in the Cell measured results IE of TS 25.331 [4]
 
 CPICH-EcNo ::=							INTEGER (0..49)
--- According to CPICH_Ec/No in [13]
+-- According to CPICH_Ec/No in TS 25.133 [13]
 
 CPICH-RSCP ::= 							INTEGER (-5..91)
--- According to CPICH_RSCP in [13]
+-- According to CPICH_RSCP in TS 25.133 [13]
 
-AOA-LCR ::=								INTEGER (0..719)-- According to mapping in [14]
+AOA-LCR ::=								INTEGER (0..719)-- According to mapping in TS 25.123 [14]
 
 AOA-LCR-Accuracy-Class ::=				ENUMERATED {
 											a,b,c,d,e,f,g,h, ...}
 
+-- **************************************************************
+--
+-- Cell Id IRAT Measured Results Sets
+--
+-- **************************************************************
+
+CellId-IRATMeasuredResultsSets ::=		SEQUENCE (SIZE (1..maxNrOfIRATMeasurements)) OF
+	CellId-IRATMeasuredResultsInfoList
+
+CellId-IRATMeasuredResultsInfoList ::=	SEQUENCE {
+	gERAN-MeasuredResultsInfoList		GERAN-MeasuredResultsInfoList														OPTIONAL,
+	iE-Extenstions						ProtocolExtensionContainer { { CellId-IRATMeasuredResultsInfoListExtIEs }} 	OPTIONAL,
+	...
+}
+
+CellId-IRATMeasuredResultsInfoListExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+GERAN-MeasuredResultsInfoList ::= 		SEQUENCE (SIZE (1..maxReportedGERANCells)) OF
+	GERAN-MeasuredResultsInfo
+
+GERAN-MeasuredResultsInfo ::=			SEQUENCE {
+	gERANCellID							GERANCellGlobalID														OPTIONAL,
+	gERANPhysicalCellID					GERANPhysicalCellID,
+	gSM-RSSI							GSM-RSSI,
+	iE-Extenstions						ProtocolExtensionContainer { { GERAN-MeasuredResultsInfo-ExtIEs }} OPTIONAL,
+	...
+}
+
+GERAN-MeasuredResultsInfo-ExtIEs		PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+GERANCellGlobalID ::=					SEQUENCE {
+	plmn-Identity						PLMN-Identity,			--As defined in TS 23.003
+	locationAreaCode					BIT STRING (SIZE (16)),
+	cellIdentity						BIT STRING (SIZE (16)),
+	iE-Extenstions						ProtocolExtensionContainer { { GERANCellGlobalID-ExtIEs }} 			OPTIONAL,
+	...
+}
+
+GERANCellGlobalID-ExtIEs				PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+PLMN-Identity ::=						OCTET STRING (SIZE (3))
+
+
+GSM-RSSI ::=							INTEGER (0..63)
+
+GERANPhysicalCellID ::=					SEQUENCE {
+	bsic								GSM-BSIC,
+	arfcn								GSM-BCCH-ARFCN
+}
+
+GSM-BSIC ::=							SEQUENCE {
+	networkColourCode					BIT STRING (SIZE (3)),
+	baseStationColourCode				BIT STRING (SIZE (3))
+}
+
+GSM-BCCH-ARFCN ::= 						INTEGER (0..1023)
 
 -- **************************************************************
 --
@@ -461,6 +527,7 @@ CellIDPositioning ::= SEQUENCE {
 }
 
 CellIDPositioning-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	{ ID id-requestedCellIDGERANMeasurements	CRITICALITY reject	EXTENSION RequestedCellIDGERANMeasurements	PRESENCE optional },
 	...
 }
 
@@ -496,6 +563,16 @@ RequestedCellIDMeasurementsTDD-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+RequestedCellIDGERANMeasurements ::= SEQUENCE {
+	rSSIMeasurementsWanted	BOOLEAN,
+	iE-Extensions			ProtocolExtensionContainer { { RequestedCellIDGERANMeasurements-ExtIEs} }	OPTIONAL,
+	...
+}
+
+RequestedCellIDGERANMeasurements-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 
 -- **************************************************************
 --
@@ -642,9 +719,19 @@ PRC ::=								INTEGER (-2047..2047)
 
 RRC ::=								INTEGER (-127..127)
 
+-- **************************************************************
+--
+-- IMEI, IMSI
+--
+-- **************************************************************
+
+-- IMEI
 
+IMEI ::=	OCTET STRING (SIZE (3..8))
 
+-- IMSI
 
+IMSI ::=	OCTET STRING (SIZE (8))
 
 
 -- **************************************************************
@@ -938,6 +1025,18 @@ AzimuthAndElevation ::=				SEQUENCE {
 }
 
 AzimuthAndElevation-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	{ID id-AzimuthAndElevationLSB		CRITICALITY	ignore	EXTENSION	AzimuthAndElevationLSB	PRESENCE	optional},
+	...
+}
+
+AzimuthAndElevationLSB ::=			SEQUENCE {
+	azimuthLSB							INTEGER (0..15),
+	elevationLSB						INTEGER (0..15),
+	iE-Extensions						ProtocolExtensionContainer { { AzimuthAndElevationLSB-ExtIEs } }	OPTIONAL,
+	...
+}
+
+AzimuthAndElevationLSB-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -1163,6 +1262,7 @@ GANSS-AlmanacAndSatelliteHealth ::= SEQUENCE {
 }
 
 GANSS-AlmanacAndSatelliteHealth-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	{ID id-completeAlmanacProvided		CRITICALITY	ignore	EXTENSION	CompleteAlmanacProvided PRESENCE	optional},
 	...
 }
 
@@ -1190,13 +1290,15 @@ GANSS-Auxiliary-Information ::= CHOICE {
 }
 
 GANSS-AzimuthAndElevation ::= SEQUENCE {
-	azimuth						INTEGER(0..31),
+	azimuth						INTEGER(0..31), 
+	-- applicable range of elevation is 0..7. Values 8-75 shall not be used.
 	elevation					INTEGER(0..75),
 	ie-Extensions				ProtocolExtensionContainer { { GANSS-AzimuthAndElevation-ExtIEs } }	OPTIONAL,
 	...
 }
 
 GANSS-AzimuthAndElevation-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	{ID id-AzimuthAndElevationLSB		CRITICALITY	ignore	EXTENSION	AzimuthAndElevationLSB	PRESENCE	optional},
 	...
 }
 
@@ -1531,9 +1633,12 @@ GANSS-Reference-Time ::= SEQUENCE {
 }
 
 GANSS-Reference-Time-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	{ID id-GANSS-Day-Cycle		CRITICALITY		ignore	EXTENSION	GANSS-Day-Cycle		PRESENCE optional},
 	...
 }
 
+GANSS-Day-Cycle			::=	INTEGER(0..7)
+
 GANSS-ReferenceTimeOnly ::= SEQUENCE {
 	gANSS-tod					INTEGER(0..3599999),
 	gANSS-timeId				GANSSID			OPTIONAL,
@@ -1771,9 +1876,12 @@ GANSS-Time-Model ::= SEQUENCE {
 }
 
 GANSS-Time-Model-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	{ID id-ganss-Delta-T		CRITICALITY		ignore	EXTENSION	GANSS-Delta-T		PRESENCE	optional},
 	...
 }
 
+GANSS-Delta-T	::=	INTEGER(-128..127)
+
 GANSS-UTRAN-TimeRelationshipUncertainty ::= ENUMERATED {
 	gANSS-UTRAN-TRU-50nano,
 	gANSS-UTRAN-TRU-500nano,
@@ -2052,9 +2160,11 @@ GPS-AlmanacAndSatelliteHealth ::=	SEQUENCE {
 }
 
 GPS-AlmanacAndSatelliteHealth-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	{ID id-completeAlmanacProvided		CRITICALITY	ignore	EXTENSION	CompleteAlmanacProvided PRESENCE	optional},
 	...
 }
 
+CompleteAlmanacProvided ::=		BOOLEAN
 
 AlmanacSatInfoList ::=				SEQUENCE (SIZE (1..maxSatAlmanac)) OF
 										AlmanacSatInfo
@@ -2289,10 +2399,13 @@ GPS-ReferenceTime-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 	{ID id-UTRAN-GPSReferenceTime		CRITICALITY	ignore	EXTENSION	UTRAN-GPSReferenceTime			PRESENCE	optional}|
 	{ID id-GPS-UTRAN-TRU				CRITICALITY	ignore	EXTENSION	GPS-UTRAN-TRU					PRESENCE	optional}|
 	{ID id-UTRAN-GPS-DriftRate			CRITICALITY	ignore	EXTENSION	UTRAN-GPS-DriftRate				PRESENCE	optional}|
-	{ID id-GPSReferenceTimeUncertainty	CRITICALITY	ignore	EXTENSION	GPSReferenceTimeUncertainty	PRESENCE	optional},
+	{ID id-GPSReferenceTimeUncertainty	CRITICALITY	ignore	EXTENSION	GPSReferenceTimeUncertainty	PRESENCE	optional}|
+	{ID id-GPS-Week-Cycle				CRITICALITY	ignore	EXTENSION	GPS-Week-Cycle					PRESENCE	optional},
 	...
 }
 
+GPS-Week-Cycle		::=				INTEGER(0..7)
+
 GPS-TOW-AssistList ::=				SEQUENCE (SIZE (1..maxSat)) OF
 										GPS-TOW-Assist
 
@@ -4019,7 +4132,7 @@ Max-Set-E-DPDCHs ::= ENUMERATED {
 	vN64, vN32, vN16, vN8, v2xN4, v2xN2, v2xN2plus2xN4,
 	...
 	}
--- Values related to [16]
+-- Values related to TS 25.212 [16]
 
 E-TFCS-Information ::= SEQUENCE {
 	e-DCH-TFCS-Index								E-DCH-TFCS-Index,
@@ -4049,7 +4162,7 @@ Reference-E-TFCI-Information-Item-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 }
 
 Reference-E-TFCI-PO ::= INTEGER (0.. maxNrOfRefETFCI-PO-QUANTSTEPs)
-	-- FFS according to mapping in [17]
+	-- FFS according to mapping in TS 25.213 [17]
 
 E-TFCI ::= INTEGER (0..127)
 	
diff --git a/asn1/pcap/PCAP-PDU-Contents.asn b/asn1/pcap/PCAP-PDU-Contents.asn
index 9210f59f18..660095a835 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.2.0 (2010-09)
+-- 3GPP TS 25.453  V11.0.0 (2012-09)
 --
 --9.3.3	PDU Definitions
 -- **************************************************************
@@ -69,7 +69,10 @@ IMPORTS
 	GANSS-UTRAN-TRU,
 	AdditionalGPSAssistDataRequired,
 	AdditionalGanssAssistDataRequired,
-	OTDOA-ReferenceCellInfoSAS-centric
+	OTDOA-ReferenceCellInfoSAS-centric,
+	CellId-IRATMeasuredResultsSets,
+	IMSI,
+	IMEI
 
 FROM PCAP-IEs
 
@@ -138,7 +141,11 @@ FROM PCAP-Containers
 	id-GANSS-UTRAN-TRU,
 	id-AdditionalGPSAssistDataRequired,
 	id-AdditionalGanssAssistDataRequired,
-	id-OTDOA-ReferenceCellInfo
+	id-OTDOA-ReferenceCellInfo,
+	id-CellId-IRATMeasuredResultsSets,
+	id-IMSI,
+	id-IMEI
+
 
 FROM PCAP-Constants;
 
@@ -161,15 +168,18 @@ PositionCalculationRequestIEs PCAP-PROTOCOL-IES ::= {
 }
 
 PositionCalculationRequestExtensions PCAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-CellId-MeasuredResultsSets		CRITICALITY reject	EXTENSION CellId-MeasuredResultsSets		PRESENCE optional } |
-	{ ID id-OTDOA-MeasurementGroup			CRITICALITY reject	EXTENSION OTDOA-MeasurementGroup			PRESENCE optional } |
-	{ ID id-HorizontalAccuracyCode			CRITICALITY ignore	EXTENSION HorizontalAccuracyCode			PRESENCE optional } |
-	{ ID id-VerticalAccuracyCode			CRITICALITY ignore	EXTENSION VerticalAccuracyCode				PRESENCE optional } |
-	{ ID id-UTDOA-Group						CRITICALITY reject	EXTENSION UTDOA-Group						PRESENCE optional } |
-	{ ID id-Positioning-ResponseTime		CRITICALITY ignore	EXTENSION Positioning-ResponseTime		PRESENCE optional } |
-	{ ID id-IncludeVelocity					CRITICALITY ignore	EXTENSION IncludeVelocity					PRESENCE optional } |
-	{ ID id-PeriodicPosCalcInfo				CRITICALITY ignore	EXTENSION PeriodicPosCalcInfo				PRESENCE optional } |
-	{ ID id-GANSS-MeasuredResultsList		CRITICALITY reject	EXTENSION GANSS-MeasuredResultsList		PRESENCE optional },
+	{ ID id-CellId-MeasuredResultsSets		CRITICALITY reject	EXTENSION CellId-MeasuredResultsSets			PRESENCE optional } |
+	{ ID id-OTDOA-MeasurementGroup			CRITICALITY reject	EXTENSION OTDOA-MeasurementGroup				PRESENCE optional } |
+	{ ID id-HorizontalAccuracyCode			CRITICALITY ignore	EXTENSION HorizontalAccuracyCode				PRESENCE optional } |
+	{ ID id-VerticalAccuracyCode			CRITICALITY ignore	EXTENSION VerticalAccuracyCode					PRESENCE optional } |
+	{ ID id-UTDOA-Group						CRITICALITY reject	EXTENSION UTDOA-Group							PRESENCE optional } |
+	{ ID id-Positioning-ResponseTime		CRITICALITY ignore	EXTENSION Positioning-ResponseTime			PRESENCE optional } |
+	{ ID id-IncludeVelocity					CRITICALITY ignore	EXTENSION IncludeVelocity						PRESENCE optional } |
+	{ ID id-PeriodicPosCalcInfo				CRITICALITY ignore	EXTENSION PeriodicPosCalcInfo					PRESENCE optional } |
+	{ ID id-GANSS-MeasuredResultsList		CRITICALITY reject	EXTENSION GANSS-MeasuredResultsList			PRESENCE optional } |
+	{ ID id-CellId-IRATMeasuredResultsSets	CRITICALITY ignore	EXTENSION CellId-IRATMeasuredResultsSets	PRESENCE optional } |
+	{ ID id-IMSI							CRITICALITY ignore	EXTENSION IMSI									PRESENCE optional } |
+	{ ID id-IMEI							CRITICALITY ignore	EXTENSION IMEI									PRESENCE optional },
 	...
 }
 
@@ -192,7 +202,7 @@ PositionCalculationResponseIEs PCAP-PROTOCOL-IES ::= {
 }
 
 PositionCalculationResponseExtensions PCAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-AccuracyFulfilmentIndicator	CRITICALITY ignore	EXTENSION AccuracyFulfilmentIndicator			PRESENCE optional} |
+	{ ID id-AccuracyFulfilmentIndicator	CRITICALITY ignore	EXTENSION AccuracyFulfilmentIndicator		PRESENCE optional} |
 	{ ID id-VelocityEstimate			CRITICALITY ignore 	EXTENSION VelocityEstimate					PRESENCE optional},
 	...
 }
@@ -245,8 +255,10 @@ InformationExchangeInitiationRequest-IEs PCAP-PROTOCOL-IES ::= {
 }
 
 InformationExchangeInitiationRequest-Extensions PCAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-GANSS-UTRAN-TRU							CRITICALITY reject	EXTENSION GANSS-UTRAN-TRU										PRESENCE conditional },
+	{ ID id-GANSS-UTRAN-TRU						CRITICALITY reject	EXTENSION GANSS-UTRAN-TRU										PRESENCE conditional } |
 	-- This IE shall be present if the information requested in the Information Type IE contains GANSS-related data
+	{ ID id-IMSI								CRITICALITY ignore	EXTENSION IMSI													PRESENCE optional } |
+	{ ID id-IMEI								CRITICALITY ignore	EXTENSION IMEI													PRESENCE optional },
 	...
 }
 
@@ -371,7 +383,9 @@ PositionInitiationRequestIEs PCAP-PROTOCOL-IES ::= {
 
 PositionInitiationRequestExtensions PCAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-IncludeVelocity				CRITICALITY ignore	EXTENSION IncludeVelocity			PRESENCE optional }|
-	{ ID id-PeriodicLocationInfo		CRITICALITY ignore	EXTENSION PeriodicLocationInfo		PRESENCE optional },
+	{ ID id-PeriodicLocationInfo		CRITICALITY ignore	EXTENSION PeriodicLocationInfo		PRESENCE optional }|
+	{ ID id-IMSI						CRITICALITY ignore	EXTENSION IMSI						PRESENCE optional }|
+	{ ID id-IMEI						CRITICALITY ignore	EXTENSION IMEI						PRESENCE optional },
 	...
 }
 
@@ -478,12 +492,13 @@ PositionActivationResponseIEs PCAP-PROTOCOL-IES ::= {
 }
 
 PositionActivationResponseExtensions PCAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-VelocityEstimate						CRITICALITY ignore	EXTENSION VelocityEstimate							PRESENCE optional} |
-	{ ID id-MeasInstructionsUsed					CRITICALITY ignore	EXTENSION MeasInstructionsUsed						PRESENCE optional} |
+	{ ID id-VelocityEstimate						CRITICALITY ignore	EXTENSION VelocityEstimate							PRESENCE optional } |
+	{ 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-OTDOA-ReferenceCellInfo					CRITICALITY reject	EXTENSION OTDOA-ReferenceCellInfoSAS-centric	PRESENCE optional },
+	{ ID id-OTDOA-ReferenceCellInfo					CRITICALITY reject	EXTENSION OTDOA-ReferenceCellInfoSAS-centric	PRESENCE optional } |
+	{ ID id-CellId-IRATMeasuredResultsSets			CRITICALITY ignore	EXTENSION CellId-IRATMeasuredResultsSets			PRESENCE optional },
 	...
 }
 
@@ -704,7 +719,8 @@ 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-OTDOA-ReferenceCellInfo					CRITICALITY reject	EXTENSION OTDOA-ReferenceCellInfoSAS-centric	PRESENCE optional },
+	{ ID id-OTDOA-ReferenceCellInfo					CRITICALITY reject	EXTENSION OTDOA-ReferenceCellInfoSAS-centric	PRESENCE optional } |
+	{ ID id-CellId-IRATMeasuredResultsSets			CRITICALITY ignore	EXTENSION CellId-IRATMeasuredResultsSets			PRESENCE optional },
 	...
 }
 
@@ -754,4 +770,3 @@ PositionPeriodicTermination-Extensions PCAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 END
-
diff --git a/asn1/pcap/PCAP-PDU-Descriptions.asn b/asn1/pcap/PCAP-PDU-Descriptions.asn
index 39313a19ba..17486a33dd 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.2.0 (2010-09)
+-- 3GPP TS 25.453 V11.0.0 (2012-09)
 --
 -- 9.3.2	Elementary Procedure Definitions
 -- **************************************************************
diff --git a/asn1/pcap/packet-pcap-template.c b/asn1/pcap/packet-pcap-template.c
index 579cc93b88..be39e3a2b8 100644
--- a/asn1/pcap/packet-pcap-template.c
+++ b/asn1/pcap/packet-pcap-template.c
@@ -72,7 +72,7 @@ static int ett_pcap = -1;
 /* Global variables */
 static guint32 ProcedureCode;
 static guint32 ProtocolIE_ID;
-static guint32 ProtocolExtensionID;
+/*static guint32 ProtocolExtensionID;*/
 
 /* Dissector tables */
 static dissector_table_t pcap_ies_dissector_table;
@@ -100,7 +100,7 @@ static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-  return (dissector_try_uint(pcap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(pcap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
diff --git a/asn1/pcap/pcap.cnf b/asn1/pcap/pcap.cnf
index f390abb411..2d05535be7 100644
--- a/asn1/pcap/pcap.cnf
+++ b/asn1/pcap/pcap.cnf
@@ -262,9 +262,19 @@ id-ganssReq-EarthOrientPara						ProtocolIE-ID
 id-ganssAddNavigationModel-req					ProtocolIE-ID
 id-ganssAddUTCModel-req							ProtocolIE-ID
 id-ganssAuxInfo-req								ProtocolIE-ID
-id-GANSS-AlmanacModelChoice						ProtocolIE-ID
+id-GANSS-AddADchoices							ProtocolIE-ID
 id-OTDOA-ReferenceCellInfo						ProtocolIE-ID
 id-DGNSS-ValidityPeriod							ProtocolIE-ID
+id-AzimuthAndElevationLSB						ProtocolIE-ID
+id-completeAlmanacProvided						ProtocolIE-ID
+id-GPS-Week-Cycle								ProtocolIE-ID
+id-GANSS-Day-Cycle								ProtocolIE-ID
+id-ganss-Delta-T								ProtocolIE-ID
+id-requestedCellIDGERANMeasurements				ProtocolIE-ID
+id-CellId-IRATMeasuredResultsSets				ProtocolIE-ID
+id-IMSI											ProtocolIE-ID
+id-IMEI											ProtocolIE-ID
+
 #.END
 
 #.REGISTER_NEW
@@ -305,8 +315,8 @@ UC-ID-InfEx-Rqst								N pcap.ies id-UC-ID-InfEx-Rqst
 UE-PositionEstimateInfo							N pcap.ies id-UE-PositionEstimateInfo
 OTDOA-MeasuredResultsSets						N pcap.ies id-OTDOA-MeasuredResultsSets
 PeriodicPosCalcInfo								N pcap.ies id-PeriodicPosCalcInfo
-PeriodicLocationInfo							N pcap.ies id-PeriodicLocationInfo
-MeasInstructionsUsed							N pcap.ies id-MeasInstructionsUsed
+PeriodicLocationInfo							N pcap.extension id-PeriodicLocationInfo
+MeasInstructionsUsed							N pcap.extension id-MeasInstructionsUsed
 PeriodicTerminationCause						N pcap.ies id-PeriodicTerminationCause
 
 #PCAP-PROTOCOL-EXTENSION
@@ -370,6 +380,16 @@ 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
+AzimuthAndElevationLSB							N pcap.extension id-AzimuthAndElevationLSB
+CompleteAlmanacProvided							N pcap.extension id-completeAlmanacProvided
+GPS-Week-Cycle									N pcap.extension id-GPS-Week-Cycle
+GANSS-Day-Cycle									N pcap.extension id-GANSS-Day-Cycle
+GANSS-Delta-T									N pcap.extension id-ganss-Delta-T
+RequestedCellIDGERANMeasurements				N pcap.extension id-requestedCellIDGERANMeasurements
+CellId-IRATMeasuredResultsSets					N pcap.extension id-CellId-IRATMeasuredResultsSets
+IMSI											N pcap.extension id-IMSI
+IMEI											N pcap.extension id-IMEI
+
 
 #PCAP-ELEMENTARY-PROCEDURE