Commit 781c2865 authored by hawbakert's avatar hawbakert
Browse files

updates for pairing down of cr

parent 6fd5f159
Loading
Loading
Loading
Loading
Loading
+15 −207
Original line number Diff line number Diff line
@@ -193,9 +193,8 @@ XIRIEvent ::= CHOICE
    mMEPositioningInfoTransfer                          [112] MMEPositioningInfoTransfer,

    -- AMF events, see 6.2.2.2.X
    aMFRANHandoverCommand                               [1000] AMFRANHandoverCommand,
    aMFRANHandoverRequest                               [1001] AMFRANHandoverRequest,
    aMFRANHandoverNotify                                [1002] AMFRANHandoverNotify
    aMFRANHandoverCommand                               [1001] AMFRANHandoverCommand
}

-- ==============
@@ -379,9 +378,8 @@ IRIEvent ::= CHOICE
    mMEPositioningInfoTransfer                          [112] MMEPositioningInfoTransfer,

    -- AMF events, see 6.2.2.2.X
    aMFRANHandoverCommand                              [1000] AMFRANHandoverCommand,
    aMFRANHandoverRequest                               [1001] AMFRANHandoverRequest,
    aMFRANHandoverNotify                               [1002] AMFRANHandoverNotify
    aMFRANHandoverCommand                               [1002] AMFRANHandoverCommand
}

IRITargetIdentifier ::= SEQUENCE
@@ -1238,62 +1236,30 @@ AMFPositioningInfoTransfer ::= SEQUENCE
    lcsCorrelationId            [8] UTF8String (SIZE(1..255))
}

-- See clause 6.2.2.2.X.2 for details of this structure
AMFRANHandoverCommand ::= SEQUENCE
{
    userIdentifiers              [1] UserIdentifiers,
    aMFMessageType               [2] AMFMessageType,
    aMFUENGAPID                  [3] AMFUENGAPID,
    rANUENGAPID                  [4] RANUENGAPID,
    handoverType                 [5] HandoverType,
    nASSecurityParameters        [6] OCTET STRING OPTIONAL,
    targetToSourceContainer      [7] RANTargetToSourceContainer
}

-- See clause 6.2.2.2.X.3 for details of this structure
AMFRANHandoverRequest ::= SEQUENCE
{
    userIdentifiers                     [1] UserIdentifiers,
    aMFMessageType                      [2] AMFMessageType,
    aMFUENGAPID                         [3] AMFUENGAPID,
    rANUENGAPID                         [4] RANUENGAPID,
    handoverType                        [5] HandoverType,
    handoverCause                       [6] HandoverCause,
    uEAMBR                              [7] BitRate,
    uESecurityCapabilities              [8] UESecurityCapabilities OPTIONAL,
    securityContext                     [9] SecurityContext,
    pDUSessionResourceInformation       [10] PDUSessionResourceInformation,
    allowedNSSAI                        [11] AllowedNSSAI,
    aMFTraceActivation                  [12] AMFTraceActivation OPTIONAL,
    rANsourceToTargetContainer          [13] RANSourceToTargetContainer,
    mobilityRestrictionList             [14] MobilityRestrictionList OPTIONAL,
    locationReportingRequestType        [15] LocationReportingRequestType,
    gUAMI                               [16] GUAMI,
    voiceEPSFallback                    [17] VoiceEPSFallback OPTIONAL,
    sRVCCOperation                      [18] SRVCCOperation OPTIONAL,
    iABAuthorizedIndicator              [19] IABAuthorizedIndicator OPTIONAL,
    nRV2XAuthorizedIndicator            [20] NRV2XAuthorizedIndicator OPTIONAL,
    lTEV2XAuthorizedIndicator           [21] LTEV2XAuthorizedIndicator OPTIONAL,
    nRSidelinkAMBR                      [22] BitRate OPTIONAL,
    lTEUESidelinkAMBR                   [23] BitRate OPTIONAL,
    pC5QoSParameters                    [24] PC5QoSParameters OPTIONAL,
    mDTPLMNList                         [25] PLMNList OPTIONAL,
    uERadioCapability                   [26] UERadioCapability OPTIONAL,
    aMFHandoverRequestACKTransferInfo   [27] AMFHandoverRequestACKTransferInfo,
    targetToSourceContainer             [28] RANTargetToSourceContainer,
    criticality                         [29] AMFProcedureCriticality OPTIONAL,
    nPNAccessInformation                [30] NPNAccessInformation OPTIONAL,
    rEDCAPIndication                    [31] REDCAPIndication OPTIONAL
}

