ULP: upgrade to approved version 2.0.2

Change-Id: Icf09e430a1732708ddd9e7abb49f7b1a6225afde
Reviewed-on: https://code.wireshark.org/review/3526
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

1 files changed, 236 insertions, 203 deletions

diff --git a/asn1/ulp/ULP-Components.asn b/asn1/ulp/ULP-Components.asn
index b47a9c5e5a..3345fdba44 100644
--- a/asn1/ulp/ULP-Components.asn
+++ b/asn1/ulp/ULP-Components.asn
@@ -1,6 +1,6 @@
 -- ULP-Components.asn
--- From UserPlane Location Protocol Approved Version 2.0.1 - 05 Dec 2012
--- OMA-TS-ULP-V2_0_1-20121205-A
+-- Taken from OMA UserPlane Location Protocol
+-- http://member.openmobilealliance.org/ftp/Public_documents/LOC/Permanent_documents/OMA-TS-ULP-V2_0_2-20140708-A.zip
 --
 -- 11.5	Common elements (SUPL Version 1)
 --
@@ -11,10 +11,10 @@ BEGIN
 EXPORTS Version, SessionID, IPAddress, SLPAddress, LocationId, Position, StatusCode, Velocity, QoP, PosMethod, Ver, SETId, PrimaryCPICH-Info, CellParametersID, FQDN;
 
 IMPORTS
-	Ver2-CellInfo-extension
+          Ver2-CellInfo-extension
 FROM Ver2-ULP-Components;
 
