Commit 3c4f5d17 authored by canterburym's avatar canterburym
Browse files

Merge branch 'cr/33128/0438' into 'meeting/SA98e' 

TS 33.128 CR0438 - Clarifications for LI_HI1

See merge request !114
parents 339018a0 c8c99874

33108/r16/ThreeGPP-HI1NotificationOperations.asn

+9 −7
Original line number Diff line number Diff line 
ThreeGPP-HI1NotificationOperations

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1) r16 (16) version-0(0)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1) r16 (16) version-1(1)}



DEFINITIONS IMPLICIT TAGS ::=
@@ -29,7 +29,7 @@ lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization( 
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}

-- hi1 Domain

threeGPP-hi1NotificationOperationsId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi1(0) notificationOperations(1)}

threeGPP-hi1OperationId OBJECT IDENTIFIER ::= {threeGPP-hi1NotificationOperationsId r16 (16) version-0(0)}

threeGPP-hi1OperationId OBJECT IDENTIFIER ::= {threeGPP-hi1NotificationOperationsId r16 (16) version-1(1)}





ThreeGPP-HI1-Operation ::= CHOICE
@@ -75,8 +75,10 @@ Alarm-Indicator ::= SEQUENCE 
		-- Lawful authorization)

	timeStamp						[2] TimeStamp,

		-- date and time of the report.

	alarm-information				[3] OCTET STRING (SIZE (1..25)),

	alarm-information				[3] OCTET STRING (SIZE (1..256)),

		-- Provides information about alarms (free format).

		-- Until ASN.1 Release 16 version 0 (document version v16.3.0) the octet string

		-- was limited to a size of 25.

	lawfulInterceptionIdentifier	[4] LawfulInterceptionIdentifier OPTIONAL,

		-- This identifier is the LIID identity provided with the lawful authorization

		-- for each target in according to national law

33108/r16/UmtsHI2Operations.asn

+14 −14
Original line number Diff line number Diff line
@@ -798,31 +798,31 @@ ReportInterval ::= SEQUENCE 
}



-- LALS extended location parameters are mapped from the MLP pos element parameters 

-- and attributes defined in [88]. For details see specific [88] clauses refered below. 

ExtendedLocParameters ::= SEQUENCE

{

	posMethod		[0]		PrintableString OPTIONAL, -- clause 5.3.72.1
 
	posMethod		[0]		PrintableString OPTIONAL, -- clause 5.3.93.1

	mapData			[1] 								-- clause 5.2.2.3

					CHOICE 		{base64Map 	[0] PrintableString, 	-- clause 5.3.11
 
					CHOICE 		{base64Map 	[0] PrintableString, 	-- clause 5.3.11

					CHOICE 		{base64Map 	[0] PrintableString, 	-- clause 5.3.12

								url 		[1] PrintableString 	-- clause 5.3.138

								} OPTIONAL,

	altitude		[2]	

					SEQUENCE 	{alt PrintableString, -- clause 5.3.4
 
								alt-uncertainty PrintableString OPTIONAL -- clause 5.3.6
 
					SEQUENCE 	{alt PrintableString, -- clause 5.3.5

								alt-uncertainty PrintableString OPTIONAL -- clause 5.3.7

								} OPTIONAL,

	speed			[3] 	PrintableString OPTIONAL, -- clause 5.3.116
 
	speed			[3] 	PrintableString OPTIONAL, -- clause 5.3.116

	direction		[4]		PrintableString OPTIONAL, -- clause 5.3.25

	level-conf		[5]		PrintableString OPTIONAL, -- clause 5.3.51

	speed			[3] 	PrintableString OPTIONAL, -- clause 5.3.119

	direction		[4]		PrintableString OPTIONAL, -- clause 5.3.26

	level-conf		[5]		PrintableString OPTIONAL, -- clause 5.3.24

	qOS-not-met		[6] 	BOOLEAN OPTIONAL, -- clause 5.3.97

	motionStateList [7] 								-- clause 5.2.2.3

					SEQUENCE	{primaryMotionState 	[0] PrintableString, -- clause 5.3.23
 
					SEQUENCE	{primaryMotionState 	[0] PrintableString, -- clause 5.3.69

								secondaryMotionState 	[1] SEQUENCE OF PrintableString OPTIONAL,

								secondaryMotionState 	[1] SEQUENCE OF PrintableString OPTIONAL,

								confidence 				[2] PrintableString -- clause 5.3.24

								} OPTIONAL,

	floor    		[8] 

					SEQUENCE 	{floor-number PrintableString, -- clause 5.3.38
 
					SEQUENCE 	{floor-number PrintableString, -- clause 5.3.39

								floor-number-uncertainty PrintableString OPTIONAL

								floor-number-uncertainty PrintableString OPTIONAL

								-- clause 5.3.40

								} OPTIONAL, 

	additional-info	[9] PrintableString OPTIONAL, -- clause 5.3.1

33128/r18/TS33128Dictionaries.xml

0 → 100644
+40 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8" ?>

<Dictionaries xmlns="http://uri.etsi.org/03280/common/2019/10/Dictionaries">

	<Dictionary>   											<!--ObjectType: see Clause 6.4.8 Table 6.14 -->

		<Owner>3GPP</Owner>

		<Name>ServiceType</Name>

		<DictionaryEntries>

			<DictionaryEntry>

				<Value>Voice</Value>

				<Meaning>Service scoping shall include the Voice service type as defined in clause 4.4.2</Meaning>

			</DictionaryEntry>

			<DictionaryEntry>

				<Value>Data</Value>

				<Meaning>Service scoping shall include the Data service type as defined in clause 4.4.2</Meaning>

			</DictionaryEntry>

			<DictionaryEntry>

				<Value>Messaging</Value>

				<Meaning>Service scoping shall include the Messaging service type as defined in clause 4.4.2</Meaning>

			</DictionaryEntry>

			<DictionaryEntry>

				<Value>PTC</Value>

				<Meaning>Service scoping shall include the Push-to-Talk service type as defined in clause 4.4.2</Meaning>

			</DictionaryEntry>

			<DictionaryEntry>

				<Value>LALS</Value>

				<Meaning>Service scoping shall include the LALS service type as defined in clause 4.4.2</Meaning>

			</DictionaryEntry>

			<DictionaryEntry>

				<Value>RCS</Value>

				<Meaning>Service scoping shall include the RCS service type as defined in clause 4.4.2</Meaning>

			</DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

<Dictionaries>