-- See clause 6.2.2.2.X.4 for details of this structure
AMFRANHandoverNotify ::= SEQUENCE
    pDUSessionResourceInformation       [7] PDUSessionResourceInformation,
    mobilityRestrictionList             [8] MobilityRestrictionList OPTIONAL,
    locationReportingRequestType        [9] LocationReportingRequestType OPTIONAL,
    targetToSourceContainer             [10] RANTargetToSourceContainer,
    nPNAccessInformation                [11] NPNAccessInformation OPTIONAL,
    sourceToTargetContainer             [12] RANSourceToTargetContainer
}

-- See clause 6.2.2.2.X.2 for details of this structure
AMFRANHandoverCommand ::= SEQUENCE
{
    userIdentifiers              [1] UserIdentifiers,
    aMFMessageType               [2] AMFMessageType,
    aMFUENGAPID                  [3] AMFUENGAPID,
    rANUENGAPID                  [4] RANUENGAPID,
    location                     [5] Location
    handoverType                 [5] HandoverType,
    targetToSourceContainer      [7] RANTargetToSourceContainer
}

-- =================
@@ -1326,35 +1292,8 @@ AMFFailureCause ::= CHOICE
    fiveGSMCause        [2] FiveGSMCause
}

-- See clause 9.3.4.11 of TS 38.413 [23] for details
AMFHandoverRequestACKTransferInfo ::= OCTET STRING

AMFIECriticality ::= ENUMERATED
{
    reject(1),
    ignore(2),
    notify(3)
}

AMFIEIdentifier ::= INTEGER (0..65535)

AMFMessageType ::= SEQUENCE
{
    aMFProcedureCode [1] AMFProcedureCode,
    typeOfMessage    [2] TypeOfMessage
}

AMFPointer ::= INTEGER (0..63)

AMFProcedureCode ::= INTEGER (0..255)

AMFProcedureCriticality ::= SEQUENCE
{
    aMFIECriticality     [1] AMFIECriticality,
    aMFIEIdentifier      [2] AMFIEIdentifier,
    typeOfError          [3] TypeOfError
}

AMFRegistrationResult ::= ENUMERATED
{
    threeGPPAccess(1),
@@ -1374,31 +1313,8 @@ AMFRegistrationType ::= ENUMERATED

AMFSetID ::= INTEGER (0..1023)

AMFTraceActivation ::= SEQUENCE
{
    nGRANTraceID                    [1] NGRANTraceID,
    interfacesToTrace               [2] AMFInterfacesToTrace,
    aMFTraceDepth                   [3] AMFTraceDepth,
    traceCollectionEntityIPAddress  [4] IPAddress
}

AMFTraceDepth ::= ENUMERATED
{
    minimum(1),
    medium(2),
    maximum(3),
    minimumWithoutVendorSpecificExtension(4),
    mediumWithoutVendorSpecificExtension(5),
    maximumWithoutVendorSpecificExtension(6)
}

AMFUENGAPID ::= INTEGER (0..1099511627775)

AMFInterfacesToTrace ::= OCTET STRING

-- see Clause 5.6 of TS 32.422 for details of this structure
NGRANTraceID ::= OCTET STRING (SIZE(8))

-- ==================
-- 5G SMF definitions
-- ==================
@@ -3582,8 +3498,6 @@ AreaOfInterestRANNodeList ::= SEQUENCE (SIZE(1..MAX)) OF GlobalRANNodeID

AreaOfInterestTAIList ::= SEQUENCE (SIZE(1..MAX)) OF TAI

BitRate ::= INTEGER

CellCAGList ::= SEQUENCE (SIZE(1..MAX)) OF CAGID

CauseMisc ::= ENUMERATED
@@ -3692,10 +3606,6 @@ EquivalentPLMNs ::= SEQUENCE (SIZE(1..MAX)) OF PLMNID

EUI64 ::= OCTET STRING (SIZE(8))

EUTRAEncryptionAlgorithms ::= BIT STRING (SIZE(16, ...))

EUTRAIntegrityProtectionAlgorithms ::= BIT STRING (SIZE(16, ...))

FiveGGUTI ::= SEQUENCE
{
    mCC         [1] MCC,
@@ -3823,12 +3733,6 @@ HomeNetworkPublicKeyID ::= OCTET STRING

HSMFURI ::= UTF8String

IABAuthorizedIndicator ::= ENUMERATED
{
    authorized(1),
    notAuthorized(2)
}

IMEI ::= NumericString (SIZE(14))

IMEISV ::= NumericString (SIZE(16))
@@ -3886,12 +3790,6 @@ LocationReportingRequestType ::= SEQUENCE
    areaOfInterestList  [3] LocationAreaOfInterestList
}

LTEV2XAuthorizedIndicator ::= SEQUENCE
{
    vehicleUE    [1] VehicleUE,
    pedestrianUE [2] PedestrianUE
}

MACAddress ::= OCTET STRING (SIZE(6))

MACRestrictionIndicator ::= ENUMERATED
@@ -3928,8 +3826,6 @@ MSISDN ::= NumericString (SIZE(1..15))

NAI ::= UTF8String

NextHopChainingCount ::= INTEGER (0..7)

NextLayerProtocol ::= INTEGER(0..255)

NonLocalID ::= ENUMERATED
@@ -3946,42 +3842,16 @@ NonIMEISVPEI ::= CHOICE
NPNAccessInformation ::= CHOICE
{
    pNINPNAccessInformation [1] CellCAGList

}
NREncryptionAlgorithms ::= BIT STRING (SIZE(16, ...))

NRIntegrityProtectionAlgorithms ::= BIT STRING (SIZE(16, ...))

NRV2XAuthorizedIndicator ::= SEQUENCE
{
    vehicleUE      [1] VehicleUE,
    pedestrianUE   [2] PedestrianUE
}

NSSAI ::= SEQUENCE OF SNSSAI

PC5QoSFlowItem ::= SEQUENCE
{
    pQI                [1] FiveQI,
    pC5QoSFlowBitRate  [2] BitRate OPTIONAL
}

PC5QoSFlowList ::= SEQUENCE (SIZE(1..MAX)) OF PC5QoSFlowItem

PC5QoSParameters ::= SEQUENCE
{
    pC5QoSFlowList     [1] PC5QoSFlowList,
    pC5LinkAMBR        [2] BitRate OPTIONAL
}

PLMNID ::= SEQUENCE
{
    mCC [1] MCC,
    mNC [2] MNC
}

PLMNList ::= SEQUENCE (SIZE(1..MAX)) OF PLMNID

PDUSessionID ::= INTEGER (0..255)

PDUSessionResourceInformation ::= SEQUENCE
@@ -3998,12 +3868,6 @@ PDUSessionType ::= ENUMERATED
    ethernet(5)
}

