Commit 1a98729d authored by canterburym's avatar canterburym
Browse files

Resolving merge conflict

parent 3c9dbbc8

33128/r19/TS33128Payloads.asn

+40 −2
Original line number Diff line number Diff line
@@ -308,7 +308,11 @@ XIRIEvent ::= CHOICE 


    -- SMF events, see clause 6.2.3.2 continued from tag 61

    sMFProSeRemoteUEReport                              [176] SMFProSeRemoteUEReport,

    sMFStartOfInterceptionWithConnectedProSeRemoteUE    [177] SMFStartOfInterceptionWithConnectedProSeRemoteUE

    sMFStartOfInterceptionWithConnectedProSeRemoteUE    [177] SMFStartOfInterceptionWithConnectedProSeRemoteUE,



    -- 5G ProSe Direct Communication events, see clause 7.X.2

    fiveGDDNMFProSeUNIDirectDiscovery                   [178] FiveGDDNMFProSeUNIDirectDiscovery,

    fiveGDDNMFProSeNNIDirectDiscovery                   [179] FiveGDDNMFProSeNNIDirectDiscovery

}



-- ==============
@@ -600,7 +604,11 @@ IRIEvent ::= CHOICE 


    -- SMF events, see clause 6.2.3.7 continued from tag 61

    sMFProSeRemoteUEReport                              [176] SMFProSeRemoteUEReport,

    sMFStartOfInterceptionWithConnectedProSeRemoteUE    [177] SMFStartOfInterceptionWithConnectedProSeRemoteUE

    sMFStartOfInterceptionWithConnectedProSeRemoteUE    [177] SMFStartOfInterceptionWithConnectedProSeRemoteUE,



    -- 5G ProSe Direct Communication events, see clause 7.X.3

    fiveGDDNMFProSeUNIDirectDiscovery                   [178] FiveGDDNMFProSeUNIDirectDiscovery,

    fiveGDDNMFProSeNNIDirectDiscovery                   [179] FiveGDDNMFProSeNNIDirectDiscovery

}



IRITargetIdentifier ::= SEQUENCE
@@ -5869,6 +5877,36 @@ NWDAFEvent ::= ENUMERATED 
    pDUSessionTraffic(7)

}



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

-- 5G DDNNMF definitions

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



-- See clause 7.X.2.2 for details of this structure

FiveGDDNMFProSeUNIDirectDiscovery ::= SEQUENCE

{

    sUPI              [1] SUPI,

    gPSI              [2] GPSI OPTIONAL,

    fiveGProSeMessage [3] FiveGProSeMessage

}



-- See clause 7.X.2.3 for details of this structure

FiveGDDNMFProSeNNIDirectDiscovery ::= SEQUENCE

{

    sUPI                                  [1] SUPI OPTIONAL,

    gPSI                                  [2] GPSI OPTIONAL,

    fiveGDDNMFProSeDirectDiscoveryMessage [3] SBIType

}



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

-- 5G DDNNMF parameters

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



FiveGProSeMessage ::= CHOICE

{

    fiveGProSeDirectDiscoveryMessage        [1] XMLType,

    fiveGProSeUsageInformationReportMessage [2] XMLType

}



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

-- 5G LALS definitions

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