Commit f792937e authored by canterburym's avatar canterburym
Browse files

Merge branch 'sa3#88' into 'rel16' 

Changes agreed at SA88e

See merge request 3GPP/SA3LI!21
parents 3fe62478 aaa774c6

3gppx1extensions.xsd

+2 −35
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"

           xmlns="urn:3GPP:ns:li:3GPPX1Extensions"

           targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions"

           xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r16:v1"

           targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r16:v1"

           elementFormDefault="qualified">



  <xs:complexType name="X1Extensions">
@@ -55,7 +55,6 @@ 
      <xs:element name="LALSLILCSTargetProvisioning" type="LALSLILCSTargetProvisioningExtensions"></xs:element>

      <xs:element name="LALSLTFProvisioning" type="LALSLTFProvisioningExtensions"></xs:element>

      <xs:element name="HeaderReporting" type="PDHRReportingExtensions"></xs:element>

      <xs:element name="ServiceScopingOptions" type="ServiceScopingOptions"></xs:element>

    </xs:choice>

  </xs:complexType>
@@ -194,36 +193,4 @@ 
    </xs:restriction>

  </xs:simpleType>



  <xs:complexType name="ServiceScopingOptions">

    <xs:sequence>

      <xs:element name="ServiceTypeOptions" type="ServiceTypeOptions"></xs:element>

      <xs:element name="LocationInformationOptions" type="LocationInformationOptions"></xs:element>

      <xs:element name="NonHPLMNRANTrafficDelivery" type="ServiceScopeOptionValue"></xs:element>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="ServiceTypeOptions">

    <xs:sequence>

      <xs:element name="Voice" type="ServiceScopeOptionValue"></xs:element>

      <xs:element name="Data" type="ServiceScopeOptionValue"></xs:element>

      <xs:element name="Messaging" type="ServiceScopeOptionValue"></xs:element>

      <xs:element name="PTT" type="ServiceScopeOptionValue"></xs:element>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="LocationInformationOptions">

    <xs:sequence>

      <xs:element name="ReportLocationAtBeginningAndEnd" type="ServiceScopeOptionValue"></xs:element>

      <xs:element name="ReportLocationUpdate" type="ServiceScopeOptionValue"></xs:element>

      <xs:element name="LALS" type="ServiceScopeOptionValue"></xs:element>

    </xs:sequence>

  </xs:complexType>



  <xs:simpleType name="ServiceScopeOptionValue">

    <xs:restriction base="xs:string">

      <xs:enumeration value="Deliver"></xs:enumeration>

      <xs:enumeration value="DoNotDeliver"></xs:enumeration>

    </xs:restriction>

  </xs:simpleType>

  

</xs:schema>

ts33128payloads.asn1

+21 −18
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) version1(1)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version2(2)}



DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
@@ -9,13 +9,13 @@ BEGIN 
-- Relative OIDs

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



xIRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version1(1) xIRI(1)}

xCCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version0(0) xCC(2)}

tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version2(2)}



iRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version1(1) iRI(3)}

cCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version0(0) cC(4)}



lINotificationPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version0(0) lINotification(5)}

xIRIPayloadOID              RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}

xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}

iRIPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID iRI(3)}

cCPayloadOID                RELATIVE-OID ::= {tS33128PayloadsOID cC(4)}

lINotificationPayloadOID    RELATIVE-OID ::= {tS33128PayloadsOID lINotification(5)}



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

-- X2 xIRI payload
@@ -23,7 +23,7 @@ lINotificationPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) versi 


XIRIPayload ::= SEQUENCE

{

    relativeOID         [1] RELATIVE-OID,

    xIRIPayloadOID      [1] RELATIVE-OID,

    event               [2] XIRIEvent

}
@@ -69,7 +69,7 @@ XIRIEvent ::= CHOICE 


IRIPayload ::= SEQUENCE

{

    relativeOID         [1] RELATIVE-OID,

    iRIPayloadOID         [1] RELATIVE-OID,

    event               [2] IRIEvent,

    targetIdentifiers   [3] SEQUENCE OF IRITargetIdentifier OPTIONAL

}
@@ -119,7 +119,7 @@ IRITargetIdentifier ::= SEQUENCE 


CCPayload ::= SEQUENCE

{

    relativeOID         [1] RELATIVE-OID,

    cCPayloadOID         [1] RELATIVE-OID,

    pDU                 [2] CCPDU

}
@@ -134,7 +134,7 @@ CCPDU ::= CHOICE 


LINotificationPayload ::= SEQUENCE

{

    relativeOID         [1] RELATIVE-OID,

    lINotificationPayloadOID         [1] RELATIVE-OID,

    notification        [2] LINotificationMessage

}
@@ -608,7 +608,8 @@ FiveGSMRequestType ::= ENUMERATED 
    initialEmergencyRequest(3),

    existingEmergencyPDUSession(4),

    modificationRequest(5),

    reserved(6)

    reserved(6),

    mAPDURequest(7)

}



FiveGSMCause ::= INTEGER (0..255)
@@ -890,13 +891,15 @@ IPAddr ::= SEQUENCE 
GlobalRANNodeID ::= SEQUENCE

{

    pLMNID                      [1] PLMNID,

    aNNodeID                    [2] CHOICE

    aNNodeID                    [2] ANNodeID

}



ANNodeID ::= CHOICE

{

    n3IWFID [1] N3IWFIDSBI,

    gNbID   [2] GNbID,

    nGENbID [3] NGENbID

}

}



-- TS 38.413 [23], clause 9.3.1.6

GNbID ::= BIT STRING(SIZE(22..32))