Commit 59921641 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'cr/102657/0145' into 'meeting/LI65' 

TS 102 657 CR145 - Extension of the Definition of PEI

See merge request !126
parents a4ec27d8 aa497725

102657/RDMessage.asn

+7 −1
Original line number Diff line number Diff line
@@ -3045,7 +3045,9 @@ PEI ::= CHOICE 
{

    iMEI        [1] IMEI,

    iMEISV      [2] IMEISV,

    ...

    ...,

    mACAddress  [3] MACAddress,

    eUI64       [4] EUI64

}
@@ -3056,6 +3058,10 @@ IMEI ::= OCTET STRING (SIZE(8)) 


IMEISV ::= NumericString (SIZE(16))



MACAddress ::= UTF8String



EUI64 ::= UTF8String



IMSI ::= OCTET STRING (SIZE(3..8))

    -- format as per 3GPP TS 09.02 [8]

102657/RDMessage.xsd

+13 −1
Original line number Diff line number Diff line
@@ -434,6 +434,16 @@ 
            <xsd:pattern value="[0-9]{16}"/>

        </xsd:restriction>

    </xsd:simpleType>

    <xsd:simpleType name="MACAddress">

        <xsd:restriction base="xsd:token">

            <xsd:pattern value="([a-f0-9]{2}:){5}[a-f0-9]{2}"/>

        </xsd:restriction>

    </xsd:simpleType>

    <xsd:simpleType name="EUI64">

        <xsd:restriction base="xsd:token">

            <xsd:pattern value="([a-f0-9]{2}:){7}[a-f0-9]{2}"/>

        </xsd:restriction>

    </xsd:simpleType>

    <xsd:simpleType name="IMSI">

        <xsd:restriction base="xsd:hexBinary">

            <xsd:minLength value="3"/>
@@ -3313,7 +3323,9 @@ 
        <xsd:choice>

            <xsd:element name="iMEI" type="IMEI"/>

            <xsd:element name="iMEISV" type="IMEISV"/>

            <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>

            <xsd:element name="mACAddress" type="MACAddress"/>

            <xsd:element name="eUI64" type="EUI64"/>

            <xsd:any namespace="##other" processContents="lax"/>

        </xsd:choice>

    </xsd:complexType>

    <xsd:simpleType name="UERadioCapID">