Commit 4268bb0c authored by canterburym's avatar canterburym
Browse files

From draft_s3i210234-r3

parent 6b0f504c
Loading
Loading
Loading
Loading
Loading
+10 −11
Original line number Diff line number Diff line
TS33128Payloads
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version6(6)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version0(0)}

DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=

@@ -9,7 +9,7 @@ BEGIN
-- Relative OIDs
-- =============

tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version6(6)}
tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version0(0)}

xIRIPayloadOID              RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}
xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -2359,9 +2359,7 @@ EUTRALocation ::= SEQUENCE
    geodeticInformation         [6] UTF8String OPTIONAL, 
    globalNGENbID               [7] GlobalRANNodeID OPTIONAL,
    cellSiteInformation         [8] CellSiteInformation OPTIONAL,
    globalENbID                 [9] GlobalRANNodeID OPTIONAL,
-- TS 38.413 [23], clause 9.3.1.16
    pSCellInfo                  [10] CellInformation OPTIONAL
    globalENbID                 [9] GlobalRANNodeID OPTIONAL
}

-- TS 29.571 [17], clause 5.4.4.9
@@ -2374,9 +2372,7 @@ NRLocation ::= SEQUENCE
    geographicalInformation     [5] UTF8String OPTIONAL,
    geodeticInformation         [6] UTF8String OPTIONAL, 
    globalGNbID                 [7] GlobalRANNodeID OPTIONAL,
    cellSiteInformation         [8] CellSiteInformation OPTIONAL,
-- TS 38.413 [23], clause 9.3.1.16
    pSCellInfo                  [10] CellInformation OPTIONAL
    cellSiteInformation         [8] CellSiteInformation OPTIONAL
}

-- TS 29.571 [17], clause 5.4.4.10
@@ -2416,7 +2412,7 @@ ANNodeID ::= CHOICE
    nGENbID [3] NGENbID,
    eNbID   [4] ENbID,
    wAGFID  [5] WAGFID,
    tNGF    [6] TNGFID
    tNGFID  [6] TNGFID
}

-- TS 38.413 [23], clause 9.3.1.6
@@ -2478,7 +2474,7 @@ TNAPID ::= SEQUENCE
{
    sSID         [1] SSID OPTIONAL,
    bSSID        [2] BSSID OPTIONAL,
    civicAddress [3] CivicAddress OPTIONAL
    civicAddress [3] CivicAddressBytes OPTIONAL
}

-- TS 29.571 [17], clause 5.4.4.64
@@ -2486,7 +2482,7 @@ TWAPID ::= SEQUENCE
{
    sSID         [1] SSID OPTIONAL,
    bSSID        [2] BSSID OPTIONAL,
    civicAddress [3] CivicAddress OPTIONAL
    civicAddress [3] CivicAddressBytes OPTIONAL
}

-- TS 29.571 [17], clause 5.4.4.62 and clause 5.4.4.64
@@ -2730,6 +2726,9 @@ CivicAddress ::= SEQUENCE
    pom                                 [31] UTF8String OPTIONAL
}

-- TS 29.571 [17], clauses 5.4.4.62 and 5.4.4.64
CivicAddressBytes ::= OCTET STRING

-- TS 29.572 [24], clause 6.1.6.2.15
PositioningMethodAndUsage ::= SEQUENCE
{