Commit a1dc8416 authored by Robert Tornkvist's avatar Robert Tornkvist
Browse files

Merge branch... 

Merge branch '32.298_Rel19_CR1051_Correction_of_satellite_ProSe_and_SMS_information' into 'Integration_Rel19_SA5_162_CH_ASN'

32.298_Rel19_CR1051_Correction_of_satellite_ProSe_and_SMS_information

See merge request !90
parents f5e6a580 e8880aa9

ASN/TS32298_CHFChargingDataTypes.asn

+30 −28
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ EnhancedDiagnostics, 
DynamicAddressFlag,

InvolvedParty,

IPAddress,

LCSClientIdentity,

LocalSequenceNumber,

ManagementExtensions,

MessageClass,
@@ -28,6 +29,7 @@ Ncgi, 
Nid,

NodeAddress,

PLMN-Id,

PositioningData,

PriorityType,

PSCellInformation,

RANNASCause,
@@ -554,7 +556,7 @@ IMSChargingInformation ::= SET 
	feIdentifierList						[57] FEIdentifierList OPTIONAL,

	imsDCAppInfo							[58] IMSDCAppInfo OPTIONAL,

	mediaResource							[59] MediaResource OPTIONAL,

	satelliteIDList							[110] SEQUENCE Of SatelliteID OPTIONAL

	satelliteIDList							[110] SEQUENCE OF SatelliteID OPTIONAL

}
@@ -760,14 +762,14 @@ RangingSLChargingInformation ::= SET 
	sLPositioningServerUEID					[2] SubscriptionID OPTIONAL,

	locatedUEID								[3] SubscriptionID OPTIONAL,

	locationType							[4] LocationType OPTIONAL,

	locationEstimate						[5] UserLocation OPTIONAL

	locationEstimate						[5] UserLocationInformationStructured OPTIONAL

}



LCSInformation	::= SET

{

	lCSClientID								[0] LCSClientIdentity OPTIONAL,

	locationType							[1] LocationType OPTIONAL,

	locationEstimate						[2] UserLocation OPTIONAL,

	locationEstimate						[2] UserLocationInformationStructured OPTIONAL,

	positioningData							[3] PositioningData OPTIONAL,

	targetUEID								[4] SubscriptionID OPTIONAL

}
@@ -2097,6 +2099,31 @@ Sac ::= UTF8String 
-- See 3GPP TS 29.571 [249] for details

-- 





SatelliteBackhaulInformation 	::= SEQUENCE

{

	satelliteBackhaulCategory			[0] SatelliteBackhaulCategory OPTIONAL,

	gEOSatelliteID					[1] UTF8String OPTIONAL 



}

-- See 3GPP TS 29.571 [249] for details.



SatelliteBackhaulCategory ::= ENUMERATED

{

	gEO   				(0),

	mEO 				(1),

	lEO					(2),

	oTHERSAT 			(3),

	dYNAMICGEO 			(4),

	dYNAMICMEO			(5),

	dYNAMICLEO 			(6),

	dYNAMICOTHERSAT 	(7),

	nONSATELLITE		(8)



}



SatelliteID 	::= UTF8String



ServiceArea ::= SEQUENCE

{

	mBSServiceArea	[0] MbsServiceArea OPTIONAL,
@@ -2400,31 +2427,6 @@ SynchronizationState ::= ENUMERATED 
}





SatelliteBackhaulInformation 	::= SEQUENCE

{

	satelliteBackhaulCategory			[0] SatelliteBackhaulCategory OPTIONAL,

	gEOSatelliteID					[1] UTF8String OPTIONAL 



}

-- See 3GPP TS 29.571 [249] for details.





SatelliteBackhaulCategory ::= ENUMERATED

{

	gEO   				(0),

	mEO 				(1),

	lEO					(2),

	oTHERSAT 			(3),

	dYNAMICGEO 			(4),

	dYNAMICMEO			(5),

	dYNAMICLEO 			(6),

	dYNAMICOTHERSAT 	(7),

	nONSATELLITE		(8)



}



