Commit f3fa1b18 authored by canterburym's avatar canterburym
Browse files

Resolving merge conflicts

parents 32053894 9109dc97

33128/r19/TS33128Payloads.asn

+53 −10
Original line number Diff line number Diff line
@@ -301,7 +301,10 @@ XIRIEvent ::= CHOICE 


    -- MMS-related events continued from choice 35

    mMSConvertedFromEmail                               [173] MMSConvertedFromEmail,

    mMSConvertedToEmail                                 [174] MMSConvertedToEmail

    mMSConvertedToEmail                                 [174] MMSConvertedToEmail,



    -- AMF events, see clause 6.2.2.2.14, continued from tag 147

    aMFUEContextUpdate                                  [175] AMFUEContextUpdate

}



-- ==============
@@ -586,7 +589,9 @@ IRIEvent ::= CHOICE 
    

    -- MMS-related events continued from choice 35

    mMSConvertedFromEmail                               [173] MMSConvertedFromEmail,

    mMSConvertedToEmail                                 [174] MMSConvertedToEmail

    mMSConvertedToEmail                                 [174] MMSConvertedToEmail,

    -- AMF events, see clause 6.2.2.3, continued from tag 147

    aMFUEContextUpdate                                  [175] AMFUEContextUpdate

}



IRITargetIdentifier ::= SEQUENCE
@@ -1264,12 +1269,6 @@ SCSASID ::= UTF8String 


SCEFID ::= UTF8String



PeriodicCommunicationIndicator ::= ENUMERATED

{

    periodic(1),

    nonPeriodic(2)

}



EPSBearerID ::= INTEGER (0..255)



APN ::= UTF8String
@@ -1910,7 +1909,7 @@ AMFUEPolicyTransfer ::= SEQUENCE 
    uEPolicy                        [6] UEPolicy

}



-- See clause 6.2.2.2.12 for details of this structure

-- See clause 6.2.2.2.13 for details of this structure

AMFUEServiceAccept ::= SEQUENCE

{

    userIdentifiers                [1] UserIdentifiers,
@@ -1926,6 +1925,14 @@ AMFUEServiceAccept ::= SEQUENCE 
    uERequestType                  [10] MUSIMUERequestType OPTIONAL

}



-- See clause 6.2.2.2.14 for details of this structure

AMFUEContextUpdate ::= SEQUENCE

{

    userIdentifiers          [1] UserIdentifiers,

    rANUEContextModification [2] RANUEContextModification OPTIONAL,

    rANDownlinkNASTransport  [3] RANDownlinkNASTransport OPTIONAL

}



-- =================

-- 5G AMF parameters

-- =================
@@ -2258,6 +2265,37 @@ FiveGSUpdateType ::= OCTET STRING (SIZE(1)) 


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



RANUEContextModification ::= SEQUENCE

{

    aMFUENGAPID                          [1] AMFUENGAPID,

    rANUENGAPID                          [2] RANUENGAPID,

    rATFrequencySelectionPriority        [3] RATFrequencySelectionPriority OPTIONAL,

    newAMFUENGAPID                       [4] AMFUENGAPID OPTIONAL,

    newGUAMI                             [5] GUAMI OPTIONAL,

    iABAuthorizedIndicator               [6] IABAuthorizedIndicator OPTIONAL,

    nRV2XServicesAuthorization           [7] NRV2XServicesAuthorization OPTIONAL,

    lTEV2XServiceAuthorization           [8] LTEV2XServiceAuthorization OPTIONAL,

    rGLevelWirelineAccessCharacteristics [9] OCTET STRING OPTIONAL,

    uERadioCapabilityID                  [10] OCTET STRING OPTIONAL,

    fiveGProSeAuthorizationIndication    [11] FiveGProSeAuthorizationIndication OPTIONAL,

    mobileIABAuthorizedIndicator         [12] MobileIABAuthorizedIndicator OPTIONAL

}



RANDownlinkNASTransport ::= SEQUENCE

{

    aMFUENGAPID                   [1] AMFUENGAPID,

    rANUENGAPID                   [2] RANUENGAPID,

    oldAMF                        [3] GUAMI OPTIONAL,

    allowedNSSAI                  [4] AllowedNSSAI OPTIONAL,

    mobilityRestrictionList       [5] MobilityRestrictionList OPTIONAL,

    rATFrequencySelectionPriority [6] RATFrequencySelectionPriority OPTIONAL,

    uEDifferentiationInfo         [7] UEDifferentiationInfo OPTIONAL,

    uERadioCapability             [8] UERadioCapability OPTIONAL,

    uERadioCapabilityID           [9] OCTET STRING OPTIONAL,

    targetNSSAIInfo               [10] TargetNSSAIInfo OPTIONAL,

    mobileIABAuthorizedIndicator  [11] MobileIABAuthorizedIndicator OPTIONAL

}



UEDifferentiationInfo ::= SEQUENCE

{

    periodicCommunicationIndicator [1] PeriodicCommunicationIndicator OPTIONAL,
@@ -2268,7 +2306,6 @@ UEDifferentiationInfo ::= SEQUENCE 
    batteryIndication              [6] SBIType OPTIONAL

}





MobileIABAuthorizedIndicator ::= ENUMERATED

{

    authorized(1),
@@ -6755,6 +6792,12 @@ NSSAI ::= SEQUENCE OF SNSSAI 


PagingRestrictionIndicator ::= OCTET STRING (SIZE(1..33))



PeriodicCommunicationIndicator ::= ENUMERATED

{

    periodic(1),

    nonPeriodic(2)

}



PLMNID ::= SEQUENCE

{

    mCC [1] MCC,