Commit 655d99bf authored by canterburym's avatar canterburym
Browse files

Resolving merge conflict

parent 900f78fe

33128/r18/TS33128Payloads.asn

+58 −17
Original line number Diff line number Diff line
@@ -1310,7 +1310,11 @@ AMFRegistration ::= SEQUENCE 
    eMM5GRegStatus                  [14] EMM5GMMStatus OPTIONAL,

    nonIMEISVPEI                    [15] NonIMEISVPEI OPTIONAL,

    mACRestIndicator                [16] MACRestrictionIndicator OPTIONAL,

    pagingRestrictionIndicator  [17] PagingRestrictionIndicator OPTIONAL

    pagingRestrictionIndicator      [17] PagingRestrictionIndicator OPTIONAL,

    rATType                         [18] RATType OPTIONAL,

    rRCEstablishmentCause           [19] RRCEstablishmentCause OPTIONAL,

    nGInformation                   [20] NGInformation OPTIONAL,

    nASTransportInitialInformation  [21] NASTransportInitialInformation OPTIONAL

}



-- See clause 6.2.2.2.3 for details of this structure
@@ -1487,6 +1491,16 @@ AMFUENGAPID ::= INTEGER (0..1099511627775) 
-- TS 24.501 [13], clause 9.11.3.49

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



NASTransportInitialInformation ::= SEQUENCE

{

    rANUENGAPID             [1] RANUENGAPID,

    iABNodeIndication       [2] BOOLEAN OPTIONAL,

    eDTSession              [3] BOOLEAN OPTIONAL,

    authenticatedIndication [4] BOOLEAN OPTIONAL,

    nPNAccessInformation    [5] CellCAGList OPTIONAL,

    rEDCAPIndication        [6] REDCAPIndication OPTIONAL

}



NGInformation ::= SEQUENCE

{

    globalRANNodeID        [1] GlobalRANNodeID,
@@ -1516,6 +1530,33 @@ F1Information ::= SEQUENCE 
    extendedGNBCUName  [6] UTF8String OPTIONAL

}



REDCAPIndication ::= ENUMERATED

{

    redCAP(1)

}



RRCEstablishmentCause ::= CHOICE

{

    ePCEstablishmentCause    [1] EstablishmentCause,

    fiveGCEstablishmentCause [2] EstablishmentCause

}



EstablishmentCause ::= ENUMERATED

{

    emergency(1),

    highPriorityAccess(2),

    mtAccess(3),

    moSignalling(4),

    moData(5),

    moVoiceCall(6),

    moVideoCall(7),

    moSMS(8),

    mpsPriorityAccess(9),

    mcsPriorityAccess(10),

    notAvailable(11),

    exceptionData(12)

}



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

-- 5G SMF definitions

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