--- protocol version expressed as x.y.z (e.g., 5.1.0)--
+-- protocol version expressed as x.y.z (e.g., 5.1.0)
 Version ::= SEQUENCE {
   maj      INTEGER(0..255),
   min      INTEGER(0..255),
@@ -22,7 +22,7 @@ Version ::= SEQUENCE {
 
 SessionID ::= SEQUENCE {
   setSessionID  SetSessionID OPTIONAL, -- the semantics of OPTIONAL applies to the encoding only. The parameter itself is MANDATORY. This is introduced only to minimize bandwidth for the SUPL INIT message. Since the setSessionID is allocated by the SET, there is no setSessionID to be transmitted in the SUPL INIT message.
-  slpSessionID  SlpSessionID OPTIONAL -- the semantics of OPTIONAL applies to the encoding only. The parameter itself is MANDATORY. This is introduced only to minimize bandwidth for the SUPL START, SUPL TRIGGERED START and SUPL SET INIT messages. Since the slpSessionID is allocated by the SLP, there is no slpSessionID to be transmitted in these messages (with the exception described in section 10.14).--
+  slpSessionID  SlpSessionID OPTIONAL -- the semantics of OPTIONAL applies to the encoding only. The parameter itself is MANDATORY. This is introduced only to minimize bandwidth for the SUPL START, SUPL TRIGGERED START and SUPL SET INIT messages. Since the slpSessionID is allocated by the SLP, there is no slpSessionID to be transmitted in these messages (with the exception described in section 10.14).
 }
 
 SetSessionID ::= SEQUENCE {sessionId  INTEGER(0..65535),
@@ -52,7 +52,7 @@ IPAddress ::= CHOICE {
   ipv6Address  OCTET STRING(SIZE (16))}
 
 SLPAddress ::= CHOICE {iPAddress  IPAddress,
-                       fQDN       FQDN,
+                       fqdn       FQDN,
                        ...}
 
 FQDN ::=
@@ -105,7 +105,7 @@ CdmaCellInformation ::= SEQUENCE {
   reBASELONG     INTEGER(0..8388607), -- Base Station Longitude
   refREFPN       INTEGER(0..511), -- Base Station PN Code
   refWeekNumber  INTEGER(0..65535), -- GPS Week Number
-  refSeconds     INTEGER(0..4194303), -- GPS Seconds --
+  refSeconds     INTEGER(0..4194303), -- GPS Seconds
   ...}
 
 GsmCellInformation ::= SEQUENCE {
@@ -113,8 +113,8 @@ GsmCellInformation ::= SEQUENCE {
   refMNC  INTEGER(0..999), -- Mobile Network Code
   refLAC  INTEGER(0..65535), -- Location area code
   refCI   INTEGER(0..65535), -- Cell identity
-  nMR     NMR OPTIONAL,
-  tA      INTEGER(0..255) OPTIONAL, --Timing Advance
+  nmr     NMR OPTIONAL,
+  ta      INTEGER(0..255) OPTIONAL, --Timing Advance
   ...}
 
 WcdmaCellInformation ::= SEQUENCE {
@@ -130,7 +130,7 @@ WcdmaCellInformation ::= SEQUENCE {
 }
 
 TimingAdvance ::= SEQUENCE {
- tA	INTEGER (0..8191),
+ ta        INTEGER (0..8191),
  tAResolution    TAResolution OPTIONAL, --If missing, resolution is 0.125 chips
  chipRate        ChipRate OPTIONAL, --If missing, chip rate is 1.28 Mchip/s
 ...}
@@ -159,8 +159,8 @@ UARFCN ::= INTEGER(0..16383)
 NMR ::= SEQUENCE (SIZE (1..15)) OF NMRelement
 
 NMRelement ::= SEQUENCE {
-  aRFCN  INTEGER(0..1023),
-  bSIC   INTEGER(0..63),
+  arfcn  INTEGER(0..1023),
+  bsic   INTEGER(0..63),
   rxLev  INTEGER(0..63),
   ...}
 
@@ -253,7 +253,7 @@ StatusCode ::= ENUMERATED {
 
 QoP ::= SEQUENCE {
   horacc     INTEGER(0..127),
-  veracc     INTEGER(0..127) OPTIONAL, -- as defined in [3GPP GAD] "uncertainty altitude"--
+  veracc     INTEGER(0..127) OPTIONAL, -- as defined in [3GPP GAD] "uncertainty altitude"
   maxLocAge  INTEGER(0..65535) OPTIONAL,
   delay      INTEGER(0..7) OPTIONAL, -- as defined in [3GPP RRLP]
   ...}
@@ -307,37 +307,37 @@ BEGIN
 EXPORTS Ver2-CellInfo-extension, MultipleLocationIds, SupportedNetworkInformation, CauseCode, UTRAN-GPSReferenceTimeAssistance, UTRAN-GPSReferenceTimeResult, SPCSETKey, SPCTID, SPCSETKeylifetime, UTRAN-GANSSReferenceTimeAssistance, UTRAN-GANSSReferenceTimeResult, GNSSPosTechnology, GANSSSignals, ThirdParty, ApplicationID, ReportingCap, Coordinate, CircularArea, EllipticalArea, PolygonArea;
 
 IMPORTS
-	LocationId, PrimaryCPICH-Info, CellParametersID, FQDN
+          LocationId, PrimaryCPICH-Info, CellParametersID, FQDN
 FROM ULP-Components;
 
 MultipleLocationIds ::= SEQUENCE SIZE (1..maxLidSize) OF LocationIdData
 
 LocationIdData ::= SEQUENCE {
-locationId	LocationId,
-relativetimestamp	RelativeTime OPTIONAL, -- if relativetimestamp is present, then data represents historical measurement, if absent, data represents current measurements
-servingFlag  	BOOLEAN, -- if "true" measurements represent serving cell
+locationId                LocationId,
+relativetimestamp         RelativeTime OPTIONAL, -- if relativetimestamp is present, then data represents historical measurement, if absent, data represents current measurements
+servingFlag               BOOLEAN, -- if "true" measurements represent serving cell
 ...}
 
 RelativeTime ::= INTEGER (0..65535) -- relative time to "current" Location Id in multiples of 0.01sec
 
-maxLidSize	INTEGER ::= 64
+maxLidSize                 INTEGER ::= 64
 
 SupportedNetworkInformation ::= SEQUENCE {
-  wLAN             		BOOLEAN,
-  supportedWLANInfo  		SupportedWLANInfo OPTIONAL,
-  supportedWLANApsList  	SupportedWLANApsList OPTIONAL,
-  gSM              		BOOLEAN,
-  wCDMA            		BOOLEAN,
-  supportedWCDMAInfo  	SupportedWCDMAInfo OPTIONAL,
-  cDMA             		BOOLEAN,
-  hRDP             		BOOLEAN,
-  uMB             		BOOLEAN,
-  lTE             		BOOLEAN,
-  wIMAX            		BOOLEAN,
-  historic         		BOOLEAN,
-  nonServing      		BOOLEAN,
-  uTRANGPSReferenceTime  	BOOLEAN,
-  uTRANGANSSReferenceTime  	BOOLEAN,
+  wlan                                     BOOLEAN,
+  supportedWLANInfo                        SupportedWLANInfo OPTIONAL,
+  supportedWLANApsList                     SupportedWLANApsList OPTIONAL,
+  gsm                                      BOOLEAN,
+  wcdma                                    BOOLEAN,
+  supportedWCDMAInfo                       SupportedWCDMAInfo OPTIONAL,
+  cdma                                     BOOLEAN,
+  hrdp                                     BOOLEAN,
+  umb                                      BOOLEAN,
+  lte                                      BOOLEAN,
+  wimax                                    BOOLEAN,
+  historic                                 BOOLEAN,
+  nonServing                               BOOLEAN,
+  uTRANGPSReferenceTime                    BOOLEAN,
+  uTRANGANSSReferenceTime                  BOOLEAN,
   ...}
 
 SupportedWLANInfo ::= SEQUENCE {
@@ -365,22 +365,22 @@ SupportedWLANApsList ::= SEQUENCE {
 }
 
 SupportedWLANApsChannel11a ::= SEQUENCE {
- ch34 	BOOLEAN,
- ch36 	BOOLEAN,
- ch38 	BOOLEAN,
- ch40 	BOOLEAN,
- ch42 	BOOLEAN,
- ch44 	BOOLEAN,
- ch46 	BOOLEAN,
- ch48 	BOOLEAN,
- ch52 	BOOLEAN,
- ch56 	BOOLEAN,
- ch60 	BOOLEAN,
- ch64  	BOOLEAN,
- ch149 	BOOLEAN,
- ch153 	BOOLEAN,
- ch157 	BOOLEAN,
- ch161 	BOOLEAN
+ ch34    BOOLEAN,
+ ch36    BOOLEAN,
+ ch38    BOOLEAN,
+ ch40    BOOLEAN,
+ ch42    BOOLEAN,
+ ch44    BOOLEAN,
+ ch46    BOOLEAN,
+ ch48    BOOLEAN,
+ ch52    BOOLEAN,
+ ch56    BOOLEAN,
+ ch60    BOOLEAN,
+ ch64    BOOLEAN,
+ ch149   BOOLEAN,
+ ch153   BOOLEAN,
+ ch157   BOOLEAN,
+ ch161   BOOLEAN
 }
 
 SupportedWLANApsChannel11bg ::= SEQUENCE {
@@ -406,7 +406,7 @@ SupportedWLANApData ::= SEQUENCE {
  ...}
 
 SupportedWCDMAInfo ::= SEQUENCE {
-  mRL    BOOLEAN, -- Measured Results List
+  mrl    BOOLEAN, -- Measured Results List
   ...}
 
 Ver2-CellInfo-extension ::= CHOICE {
@@ -422,59 +422,61 @@ HrpdCellInformation ::= SEQUENCE {
   refBASELAT     INTEGER(0..4194303), -- Base Station Latitude
   reBASELONG     INTEGER(0..8388607), -- Base Station Longitude
   refWeekNumber  INTEGER(0..65535), -- GPS Week Number
-  refSeconds     INTEGER(0..4194303), -- GPS Seconds --
+  refSeconds     INTEGER(0..4194303), -- GPS Seconds
   ...}
 
 UmbCellInformation ::= SEQUENCE {
-  refSECTORID    	BIT STRING(SIZE (128)), -- UMB Sector Id
-  refMCC  	INTEGER(0..999), -- Mobile Country Code
-  refMNC  	INTEGER(0..999), -- Mobile Network Code
-  refBASELAT     	INTEGER(0..4194303), -- Base Station Latitude
-  reBASELONG     	INTEGER(0..8388607), -- Base Station Longitude
-  refWeekNumber  	INTEGER(0..65535), -- GPS Week Number
-  refSeconds     	INTEGER(0..4194303), -- GPS Seconds --
+  refSECTORID              BIT STRING(SIZE (128)), -- UMB Sector Id
+  refMCC                   INTEGER(0..999), -- Mobile Country Code
+  refMNC                   INTEGER(0..999), -- Mobile Network Code
+  refBASELAT               INTEGER(0..4194303), -- Base Station Latitude
+  reBASELONG               INTEGER(0..8388607), -- Base Station Longitude
+  refWeekNumber            INTEGER(0..65535), -- GPS Week Number
+  refSeconds               INTEGER(0..4194303), -- GPS Seconds
   ...}
 
--- LTE Cell info per 3GPP TS 36.331. --
--- If not otherwise stated info is related to serving cell --
+-- LTE Cell info per 3GPP TS 36.331.
+-- If not otherwise stated info is related to serving cell
 
 LteCellInformation ::= SEQUENCE {
-  cellGlobalIdEUTRA	 	CellGlobalIdEUTRA,
-  physCellId		PhysCellId,
-  trackingAreaCode		TrackingAreaCode,
-  rsrpResult		RSRP-Range	OPTIONAL,
-  rsrqResult		RSRQ-Range	OPTIONAL,
-  tA      INTEGER(0..1282) OPTIONAL, -- Currently used Timing Advance value (N /16 as per [3GPP 36.213]) TA
+  cellGlobalIdEUTRA                        CellGlobalIdEUTRA,
+  physCellId                               PhysCellId,
+  trackingAreaCode                         TrackingAreaCode,
+  rsrpResult                               RSRP-Range      OPTIONAL,
+  rsrqResult                               RSRQ-Range      OPTIONAL,
+  ta      INTEGER(0..1282) OPTIONAL, -- Currently used Timing Advance value (N_TA/16 as per [3GPP 36.213])
   measResultListEUTRA   MeasResultListEUTRA OPTIONAL, --Neighbour measurements
-  ...,
-  earfcn INTEGER(0..65535) OPTIONAL
+   ...,
+  earfcn INTEGER(0..65535) OPTIONAL, -- see Table 37
+  earfcn-ext INTEGER (65536..262143) OPTIONAL -- see Table 37
  }
 
--- Measured results of neighbours cells per 3GPP TS 36.331 --
+-- Measured results of neighbours cells per 3GPP TS 36.331
 
 MeasResultListEUTRA ::= SEQUENCE (SIZE (1..maxCellReport)) OF MeasResultEUTRA
 
-MeasResultEUTRA ::=	SEQUENCE {
+MeasResultEUTRA ::=   SEQUENCE {
  physCellId PhysCellId,
  cgi-Info SEQUENCE {
-	cellGlobalId	CellGlobalIdEUTRA,
-	trackingAreaCode TrackingAreaCode
+          cellGlobalId CellGlobalIdEUTRA,
+          trackingAreaCode TrackingAreaCode
 } OPTIONAL,
  measResult SEQUENCE {
-	rsrpResult	RSRP-Range	OPTIONAL,  -- Mapping to measured values
-	rsrqResult	RSRQ-Range	OPTIONAL,  -- in 3GPP TS 36.133
-            ...,
-            earfcn           INTEGER(0..65535) OPTIONAL
+          rsrpResult       RSRP-Range      OPTIONAL,  -- Mapping to measured values
+          rsrqResult       RSRQ-Range      OPTIONAL,  -- in 3GPP TS 36.133
+           ...,
+          earfcn           INTEGER(0..65535) OPTIONAL, -- see Table 37
+          earfcn-ext       INTEGER (65536..262143) OPTIONAL -- see Table 37
  }
 }
 
-PhysCellId ::=	 INTEGER (0..503)
+PhysCellId ::=              INTEGER (0..503)
 
-TrackingAreaCode ::=	BIT STRING (SIZE (16))
+TrackingAreaCode ::=  BIT STRING (SIZE (16))
 
 CellGlobalIdEUTRA ::= SEQUENCE {
- plmn-Identity	PLMN-Identity,
- cellIdentity	CellIdentity,
+ plmn-Identity             PLMN-Identity,
+ cellIdentity              CellIdentity,
  ...
 }
 
@@ -487,7 +489,7 @@ CellIdentity ::= BIT STRING (SIZE (28))
 
 MCC ::= SEQUENCE (SIZE (3)) OF MCC-MNC-Digit
 
-MNC ::=	SEQUENCE (SIZE (2..3)) OF MCC-MNC-Digit
+MNC ::= SEQUENCE (SIZE (2..3)) OF MCC-MNC-Digit
 
 MCC-MNC-Digit ::= INTEGER (0..9)
 
@@ -495,12 +497,12 @@ RSRP-Range ::= INTEGER(0..97)
 RSRQ-Range ::= INTEGER(0..34)
 maxCellReport INTEGER ::= 8
 
-WlanAPInformation ::= SEQUENCE { -- as per [IEEE 802.11v]
+WlanAPInformation ::= SEQUENCE { -- as per [IEEE 802.11]
   apMACAddress       BIT STRING(SIZE (48)), -- AP MAC Address
   apTransmitPower    INTEGER(-127..128) OPTIONAL, -- AP transmit power in dbm
   apAntennaGain      INTEGER(-127..128) OPTIONAL, -- AP antenna gain in dBi
   apSignaltoNoise    INTEGER(-127..128) OPTIONAL, -- AP S/N received at SET
-  apDeviceType       ENUMERATED {wlan802-11a(0), wlan802-11b(1), wlan802-11g(2), ...} OPTIONAL,
+  apDeviceType       ENUMERATED {wlan802-11a(0), wlan802-11b(1), wlan802-11g(2), ..., wlan802-11n(3), wlan802-11ac(4), wlan802-11ad(5)} OPTIONAL,
   apSignalStrength   INTEGER(-127..128) OPTIONAL, -- AP signal strength at SET
   apChannelFrequency INTEGER(0..256) OPTIONAL, -- AP channel/frequency of Tx/Rx
   apRoundTripDelay   RTD OPTIONAL, -- Round Trip Delay between SET and AP
@@ -508,10 +510,20 @@ WlanAPInformation ::= SEQUENCE { -- as per [IEEE 802.11v]
   setAntennaGain     INTEGER (-127..128) OPTIONAL, -- SET antenna gain in dBi
   setSignaltoNoise   INTEGER (-127..128) OPTIONAL, -- SET S/N received at AP
   setSignalStrength  INTEGER(-127..128) OPTIONAL, -- SET signal strength at AP
-  apReportedLocation ReportedLocation OPTIONAL, -- AP Location reported by AP
-  ...}
+  apReportedLocation ReportedLocation OPTIONAL, -- AP Location reported by AP (legacy encoding)
+  ...,
+  apRepLocation              RepLocation OPTIONAL, -- AP Location reported by AP
+  apSignalStrengthDelta                    INTEGER (0..1) OPTIONAL, -- see Table 41
+  apSignaltoNoiseDelta                     INTEGER (0..1) OPTIONAL, -- see Table 41
+  setSignalStrengthDelta                   INTEGER (0..1) OPTIONAL, -- see Table 41
+  setSignaltoNoiseDelta                    INTEGER (0..1) OPTIONAL, -- see Table 41
+  operatingClass                           INTEGER (0..255) OPTIONAL,
+  apSSID                   OCTET STRING (SIZE (1..32)) OPTIONAL,
+  apPHYType                ENUMERATED {unknown(0), any(1), fhss(2), dsss(3), irbaseband(4), ofdm(5), hrdsss(6), erp(7), ht(8), ihv(9), ...} OPTIONAL,
+  setMACAddress              BIT STRING(SIZE (48)) OPTIONAL -- MAC Address used by SET to connect to AP
+}
 
-RTD ::= SEQUENCE { -- as per [IEEE 802.11v]
+RTD ::= SEQUENCE { -- as per [IEEE 802.11]
   rTDValue     INTEGER(0..16777216), -- measured RTD value corresponding to
 -- about 500km in units of 1/10 of nanoseconds
   rTDUnits     RTDUnits, -- units of RTD
@@ -527,28 +539,48 @@ ReportedLocation ::= SEQUENCE { -- as per [IEEE 802.11v]
   ...}
 
 LocationEncodingDescriptor ::= ENUMERATED {
-  lCI(0), aSN1(1), ...}
+  lci (0), asn1(1), ...}
 
 LocationData ::= SEQUENCE {
   locationAccuracy   INTEGER(0..4294967295) OPTIONAL,
   locationValue      OCTET STRING (SIZE(1..128)),
   ...}
 
+RepLocation ::= CHOICE {
+  lciLocData                               LciLocData, -- location data field as per [IEEE 802.11] and [RFC 3825]
+   ...    -- future formats may be added here
+}
+
+LciLocData  ::= SEQUENCE {
+   locationDataLCI  LocationDataLCI  OPTIONAL,
+...}
+
+LocationDataLCI ::= SEQUENCE {
+  latitudeResolution                       BIT STRING (SIZE (6)),
+  latitude                                 BIT STRING (SIZE (34)),
+  longitudeResolution                      BIT STRING (SIZE (6)),
+  longitude                                BIT STRING (SIZE  (34)),
+  altitudeType                             BIT STRING (SIZE (4)),
+  altitudeResolution                       BIT STRING (SIZE (6)),
+  altitude                                 BIT STRING (SIZE (30)),
+  datum                                    BIT STRING (SIZE (8)),
+...}
+
 WimaxBSInformation ::= SEQUENCE {
-  wimaxBsID 	WimaxBsID, 	-- WiMax serving base station ID
-  wimaxRTD	WimaxRTD 	OPTIONAL, -- Round Trip Delay measurements
-  wimaxNMRList	WimaxNMRList 	OPTIONAL, -- Network measurements
+  wimaxBsID               WimaxBsID,   -- WiMax serving base station ID
+  wimaxRTD                WimaxRTD         OPTIONAL, -- Round Trip Delay measurements
+  wimaxNMRList            WimaxNMRList  OPTIONAL, -- Network measurements
   ...}
 
 WimaxBsID ::= SEQUENCE {
-  bsID-MSB	BIT STRING (SIZE(24)) OPTIONAL,
-  bsID-LSB	BIT STRING (SIZE(24)),
-...}
+  bsID-MSB                BIT STRING (SIZE(24)) OPTIONAL,
+  bsID-LSB                BIT STRING (SIZE(24)),
+  ...}
 -- if only LSB is present, MSB is assumed to be identical to the current serving BS or clamped on network value
 
 WimaxRTD ::= SEQUENCE {
-  rTD	INTEGER (0..65535), -- Round trip delay of serving BS in units of 10 ns
-  rTDstd	INTEGER (0..1023) OPTIONAL, -- Standard deviation of round trip delay in units of 10 ns
+  rtd     INTEGER (0..65535), -- Round trip delay of serving BS in units of 10 ns
+  rTDstd INTEGER (0..1023) OPTIONAL, -- Standard deviation of round trip delay in units of 10 ns
 ...}
 
 WimaxNMRList ::= SEQUENCE  (SIZE (1..maxWimaxBSMeas)) OF WimaxNMR
@@ -557,10 +589,10 @@ WimaxNMR ::= SEQUENCE {
   wimaxBsID   WimaxBsID, 	-- WiMax BS ID for the measurement
   relDelay    INTEGER (-32768..32767) OPTIONAL, -- Relative delay for this neighbouring BSs to the serving cell in units of 10 ns
   relDelaystd  INTEGER (0..1023) OPTIONAL, -- Standard deviation of Relative delay in units of 10 ns
-  rSSI        INTEGER (0..255) OPTIONAL, -- RSSI in 0.25 dBm steps, starting from -103.75 dBm
+  rssi        INTEGER (0..255) OPTIONAL, -- RSSI in 0.25 dBm steps, starting from -103.75 dBm
   rSSIstd     INTEGER (0..63) OPTIONAL, -- Standard deviation of RSSI in dB
   bSTxPower   INTEGER (0..255) OPTIONAL, -- BS transmit power in 0.25 dBm steps, starting from -103.75 dBm
-  cINR        INTEGER (0..255) OPTIONAL, -- in dB
+  cinr        INTEGER (0..255) OPTIONAL, -- in dB
   cINRstd     INTEGER (0..63) OPTIONAL, -- Standard deviation of CINR in dB
   bSLocation  ReportedLocation OPTIONAL, -- Reported location of the BS
 ...}
@@ -568,21 +600,21 @@ WimaxNMR ::= SEQUENCE {
 maxWimaxBSMeas INTEGER ::= 32
 
 UTRAN-GPSReferenceTimeAssistance ::= SEQUENCE {
-utran-GPSReferenceTime	UTRAN-GPSReferenceTime,
-gpsReferenceTimeUncertainty	INTEGER (0..127) OPTIONAL,
-utranGPSDriftRate		UTRANGPSDriftRate OPTIONAL}
+utran-GPSReferenceTime                     UTRAN-GPSReferenceTime,
+gpsReferenceTimeUncertainty                INTEGER (0..127) OPTIONAL,
+utranGPSDriftRate                          UTRANGPSDriftRate OPTIONAL}
 
 UTRAN-GPSReferenceTime ::= SEQUENCE {
 -- For utran-GPSTimingOfCell values above 2322431999999 are not used in this version of the specification. Actual value utran-GPSTimingOfCell = (ms-part * 4294967296) + ls-part used on the downlink i.e. sent from the SLP to the SET
-     utran-GPSTimingOfCell	SEQUENCE {
-        ms-part 	INTEGER (0..1023),
-        ls-part	INTEGER (0..4294967295)},
-	    modeSpecificInfo	CHOICE {
-		 fdd	SEQUENCE {
-		   referenceIdentity	PrimaryCPICH-Info},
-		 tdd	SEQUENCE {
-		   referenceIdentity	CellParametersID}} OPTIONAL,
-	    sfn	INTEGER (0..4095)}
+     utran-GPSTimingOfCell                 SEQUENCE {
+        ms-part            INTEGER (0..1023),
+        ls-part            INTEGER (0..4294967295)},
+              modeSpecificInfo             CHOICE {
+                           fdd             SEQUENCE {
+                             referenceIdentity             PrimaryCPICH-Info},
+                           tdd             SEQUENCE {
+                             referenceIdentity             CellParametersID}} OPTIONAL,
+              sfn          INTEGER (0..4095)}
 
 UTRANGPSDriftRate ::= ENUMERATED {
       utran-GPSDrift0, utran-GPSDrift1, utran-GPSDrift2,
@@ -593,35 +625,35 @@ UTRANGPSDriftRate ::= ENUMERATED {
 
 UTRAN-GPSReferenceTimeResult ::= SEQUENCE {
 -- For ue-GPSTimingOfCell values above 37158911999999 are not used in this version of the specification. Actual value utran-GPSTimingOfCell = (ms-part * 4294967296) + ls-part used on the uplink i.e. reported by the SET to the SLP
-     set-GPSTimingOfCell	SEQUENCE {
-        ms-part 	INTEGER (0.. 16383),
-        ls-part	INTEGER (0..4294967295)},
-	    modeSpecificInfo	CHOICE {
-		 fdd	SEQUENCE {
-		   referenceIdentity	PrimaryCPICH-Info},
-		 tdd	SEQUENCE {
-		   referenceIdentity	CellParametersID}} OPTIONAL,
-	    sfn	INTEGER (0..4095),
-     gpsReferenceTimeUncertainty	INTEGER (0..127) OPTIONAL,
-     ...}
+     set-GPSTimingOfCell                   SEQUENCE {
+        ms-part            INTEGER (0.. 16383),
+        ls-part            INTEGER (0..4294967295)},
+              modeSpecificInfo             CHOICE {
+                           fdd             SEQUENCE {
+                             referenceIdentity             PrimaryCPICH-Info},
+                           tdd             SEQUENCE {
+                             referenceIdentity             CellParametersID}} OPTIONAL,
+              sfn          INTEGER (0..4095),
+     gpsReferenceTimeUncertainty           INTEGER (0..127) OPTIONAL,
+      ...}
 
 UTRAN-GANSSReferenceTimeAssistance ::= SEQUENCE {
 ganssDay INTEGER (0..8191) OPTIONAL,
-ganssTimeID	INTEGER (0..15),
-utran-GANSSReferenceTime	UTRAN-GANSSReferenceTime,
-utranGANSSDriftRate	UTRANGANSSDriftRate	OPTIONAL}
+ganssTimeID                INTEGER (0..15),
+utran-GANSSReferenceTime                   UTRAN-GANSSReferenceTime,
+utranGANSSDriftRate   UTRANGANSSDriftRate                  OPTIONAL}
 
 UTRAN-GANSSReferenceTime ::= SEQUENCE {
 
      ganssTOD INTEGER (0..86399),
-     utran-GANSSTimingOfCell	INTEGER (0..3999999)OPTIONAL,
-	    modeSpecificInfo	CHOICE {
-		 fdd	SEQUENCE {
-		   referenceIdentity	PrimaryCPICH-Info},
-		 tdd	SEQUENCE {
-		   referenceIdentity	CellParametersID}} OPTIONAL,
-	    sfn	INTEGER (0..4095),
-	    ganss-TODUncertainty INTEGER (0..127) OPTIONAL,
+     utran-GANSSTimingOfCell               INTEGER (0..3999999)OPTIONAL,
+              modeSpecificInfo             CHOICE {
+                           fdd             SEQUENCE {
+                             referenceIdentity             PrimaryCPICH-Info},
+                           tdd             SEQUENCE {
+                             referenceIdentity             CellParametersID}} OPTIONAL,
+              sfn          INTEGER (0..4095),
+              ganss-TODUncertainty INTEGER (0..127) OPTIONAL,
 ...}
 
 UTRANGANSSDriftRate ::= ENUMERATED {
@@ -631,35 +663,36 @@ UTRANGANSSDriftRate ::= ENUMERATED {
       utran-GANSSDrift-2, utran-GANSSDrift-5, utran-GANSSDrift-10,
       utran-GANSSDrift-15, utran-GANSSDrift-25, utran-GANSSDrift-50}
 
-UTRAN-GANSSReferenceTimeResult ::= SEQUENCE {
-     ganssTimeID	INTEGER (0..15),
-     set-GANSSReferenceTime	SET-GANSSReferenceTime,
-	    ...}
+UTRAN-GANSSReferenceTimeResult  ::= SEQUENCE {
+     ganssTimeID           INTEGER (0..15),
+     set-GANSSReferenceTime                SET-GANSSReferenceTime,
+               ...}
 
 SET-GANSSReferenceTime ::= SEQUENCE {
 -- Actual value [ns] = (ms-Part * 4294967296 + ls-Part) * 250
 -- Actual values [ns] > 86399999999750 are reserved and are considered a
 -- protocol error
-            set-GANSSTimingOfCell	SEQUENCE {
-                 ms-part	INTEGER (0..80),
-                 ls-part	INTEGER (0..4294967295)} OPTIONAL,
-	    modeSpecificInfo	CHOICE {
-		 fdd	SEQUENCE {
-		   referenceIdentity	PrimaryCPICH-Info},
-		 tdd	SEQUENCE {
-		   referenceIdentity	CellParametersID}} OPTIONAL,
-	    sfn	INTEGER (0..4095),
-	    ganss-TODUncertainty INTEGER (0..127) OPTIONAL,
+            set-GANSSTimingOfCell  SEQUENCE {
+                 ms-part                   INTEGER (0..80),
+                 ls-part                   INTEGER (0..4294967295)} OPTIONAL,
+              modeSpecificInfo             CHOICE {
+                           fdd             SEQUENCE {
+                             referenceIdentity             PrimaryCPICH-Info},
+                           tdd             SEQUENCE {
+                             referenceIdentity             CellParametersID}} OPTIONAL,
+              sfn          INTEGER (0..4095),
+              ganss-TODUncertainty INTEGER (0..127) OPTIONAL,
 ...}
 
 GNSSPosTechnology ::= SEQUENCE {
-  gps 		BOOLEAN,
-  galileo 	BOOLEAN,
-  sbas		BOOLEAN,
-  modernized-gps	BOOLEAN,
-  qzss		BOOLEAN,
-  glonass	BOOLEAN,
-...}
+  gps                     BOOLEAN,
+  galileo                 BOOLEAN,
+  sbas                    BOOLEAN,
+  modernized-gps          BOOLEAN,
+  qzss                    BOOLEAN,
+  glonass                 BOOLEAN,
+...,
+  bds                     BOOLEAN          OPTIONAL}
 
 -- indicates MS support for particular GANSS signals and frequencies coding according to parameter definition in section 10.9
 
@@ -676,82 +709,82 @@ GANSSSignals ::= BIT STRING {
 SPCSETKey ::= BIT STRING(SIZE (128))
 
 SPCTID ::= SEQUENCE {
-  rAND		BIT STRING(SIZE (128)),
-  slpFQDN	FQDN,
-	...}
+  rand                    BIT STRING(SIZE (128)),
+  slpFQDN                 FQDN,
+           ...}
 
 SPCSETKeylifetime ::= INTEGER (1..24) -- units in hours
 
 CauseCode ::= ENUMERATED {
-servingNetWorkNotInAreaIdList(0), sETCapabilitiesChanged(1), noSUPLCoverage(2), ...}
+  servingNetWorkNotInAreaIdList(0), sETCapabilitiesChanged(1), noSUPLCoverage(2),  ...}
 
 ThirdParty ::= SEQUENCE (SIZE (1..64)) OF ThirdPartyID
 
 ThirdPartyID ::= CHOICE {
-	logicalName	IA5String(SIZE (1..1000)),
-	msisdn	OCTET STRING(SIZE (8)),
-	emailaddr	IA5String(SIZE (1..1000)),
---	sip-uri VisibleString(FROM ("a".."z" | "A".."Z" | "0".."9" | ":./-_~%#@?")) (SIZE (1..255)),
---	ims-public-identity VisibleString(FROM ("a".."z" | "A".."Z" | "0".."9" | ":./-_~%#@?")) (SIZE (1..255)),
+          logicalName  IA5String(SIZE (1..1000)),
+          msisdn          OCTET STRING(SIZE (8)),
+          emailaddr        IA5String(SIZE (1..1000)),
+--          sip-uri         VisibleString(FROM ("a".."z" | "A".."Z" | "0".."9" | ":./-_~%#@?")) (SIZE (1..255)),
+--          ims-public-identity              VisibleString(FROM ("a".."z" | "A".."Z" | "0".."9" | ":./-_~%#@?")) (SIZE (1..255)),
 -- # asn2wrs does not handle '%' in the restricted string
-	sip-uri VisibleString(FROM ("a".."z" | "A".."Z" | "0".."9" | ":./-_~#@?")) (SIZE (1..255)),
-	ims-public-identity VisibleString(FROM ("a".."z" | "A".."Z" | "0".."9" | ":./-_~#@?")) (SIZE (1..255)),
-	min	BIT STRING(SIZE (34)), -- coded according to TIA-553
-	mdn	OCTET STRING(SIZE (8)),
---	uri VisibleString(FROM ("a".."z" | "A".."Z" | "0".."9" | "./-_~%#")) (SIZE (1..255)),
-	uri VisibleString(FROM ("a".."z" | "A".."Z" | "0".."9" | "./-_~#")) (SIZE (1..255)),
+          sip-uri         VisibleString(FROM ("a".."z" | "A".."Z" | "0".."9" | ":./-_~#@?")) (SIZE (1..255)),
+          ims-public-identity              VisibleString(FROM ("a".."z" | "A".."Z" | "0".."9" | ":./-_~#@?")) (SIZE (1..255)),
+          min              BIT STRING(SIZE (34)), -- coded according to TIA-553
+          mdn              OCTET STRING(SIZE (8)),
+--          uri             VisibleString(FROM ("a".."z" | "A".."Z" | "0".."9" | "./-_~%#")) (SIZE (1..255)),
+          uri             VisibleString(FROM ("a".."z" | "A".."Z" | "0".."9" | "./-_~#")) (SIZE (1..255)),
 ...}
 
 ApplicationID ::= SEQUENCE {
-	appProvider IA5String(SIZE (1..24)), -- The application provider
-	appName IA5String(SIZE (1..32)), -- The application name
-	appVersion IA5String(SIZE (1..8)) OPTIONAL,  -- The application version
+          appProvider IA5String(SIZE (1..24)), -- The application provider
+          appName IA5String(SIZE (1..32)), -- The application name
+          appVersion IA5String(SIZE (1..8)) OPTIONAL,  -- The application version
 ...}
 
 ReportingCap ::= SEQUENCE {
-  minInt	INTEGER (1..3600), -- units in seconds
-  maxInt	INTEGER (1..1440) OPTIONAL, -- units in minutes
-repMode	RepMode-cap,
-batchRepCap	BatchRepCap OPTIONAL, -- only used for batch and quasi real time reporting
-...}
-
-RepMode-cap ::= SEQUENCE {
-realtime 	BOOLEAN,
-quasirealtime 	BOOLEAN,
-batch 		BOOLEAN,
-...}
+  minInt INTEGER (1..3600), -- units in seconds
+  maxInt INTEGER (1..1440) OPTIONAL, -- units in minutes
+  repMode                  RepMode,
+  batchRepCap              BatchRepCap OPTIONAL, -- only used for batch and quasi real time reporting
+   ...}
+
+RepMode ::= SEQUENCE {
+  realtime                 BOOLEAN,
+  quasirealtime            BOOLEAN,
+  batch                    BOOLEAN,
+   ...}
 
 BatchRepCap ::= SEQUENCE {
-report-position	BOOLEAN, -- set to "true"if reporting of position is supported
-report-measurements	BOOLEAN, -- set to "true"if reporting of measurements is supported
-max-num-positions	INTEGER (1..1024) OPTIONAL,
-max-num-measurements INTEGER (1..1024) OPTIONAL,
-...}
+  report-position          BOOLEAN, -- set to "true" if reporting of position is supported
+  report-measurements BOOLEAN, -- set to "true" if reporting of measurements is supported
+  max-num-positions   INTEGER (1..1024) OPTIONAL,
+  max-num-measurements INTEGER (1..1024) OPTIONAL,
+   ...}
 
 Coordinate::= SEQUENCE {
- latitudeSign	ENUMERATED {north(0), south(1)},
- latitude	INTEGER(0..8388607),
- longitude	INTEGER(-8388608..8388607)} -- Coding as in [3GPP GAD]
+ latitudeSign              ENUMERATED {north(0), south(1)},
+ latitude                  INTEGER(0..8388607),
+ longitude                 INTEGER(-8388608..8388607)} -- Coding as in  [3GPP GAD]
 
 CircularArea ::= SEQUENCE {
- coordinate	Coordinate,
- radius		INTEGER(1..1000000), -- radius in meters
- radius-min	INTEGER(1..1000000) OPTIONAL, -- hysteresis minimum radius
- radius-max	INTEGER(1..1500000) OPTIONAL} -- hysteresis maximum radius
+ coordinate                Coordinate,
+ radius                    INTEGER(1..1000000), -- radius in meters
+ radius-min                INTEGER(1..1000000) OPTIONAL, -- hysteresis minimum radius
+ radius-max                INTEGER(1..1500000) OPTIONAL} -- hysteresis maximum radius
 
 EllipticalArea ::= SEQUENCE {
- coordinate	Coordinate,
- semiMajor	INTEGER(1..1000000), -- units in meters
- semiMajor-min	INTEGER(1..1000000) OPTIONAL, -- hysteresis minimum semiMajor
- semiMajor-max	INTEGER(1..1500000) OPTIONAL, -- hysteresis maximum semiMajor
- semiMinor	INTEGER(1..1000000), -- units in meters
- semiMinor-min	INTEGER(1..1000000) OPTIONAL, -- hysteresis minimum semiMinor
- semiMinor-max	INTEGER(1..1500000) OPTIONAL, -- hysteresis maximum semiMinor
- angle		INTEGER(0.. 179)} -- units in degrees the angle is defined as the angle between the semi-major axis and North, increasing in a clockwise direction. An angle of 0 represents an ellipse with the semi-major axis pointing North/South while an angle of 90 represents an ellipse with the semi-major axis pointing East/West.
+ coordinate                Coordinate,
+ semiMajor                 INTEGER(1..1000000), -- units in meters
+ semiMajor-min             INTEGER(1..1000000) OPTIONAL, -- hysteresis minimum semiMajor
+ semiMajor-max               INTEGER(1..1500000) OPTIONAL, -- hysteresis maximum semiMajor
+ semiMinor                   INTEGER(1..1000000), -- units in meters
+ semiMinor-min               INTEGER(1..1000000) OPTIONAL, -- hysteresis minimum semiMinor
+ semiMinor-max               INTEGER(1..1500000) OPTIONAL, -- hysteresis maximum semiMinor
+ angle                       INTEGER(0.. 179)} -- units in degrees. The angle is defined as the angle between the semi-major axis and North, increasing in a clockwise direction. An angle of 0 represents an ellipse with the semi-major axis pointing North/South while an angle of 90 represents an ellipse with the semi-major axis pointing East/West.
 
 PolygonArea ::= SEQUENCE {
- polygonDescription	PolygonDescription,
- polygonHysteresis	INTEGER(1..100000) OPTIONAL} -- units in meters
+ polygonDescription   PolygonDescription,
+ polygonHysteresis           INTEGER(1..100000) OPTIONAL} --units in meters
 
 PolygonDescription ::= SEQUENCE (SIZE (3..15)) OF Coordinate