Resolving merge conflicts in CR0549 (4e77950c) · Commits · SA3 / SA3 LI

33128/r18/TS33128Payloads.asn

+95 −1

Original line number	Diff line number	Diff line
		@@ -1346,7 +1346,11 @@ AMFRegistration ::= SEQUENCE
		rRCEstablishmentCause [19] RRCEstablishmentCause OPTIONAL,
		nGInformation [20] NGInformation OPTIONAL,
		nASTransportInitialInformation [21] NASTransportInitialInformation OPTIONAL,
		sORTransparentContainer [22] SORTransparentContainer OPTIONAL
		sORTransparentContainer [22] SORTransparentContainer OPTIONAL,
		equivalentPLMNList [23] PLMNList OPTIONAL,
		fiveGMMCapability [24] FiveGMMCapability OPTIONAL,
		initialRANUEContextSetup [25] InitialRANUEContextSetup OPTIONAL,
		mUSIMUERequestType [26] MUSIMUERequestType OPTIONAL
		}

		-- See clause 6.2.2.2.3 for details of this structure
		@@ -1726,6 +1730,96 @@ SORTransparentContainer ::= OCTET STRING (SIZE (17..65535))

		UEPolicy ::= OCTET STRING (SIZE(16..65540))

		InitialRANUEContextSetup ::= SEQUENCE
		{
		aMFUENGAPID [1] AMFUENGAPID,
		rANUENGAPID [2] RANUENGAPID,
		oldAMF [3] GUAMI OPTIONAL,
		pDUSessionSetupRequest [4] SEQUENCE (SIZE(1..MAX)) OF PDUSessionSetupRequestItem,
		allowedNSSAI [5] AllowedNSSAI,
		mobilityRestrictionList [6] MobilityRestrictionList OPTIONAL,
		uERadioCapability [7] UERadioCapability OPTIONAL,
		rATFrequencySelectionPriority [8] RATFrequencySelectionPriority OPTIONAL,
		uERadioCapabilityForPaging [9] UERadioCapabilityForPaging OPTIONAL,
		iABAuthorizedIndicator [10] IABAuthorizedIndicator OPTIONAL,
		nRV2XServicesAuthorization [11] NRV2XServicesAuthorization OPTIONAL,
		lTEV2XServiceAuthorization [12] LTEV2XServiceAuthorization OPTIONAL,
		rGLevelWirelineAccessCharacteristics [13] OCTET STRING OPTIONAL,
		uERadioCapabilityID [14] OCTET STRING OPTIONAL,
		targetNSSAIInfo [15] TargetNSSAIInfo OPTIONAL,
		fiveGProSeAuthorizationIndication [16] FiveGProSeAuthorizationIndication OPTIONAL
		}

		PDUSessionSetupRequestItem ::= SEQUENCE
		{
		pDUSessionID [1] PDUSessionID,
		sNSSAI [2] SNSSAI
		}

		UERadioCapability ::= SEQUENCE
		{
		uERadioCapibilityNR [1] OCTET STRING OPTIONAL,
		uERadioCapabilityEUTRA [2] OCTET STRING OPTIONAL
		}

		UERadioCapabilityForPaging ::= SEQUENCE
		{
		uERadioCapabilityForPagingOfNR [1] OCTET STRING OPTIONAL,
		uERadioCapabilityForPagingOfEUTRA [2] OCTET STRING OPTIONAL,
		uERadioCapabilityForPagingOfNBIoT [3] OCTET STRING OPTIONAL
		}

		NRV2XServicesAuthorization ::= SEQUENCE
		{
		v2XVehicleUEAuthorizationIndicator [1] V2XUEAuthorizationIndicator OPTIONAL,
		v2XPedestrianUEAuthorizationIndicator [2] V2XUEAuthorizationIndicator OPTIONAL
		}

		LTEV2XServiceAuthorization ::= SEQUENCE
		{
		v2XVehicleUEAuthorizationIndicator [1] V2XUEAuthorizationIndicator OPTIONAL,
		v2XPedestrianUEAuthorizationIndicator [2] V2XUEAuthorizationIndicator OPTIONAL
		}

		TargetNSSAIInfo ::= SEQUENCE
		{
		targetSNSSAIList [1] NSSAI,
		rATFrequencySelectionPriority [2] RATFrequencySelectionPriority
		}

		FiveGProSeAuthorizationIndication ::= SEQUENCE
		{
		fiveGProSeDirectDiscovery [1] FiveGProSeAuthorizationIndicator OPTIONAL,
		fiveGProSeDirectCommunication [2] FiveGProSeAuthorizationIndicator OPTIONAL,
		fiveGProSeL2UEToNetworkRelay [3] FiveGProSeAuthorizationIndicator OPTIONAL,
		fiveGProSeL3UEToNetworkRelay [4] FiveGProSeAuthorizationIndicator OPTIONAL,
		fiveGProSeL2RemoteUE [5] FiveGProSeAuthorizationIndicator OPTIONAL
		}

		IABAuthorizedIndicator ::= ENUMERATED
		{
		authorized(1),
		notAuthorized(2)
		}

		V2XUEAuthorizationIndicator ::= ENUMERATED
		{
		authorized(1),
		notAuthorized(2)
		}

		FiveGProSeAuthorizationIndicator ::= ENUMERATED
		{
		authorized(1),
		notAuthorized(2)
		}

		MUSIMUERequestType ::= OCTET STRING (SIZE(1))

		RATFrequencySelectionPriority ::= INTEGER (1..256)

		FiveGMMCapability ::= OCTET STRING (SIZE(1..13))

		-- ==================
		-- 5G SMF definitions
		-- ==================