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>

5 files changed, 531 insertions, 491 deletions

diff --git a/asn1/ulp/SUPL.asn b/asn1/ulp/SUPL.asn
index b4a12d03b0..55b8e06cdb 100644
--- a/asn1/ulp/SUPL.asn
+++ b/asn1/ulp/SUPL.asn
@@ -1,6 +1,6 @@
 -- SUPL.asn
--- From OMA UserPlane Location Protocol Approved Version 2.0.1 - 05 Dec 2012
--- OMA-TS-ULP-V2_0_1-20121205-A.zip
+-- 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.2 Message Specific Part
 --
@@ -15,11 +15,11 @@ BEGIN
 EXPORTS SUPLINIT, Notification;
 
 IMPORTS
-	SLPAddress, QoP, PosMethod
+          SLPAddress, QoP, PosMethod
 FROM ULP-Components
-	Ver2-SUPL-INIT-extension
+          Ver2-SUPL-INIT-extension
 FROM ULP-Version-2-message-extensions
-	Ver2-Notification-extension
+          Ver2-Notification-extension
 FROM ULP-Version-2-parameter-extensions;
 
 SUPLINIT ::= SEQUENCE {
@@ -28,7 +28,7 @@ SUPLINIT ::= SEQUENCE {
   sLPAddress    SLPAddress OPTIONAL,
   qoP           QoP OPTIONAL,
   sLPMode       SLPMode,
-  mAC           MAC OPTIONAL, -- included for backwards compatibility
+  mac           MAC OPTIONAL, -- included for backwards compatibility
   keyIdentity   KeyIdentity OPTIONAL, -- included for backwards compatibility
   ...,
 -- version 2 extension element
@@ -42,7 +42,7 @@ Notification ::= SEQUENCE {
   clientName        OCTET STRING(SIZE (1..maxClientLength)) OPTIONAL,
   clientNameType    FormatIndicator OPTIONAL,
   ...,
-  ver2-Notification-extension	Ver2-Notification-extension OPTIONAL}
+  ver2-Notification-extension              Ver2-Notification-extension OPTIONAL}
 
 NotificationType ::= ENUMERATED {
   noNotificationNoVerification(0), notificationOnly(1),
@@ -102,10 +102,10 @@ PosTechnology ::= SEQUENCE {
   agpsSETassisted  BOOLEAN,
   agpsSETBased     BOOLEAN,
   autonomousGPS    BOOLEAN,
-  aFLT             BOOLEAN,
-  eCID             BOOLEAN,
-  eOTD             BOOLEAN,
-  oTDOA            BOOLEAN,
+  aflt             BOOLEAN,
+  ecid             BOOLEAN,
+  eotd             BOOLEAN,
+  otdoa            BOOLEAN,
   ...,
   ver2-PosTechnology-extension	Ver2-PosTechnology-extension OPTIONAL}
 
@@ -119,7 +119,7 @@ PosProtocol ::= SEQUENCE {
   rrlp    BOOLEAN,
   rrc     BOOLEAN,
   ...,
-  ver2-PosProtocol-extension	Ver2-PosProtocol-extension OPTIONAL}
+  ver2-PosProtocol-extension               Ver2-PosProtocol-extension OPTIONAL}
 
 END
 
@@ -132,19 +132,19 @@ BEGIN
 EXPORTS SUPLRESPONSE;
 
 IMPORTS
-	PosMethod, SLPAddress
+          PosMethod, SLPAddress
 FROM ULP-Components
-	Ver2-SUPL-RESPONSE-extension
+          Ver2-SUPL-RESPONSE-extension
 FROM ULP-Version-2-message-extensions;
 
 SUPLRESPONSE ::= SEQUENCE {
   posMethod     PosMethod,
   sLPAddress    SLPAddress OPTIONAL,
-sETAuthKey    SETAuthKey OPTIONAL, -- included for backwards compatibility
+  sETAuthKey    SETAuthKey OPTIONAL, -- included for backwards compatibility
   keyIdentity4  KeyIdentity4 OPTIONAL, -- included for backwards compatibility
   ...,
 -- version 2 extension element
-  ver2-SUPL-RESPONSE-extension	Ver2-SUPL-RESPONSE-extension OPTIONAL}
+  ver2-SUPL-RESPONSE-extension             Ver2-SUPL-RESPONSE-extension OPTIONAL}
 
 SETAuthKey ::= CHOICE {
   shortKey  BIT STRING(SIZE (128)),
@@ -164,15 +164,15 @@ BEGIN
 EXPORTS SUPLPOSINIT;
 
 IMPORTS
-	SUPLPOS
+          SUPLPOS
 FROM SUPL-POS
-	SETCapabilities
+          SETCapabilities
 FROM SUPL-START
-	LocationId, Position, Ver
+          LocationId, Position, Ver
 FROM ULP-Components
-	Ver2-SUPL-POS-INIT-extension
+          Ver2-SUPL-POS-INIT-extension
 FROM ULP-Version-2-message-extensions
-	Ver2-RequestedAssistData-extension
+          Ver2-RequestedAssistData-extension
 FROM ULP-Version-2-parameter-extensions;
 
 SUPLPOSINIT ::= SEQUENCE {
@@ -180,7 +180,7 @@ SUPLPOSINIT ::= SEQUENCE {
   requestedAssistData  RequestedAssistData OPTIONAL,
   locationId           LocationId,
   position             Position OPTIONAL,
-  sUPLPOS              SUPLPOS OPTIONAL,
+  suplpos              SUPLPOS OPTIONAL,
   ver                  Ver OPTIONAL,
   ...,
 -- version 2 extension element
@@ -203,7 +203,7 @@ RequestedAssistData ::= SEQUENCE {
 NavigationModel ::= SEQUENCE {
   gpsWeek   INTEGER(0..1023),
   gpsToe    INTEGER(0..167),
-  nSAT      INTEGER(0..31),
+  nsat      INTEGER(0..31),
   toeLimit  INTEGER(0..10),
   satInfo   SatelliteInfo OPTIONAL,
 ...}
@@ -215,7 +215,7 @@ SatelliteInfo ::= SEQUENCE (SIZE (1..31)) OF SatelliteInfoElement
 
 SatelliteInfoElement ::= SEQUENCE {
   satId  INTEGER(0..63),
-  iODE   INTEGER(0..255),
+  iode   INTEGER(0..255),
   ...}
 
 END
@@ -229,11 +229,11 @@ BEGIN
 EXPORTS SUPLPOS;
 
 IMPORTS
-	Velocity
+          Velocity
 FROM ULP-Components
-	Ver2-SUPL-POS-extension
+          Ver2-SUPL-POS-extension
 FROM ULP-Version-2-message-extensions
-Ver2-PosPayLoad-extension
+          Ver2-PosPayLoad-extension
 FROM ULP-Version-2-parameter-extensions;
 
 SUPLPOS ::= SEQUENCE {
@@ -241,7 +241,7 @@ SUPLPOS ::= SEQUENCE {
   velocity    Velocity OPTIONAL,
   ...,
 -- version 2 extension element
-  ver2-SUPL-POS-extension	Ver2-SUPL-POS-extension OPTIONAL}
+  ver2-SUPL-POS-extension                  Ver2-SUPL-POS-extension OPTIONAL}
 
 PosPayLoad ::= CHOICE {
   tia801payload  OCTET STRING(SIZE (1..8192)),
@@ -261,18 +261,18 @@ BEGIN
 EXPORTS SUPLEND;
 
 IMPORTS
-	StatusCode, Position, Ver
+          StatusCode, Position, Ver
 FROM ULP-Components
-	Ver2-SUPL-END-extension
+          Ver2-SUPL-END-extension
 FROM ULP-Version-2-message-extensions;
 
 SUPLEND ::= SEQUENCE {
-  position	Position OPTIONAL,
-  statusCode	StatusCode OPTIONAL,
-  ver		Ver OPTIONAL,
+  position                Position OPTIONAL,
+  statusCode              StatusCode OPTIONAL,
+  ver                     Ver OPTIONAL,
   ...,
 -- version 2 extension element
-  ver2-SUPL-END-extension	Ver2-SUPL-END-extension OPTIONAL}
+  ver2-SUPL-END-extension                  Ver2-SUPL-END-extension OPTIONAL}
 
 END
 
@@ -285,15 +285,15 @@ BEGIN
 EXPORTS SUPLAUTHREQ;
 
 IMPORTS
-	Ver
+          Ver
 FROM ULP-Components
-	SETCapabilities
+          SETCapabilities
 FROM SUPL-START;
 
 SUPLAUTHREQ ::= SEQUENCE {
-  ver      	Ver OPTIONAL,
-  sETCapabilities	SETCapabilities OPTIONAL,
-  ...}
+  ver                     Ver OPTIONAL,
+  sETCapabilities         SETCapabilities OPTIONAL,
+   ...}
 
 END
 
@@ -306,13 +306,13 @@ BEGIN
 EXPORTS SUPLAUTHRESP;
 
 IMPORTS
-	SPCSETKey, SPCTID, SPCSETKeylifetime
+          SPCSETKey, SPCTID, SPCSETKeylifetime
 FROM Ver2-ULP-Components;
 
 SUPLAUTHRESP ::= SEQUENCE {
-  sPCSETKey	SPCSETKey,
-  sPCTID  	SPCTID,
-  sPCSETKeylifetime	SPCSETKeylifetime OPTIONAL,
+  sPCSETKey               SPCSETKey,
+  spctid                  SPCTID,
+  sPCSETKeylifetime   SPCSETKeylifetime OPTIONAL,
   ...}
 
 END
@@ -326,7 +326,7 @@ BEGIN
 EXPORTS Ver2-SUPLNOTIFY;
 
 IMPORTS
-	Notification
+          Notification
 FROM SUPL-INIT;
 
 Ver2-SUPLNOTIFY ::= SEQUENCE {
@@ -359,12 +359,11 @@ BEGIN
 EXPORTS Ver2-SUPLSETINIT;
 
 IMPORTS
-	SETId, QoP
+          SETId, QoP
 FROM ULP-Components
-ApplicationID
+          ApplicationID
 FROM Ver2-ULP-Components;
 
-
 Ver2-SUPLSETINIT ::= SEQUENCE {
   targetSETID    SETId, --Target SETid identifies the target SET to be located
   qoP            QoP OPTIONAL,
@@ -382,41 +381,41 @@ BEGIN
 EXPORTS Ver2-SUPLTRIGGEREDSTART, TriggerType, TriggerParams, maxNumGeoArea, maxAreaId, maxAreaIdList;
 
 IMPORTS
-	LocationId, QoP, Ver, Position
+          LocationId, QoP, Ver, Position
 FROM ULP-Components
-	MultipleLocationIds, CauseCode, ThirdParty, ApplicationID, ReportingCap, Coordinate, CircularArea, EllipticalArea, PolygonArea
+          MultipleLocationIds, CauseCode, ThirdParty, ApplicationID, ReportingCap, Coordinate, CircularArea, EllipticalArea, PolygonArea
 FROM Ver2-ULP-Components
-	SETCapabilities
+          SETCapabilities
 FROM SUPL-START;
 
 Ver2-SUPLTRIGGEREDSTART ::= SEQUENCE {
-  sETCapabilities  	SETCapabilities,
-  locationId       	LocationId,
-  ver              	Ver OPTIONAL,
-  qoP              	QoP OPTIONAL,
-  multipleLocationIds	MultipleLocationIds OPTIONAL,
-thirdParty    	ThirdParty OPTIONAL,
-applicationID	ApplicationID OPTIONAL,
-  triggerType   	TriggerType OPTIONAL,
-  triggerParams 	TriggerParams OPTIONAL,
-  position         	Position OPTIONAL,
-  reportingCap	ReportingCap OPTIONAL,
-  causeCode	CauseCode OPTIONAL,
-...}
+  sETCapabilities     SETCapabilities,
+  locationId          LocationId,
+  ver                 Ver OPTIONAL,
+  qoP                 QoP OPTIONAL,
+  multipleLocationIds MultipleLocationIds OPTIONAL,
+  thirdParty              ThirdParty OPTIONAL,
+  applicationID           ApplicationID OPTIONAL,
+  triggerType             TriggerType OPTIONAL,
+  triggerParams           TriggerParams OPTIONAL,
+  position            Position OPTIONAL,
+  reportingCap            ReportingCap OPTIONAL,
+  causeCode               CauseCode OPTIONAL,
+  ...}
 
 TriggerType ::= ENUMERATED {
   periodic(0), areaEvent(1),
   ...}
 
 TriggerParams ::= CHOICE {
-   periodicParams	PeriodicParams,
-   areaEventParams	AreaEventParams,
+   periodicParams         PeriodicParams,
+   areaEventParams        AreaEventParams,
    ...}
 
 PeriodicParams ::= SEQUENCE{
-   numberOfFixes   		INTEGER(1.. 8639999),
-   intervalBetweenFixes    	INTEGER(1.. 8639999),
-   startTime		INTEGER(0..2678400) OPTIONAL,
+   numberOfFixes                           INTEGER(1.. 8639999),
+   intervalBetweenFixes                    INTEGER(1.. 8639999),
+   startTime                               INTEGER(0..2678400) OPTIONAL,
 ...}
 -- intervalBetweenFixes and startTime are in seconds.
 -- numberOfFixes  * intervalBetweenFixes shall not exceed 8639999
@@ -426,14 +425,14 @@ PeriodicParams ::= SEQUENCE{
 -- seconds from "now"
 
 AreaEventParams ::= SEQUENCE {
-areaEventType		AreaEventType,
-locationEstimate		BOOLEAN,
-repeatedReportingParams	RepeatedReportingParams OPTIONAL,
-startTime		INTEGER(0..2678400) OPTIONAL,
-stopTime		INTEGER(0..11318399) OPTIONAL,
-geographicTargetAreaList	GeographicTargetAreaList	OPTIONAL,
-areaIdLists		SEQUENCE (SIZE (1..maxAreaIdList)) OF AreaIdList OPTIONAL,
-...}
+  areaEventType                            AreaEventType,
+  locationEstimate                         BOOLEAN,
+  repeatedReportingParams                  RepeatedReportingParams OPTIONAL,
+  startTime                                INTEGER(0..2678400) OPTIONAL,
+  stopTime                                 INTEGER(0..11318399) OPTIONAL,
+  geographicTargetAreaList                 GeographicTargetAreaList  OPTIONAL,
+  areaIdLists                              SEQUENCE (SIZE (1..maxAreaIdList)) OF AreaIdList OPTIONAL,
+  ...}
 
 -- startTime and stopTime are in seconds.
 -- startTime and stop Time are in relative time in units of seconds measured
@@ -446,51 +445,51 @@ areaIdLists		SEQUENCE (SIZE (1..maxAreaIdList)) OF AreaIdList OPTIONAL,
 AreaEventType ::= ENUMERATED {enteringArea(0), insideArea(1), outsideArea(2), leavingArea(3), ...}
 
 RepeatedReportingParams ::= SEQUENCE {
-minimumIntervalTime	     INTEGER (1..604800), -- time in seconds
-maximumNumberOfReports   INTEGER (1..1024),
-...}
+  minimumIntervalTime      INTEGER (1..604800), -- time in seconds
+  maximumNumberOfReports   INTEGER (1..1024),
+  ...}
 
 GeographicTargetAreaList ::= SEQUENCE (SIZE (1..maxNumGeoArea)) OF GeographicTargetArea
 
 GeographicTargetArea ::= CHOICE {
- circularArea	CircularArea,
- ellipticalArea	EllipticalArea,
- polygonArea	PolygonArea,
+ circularArea              CircularArea,
+ ellipticalArea            EllipticalArea,
+ polygonArea               PolygonArea,
  ...}
 
 AreaIdList ::= SEQUENCE {
- areaIdSet	AreaIdSet,
- areaIdSetType    	AreaIdSetType OPTIONAL,
- geoAreaMappingList		GeoAreaMappingList OPTIONAL}
+ areaIdSet                 AreaIdSet,
+ areaIdSetType             AreaIdSetType OPTIONAL,
+ geoAreaMappingList                        GeoAreaMappingList OPTIONAL}
 
 AreaIdSet ::= SEQUENCE SIZE (1..maxAreaId) OF AreaId
 
 AreaId ::= CHOICE {
- gSMAreaId	GSMAreaId,
- wCDMAAreaId  	WCDMAAreaId, -- For TD-SCDMA networks, this parameter indicates a TD-SCDMA Area ID
- cDMAAreaId 	CDMAAreaId,
- hRPDAreaId	HRPDAreaId,
- uMBAreaId	UMBAreaId,
- lTEAreaId	LTEAreaId,
- wLANAreaId 	WLANAreaId,
- wiMAXAreaId	WimaxAreaId,
+ gSMAreaId                 GSMAreaId,
+ wCDMAAreaId               WCDMAAreaId, -- For TD-SCDMA networks, this parameter indicates a TD-SCDMA Area ID
+ cDMAAreaId                CDMAAreaId,
+ hRPDAreaId                HRPDAreaId,
+ uMBAreaId                 UMBAreaId,
+ lTEAreaId                 LTEAreaId,
+ wLANAreaId                WLANAreaId,
+ wiMAXAreaId               WimaxAreaId,
  ...}
 
 GSMAreaId ::= SEQUENCE {
- refMCC		INTEGER(0..999) OPTIONAL, -- Mobile Country Code
- refMNC		INTEGER(0..999) OPTIONAL, -- Mobile Network Code
- refLAC		INTEGER(0..65535) OPTIONAL, -- Location Area Code
- refCI		INTEGER(0..65535) OPTIONAL, -- Cell Id
+ refMCC                    INTEGER(0..999) OPTIONAL, -- Mobile Country Code
+ refMNC                    INTEGER(0..999) OPTIONAL, -- Mobile Network Code
+ refLAC                    INTEGER(0..65535) OPTIONAL, -- Location Area Code
+ refCI                     INTEGER(0..65535) OPTIONAL, -- Cell Id
  ...}
 
 -- only one of the following four combinations are allowed: (1) refMCC, (2)
 -- refMCC+refMNC, (3) refMCC+refMNC+refLAC or (4) refMCC+refMNC+refLAC+refCI
 
 WCDMAAreaId ::= SEQUENCE {
-  refMCC	INTEGER(0..999) OPTIONAL, -- Mobile Country Code
-refMNC	INTEGER(0..999) OPTIONAL, -- Mobile Network Code
-  refLAC	INTEGER(0..65535) OPTIONAL, -- Location Area Code
-refUC	INTEGER(0..268435455) OPTIONAL, -- Cell identity
+  refMCC INTEGER(0..999) OPTIONAL, -- Mobile Country Code
+  refMNC INTEGER(0..999) OPTIONAL, -- Mobile Network Code
+  refLAC INTEGER(0..65535) OPTIONAL, -- Location Area Code
+  refUC  INTEGER(0..268435455) OPTIONAL, -- Cell identity
 ...}
 
 -- only one of the following four combinations are allowed: (1) refMCC, (2)
@@ -506,26 +505,24 @@ CDMAAreaId::= SEQUENCE {
 -- refSID+refNID, or (3) refSID+refNID+refBASEID
 
 HRPDAreaId::= SEQUENCE {
-refSECTORID    BIT STRING(SIZE (128)), -- HRPD Sector Id
+  refSECTORID    BIT STRING(SIZE (128)), -- HRPD Sector Id
 ...}
 
 UMBAreaId::= SEQUENCE {
-  refMCC		INTEGER(0..999) OPTIONAL, -- Mobile Country Code
-  refMNC		INTEGER(0..999) OPTIONAL, -- Mobile Network Code
-refSECTORID    	BIT STRING(SIZE (128)) OPTIONAL, -- UMB Sector Id
+  refMCC                   INTEGER(0..999) OPTIONAL, -- Mobile Country Code
+  refMNC                   INTEGER(0..999) OPTIONAL, -- Mobile Network Code
+  refSECTORID              BIT STRING(SIZE (128)) OPTIONAL, -- UMB Sector Id
 ...}
 
-
 LTEAreaId::= SEQUENCE {
-  refMCC	INTEGER(0..999) OPTIONAL, -- Mobile Country Code
-  refMNC	INTEGER(0..999) OPTIONAL, -- Mobile Network Code
-refCI	BIT STRING(SIZE (29)) OPTIONAL, -- LTE Cell-Id
+  refMCC INTEGER(0..999) OPTIONAL, -- Mobile Country Code
+  refMNC INTEGER(0..999) OPTIONAL, -- Mobile Network Code
+  refCI  BIT STRING(SIZE (29)) OPTIONAL, -- LTE Cell-Id
 ...}
 
 -- only one of the following three combinations are allowed: (1) refMCC, (2) refMCC+refMNC, or (3) refMCC+refMNC+refCI
--- The LTE Cell-Id is encoded in the 28 Least Significant Bits of refCI -
--- The Most Significant Bit of refCI shall be ignored -
-
+-- The LTE Cell-Id is encoded in the 28 Least Significant Bits of refCI
+-- The Most Significant Bit of refCI shall be ignored
 
 WLANAreaId::= SEQUENCE {
   apMACAddress       BIT STRING(SIZE (48)), -- AP MAC Address
@@ -559,31 +556,32 @@ BEGIN
 EXPORTS Ver2-SUPLTRIGGEREDRESPONSE;
 
 IMPORTS
-	PosMethod, SLPAddress
+          PosMethod, SLPAddress
 FROM ULP-Components
-	SupportedNetworkInformation, SPCSETKey, SPCTID, SPCSETKeylifetime, GNSSPosTechnology
+          SupportedNetworkInformation, SPCSETKey, SPCTID, SPCSETKeylifetime, GNSSPosTechnology
 FROM Ver2-ULP-Components
-	TriggerParams
+          TriggerParams
 FROM SUPL-TRIGGERED-START;
 
 Ver2-SUPLTRIGGEREDRESPONSE::= SEQUENCE{
-  posMethod     		PosMethod,
-  triggerParams 		TriggerParams  OPTIONAL,
-  sLPAddress    		SLPAddress OPTIONAL,
-  supportedNetworkInformation   	SupportedNetworkInformation OPTIONAL,
-  reportingMode		ReportingMode OPTIONAL,
-  sPCSETKey		SPCSETKey	OPTIONAL,
-  sPCTID			SPCTID	OPTIONAL,
-  sPCSETKeylifetime		SPCSETKeylifetime OPTIONAL,
-  gnssPosTechnology		GNSSPosTechnology OPTIONAL,
+  posMethod                                PosMethod,
+  triggerParams                            TriggerParams  OPTIONAL,
+  sLPAddress                               SLPAddress OPTIONAL,
+  supportedNetworkInformation              SupportedNetworkInformation OPTIONAL,
+  reportingMode                            ReportingMode OPTIONAL,
+  sPCSETKey                                SPCSETKey       OPTIONAL,
+  spctid                                   SPCTID          OPTIONAL,
+  sPCSETKeylifetime                        SPCSETKeylifetime OPTIONAL,
+  gnssPosTechnology                        GNSSPosTechnology OPTIONAL,
   ...}
+
 ReportingMode ::= SEQUENCE {
-repMode	RepMode,
-batchRepConditions	BatchRepConditions OPTIONAL, -- only used for batch reporting
-batchRepType	BatchRepType OPTIONAL, -- only used for batch reporting
-...}
+  repMode                 RepModee,
+  batchRepConditions  BatchRepConditions OPTIONAL, -- only used for batch reporting
+  batchRepType            BatchRepType OPTIONAL, -- only used for batch reporting
+   ...}
 
-RepMode ::= ENUMERATED {realtime(1), quasirealtime(2), batch(3), ...}
+RepModee  ::= ENUMERATED {realtime(1), quasirealtime(2), batch(3), ...}
 
 BatchRepConditions ::= CHOICE {
  num-interval INTEGER (1..1024), -- number of periodic fixes/measurements after which the batch report is sent to the SLP
@@ -592,11 +590,11 @@ BatchRepConditions ::= CHOICE {
  ...}
 
 BatchRepType ::= SEQUENCE {
-reportPosition	BOOLEAN, -- set to "true" if reporting of position is allowed
-reportMeasurements	BOOLEAN, -- set to "true" if reporting of measurements is allowed
-intermediateReports   BOOLEAN, -- set to "true" if the SET is allowed to send intermediate reports if it runs out of memory
-discardOldest 	BOOLEAN OPTIONAL, -- set to "true" if the SET should discard the oldest positions or measurements of the batch report in order to save memory, set to "false" the SET should discard the latest positions or measurements
-...}
+  reportPosition          BOOLEAN, -- set to "true" if reporting of position is allowed
+  reportMeasurements  BOOLEAN, -- set to "true" if reporting of measurements is allowed
+  intermediateReports   BOOLEAN, -- set to "true" if the SET is allowed to send intermediate reports if it runs out of memory
+  discardOldest           BOOLEAN OPTIONAL, -- set to "true" if the SET should discard the oldest positions or measurements of the batch report in order to save memory, set to "false" the SET should discard the latest positions or measurements
+  ...}
 
 END
 
@@ -609,27 +607,27 @@ BEGIN
 EXPORTS Ver2-SUPLREPORT;
 
 IMPORTS
-	SETCapabilities
+          SETCapabilities
 FROM SUPL-START
-	Position, PosMethod, SessionID, Ver
+          Position, PosMethod, SessionID, Ver
 FROM ULP-Components
-	MultipleLocationIds, GNSSPosTechnology, GANSSSignals
+          MultipleLocationIds, GNSSPosTechnology, GANSSSignals
 FROM Ver2-ULP-Components
-	maxGANSS
+          maxGANSS
 FROM ULP-Version-2-parameter-extensions;
 
 Ver2-SUPLREPORT ::= SEQUENCE {
- sessionList	SessionList OPTIONAL,
+ sessionList               SessionList OPTIONAL,
  sETCapabilities      SETCapabilities OPTIONAL,
- reportDataList 	ReportDataList OPTIONAL,
- ver  		Ver OPTIONAL,
- moreComponents	NULL OPTIONAL,
+ reportDataList           ReportDataList OPTIONAL,
+ ver                      Ver OPTIONAL,
+ moreComponents           NULL OPTIONAL,
 ...}
 
 SessionList ::= SEQUENCE SIZE (1..maxnumSessions) OF SessionInformation
 
 SessionInformation ::= SEQUENCE {
- sessionID	SessionID,
+ sessionID                 SessionID,
  ...}
 
 maxnumSessions    INTEGER ::= 64
@@ -637,24 +635,24 @@ maxnumSessions    INTEGER ::= 64
 ReportDataList ::= SEQUENCE SIZE (1.. 1024) OF ReportData
 
 ReportData ::= SEQUENCE {
-  positionData	PositionData OPTIONAL,
-  multipleLocationIds	MultipleLocationIds OPTIONAL,
-  resultCode	ResultCode OPTIONAL,
-  timestamp	TimeStamp OPTIONAL,
+  positionData             PositionData OPTIONAL,
+  multipleLocationIds MultipleLocationIds OPTIONAL,
+  resultCode              ResultCode OPTIONAL,
+  timestamp               TimeStamp OPTIONAL,
   ...}
 
 PositionData ::= SEQUENCE {
- position		Position,
- posMethod		PosMethod OPTIONAL,
- gnssPosTechnology		GNSSPosTechnology OPTIONAL,
- ganssSignalsInfo		GANSSsignalsInfo OPTIONAL,
+ position                                  Position,
+ posMethod                                 PosMethod OPTIONAL,
+ gnssPosTechnology                         GNSSPosTechnology OPTIONAL,
+ ganssSignalsInfo                          GANSSsignalsInfo OPTIONAL,
  ...}
 
 GANSSsignalsInfo ::= SEQUENCE SIZE (1..maxGANSS) OF GANSSSignalsDescription
 
 GANSSSignalsDescription ::= SEQUENCE {
-ganssId		INTEGER(0..15), -- coding according to parameter definition in section 10.10
-gANSSSignals	GANSSSignals,
+ ganssId                   INTEGER(0..15), -- coding according to parameter definition in section 10.10
+ gANSSSignals             GANSSSignals,
 ...}
 
 ResultCode ::= ENUMERATED {outofradiocoverage(1), noposition(2), nomeasurement(3), nopositionnomeasurement(4), outofmemory(5), outofmemoryintermediatereporting(6), other(7), ...}
@@ -674,7 +672,7 @@ BEGIN
 EXPORTS Ver2-SUPLTRIGGEREDSTOP;
 
 IMPORTS
-	StatusCode
+          StatusCode
 FROM ULP-Components;
 
 Ver2-SUPLTRIGGEREDSTOP::= SEQUENCE{
@@ -693,90 +691,90 @@ EXPORTS
 Ver2-SUPL-INIT-extension, Ver2-SUPL-START-extension, Ver2-SUPL-RESPONSE-extension, Ver2-SUPL-POS-INIT-extension, Ver2-SUPL-POS-extension, Ver2-SUPL-END-extension;
 
 IMPORTS
-	SLPAddress, Position, Ver
+          SLPAddress, Position, Ver
 FROM ULP-Components
-	SETCapabilities
+          SETCapabilities
 FROM SUPL-START
-	SupportedNetworkInformation, GNSSPosTechnology, MultipleLocationIds, UTRAN-GPSReferenceTimeResult, UTRAN-GANSSReferenceTimeResult, UTRAN-GPSReferenceTimeAssistance, UTRAN-GANSSReferenceTimeAssistance, SPCSETKey, SPCTID, SPCSETKeylifetime, ThirdParty, ApplicationID
+          SupportedNetworkInformation, GNSSPosTechnology, MultipleLocationIds, UTRAN-GPSReferenceTimeResult, UTRAN-GANSSReferenceTimeResult, UTRAN-GPSReferenceTimeAssistance, UTRAN-GANSSReferenceTimeAssistance, SPCSETKey, SPCTID, SPCSETKeylifetime, ThirdParty, ApplicationID
 FROM Ver2-ULP-Components
-	TriggerType
+          TriggerType
 FROM SUPL-TRIGGERED-START;
 
 Ver2-SUPL-INIT-extension ::= SEQUENCE {
-  notificationMode  		NotificationMode OPTIONAL,
-  supportedNetworkInformation   	SupportedNetworkInformation OPTIONAL,
-  triggerType   		TriggerType OPTIONAL,
-  e-SLPAddress  		SLPAddress OPTIONAL,
-  historicReporting		HistoricReporting OPTIONAL,
-  protectionLevel		ProtectionLevel OPTIONAL,
-  gnssPosTechnology		GNSSPosTechnology OPTIONAL,
-  minimumMajorVersion		INTEGER (0..255) OPTIONAL,
+  notificationMode                         NotificationMode OPTIONAL,
+  supportedNetworkInformation              SupportedNetworkInformation OPTIONAL,
+  triggerType                              TriggerType OPTIONAL,
+  e-SLPAddress                             SLPAddress OPTIONAL,
+  historicReporting                        HistoricReporting OPTIONAL,
+  protectionLevel                          ProtectionLevel OPTIONAL,
+  gnssPosTechnology                        GNSSPosTechnology OPTIONAL,
+  minimumMajorVersion                      INTEGER (0..255) OPTIONAL,
 ...}
 
 NotificationMode ::= ENUMERATED {normal(0), basedOnLocation(1), ...}
 
 HistoricReporting ::= SEQUENCE {
-  allowedReportingType 	AllowedReportingType,
-  reportingCriteria	   	ReportingCriteria OPTIONAL,...}
+  allowedReportingType                     AllowedReportingType,
+  reportingCriteria                        ReportingCriteria OPTIONAL,  ...}
 
 AllowedReportingType ::= ENUMERATED {
   positionsOnly(0), measurementsOnly(1), positionsAndMeasurements(2),...}
 
 ReportingCriteria ::= SEQUENCE {
-  timeWindow	TimeWindow	OPTIONAL,
-  maxNumberofReports	INTEGER(1..65536) OPTIONAL,
-  minTimeInterval	INTEGER(1..86400) OPTIONAL,
+  timeWindow              TimeWindow       OPTIONAL,
+  maxNumberofReports  INTEGER(1..65536) OPTIONAL,
+  minTimeInterval          INTEGER(1..86400) OPTIONAL,
 ...}
 
 TimeWindow ::= SEQUENCE {
-  startTime	INTEGER(-525600..-1), -- Time in minutes
-  stopTime	INTEGER(-525599..0)} -- Time in minutes
+  startTime                INTEGER(-525600..-1), -- Time in minutes
+  stopTime                 INTEGER(-525599..0)} -- Time in minutes
 
 ProtectionLevel ::= SEQUENCE {
- protlevel		ProtLevel,
- basicProtectionParams	BasicProtectionParams	OPTIONAL,
+ protlevel                                 ProtLevel,
+ basicProtectionParams                     BasicProtectionParams           OPTIONAL,
 ...}
 
 ProtLevel ::= ENUMERATED {
  nullProtection(0), basicProtection(1), ...}
 
 BasicProtectionParams ::= SEQUENCE {
- keyIdentifier 		OCTET STRING(SIZE (8)),
- basicReplayCounter		INTEGER(0..65535),
- basicMAC		BIT STRING(SIZE (32)),
+ keyIdentifier                             OCTET STRING(SIZE (8)),
+ basicReplayCounter                        INTEGER(0..65535),
+ basicMAC                                  BIT STRING(SIZE (32)),
 ...}
 
 Ver2-SUPL-START-extension ::= SEQUENCE {
-  multipleLocationIds	MultipleLocationIds OPTIONAL,
-  thirdParty     	ThirdParty OPTIONAL,
-  applicationID	ApplicationID OPTIONAL,
-  position         	Position OPTIONAL,
+  multipleLocationIds MultipleLocationIds OPTIONAL,
+  thirdParty              ThirdParty OPTIONAL,
+  applicationID           ApplicationID OPTIONAL,
+  position            Position OPTIONAL,
 ...}
 
 Ver2-SUPL-RESPONSE-extension ::= SEQUENCE {
-  supportedNetworkInformation   	SupportedNetworkInformation OPTIONAL,
-  sPCSETKey     		SPCSETKey	OPTIONAL,
-  sPCTID	       		SPCTID	OPTIONAL,
-  sPCSETKeylifetime		SPCSETKeylifetime OPTIONAL,
-  initialApproximateposition    	Position 	OPTIONAL,
-  gnssPosTechnology		GNSSPosTechnology OPTIONAL,
+  supportedNetworkInformation              SupportedNetworkInformation OPTIONAL,
+  sPCSETKey                                SPCSETKey       OPTIONAL,
+  spctid                                   SPCTID          OPTIONAL,
+  sPCSETKeylifetime                        SPCSETKeylifetime OPTIONAL,
+  initialApproximateposition               Position        OPTIONAL,
+  gnssPosTechnology                        GNSSPosTechnology OPTIONAL,
 ...}
 
 Ver2-SUPL-POS-INIT-extension ::= SEQUENCE {
-  multipleLocationIds	 	MultipleLocationIds OPTIONAL,
-  utran-GPSReferenceTimeResult	UTRAN-GPSReferenceTimeResult OPTIONAL,
-  utran-GANSSReferenceTimeResult	UTRAN-GANSSReferenceTimeResult OPTIONAL,
+  multipleLocationIds                      MultipleLocationIds OPTIONAL,
+  utran-GPSReferenceTimeResult             UTRAN-GPSReferenceTimeResult OPTIONAL,
+  utran-GANSSReferenceTimeResult   UTRAN-GANSSReferenceTimeResult OPTIONAL,
 ...}
 
 Ver2-SUPL-POS-extension ::= SEQUENCE {
-utran-GPSReferenceTimeAssistance	UTRAN-GPSReferenceTimeAssistance OPTIONAL,
-utran-GPSReferenceTimeResult	UTRAN-GPSReferenceTimeResult OPTIONAL,
-utran-GANSSReferenceTimeAssistance	UTRAN-GANSSReferenceTimeAssistance OPTIONAL,
-utran-GANSSReferenceTimeResult	UTRAN-GANSSReferenceTimeResult OPTIONAL,
+utran-GPSReferenceTimeAssistance   UTRAN-GPSReferenceTimeAssistance OPTIONAL,
+utran-GPSReferenceTimeResult               UTRAN-GPSReferenceTimeResult OPTIONAL,
+utran-GANSSReferenceTimeAssistance UTRAN-GANSSReferenceTimeAssistance OPTIONAL,
+utran-GANSSReferenceTimeResult             UTRAN-GANSSReferenceTimeResult OPTIONAL,
 ...}
 
 Ver2-SUPL-END-extension ::= SEQUENCE {
-  sETCapabilities	SETCapabilities OPTIONAL,
+  sETCapabilities         SETCapabilities OPTIONAL,
 ...}
 
 END
@@ -792,9 +790,9 @@ EXPORTS
 maxGANSS, Ver2-Notification-extension, Ver2-SETCapabilities-extension, Ver2-PosProtocol-extension, Ver2-PosTechnology-extension, Ver2-RequestedAssistData-extension, Ver2-PosPayLoad-extension;
 
 IMPORTS
-	GANSSSignals, ReportingCap
+          GANSSSignals, ReportingCap
 FROM Ver2-ULP-Components
-	maxNumGeoArea, maxAreaId, maxAreaIdList
+          maxNumGeoArea, maxAreaId, maxAreaIdList
 FROM SUPL-TRIGGERED-START;
 
 Ver2-Notification-extension ::= SEQUENCE {
@@ -802,28 +800,27 @@ Ver2-Notification-extension ::= SEQUENCE {
   ...}
 
 Ver2-SETCapabilities-extension ::= SEQUENCE {
-serviceCapabilities	ServiceCapabilities OPTIONAL,
+  serviceCapabilities                 ServiceCapabilities OPTIONAL,
 ...,
   supportedBearers SupportedBearers OPTIONAL}
 
-
 ServiceCapabilities ::= SEQUENCE {
-  servicesSupported		ServicesSupported,
-  reportingCapabilities	ReportingCap OPTIONAL,
-  eventTriggerCapabilities	EventTriggerCapabilities OPTIONAL,
-  sessionCapabilities		SessionCapabilities,
+  servicesSupported                        ServicesSupported,
+  reportingCapabilities                    ReportingCap OPTIONAL,
+  eventTriggerCapabilities                 EventTriggerCapabilities OPTIONAL,
+  sessionCapabilities                      SessionCapabilities,
 ...}
 
 ServicesSupported ::= SEQUENCE {
-  periodicTrigger	BOOLEAN,
-  areaEventTrigger	BOOLEAN,
+  periodicTrigger          BOOLEAN,
+  areaEventTrigger         BOOLEAN,
 ...}
 
 EventTriggerCapabilities ::= SEQUENCE {
-  geoAreaShapesSupported        	GeoAreaShapesSupported,
-  maxNumGeoAreaSupported	INTEGER (0..maxNumGeoArea) OPTIONAL,
-  maxAreaIdListSupported	INTEGER (0..maxAreaIdList) OPTIONAL,
-  maxAreaIdSupportedPerList	INTEGER (0..maxAreaId) OPTIONAL,
+  geoAreaShapesSupported                   GeoAreaShapesSupported,
+  maxNumGeoAreaSupported                   INTEGER (0..maxNumGeoArea) OPTIONAL,
+  maxAreaIdListSupported                   INTEGER (0..maxAreaIdList) OPTIONAL,
+  maxAreaIdSupportedPerList                INTEGER (0..maxAreaId) OPTIONAL,
 ...}
 
 GeoAreaShapesSupported ::= SEQUENCE {
@@ -832,29 +829,31 @@ GeoAreaShapesSupported ::= SEQUENCE {
 ...}
 
 SessionCapabilities ::= SEQUENCE {
-  maxNumberTotalSessions	INTEGER (1..128),
-  maxNumberPeriodicSessions	INTEGER (1..32),
-  maxNumberTriggeredSessions	INTEGER (1..32),
+  maxNumberTotalSessions                   INTEGER (1..128),
+  maxNumberPeriodicSessions                INTEGER (1..32),
+  maxNumberTriggeredSessions               INTEGER (1..32),
 ...}
 
 SupportedBearers ::= SEQUENCE {
-  gsm		BOOLEAN,
-  wcdma		BOOLEAN,
-  lte		BOOLEAN,
-  cdma		BOOLEAN,
-  hprd		BOOLEAN,
-  umb		BOOLEAN,
-  wlan		BOOLEAN,
-  wiMAX		BOOLEAN,
+  gsm                      BOOLEAN,
+  wcdma                    BOOLEAN,
+  lte                      BOOLEAN,
+  cdma                     BOOLEAN,
+  hprd                     BOOLEAN,
+  umb                      BOOLEAN,
+  wlan                     BOOLEAN,
+  wiMAX                    BOOLEAN,
 ...}
 
 Ver2-PosProtocol-extension ::= SEQUENCE {
   lpp     BOOLEAN,
-posProtocolVersionRRLP	PosProtocolVersion3GPP OPTIONAL,
-posProtocolVersionRRC	PosProtocolVersion3GPP OPTIONAL,
-posProtocolVersionTIA801	PosProtocolVersion3GPP2 OPTIONAL,
-posProtocolVersionLPP  PosProtocolVersion3GPP OPTIONAL,
-...}
+  posProtocolVersionRRLP                   PosProtocolVersion3GPP OPTIONAL,
+  posProtocolVersionRRC                    PosProtocolVersion3GPP OPTIONAL,
+  posProtocolVersionTIA801                 PosProtocolVersion3GPP2 OPTIONAL,
+  posProtocolVersionLPP  PosProtocolVersion3GPP OPTIONAL,
+...,
+  lppe   BOOLEAN OPTIONAL,
+  posProtocolVersionLPPe                   PosProtocolVersionOMA OPTIONAL}
 
 PosProtocolVersion3GPP ::= SEQUENCE {
   majorVersionField      INTEGER(0..255),
@@ -865,9 +864,14 @@ PosProtocolVersion3GPP ::= SEQUENCE {
 PosProtocolVersion3GPP2 ::= SEQUENCE (SIZE(1..8)) OF Supported3GPP2PosProtocolVersion
 
 Supported3GPP2PosProtocolVersion ::= SEQUENCE {
-  revisionNumber   		BIT STRING(SIZE (6)), -- the location standard revision number the SET supports coded according to 3GPP2 C.S0022
-  pointReleaseNumber  	INTEGER(0..255),
-  internalEditLevel  		INTEGER(0..255),
+  revisionNumber                           BIT STRING(SIZE (6)), -- the location standard revision number the SET supports coded according to 3GPP2 C.S0022
+  pointReleaseNumber                       INTEGER(0..255),
+  internalEditLevel                        INTEGER(0..255),
+...}
+
+PosProtocolVersionOMA  ::= SEQUENCE {
+  majorVersionField      INTEGER(0..255),
+  minorVersionField      INTEGER(0..255),
 ...}
 
 Ver2-PosTechnology-extension ::= SEQUENCE {
@@ -877,10 +881,10 @@ Ver2-PosTechnology-extension ::= SEQUENCE {
 GANSSPositionMethods ::= SEQUENCE (SIZE(1..16)) OF GANSSPositionMethod
 
 GANSSPositionMethod ::= SEQUENCE {
-ganssId			INTEGER(0..15), -- coding according to parameter definition in section 10.10
-ganssSBASid 		BIT STRING(SIZE(3)) OPTIONAL, --coding according to parameter definition in section 10.10
-gANSSPositioningMethodTypes	GANSSPositioningMethodTypes,
-gANSSSignals		GANSSSignals,
+ ganssId                                   INTEGER(0..15), -- coding according to parameter definition in section 10.10
+ ganssSBASid                               BIT STRING(SIZE(3)) OPTIONAL, --coding according to parameter definition in section 10.10
+ gANSSPositioningMethodTypes               GANSSPositioningMethodTypes,
+ gANSSSignals                              GANSSSignals,
 ...}
 
 GANSSPositioningMethodTypes ::= SEQUENCE {
@@ -890,10 +894,10 @@ GANSSPositioningMethodTypes ::= SEQUENCE {
 ...}
 
 Ver2-RequestedAssistData-extension ::= SEQUENCE {
-  ganssRequestedCommonAssistanceDataList          GanssRequestedCommonAssistanceDataList OPTIONAL,
+  ganssRequestedCommonAssistanceDataList GanssRequestedCommonAssistanceDataList OPTIONAL,
   ganssRequestedGenericAssistanceDataList GanssRequestedGenericAssistanceDataList OPTIONAL,
-  extendedEphemeris		ExtendedEphemeris OPTIONAL,
-  extendedEphemerisCheck	ExtendedEphCheck OPTIONAL,
+  extendedEphemeris                        ExtendedEphemeris OPTIONAL,
+  extendedEphemerisCheck                   ExtendedEphCheck OPTIONAL,
 ...}
 
 GanssRequestedCommonAssistanceDataList ::= SEQUENCE {
@@ -902,62 +906,67 @@ GanssRequestedCommonAssistanceDataList ::= SEQUENCE {
   ganssAdditionalIonosphericModelForDataID00	BOOLEAN,
   ganssAdditionalIonosphericModelForDataID11	BOOLEAN,
   ganssEarthOrientationParameters		BOOLEAN,
-...}
+...,
+  ganssAdditionalIonosphericModelForDataID01               BOOLEAN OPTIONAL}
 
 GanssRequestedGenericAssistanceDataList ::= SEQUENCE(SIZE(1..maxGANSS)) OF GanssReqGenericData
 
 GanssReqGenericData ::= SEQUENCE {
   ganssId   INTEGER(0..15), -- coding according to parameter definition in section 10.10
   ganssSBASid BIT STRING(SIZE(3)) OPTIONAL, --coding according to parameter definition in section 10.10
-  ganssRealTimeIntegrity	BOOLEAN,
-  ganssDifferentialCorrection	DGANSS-Sig-Id-Req OPTIONAL,
-  ganssAlmanac		BOOLEAN,
-  ganssNavigationModelData	GanssNavigationModelData OPTIONAL,
-  ganssTimeModels		BIT STRING(SIZE(16)) OPTIONAL,
-  ganssReferenceMeasurementInfo	BOOLEAN,
-  ganssDataBits		GanssDataBits OPTIONAL,
-  ganssUTCModel		BOOLEAN,
+  ganssRealTimeIntegrity                   BOOLEAN,
+  ganssDifferentialCorrection              DGANSS-Sig-Id-Req OPTIONAL,
+  ganssAlmanac                             BOOLEAN,
+  ganssNavigationModelData                 GanssNavigationModelData OPTIONAL,
+  ganssTimeModels                          BIT STRING(SIZE(16)) OPTIONAL,
+  ganssReferenceMeasurementInfo            BOOLEAN,
+  ganssDataBits                            GanssDataBits OPTIONAL,
+  ganssUTCModel                            BOOLEAN,
   ganssAdditionalDataChoices GanssAdditionalDataChoices OPTIONAL,
   ganssAuxiliaryInformation	BOOLEAN,
   ganssExtendedEphemeris         	ExtendedEphemeris OPTIONAL,
   ganssExtendedEphemerisCheck    	GanssExtendedEphCheck OPTIONAL,
-...}
+...,
+  bds-DifferentialCorrection BDS-Sig-Id-Req OPTIONAL,
+  bds-GridModelReq        BOOLEAN          OPTIONAL}
 
 DGANSS-Sig-Id-Req ::= BIT STRING (SIZE(8)) -- coding according to parameter definition in section 10.9
 
+BDS-Sig-Id-Req ::= BIT STRING (SIZE(8)) -- coding according to parameter definition in section 10.9
+
 GanssNavigationModelData ::= SEQUENCE {
-ganssWeek		INTEGER(0..4095),
-ganssToe			INTEGER(0..167),
-t-toeLimit		INTEGER(0..15),
-satellitesListRelatedDataList	SatellitesListRelatedDataList OPTIONAL,
+ganssWeek                                  INTEGER(0..4095),
+ganssToe                                   INTEGER(0..167),
+t-toeLimit                                 INTEGER(0..15),
+satellitesListRelatedDataList              SatellitesListRelatedDataList OPTIONAL,
 ...}
 
 SatellitesListRelatedDataList ::= SEQUENCE(SIZE(0..maxGANSSSat)) OF SatellitesListRelatedData
 
 SatellitesListRelatedData ::= SEQUENCE {
-  satId	INTEGER(0..63),
-  iod	INTEGER(0..1023),
+  satId  INTEGER(0..63),
+  iod     INTEGER(0..1023),
 ...}
 
 maxGANSS    INTEGER ::= 16
 maxGANSSSat INTEGER ::= 32
 
 GanssDataBits ::= SEQUENCE {
-  ganssTODmin     		INTEGER (0..59),
-  reqDataBitAssistanceList 	ReqDataBitAssistanceList,
+  ganssTODmin                              INTEGER (0..59),
+  reqDataBitAssistanceList                 ReqDataBitAssistanceList,
 ...}
 
 ReqDataBitAssistanceList ::= SEQUENCE {
-  gnssSignals  	     	GANSSSignals,
-  ganssDataBitInterval  	INTEGER (0..15),
-  ganssDataBitSatList		SEQUENCE (SIZE(1..maxGANSSSat)) OF INTEGER (0..63) OPTIONAL,
+  gnssSignals                              GANSSSignals,
+  ganssDataBitInterval                     INTEGER (0..15),
+  ganssDataBitSatList                      SEQUENCE (SIZE(1..maxGANSSSat)) OF INTEGER (0..63) OPTIONAL,
 ...}
 
 GanssAdditionalDataChoices ::= SEQUENCE {
-  orbitModelID	INTEGER(0..7) OPTIONAL,
-  clockModelID	INTEGER(0..7) OPTIONAL,
-  utcModelID	INTEGER(0..7) OPTIONAL,
-  almanacModelID	INTEGER(0..7) OPTIONAL,
+  orbitModelID             INTEGER(0..7) OPTIONAL,
+  clockModelID             INTEGER(0..7) OPTIONAL,
+  utcModelID               INTEGER(0..7) OPTIONAL,
+  almanacModelID           INTEGER(0..7) OPTIONAL,
 ...}
 
 ExtendedEphemeris ::= SEQUENCE {
@@ -986,7 +995,7 @@ GANSSextEphTime ::= SEQUENCE {
 
 Ver2-PosPayLoad-extension ::= SEQUENCE {
    lPPPayload SEQUENCE (SIZE (1..3)) OF OCTET STRING(SIZE (1..60000)) OPTIONAL,
-   tIA801Payload SEQUENCE (SIZE(1..3)) OF OCTET STRING(SIZE (1..60000)) OPTIONAL,
+   tia801Payload SEQUENCE (SIZE(1..3)) OF OCTET STRING(SIZE (1..60000)) OPTIONAL,
 ...}
 
 
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
 
diff --git a/asn1/ulp/ULP.asn b/asn1/ulp/ULP.asn
index 155fe4de14..bbcd7563a3 100644
--- a/asn1/ulp/ULP.asn
+++ b/asn1/ulp/ULP.asn
@@ -1,46 +1,45 @@
 -- ULP.asn
---
 -- Taken from OMA UserPlane Location Protocol
--- http://member.openmobilealliance.org/ftp/Public_documents/LOC/Permanent_documents/OMA-TS-ULP-V2_0_1-20121205-A.zip
+-- http://member.openmobilealliance.org/ftp/Public_documents/LOC/Permanent_documents/OMA-TS-ULP-V2_0_2-20140708-A.zip
 --
--- 11.1	Common Part
+-- 11.1 Common Part
 --
 
 ULP DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
 
 IMPORTS
-	Version, SessionID
+          Version, SessionID
 FROM ULP-Components
-  	SUPLINIT
+          SUPLINIT
 FROM SUPL-INIT
-  	SUPLSTART
+          SUPLSTART
 FROM SUPL-START
-  	SUPLRESPONSE
+          SUPLRESPONSE
 FROM SUPL-RESPONSE
-  	SUPLPOSINIT
+          SUPLPOSINIT
 FROM SUPL-POS-INIT
-  	SUPLPOS
+          SUPLPOS
 FROM SUPL-POS
-  	SUPLEND
+          SUPLEND
 FROM SUPL-END
-  	SUPLAUTHREQ
+          SUPLAUTHREQ
 FROM SUPL-AUTH-REQ
-  	SUPLAUTHRESP
+          SUPLAUTHRESP
 FROM SUPL-AUTH-RESP
-  	Ver2-SUPLTRIGGEREDSTART
+          Ver2-SUPLTRIGGEREDSTART
 FROM SUPL-TRIGGERED-START
-  	Ver2-SUPLTRIGGEREDRESPONSE
+          Ver2-SUPLTRIGGEREDRESPONSE
 FROM SUPL-TRIGGERED-RESPONSE
-  	Ver2-SUPLREPORT
+          Ver2-SUPLREPORT
 FROM SUPL-REPORT
-  	Ver2-SUPLTRIGGEREDSTOP
+          Ver2-SUPLTRIGGEREDSTOP
 FROM SUPL-TRIGGERED-STOP
-  	Ver2-SUPLSETINIT
+          Ver2-SUPLSETINIT
 FROM SUPL-SET-INIT
-  	Ver2-SUPLNOTIFY
+          Ver2-SUPLNOTIFY
 FROM SUPL-NOTIFY
-  	Ver2-SUPLNOTIFYRESPONSE
+          Ver2-SUPLNOTIFYRESPONSE
 FROM SUPL-NOTIFY-RESPONSE;
 
 -- general ULP PDU layout;--
@@ -59,14 +58,13 @@ UlpMessage ::= CHOICE {
   msSUPLEND       SUPLEND,
   msSUPLAUTHREQ   SUPLAUTHREQ,
   msSUPLAUTHRESP  SUPLAUTHRESP,
- ...,
+  ...,
   msSUPLTRIGGEREDSTART    Ver2-SUPLTRIGGEREDSTART,
   msSUPLTRIGGEREDRESPONSE Ver2-SUPLTRIGGEREDRESPONSE,
   msSUPLTRIGGEREDSTOP     Ver2-SUPLTRIGGEREDSTOP,
-  msSUPLNOTIFY    	    Ver2-SUPLNOTIFY,
+  msSUPLNOTIFY                Ver2-SUPLNOTIFY,
   msSUPLNOTIFYRESPONSE    Ver2-SUPLNOTIFYRESPONSE,
-  msSUPLSETINIT   	    Ver2-SUPLSETINIT,
-msSUPLREPORT    	    Ver2-SUPLREPORT}
+  msSUPLSETINIT               Ver2-SUPLSETINIT,
+  msSUPLREPORT                Ver2-SUPLREPORT}
 
 END
-
diff --git a/asn1/ulp/packet-ulp-template.c b/asn1/ulp/packet-ulp-template.c
index d242da1302..f62c755b42 100644
--- a/asn1/ulp/packet-ulp-template.c
+++ b/asn1/ulp/packet-ulp-template.c
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * ref OMA-TS-ULP-V2_0_1-20121205-A
+ * ref OMA-TS-ULP-V2_0_2-20140708-A
  * http://www.openmobilealliance.org
  */
 
diff --git a/asn1/ulp/ulp.cnf b/asn1/ulp/ulp.cnf
index 801edb1c11..0bc6c0e2b8 100644
--- a/asn1/ulp/ulp.cnf
+++ b/asn1/ulp/ulp.cnf
@@ -45,7 +45,7 @@ guint32 UlpMessage;
 
   %(DEFAULT_BODY)s
 
-  col_append_fstr(%(ACTX)s->pinfo->cinfo, COL_INFO, "%%s ", val_to_str(UlpMessage,ulp_UlpMessage_vals,"Unknown"));
+  col_prepend_fstr(%(ACTX)s->pinfo->cinfo, COL_INFO, "%%s ", val_to_str(UlpMessage,ulp_UlpMessage_vals,"Unknown"));
 
 #.END