Update to V11.1.0 (2012-03)

svn path=/trunk/; revision=41904

1 files changed, 251 insertions, 276 deletions

diff --git a/asn1/lcsap/LCS-AP-PDU-Contents.asn b/asn1/lcsap/LCS-AP-PDU-Contents.asn
index 80b53de29e..6d9cb056ad 100644
--- a/asn1/lcsap/LCS-AP-PDU-Contents.asn
+++ b/asn1/lcsap/LCS-AP-PDU-Contents.asn
@@ -1,283 +1,258 @@
 -- $Id$
--- ETSI TS 129 171 V9.2.0 (2010-10)
+-- ETSI TS 129 171 V11.1.0 (2012-03)
+--
+-- 7.5.4	PDU definitions
 -- ************************************************************** 
 -- 
 -- PDU definitions for LCS-AP. 
 -- 
 -- ************************************************************** 
  
-LCS-AP-PDU-Contents { 
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)  
-eps-Access (21) modules (3) lcs-AP (4) version1 (1) lcs-AP-PDU-Contents (1)} 
- 
-DEFINITIONS AUTOMATIC TAGS ::=  
- 
-BEGIN 
- 
--- ************************************************************** 
--- 
--- IE parameter types from other modules. 
--- 
--- ************************************************************** 
- 
-IMPORTS 
-  
- APDU, 
- Accuracy-Fulfillment-Indicator, 
- Correlation-ID, 
- E-CGI, 
- Geographical-Area, 
- IMSI, 
- IMEI, 
- Include-Velocity, 
- LCS-Cause, 
- LCS-Client-Type, 
- LCS-Priority, 
- LCS-QoS, 
- Location-Type, 
- MultipleAPDUs, 
- Network-Element, 
- Payload-Type, 
- Positioning-Data, 
- Return-Error-Type, 
- Return-Error-Cause, 
- UE-Positioning-Capability, 
- Velocity-Estimate 
-FROM LCS-AP-IEs 
- 
- ProtocolExtensionContainer{}, 
- ProtocolIE-Container{}, 
- LCS-AP-PROTOCOL-EXTENSION, 
- LCS-AP-PROTOCOL-IES 
-FROM LCS-AP-Containers 
- 
- id-Accuracy-Fulfillment-Indicator, 
- id-APDU, 
- id-Correlation-ID, 
- id-Destination-ID, 
- id-E-UTRAN-Cell-Identifier, 
- id-Include-Velocity, 
- id-IMEI,  
- id-IMSI, 
- id-LCS-Client-Type, 
- id-LCS-Priority, 
- id-LCS-QOS, 
- id-LCS-Cause, 
- id-Location-Estimate, 
- id-Location-Type, 
- id-MultipleAPDUs, 
- id-Payload-Type, 
- id-Positioning-Data, 
- id-Return-Error-Request, 
- id-Return-Error-Cause, 
- id-Source-Identity, 
- id-UE-Positioning-Capability, 
- id-Velocity-Estimate 
-FROM LCS-AP-Constants; 
- 
- 
--- ************************************************************** 
--- 
--- Location-Request 
--- 
--- ************************************************************** 
- 
-Location-Request ::= SEQUENCE { 
-  protocolIEs       ProtocolIE-Container        { { Location-Request-IEs} }, 
-  protocolExtensions    ProtocolExtensionContainer  { { Location-Request-Extensions} } OPTIONAL, 
- ... 
-} 
- 
-Location-Request-IEs LCS-AP-PROTOCOL-IES ::= { 
- { ID id-Correlation-ID    CRITICALITY reject TYPE Correlation-ID    PRESENCE 
-mandatory } | 
- { ID id-Location-Type    CRITICALITY reject TYPE Location-Type    PRESENCE 
-mandatory } | 
- { ID id-E-UTRAN-Cell-Identifier  CRITICALITY ignore TYPE E-CGI      PRESENCE 
-mandatory  } | 
- { ID id-LCS-Client-Type    CRITICALITY reject TYPE LCS-Client-Type   PRESENCE 
-optional  } | 
- { ID id-LCS-Priority    CRITICALITY reject TYPE LCS-Priority    PRESENCE 
-optional  } | 
- { ID id-LCS-QOS      CRITICALITY reject TYPE LCS-QoS     PRESENCE 
-optional  } | 
-  { ID id-UE-Positioning-Capability  CRITICALITY reject  TYPE UE-Positioning-Capability  PRESENCE 
-optional  } | 
- { ID id-Include-Velocity   CRITICALITY reject TYPE Include-Velocity   PRESENCE 
-optional  } | 
- { ID id-IMSI      CRITICALITY ignore TYPE IMSI      PRESENCE 
-optional  } | 
- { ID id-IMEI      CRITICALITY ignore TYPE IMEI      PRESENCE 
-optional  } | 
- { ID id-MultipleAPDUs    CRITICALITY reject TYPE MultipleAPDUs    PRESENCE 
-optional  } , 
- ... 
-} 
- 
-Location-Request-Extensions LCS-AP-PROTOCOL-EXTENSION ::= { 
- ... 
-} 
- 
- 
--- ************************************************************** 
--- 
--- Location-Response 
--- 
--- ************************************************************** 
- 
-Location-Response ::= SEQUENCE { 
-  protocolIEs     ProtocolIE-Container      { {Location-Response-IEs} }, 
-  protocolExtensions    ProtocolExtensionContainer { {Location-Response-Extensions} } OPTIONAL, 
- ... 
-} 
- 
-Location-Response-IEs LCS-AP-PROTOCOL-IES ::= { 
- { ID id-Correlation-ID     CRITICALITY reject TYPE Correlation-ID     
-  PRESENCE mandatory } | 
- { ID id-Location-Estimate    CRITICALITY reject TYPE Geographical-Area    
-  PRESENCE optional  } |  
- { ID id-Positioning-Data    CRITICALITY reject TYPE Positioning-Data    
-  PRESENCE optional  } | 
- { ID id-Velocity-Estimate    CRITICALITY reject TYPE Velocity-Estimate    
-  PRESENCE optional  } | 
-  { ID id-Accuracy-Fulfillment-Indicator  CRITICALITY reject  TYPE Accuracy-Fulfillment-Indicator
-  PRESENCE optional  } | 
- { ID id-LCS-Cause      CRITICALITY ignore TYPE LCS-Cause      
-  PRESENCE optional  } , 
-... 
-} 
- 
- 
-Location-Response-Extensions LCS-AP-PROTOCOL-EXTENSION ::= { 
- ... 
-} 
- 
--- ************************************************************** 
--- 
--- Location-Abort 
--- 
--- ************************************************************** 
- 
-Location-Abort-Request ::= SEQUENCE { 
-  protocolIEs     ProtocolIE-Container      { {Location-Abort-Request-IEs} }, 
-  protocolExtensions    ProtocolExtensionContainer { {Location-Abort-Request-Extensions} } 
-OPTIONAL, 
- ... 
-} 
- 
-Location-Abort-Request-IEs LCS-AP-PROTOCOL-IES ::= { 
- { ID id-Correlation-ID     CRITICALITY reject TYPE Correlation-ID  PRESENCE 
-mandatory } | 
- { ID id-LCS-Cause      CRITICALITY ignore TYPE LCS-Cause   PRESENCE 
-mandatory } , 
- ... 
-} 
- 
-Location-Abort-Request-Extensions LCS-AP-PROTOCOL-EXTENSION ::= { 
- ... 
-} 
- 
--- ************************************************************** 
--- 
--- Connection-Oriented-Information  
--- 
--- ************************************************************** 
- 
-Connection-Oriented-Information ::= SEQUENCE { 
-  protocolIEs     ProtocolIE-Container      { {Connection-Oriented-Information-IEs} }, 
- protocolExtensions  ProtocolExtensionContainer { {Connection-Oriented-Information-
-Extensions} } OPTIONAL, 
- ... 
-} 
- 
-Connection-Oriented-Information-IEs LCS-AP-PROTOCOL-IES ::= { 
-  { ID id-Correlation-ID    CRITICALITY reject  TYPE Correlation-ID     PRESENCE optional  } 
-| 
-  { ID id-Payload-Type     CRITICALITY reject  TYPE Payload-Type      PRESENCE optional  } 
-| 
- { ID id-APDU    CRITICALITY reject TYPE APDU     PRESENCE optional  } 
-, 
- ... 
-} 
- 
-Connection-Oriented-Information-Extensions LCS-AP-PROTOCOL-EXTENSION ::= { 
- ... 
-} 
- 
--- ************************************************************** 
--- 
--- Connectionless-Information 
--- 
--- ************************************************************** 
- 
-Connectionless-Information ::= SEQUENCE { 
-  protocolIEs     ProtocolIE-Container      { {Connectionless-Information-IEs} }, 
-  protocolExtensions    ProtocolExtensionContainer { {Connectionless-Information-Extensions} } 
-OPTIONAL,  
- ... 
-} 
- 
-Connectionless-Information-IEs LCS-AP-PROTOCOL-IES ::= { 
-  { ID id-Source-Identity     CRITICALITY reject  TYPE Network-Element    PRESENCE 
-mandatory } | 
- { ID id-Destination-ID   CRITICALITY reject TYPE Network-Element  PRESENCE 
-mandatory } | 
- { ID id-APDU     CRITICALITY reject TYPE APDU     PRESENCE 
-mandatory } | 
-  { ID id-Return-Error-Request  CRITICALITY reject  TYPE Return-Error-Type    PRESENCE 
-optional  } | 
-  { ID id-Return-Error-Cause    CRITICALITY ignore  TYPE Return-Error-Cause   PRESENCE 
-optional  } , 
- ... 
-} 
- 
- 
-Connectionless-Information-Extensions LCS-AP-PROTOCOL-EXTENSION ::= { 
- ... 
-} 
- 
--- ************************************************************** 
--- 
--- Reset-Request  
--- 
--- ************************************************************** 
- 
-Reset-Request ::= SEQUENCE { 
-  protocolIEs       ProtocolIE-Container        { {Reset-Request-IEs} }, 
-  protocolExtensions    ProtocolExtensionContainer  { {Reset-Request-Extensions} } OPTIONAL, 
- ... 
-} 
- 
-Reset-Request-IEs LCS-AP-PROTOCOL-IES ::= { 
-  { ID id-LCS-Cause  CRITICALITY ignore  TYPE LCS-Cause      PRESENCE mandatory } , 
- ... 
-} 
- 
- 
-Reset-Request-Extensions LCS-AP-PROTOCOL-EXTENSION ::= { 
- ... 
-} 
- 
- 
--- ************************************************************** 
--- 
--- Reset-Acknowledge  
--- 
--- ************************************************************** 
- 
-Reset-Acknowledge       ::= SEQUENCE { 
-  protocolIEs       ProtocolIE-Container      { { Reset-Acknowledge-IEs} }, 
-  protocolExtensions    ProtocolExtensionContainer { { Reset-Acknowledge-Extensions} } OPTIONAL, 
- ... 
-} 
- 
-Reset-Acknowledge-IEs LCS-AP-PROTOCOL-IES ::= { 
- ... 
-} 
- 
-Reset-Acknowledge-Extensions LCS-AP-PROTOCOL-EXTENSION ::= { 
- ... 
-} 
- 
- 
-END 
\ No newline at end of file
+LCS-AP-PDU-Contents {
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
+eps-Access (21) modules (3) lcs-AP (4) version1 (1) lcs-AP-PDU-Contents (1)}
+
+DEFINITIONS AUTOMATIC TAGS ::= 
+
+BEGIN
+
+-- **************************************************************
+--
+-- IE parameter types from other modules.
+--
+-- **************************************************************
+
+IMPORTS
+	
+	APDU,
+	Accuracy-Fulfillment-Indicator,
+	Correlation-ID,
+	E-CGI,
+	Geographical-Area,
+	IMSI,
+	IMEI,
+	Include-Velocity,
+	LCS-Cause,
+	LCS-Client-Type, 
+	LCS-Service-Type-ID,
+	LCS-Priority,
+	LCS-QoS,
+	Location-Type,
+	MultipleAPDUs,
+	Network-Element,
+	Payload-Type,
+	Positioning-Data,
+	Return-Error-Type,
+	Return-Error-Cause,
+	UE-Positioning-Capability,
+	Velocity-Estimate
+FROM LCS-AP-IEs
+
+	ProtocolExtensionContainer{},
+	ProtocolIE-Container{},
+	LCS-AP-PROTOCOL-EXTENSION,
+	LCS-AP-PROTOCOL-IES
+FROM LCS-AP-Containers
+
+	id-Accuracy-Fulfillment-Indicator,
+	id-APDU,
+	id-Correlation-ID,
+	id-Destination-ID,
+	id-E-UTRAN-Cell-Identifier,
+	id-Include-Velocity,
+	id-IMEI,
+	id-IMSI,
+	id-LCS-Client-Type,
+	id-LCS-Priority,
+	id-LCS-QOS,
+	id-LCS-Cause, 
+	id-LCS-Service-Type-ID,
+	id-Location-Estimate,
+	id-Location-Type,
+	id-MultipleAPDUs,
+	id-Payload-Type,
+	id-Positioning-Data,
+	id-Return-Error-Request,
+	id-Return-Error-Cause,
+	id-Source-Identity,
+	id-UE-Positioning-Capability,
+	id-Velocity-Estimate
+FROM LCS-AP-Constants;
+
+
+-- **************************************************************
+--
+-- Location-Request
+--
+-- **************************************************************
+
+Location-Request ::= SEQUENCE {
+	protocolIEs				ProtocolIE-Container      	{ { Location-Request-IEs} },
+	protocolExtensions		ProtocolExtensionContainer	{ { Location-Request-Extensions} } OPTIONAL,
+	...
+}
+
+Location-Request-IEs LCS-AP-PROTOCOL-IES ::= {
+	{ ID id-Correlation-ID				CRITICALITY reject	TYPE Correlation-ID				PRESENCE mandatory } |
+	{ ID id-Location-Type				CRITICALITY reject	TYPE Location-Type				PRESENCE mandatory } |
+	{ ID id-E-UTRAN-Cell-Identifier		CRITICALITY ignore	TYPE E-CGI						PRESENCE mandatory  } |
+	{ ID id-LCS-Client-Type				CRITICALITY reject	TYPE LCS-Client-Type			PRESENCE optional  } |
+	{ ID id-LCS-Priority				CRITICALITY reject	TYPE LCS-Priority				PRESENCE optional  } |
+	{ ID id-LCS-QOS						CRITICALITY reject	TYPE LCS-QoS					PRESENCE optional  } |
+	{ ID id-UE-Positioning-Capability	CRITICALITY reject	TYPE UE-Positioning-Capability	PRESENCE optional  } |
+	{ ID id-Include-Velocity			CRITICALITY reject	TYPE Include-Velocity			PRESENCE optional  } |
+	{ ID id-IMSI						CRITICALITY ignore	TYPE IMSI						PRESENCE optional  } |
+	{ ID id-IMEI						CRITICALITY ignore	TYPE IMEI						PRESENCE optional  } |
+	{ ID id-MultipleAPDUs				CRITICALITY reject	TYPE MultipleAPDUs				PRESENCE optional  } ,
+	...
+}
+
+Location-Request-Extensions LCS-AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-LCS-Service-Type-ID				CRITICALITY ignore 	EXTENSION LCS-Service-Type-ID 			PRESENCE optional  },
+	...
+}
+
+
+-- **************************************************************
+--
+-- Location-Response
+--
+-- **************************************************************
+
+Location-Response ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container      { {Location-Response-IEs} },
+	protocolExtensions		ProtocolExtensionContainer { {Location-Response-Extensions} } OPTIONAL,
+	...
+}
+
+Location-Response-IEs LCS-AP-PROTOCOL-IES ::= {
+	{ ID id-Correlation-ID					CRITICALITY reject	TYPE Correlation-ID						PRESENCE mandatory } |
+	{ ID id-Location-Estimate				CRITICALITY reject	TYPE Geographical-Area					PRESENCE optional  } |
+	{ ID id-Positioning-Data				CRITICALITY reject	TYPE Positioning-Data					PRESENCE optional  } |
+	{ ID id-Velocity-Estimate				CRITICALITY reject	TYPE Velocity-Estimate					PRESENCE optional  } |
+	{ ID id-Accuracy-Fulfillment-Indicator	CRITICALITY reject	TYPE Accuracy-Fulfillment-Indicator	PRESENCE optional  } |
+	{ ID id-LCS-Cause						CRITICALITY ignore	TYPE LCS-Cause							PRESENCE optional  } ,
+...
+}
+
+
+Location-Response-Extensions LCS-AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+-- **************************************************************
+--
+-- Location-Abort
+--
+-- **************************************************************
+
+Location-Abort-Request ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container      { {Location-Abort-Request-IEs} },
+	protocolExtensions		ProtocolExtensionContainer { {Location-Abort-Request-Extensions} } OPTIONAL,
+	...
+}
+
+Location-Abort-Request-IEs LCS-AP-PROTOCOL-IES ::= {
+	{ ID id-Correlation-ID					CRITICALITY reject	TYPE Correlation-ID		PRESENCE mandatory } |
+	{ ID id-LCS-Cause						CRITICALITY ignore	TYPE LCS-Cause			PRESENCE mandatory } ,
+	...
+}
+
+Location-Abort-Request-Extensions LCS-AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+-- **************************************************************
+--
+-- Connection-Oriented-Information 
+--
+-- **************************************************************
+
+Connection-Oriented-Information ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container      { {Connection-Oriented-Information-IEs} },
+	protocolExtensions		ProtocolExtensionContainer { {Connection-Oriented-Information-Extensions} } OPTIONAL,
+	...
+}
+
+Connection-Oriented-Information-IEs LCS-AP-PROTOCOL-IES ::= {
+	{ ID id-Correlation-ID		CRITICALITY reject	TYPE Correlation-ID			PRESENCE optional  } |
+	{ ID id-Payload-Type 		CRITICALITY reject	TYPE Payload-Type			PRESENCE optional  } |
+	{ ID id-APDU				CRITICALITY reject	TYPE APDU					PRESENCE optional  } ,
+	...
+}
+
+Connection-Oriented-Information-Extensions LCS-AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+-- **************************************************************
+--
+-- Connectionless-Information
+--
+-- **************************************************************
+
+Connectionless-Information ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container      { {Connectionless-Information-IEs} },
+	protocolExtensions		ProtocolExtensionContainer { {Connectionless-Information-Extensions} } OPTIONAL,
+	...
+}
+
+Connectionless-Information-IEs LCS-AP-PROTOCOL-IES ::= {
+	{ ID id-Source-Identity			CRITICALITY reject	TYPE Network-Element		PRESENCE mandatory } |
+	{ ID id-Destination-ID			CRITICALITY reject	TYPE Network-Element		PRESENCE mandatory } |
+	{ ID id-APDU					CRITICALITY reject	TYPE APDU					PRESENCE mandatory } |
+	{ ID id-Return-Error-Request	CRITICALITY reject	TYPE Return-Error-Type		PRESENCE optional  } |
+	{ ID id-Return-Error-Cause		CRITICALITY ignore	TYPE Return-Error-Cause		PRESENCE optional  } ,
+	...
+}
+
+
+Connectionless-Information-Extensions LCS-AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+-- **************************************************************
+--
+-- Reset-Request 
+--
+-- **************************************************************
+
+Reset-Request ::= SEQUENCE {
+	protocolIEs				ProtocolIE-Container      	{ {Reset-Request-IEs} },
+	protocolExtensions		ProtocolExtensionContainer	{ {Reset-Request-Extensions} } OPTIONAL,
+	...
+}
+
+Reset-Request-IEs LCS-AP-PROTOCOL-IES ::= {
+	{ ID id-LCS-Cause	CRITICALITY ignore	TYPE LCS-Cause			PRESENCE mandatory } ,
+	...
+}
+
+
+Reset-Request-Extensions LCS-AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+-- **************************************************************
+--
+-- Reset-Acknowledge 
+--
+-- **************************************************************
+
+Reset-Acknowledge 			::= SEQUENCE {
+	protocolIEs				ProtocolIE-Container      { { Reset-Acknowledge-IEs} },
+	protocolExtensions		ProtocolExtensionContainer { { Reset-Acknowledge-Extensions} } OPTIONAL,
+	...
+}
+
+Reset-Acknowledge-IEs LCS-AP-PROTOCOL-IES ::= {
+	...
+}
+
+Reset-Acknowledge-Extensions LCS-AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+END