SatelliteID 	::= UTF8String OPTIONAL



-- 

-- T

--

ASN/TS32298_CPDTChargingDataTypes.asn

+2 −1
Original line number Diff line number Diff line
@@ -173,4 +173,5 @@ SubmissionResultCode ::= INTEGER 
-- for MO/MT data transfer

--





END           
 No newline at end of file

ASN/TS32298_IMSChargingDataTypes.asn

+2 −2
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ PCSCFRecord ::= SET 
	relatedICID								[107] IMS-Charging-Identifier OPTIONAL,

	relatedICIDGenerationNode				[108] NodeAddress OPTIONAL,

	fEIdentifierList                        [109] FEIdentifierList OPTIONAL,

	satelliteIDList							[110] SEQUENCE Of SatelliteID OPTIONAL

	satelliteIDList							[110] SEQUENCE OF SatelliteID OPTIONAL





}
@@ -1016,7 +1016,7 @@ Status ::= ENUMERATED 
	time-out			(2)

}



SatelliteID 	::= UTF8String OPTIONAL

SatelliteID 	::= UTF8String



-- 

-- T

ASN/TS32298_ProSeChargingDataTypes.asn

+8 −8
Original line number Diff line number Diff line
@@ -147,8 +147,6 @@ targetIPaddress [26] IPAddress OPTIONAL, 
	relayIPaddress					[27] IPAddress OPTIONAL,

	proSeUEtoNetworkRelayUEID		[28] OCTET STRING OPTIONAL,

	proSeTargetLayerTwoID			[29] OCTET STRING OPTIONAL

	hopCount					[30] INTEGER OPTIONAL

	intermediateRelayInformationContainer				[31] SEQUENCE OF intermediateRelayInformation OPTIONAL			

}



--
@@ -195,11 +193,13 @@ CoverageStatus ::= ENUMERATED 
--

-- I

--

intermediateRelayInformation	::= SEQUENCE



IntermediateRelayInformation	::= SEQUENCE

{

	intermediateRelayIPAddress			[0] IPAddress OPTIONAL

	proSeUEtoNetworkIntermediateRelayUEID			[1] OCTET STRING OPTIONAL,

	intermediateRelayIPAddress				[0] IPAddress OPTIONAL,

	proSeUEtoNetworkIntermediateRelayUEID	[1] OCTET STRING OPTIONAL

}



-- 

-- L

--

ASN/TS32298_SMSChargingDataTypes.asn

+4 −3
Original line number Diff line number Diff line
@@ -267,7 +267,8 @@ RecipientInfo ::= SEQUENCE 
	sMRecipientProtocolID		[6] OCTET STRING OPTIONAL,

	recipientOtherAddresses		[7] SEQUENCE OF SMAddressInfo OPTIONAL,

									-- included for backwards compatibility

	recipientOtherAddresses		[8] SEQUENCE OF RecipientAddress OPTIONAL

	recipientOtherAddressList	[8] SEQUENCE OF RecipientAddress OPTIONAL

									-- used if type different from IMSI and MSISDN

} 



RecipientAddress	::= SEQUENCE
@@ -388,13 +389,13 @@ SMSStatus ::= OCTET STRING (SIZE(1)) 
SatelliteStoreAndForwardInformation 	::= SEQUENCE

{

	storeAndForwardIndicator		[0] BOOLEAN OPTIONAL,

	satelliteIDList					[1] SEQUENCE Of SatelliteID OPTIONAL,

	satelliteIDList					[1] SEQUENCE OF SatelliteID OPTIONAL,

	storeDuration					[2] CallDuration OPTIONAL,

	storeDataVolume					[3]	DataVolume OPTIONAL



}



SatelliteID 	::= UTF8String OPTIONAL

SatelliteID 	::= UTF8String





END
 
 No newline at end of file