Commit 239776c5 authored by Luke Mewburn's avatar Luke Mewburn
Browse files

LI-PS-PDU: replace Location types with aliases to Common-Locations

parent 6fbc217a

102232-1/LI-PS-PDU.asn

+16 −32
Changes for 102232-1/LI-PS-PDU.asn: 16 added lines, 32 removed lines.
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ BEGIN 
IMPORTS

    -- Any of the IMPORTs may be commented out if they are not used (see clause A.3)



    -- from ETSI TS 103 280 [44]

    -- from ETSI TS 103 280 [44] Common-Parameters

    GNSSLocation,

    LIID,

    LongString,
@@ -17,10 +17,16 @@ IMPORTS 
        FROM Common-Parameters

        {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version281(281)}



    -- from ETSI TS 103 280 [44] Common-Locations

    CommonLocation,

    WlanLocation,

    CPEProvidedLocation

        FROM Common-Locations

	{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) commonLocations(39) genHeader(1) version1(1)}



    -- previously from ETSI TS 101 671 [4]; now provided with this specification

    IRI-Parameters,

    IRIsContent,

    Location,

    Network-Element-Identifier

        FROM HI2Operations

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)}
@@ -69,8 +75,7 @@ IMPORTS 
    -- from 3GPP TS 33.108 [9]

    IRI-Parameters,

    UmtsIRIsContent,

    CorrelationValues,

    Location

    CorrelationValues

        FROM UmtsHI2Operations

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2(1)}

            -- The relevant module (including the 3GPP release and version number) needs
@@ -86,8 +91,7 @@ IMPORTS 


    -- from 3GPP TS 33.108 [9]

    IRI-Parameters,

    EpsIRIsContent,

    EPSLocation

    EpsIRIsContent

        FROM EpsHI2Operations

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)}

            -- The relevant module (including the 3GPP release and version number) needs
@@ -194,8 +198,7 @@ IMPORTS 
    -- from 3GPP TS 33.128 [46]

    LINotificationPayload,

    IRIPayload,

    CCPayload,

    UserLocation

    CCPayload

        FROM TS33128Payloads

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

        -- The relevant module (including the 3GPP release and version number)
@@ -729,34 +732,15 @@ DictionaryEntry ::= SEQUENCE 
}



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

-- Common Parameters

-- Common Parameters previously defined in this module

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



Location ::= SEQUENCE

    -- This is a common parameter, the use of this parameter is described in clause 4.5

{

    umtsHI2Location               [0] UmtsHI2Operations.Location OPTIONAL,

    epsLocation                   [1] EpsHI2Operations.EPSLocation OPTIONAL,

    ...,

    wlanLocationAttributes        [2] WlanLocationAttributes OPTIONAL,

    eTSI671HI2Location            [3] HI2Operations.Location OPTIONAL,

    threeGPP33128UserLocation     [4] TS33128Payloads.UserLocation OPTIONAL,

    cPEProvidedLocationAttributes [5] CPEProvidedLocationAttributes OPTIONAL

}

Location ::= Common-Locations.CommonLocation



WlanLocationAttributes ::= SEQUENCE

{

    wlanAPMACAddress        [0] OCTET STRING (SIZE(6)) OPTIONAL,

        -- 48-bit (6 octet) MAC address of the WLAN access point derived from the BSSID

    ...

}

WlanLocationAttributes ::= Common-Locations.WlanLocation



CPEProvidedLocationAttributes ::= Common-Locations.CPEProvidedLocation



CPEProvidedLocationAttributes ::= SEQUENCE

{

    wGS84CoordinateDecimal  [0] Common-Parameters.WGS84CoordinateDecimal OPTIONAL,

    ...,

    gNSSLocation            [1] Common-Parameters.GNSSLocation OPTIONAL

}



IPAddress ::= SEQUENCE

    -- This parameter was previously imported from ETSI TS 101 671 [4] but has been copied

103280/Common-Locations.asn1

+4 −4
Changes for 103280/Common-Locations.asn1: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -49,20 +49,20 @@ CommonLocation ::= SEQUENCE 
    umtsHI2Location               [0] UmtsHI2Operations.Location OPTIONAL,

    epsLocation                   [1] EpsHI2Operations.EPSLocation OPTIONAL,

    ...,

    wlanLocationAttributes        [2] WlanLocationAttributes OPTIONAL,

    wlanLocationAttributes        [2] WlanLocation OPTIONAL,

    eTSI671HI2Location            [3] HI2Operations.Location OPTIONAL,

    threeGPP33128UserLocation     [4] TS33128Payloads.UserLocation OPTIONAL,

    cPEProvidedLocationAttributes [5] CPEProvidedLocationAttributes OPTIONAL

    cPEProvidedLocationAttributes [5] CPEProvidedLocation OPTIONAL

}



WlanLocationAttributes ::= SEQUENCE

WlanLocation ::= SEQUENCE

{

    wlanAPMACAddress        [0] OCTET STRING (SIZE(6)) OPTIONAL,

        -- 48-bit (6 octet) MAC address of the WLAN access point derived from the BSSID

    ...

}



CPEProvidedLocationAttributes ::= SEQUENCE

CPEProvidedLocation ::= SEQUENCE

{

    wGS84CoordinateDecimal  [0] Common-Parameters.WGS84CoordinateDecimal OPTIONAL,

    ...,

testing/asn/asn_compile_targets.json

+1 −0
Changes for testing/asn/asn_compile_targets.json: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  [

    "./102232-1/LI-PS-PDU.asn",

    "./103280/TS_103_280.asn1",

    "./103280/Common-Locations.asn1",

    "./testing/deps/33128/TS33128Payloads.asn",

    "./testing/deps/33108/Three3gppHI1Notifications.asn",

    "./testing/deps/33108/UMTSHI2Operations.asn",