Commit 9700a30f authored by canterburym's avatar canterburym
Browse files

Resolving merge conflicts in CR0555

parents 333894a8 b61e10f2

33128/r18/TS33128Payloads.asn

+24 −2
Original line number Diff line number Diff line
@@ -244,7 +244,8 @@ XIRIEvent ::= CHOICE 
    rCSSessionRelease                                   [145] RCSSessionRelease,



    -- AMF events, see clause 6.2.2.2.X, continued from tag 139

    aMFUEPolicyTransfer                                 [146] AMFUEPolicyTransfer

    aMFUEPolicyTransfer                                 [146] AMFUEPolicyTransfer,

    aMFUEServiceAccept                                  [147] AMFUEServiceAccept

}



-- ==============
@@ -481,7 +482,8 @@ IRIEvent ::= CHOICE 
    rCSSessionRelease                                   [145] RCSSessionRelease,



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

    aMFUEPolicyTransfer                                 [146] AMFUEPolicyTransfer

    aMFUEPolicyTransfer                                 [146] AMFUEPolicyTransfer,

    aMFUEServiceAccept                                  [147] AMFUEServiceAccept

}



IRITargetIdentifier ::= SEQUENCE
@@ -1491,6 +1493,20 @@ AMFUEPolicyTransfer ::= SEQUENCE 
    uEPolicy                        [6] UEPolicy

}



-- See clause 6.2.2.2.12 for details of this structure

AMFUEServiceAccept ::= SEQUENCE

{

    userIdentifiers                [1] UserIdentifiers,

    serviceMessageIdentity         [2] ServiceMessageIdentity,

    serviceType                    [3] OCTET STRING (SIZE(1)) OPTIONAL,

    fiveGTMSI                      [4] FiveGTMSI OPTIONAL,

    uplinkDataStatus               [5] OCTET STRING (SIZE(2..32)) OPTIONAL,

    pDUSessionStatus               [6] OCTET STRING (SIZE(2..32)) OPTIONAL,

    uERequestType                  [7] FiveGSMRequestType OPTIONAL,

    pagingRestriction              [8] PagingRestrictionIndicator OPTIONAL,

    forbiddenTAIList               [9] TAIList OPTIONAL

}



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

-- 5G AMF parameters

-- =================
@@ -1594,6 +1610,12 @@ MDTMode ::= CHOICE 
-- TS 24.501 [13], clause 9.11.3.49

ServiceAreaList ::= OCTET STRING (SIZE(4..112))



ServiceMessageIdentity ::= CHOICE

{

    serviceRequest    [1] OCTET STRING,

    serviceAccept     [2] OCTET STRING

}



TraceActivationInfo ::= SEQUENCE

{

    nGRANTraceID                     [1] OCTET STRING (SIZE(8)),