Commit a2170938 authored by canterburym's avatar canterburym
Browse files

Merge branch 'cr/33128/0780' into 'meeting/SA110' 

TS 33.128 CR0780 - LI for MCPTT

See merge request !349
parents f0d1bfdc e3625c56

33128/r19/TS33128Payloads.asn

+19 −5
Original line number Diff line number Diff line
@@ -341,7 +341,8 @@ XIRIEvent ::= CHOICE 
    mCXStartOfInterceptionWithEstablishedSession        [193] MCXStartOfInterceptionWithEstablishedSession,

    mCXManagementMessage                                [194] MCXManagementMessage,

    mCVideoTransmissionControlMessage                   [195] MCVideoTransmissionControlMessage,

    mCDataFileDistribution                              [196] MCDataFileDistribution

    mCDataFileDistribution                              [196] MCDataFileDistribution,

    mCPTTFloorControlMessage                            [197] MCPTTFloorControlMessage

}



-- ==============
@@ -666,7 +667,8 @@ IRIEvent ::= CHOICE 
    mCXStartOfInterceptionWithEstablishedSession        [193] MCXStartOfInterceptionWithEstablishedSession,

    mCXManagementMessage                                [194] MCXManagementMessage,

    mCVideoTransmissionControlMessage                   [195] MCVideoTransmissionControlMessage,

    mCDataFileDistribution                              [196] MCDataFileDistribution

    mCDataFileDistribution                              [196] MCDataFileDistribution,

    mCPTTFloorControlMessage                            [197] MCPTTFloorControlMessage

}



IRITargetIdentifier ::= SEQUENCE
@@ -705,7 +707,8 @@ CCPDU ::= CHOICE 
    iMSCCPDU            [6] IMSCCPDU,

    rCSCCPDU            [7] RCSCCPDU,

    mCVideoCCPDU        [8] MCVideoCCPDU,

    mCDataCCPDU         [9] MCDataCCPDU

    mCDataCCPDU         [9] MCDataCCPDU,

    mCPTTCCPDU          [10] MCPTTCCPDU

}



-- ===========================
@@ -4785,7 +4788,8 @@ PTCTargetInformation ::= SEQUENCE 


PTCIdentifiers  ::= CHOICE

{

    mCPTTID                    [1] UTF8String,

    -- deprecatedMCPTT was deprecated in r19(19) version5(5)

    deprecatedMCPTTID          [1] UTF8String,

    instanceIdentifierURN      [2] UTF8String,

    pTCChatGroupID             [3] PTCChatGroupID,

    iMPU                       [4] IMPU,
@@ -6174,6 +6178,13 @@ MCDataFileDistribution ::= CHOICE 
    mCDataFileDownload [2] MCDataFileDownload

}



-- See clause 7.20.2.X for details of this structure

MCPTTFloorControlMessage ::= SEQUENCE

{

    mCServiceIDOrGroupID                [1] MCServiceIDOrGroupID,

    floorControlMessage                 [2] OCTET STRING

}



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

-- MCService parameters

-- ====================
@@ -6350,6 +6361,8 @@ MCDataCCPDU ::= CHOICE 


MCVideoCCPDU ::= OCTET STRING



MCPTTCCPDU ::= OCTET STRING



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

-- 5G LALS definitions

-- ===================
@@ -7808,7 +7821,8 @@ TargetIdentifier ::= CHOICE 
    emailAddress           [14] EmailAddress,

    mCPTTID                [15] UTF8String,

    instanceIdentifierURN  [16] UTF8String,

    pTCChatGroupID         [17] PTCChatGroupID

    pTCChatGroupID         [17] PTCChatGroupID,

    mCServiceIDOrGroupID   [18] MCServiceIDOrGroupID

}



TargetIdentifierProvenance ::= ENUMERATED