PedestrianUE ::= ENUMERATED
{
    authorized(1),
    notAuthorized(2)
}

PEI ::= CHOICE
{
    iMEI        [1] IMEI,
@@ -4072,11 +3936,6 @@ RATType ::= ENUMERATED
    nRREDCAP(20)
}

REDCAPIndication ::= ENUMERATED
{
    redcap(1)
}

RejectedNSSAI ::= SEQUENCE OF RejectedSNSSAI

RejectedSNSSAI ::= SEQUENCE
@@ -4097,14 +3956,6 @@ RoutingIndicator ::= INTEGER (0..9999)

SchemeOutput ::= OCTET STRING

SecurityContext ::= SEQUENCE
{
    nextHopChainingCount    [1] NextHopChainingCount,
    nextHopNH               [2] SecurityKey
}

SecurityKey ::= BIT STRING (SIZE(256))

ServiceAreaInformation ::= SEQUENCE (SIZE(1..MAX)) OF ServiceAreaInfo

ServiceAreaInfo ::= SEQUENCE
@@ -4138,12 +3989,6 @@ SNSSAI ::= SEQUENCE
    sliceDifferentiator [2] OCTET STRING (SIZE(3)) OPTIONAL
}

SRVCCOperation ::= ENUMERATED
{
    possible(1),
    notPossible(2)
}

SubscriberIdentifier ::= CHOICE
{
    sUCI   [1] SUCI,
@@ -4203,21 +4048,6 @@ TELURI ::= UTF8String

Timestamp ::= GeneralizedTime

TypeOfError ::= ENUMERATED
{
    notunderstood(1),
    missing(2),
    other(3)
}

TypeOfMessage ::= ENUMERATED
{
    initiatingMessage(1),
    successfulOutcome(2),
    unsuccessfulOutcome(3),
    other(4)
}

UEContextInfo ::= SEQUENCE
{
    supportVoPS         [1] BOOLEAN OPTIONAL,
@@ -4234,16 +4064,6 @@ UEEndpointAddress ::= CHOICE
    ethernetAddress     [3] MACAddress
}

UERadioCapability ::= OCTET STRING

UESecurityCapabilities ::= SEQUENCE
{
    nREncryptionAlgorithms              [1] NREncryptionAlgorithms,
    nRIntegrityProtectionAlgorithms     [2] NRIntegrityProtectionAlgorithms,
    eUTRAEncryptionAlgorithms           [3] EUTRAEncryptionAlgorithms,
    eUTRAIntegrityProtectionAlgorithms  [4] EUTRAIntegrityProtectionAlgorithms
}

UserIdentifiers ::= SEQUENCE
{
    fiveGSSubscriberIDs [1] FiveGSSubscriberIDs OPTIONAL,
@@ -4251,18 +4071,6 @@ UserIdentifiers ::= SEQUENCE
    targetIdentifiers   [3] TargetIdentifier
}

VehicleUE ::= ENUMERATED
{
    authorized(1),
    notAuthorized(2)
}

VoiceEPSFallback ::= ENUMERATED
{
    possible(1),
    notPossible(2)
}

-- ===================
-- Location parameters
-- ===================