Commit 35dc034f authored by canterburym's avatar canterburym
Browse files

Resolving merge conflict

parents 0d46b632 602ab4d1

33128/r18/TS33128Payloads.asn

+22 −0
Original line number Diff line number Diff line
@@ -216,6 +216,9 @@ XIRIEvent ::= CHOICE 
    fiveGMSAFNetworkAssistance                            [204] FiveGMSAFNetworkAssistance,

    fiveGMSAFUnsuccessfulProcedure                        [205] FiveGMSAFUnsuccessfulProcedure,

    fiveGMSAFStartOfInterceptionWithAlreadyConfiguredUE   [206] FiveGMSAFStartOfInterceptionWithAlreadyConfiguredUE



    --AMF events, see 6.2.2.2.Cl1, continued from tag 114

    aMFUEConfigurationUpdate                            [4581] AMFUEConfigurationUpdate

}



-- ==============
@@ -424,6 +427,9 @@ IRIEvent ::= CHOICE 
    fiveGMSAFNetworkAssistance                            [204] FiveGMSAFNetworkAssistance,

    fiveGMSAFUnsuccessfulProcedure                        [205] FiveGMSAFUnsuccessfulProcedure,

    fiveGMSAFStartOfInterceptionWithAlreadyConfiguredUE   [206] FiveGMSAFStartOfInterceptionWithAlreadyConfiguredUE



    --AMF events, see 6.2.2.3, continued from tag 114

    aMFUEConfigurationUpdate                            [4581] AMFUEConfigurationUpdate

}



IRITargetIdentifier ::= SEQUENCE
@@ -1315,6 +1321,19 @@ AMFRANHandoverRequest ::= SEQUENCE 
    sourceToTargetContainer             [11] RANSourceToTargetContainer

}



--See clause 6.2.2.2.Cl1 on for details of this structure

AMFUEConfigurationUpdate ::= SEQUENCE

{

    userIdentifiers     [1] UserIdentifiers,

    gUTI                [2] GUTI,

    oldGUTI             [3] EPS5GGUTI OPTIONAL,

    fiveGSTAIList       [4] TAIList OPTIONAL,

    slice               [5] Slice OPTIONAL,

    serviceAreaList     [6] ServiceAreaList OPTIONAL,

    registrationResult  [7] AMFRegistrationResult OPTIONAL,

    sMSOverNASIndicator [8] SMSOverNASIndicator OPTIONAL

}



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

-- 5G AMF parameters

-- =================
@@ -1371,6 +1390,9 @@ AMFSetID ::= INTEGER (0..1023) 


AMFUENGAPID ::= INTEGER (0..1099511627775)



-- TS 24.501 [13], clause 9.11.3.49

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



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

-- 5G SMF definitions

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