Resolving merge conflicts (076b0b87) · Commits · SA3 / SA3 LI

33128/r18/TS33128Payloads.asn

+68 −1

Original line number	Diff line number	Diff line
		@@ -259,6 +259,10 @@ XIRIEvent ::= CHOICE
		nWDAFAnalyticsInfoQuery [154] NWDAFAnalyticsInfoQuery,
		nWDAFRoamingAnalyticsSubscription [155] NWDAFRoamingAnalyticsSubscription,
		nWDAFRoamingAnalyticsNotification [156] NWDAFRoamingAnalyticsNotification

		-- RCS events, see clause 7.13.3, continued from tag 145
		startOfInterceptForRegisteredRCSUser [157] StartOfInterceptForRegisteredRCSUser,
		startOfInterceptWithEstablisedRCSSession [158] StartOfInterceptWithEstablisedRCSSession
		}

		-- ==============
		@@ -510,6 +514,10 @@ IRIEvent ::= CHOICE
		nWDAFAnalyticsInfoQuery [154] NWDAFAnalyticsInfoQuery,
		nWDAFRoamingAnalyticsSubscription [155] NWDAFRoamingAnalyticsSubscription,
		nWDAFRoamingAnalyticsNotification [156] NWDAFRoamingAnalyticsNotification

		-- RCS events, see clause 7.13.3, continued from tag 145
		startOfInterceptForRegisteredRCSUser [157] StartOfInterceptForRegisteredRCSUser,
		startOfInterceptWithEstablisedRCSSession [158] StartOfInterceptWithEstablisedRCSSession
		}

		IRITargetIdentifier ::= SEQUENCE
		@@ -4456,6 +4464,31 @@ RCSCapabilityDiscovery ::= SEQUENCE
		location [5] Location OPTIONAL
		}

		-- See clause 7.13.3.6.1.2 for details of this structure
		StartOfInterceptForRegisteredRCSUser ::= SEQUENCE
		{
		rCSTargetIdentities [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity,
		rCSRegistrationInformation [2] SEQUENCE SIZE (1..MAX) OF RCSRegistrationInformation,
		userOnline [3] BOOLEAN,
		location [4] Location OPTIONAL,
		additionalInstanceLocation [5] SEQUENCE SIZE (1..MAX) OF AdditionalInstanceLocation OPTIONAL
		}

		-- See clause 7.13.3.6.1.3 for details of this structure
		StartOfInterceptWithEstablisedRCSSession ::= SEQUENCE
		{
		rCSTargetIdentities [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity,
		participants [2] SEQUENCE SIZE (1..MAX) OF RCSDestinations,
		conversationID [3] RCSConversationID,
		contributionID [4] RCSContributionID,
		rCSSessionType [5] RCSSessionType,
		rCSSessionEndpoints [6] RCSSessionEndpoints,
		rCSSessionLegs [7] SEQUENCE SIZE (1..MAX) OF RCSSIPSessionExchange OPTIONAL,
		rCSSessionInformation [8] SEQUENCE SIZE (1..MAX) OF RCSSessionContext,
		location [9] Location OPTIONAL,
		additionalInstanceLocation [10] SEQUENCE SIZE (1..MAX) OF AdditionalInstanceLocation OPTIONAL
		}

		RCSCCPDU ::= CHOICE
		{
		encapsulatedRCSPayload [1] EncapsulatedRCSPayload
		@@ -4465,6 +4498,12 @@ RCSCCPDU ::= CHOICE
		-- RCS Parameters
		-- ==============

		AdditionalInstanceLocation ::= SEQUENCE
		{
		instance [1] SIPEndpoint,
		location [2] Location
		}

		IMDNMessageID ::= UTF8String

		MSRPPath ::= SEQUENCE
		@@ -4497,6 +4536,14 @@ RCSMessageType ::= ENUMERATED
		iMDNNotification(4)
		}

		RCSRegistrationInformation ::= CHOICE
		{
		sIPRegistration [1] RCSSIPRegistrationExchange,
		userProfile [2] XMLType,
		multiDevice [3] XMLType,
		presenceDocument [4] XMLType
		}

		RCSRegistrationType ::= ENUMERATED
		{
		registration(1),
		@@ -4510,7 +4557,7 @@ RCSServerURI ::= UTF8String
		RCSSessionEndpoints ::= ENUMERATED
		{
		remoteOnly(1),
		locatlOnly(2),
		localOnly(2),
		localAndRemote(3)
		}

		@@ -4520,12 +4567,30 @@ RCSSessionLeg ::= ENUMERATED
		localLeg(2)
		}

		RCSSessionContext ::= CHOICE
		{
		cPMSessionInfo [1] MIMEEntity
		}

		RCSSessionType ::= ENUMERATED
		{
		largeMessageStandalone(1),
		oneTo1Chat(2)
		}

		RCSSIPRegistrationExchange ::= SEQUENCE
		{
		rCSRegistrationUpdateRequest [1] IMSPayload,
		rCSRegistrationUpdateResponse [2] IMSPayload
		}

		RCSSIPSessionExchange ::= SEQUENCE
		{
		sessionLeg [1] RCSSessionLeg,
		sIPRequest [2] IMSPayload,
		sIPResponse [3] IMSPayload
		}

		RCSSIPSessionMessage ::= SEQUENCE
		{
		sessionLeg [1] RCSSessionLeg,
		@@ -4544,6 +4609,8 @@ RCSSessionResult ::= ENUMERATED
		legRemovalComplete(6)
		}

		SIPEndpoint ::= UTF8String

		-- =================
		-- EES definitions
		-- =================