Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_malloc.c

@@ -18,8 +18,8 @@
  */
 
 #include "volk_gnsssdr/volk_gnsssdr_malloc.h"
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 /*

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.c

@@ -16,12 +16,13 @@
  * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
  */
 
-
+// clang-format off
 #include <volk_gnsssdr_rank_archs.h>
 #include <volk_gnsssdr/volk_gnsssdr_prefs.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+// clang-format on
 
 #if __GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ >= 4
 #define __popcnt __builtin_popcount

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.c

@@ -16,15 +16,17 @@
  * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
  */
 
+// clang-format off
 #include <volk_gnsssdr/volk_gnsssdr_common.h>
 #include "volk_gnsssdr_machines.h"
 #include <volk_gnsssdr/volk_gnsssdr_typedefs.h>
 #include <volk_gnsssdr/volk_gnsssdr_cpu.h>
 #include "volk_gnsssdr_rank_archs.h"
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <assert.h>
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
+// clang-format on
 
 static size_t __alignment = 0;
 static intptr_t __alignment_mask = 0;

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.c

@@ -16,10 +16,12 @@
  * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
  */
 
+// clang-format off
 #include <volk_gnsssdr/volk_gnsssdr_cpu.h>
 #include <volk_gnsssdr/volk_gnsssdr_config_fixed.h>
 #include <stdlib.h>
 #include <string.h>
+// clang-format on
 
 struct VOLK_CPU volk_gnsssdr_cpu;
 

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.c

@@ -16,11 +16,11 @@
  * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
  */
 
+// clang-format off
 #include <volk_gnsssdr/volk_gnsssdr_common.h>
 #include <volk_gnsssdr/volk_gnsssdr_typedefs.h>
 #include "volk_gnsssdr_machines.h"
 
-// clang-format off
 struct volk_gnsssdr_machine *volk_gnsssdr_machines[] = {
 %for machine in machines:
 #ifdef LV_MACHINE_${machine.name.upper()}

src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc

@@ -32,7 +32,7 @@
 
 #include "ad9361_fpga_signal_source.h"
 #include "GPS_L1_CA.h"
-#include "GPS_L2C.h"
+#include "GPS_L5.h"
 #include "ad9361_manager.h"
 #include "configuration_interface.h"
 #include <glog/logging.h>
@@ -310,8 +310,8 @@ Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(ConfigurationInterface *configura
     Fpass_ = configuration->property(role + ".Fpass", 0.0);
     Fstop_ = configuration->property(role + ".Fstop", 0.0);
     enable_dds_lo_ = configuration->property(role + ".enable_dds_lo", false);
-    freq_dds_tx_hz_ = configuration->property(role + ".freq_dds_tx_hz", 1000);
+    freq_dds_tx_hz_ = configuration->property(role + ".freq_dds_tx_hz", 10000);
-    freq_rf_tx_hz_ = configuration->property(role + ".freq_rf_tx_hz", GPS_L1_FREQ_HZ - GPS_L2_FREQ_HZ - freq_dds_tx_hz_);
+    freq_rf_tx_hz_ = configuration->property(role + ".freq_rf_tx_hz", GPS_L1_FREQ_HZ - GPS_L5_FREQ_HZ - freq_dds_tx_hz_);
     scale_dds_dbfs_ = configuration->property(role + ".scale_dds_dbfs", -3.0);
     tx_attenuation_db_ = configuration->property(role + ".tx_attenuation_db", default_tx_attenuation_db);
     tx_bandwidth_ = configuration->property(role + ".tx_bandwidth", 500000);

src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc

@@ -87,7 +87,7 @@ Fmcomms2SignalSource::Fmcomms2SignalSource(ConfigurationInterface *configuration
 
     // AD9361 Local Oscillator generation for dual band operation
     enable_dds_lo_ = configuration->property(role + ".enable_dds_lo", false);
-    freq_dds_tx_hz_ = configuration->property(role + ".freq_dds_tx_hz", 1000);
+    freq_dds_tx_hz_ = configuration->property(role + ".freq_dds_tx_hz", 10000);
     freq_rf_tx_hz_ = configuration->property(role + ".freq_rf_tx_hz", GPS_L1_FREQ_HZ - GPS_L2_FREQ_HZ - freq_dds_tx_hz_);
     scale_dds_dbfs_ = configuration->property(role + ".scale_dds_dbfs", 0.0);
     phase_dds_deg_ = configuration->property(role + ".phase_dds_deg", 0.0);

src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.c

@@ -30,10 +30,9 @@
  */
 
 
-#include "edc.h"
-#include "bits.h"
 #include "cnav_msg.h"
-
+#include "bits.h"
+#include "edc.h"
 #include <limits.h>
 #include <string.h>
 

src/core/libs/supl/asn-rrlp/.clang-format

@@ -1,5 +0,0 @@
----
-Language: Cpp
-DisableFormat: true
-...
-

src/core/libs/supl/asn-rrlp/AcquisAssist.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "TimeRelation.h"
 #include "SeqOfAcquisElement.h"
+#include "TimeRelation.h"
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/AcquisElement.h

@@ -47,8 +47,8 @@ extern "C"
 #endif
 
 /* Referred external types */
-#include "AddionalDopplerFields.h"
 #include "AddionalAngleFields.h"
+#include "AddionalDopplerFields.h"
 
 #endif /* _AcquisElement_H_ */
 #include <asn_internal.h>

src/core/libs/supl/asn-rrlp/AdditionalAssistanceData.h

@@ -10,9 +10,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "GPSAssistanceData.h"
 #include "ExtensionContainer.h"
 #include "GANSSAssistanceData.h"
+#include "GPSAssistanceData.h"
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/Almanac.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NativeInteger.h>
 #include "SeqOfAlmanacElement.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/AssistBTSData-R98-ExpOTD.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "ExpectedOTD.h"
 #include "ExpOTDUncertainty.h"
+#include "ExpectedOTD.h"
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/AssistBTSData.h

@@ -12,8 +12,8 @@
 /* Including external dependencies */
 #include "BSIC.h"
 #include "MultiFrameOffset.h"
-#include "TimeSlotScheme.h"
 #include "RoughRTD.h"
+#include "TimeSlotScheme.h"
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/AssistanceData.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "MoreAssDataToBeSent.h"
 #include "ExtensionContainer.h"
+#include "MoreAssDataToBeSent.h"
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
@@ -57,12 +57,12 @@ extern "C"
 #endif
 
 /* Referred external types */
-#include "ReferenceAssistData.h"
-#include "MsrAssistData.h"
-#include "SystemInfoAssistData.h"
 #include "GPS-AssistData.h"
-#include "Rel98-AssistanceData-Extension.h"
+#include "MsrAssistData.h"
+#include "ReferenceAssistData.h"
 #include "Rel5-AssistanceData-Extension.h"
+#include "Rel98-AssistanceData-Extension.h"
+#include "SystemInfoAssistData.h"
 
 #endif /* _AssistanceData_H_ */
 #include <asn_internal.h>

src/core/libs/supl/asn-rrlp/BIT_STRING.c

@@ -2,7 +2,6 @@
  * Copyright (c) 2003, 2004 Lev Walkin <vlm@lionet.info>. All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
-#include <asn_internal.h>
 #include <BIT_STRING.h>
 #include <asn_internal.h>
 

src/core/libs/supl/asn-rrlp/BOOLEAN.c

@@ -2,9 +2,9 @@
  * Copyright (c) 2003, 2005 Lev Walkin <vlm@lionet.info>. All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
-#include <asn_internal.h>
-#include <asn_codecs_prim.h>
 #include <BOOLEAN.h>
+#include <asn_codecs_prim.h>
+#include <asn_internal.h>
 
 /*
  * BOOLEAN basic type description.

src/core/libs/supl/asn-rrlp/CellIDAndLAC.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "LAC.h"
 #include "CellID.h"
+#include "LAC.h"
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/ControlHeader.h

@@ -53,15 +53,15 @@ extern "C"
 #endif
 
 /* Referred external types */
-#include "ReferenceTime.h"
-#include "RefLocation.h"
-#include "DGPSCorrections.h"
-#include "NavigationModel.h"
-#include "IonosphericModel.h"
-#include "UTCModel.h"
-#include "Almanac.h"
 #include "AcquisAssist.h"
+#include "Almanac.h"
+#include "DGPSCorrections.h"
+#include "IonosphericModel.h"
+#include "NavigationModel.h"
+#include "RefLocation.h"
+#include "ReferenceTime.h"
 #include "SeqOf-BadSatelliteSet.h"
+#include "UTCModel.h"
 
 #endif /* _ControlHeader_H_ */
 #include <asn_internal.h>

src/core/libs/supl/asn-rrlp/DGPSCorrections.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NativeInteger.h>
 #include "SeqOfSatElement.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/ENUMERATED.c

@@ -3,10 +3,10 @@
  * All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
-#include <asn_internal.h>
 #include <ENUMERATED.h>
 #include <NativeEnumerated.h>
 #include <asn_codecs_prim.h> /* Encoder and decoder of a primitive type */
+#include <asn_internal.h>
 
 /*
  * ENUMERATED basic type description.

src/core/libs/supl/asn-rrlp/GANSS-MsrSetElement.h

@@ -10,10 +10,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "GANSSTODm.h"
-#include <NativeInteger.h>
 #include "GANSSTODUncertainty.h"
+#include "GANSSTODm.h"
 #include "SeqOfGANSS-SgnTypeElement.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/GANSS-SgnElement.h

@@ -10,9 +10,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
+#include "MpathIndic.h"
 #include "SVID.h"
 #include <NativeInteger.h>
-#include "MpathIndic.h"
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/GANSS-SgnTypeElement.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NativeInteger.h>
 #include "SeqOfGANSS-SgnElement.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/GANSSAlmanacModel.h

@@ -10,9 +10,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NativeInteger.h>
 #include "SVIDMASK.h"
 #include "SeqOfGANSSAlmanacElement.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/GANSSCommonAssistData.h

@@ -45,9 +45,9 @@ extern "C"
 #endif
 
 /* Referred external types */
-#include "GANSSReferenceTime.h"
-#include "GANSSRefLocation.h"
 #include "GANSSIonosphericModel.h"
+#include "GANSSRefLocation.h"
+#include "GANSSReferenceTime.h"
 
 #endif /* _GANSSCommonAssistData_H_ */
 #include <asn_internal.h>

src/core/libs/supl/asn-rrlp/GANSSDataBitAssist.h

@@ -10,9 +10,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NativeInteger.h>
 #include "SVID.h"
 #include "SeqOf-GANSSDataBits.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/GANSSDiffCorrections.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NativeInteger.h>
 #include "SeqOfSgnTypeElement.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/GANSSGenericAssistDataElement.h

@@ -58,14 +58,14 @@ extern "C"
 #endif
 
 /* Referred external types */
-#include "SeqOfGANSSTimeModel.h"
+#include "GANSSAlmanacModel.h"
+#include "GANSSDataBitAssist.h"
 #include "GANSSDiffCorrections.h"
 #include "GANSSNavModel.h"
 #include "GANSSRealTimeIntegrity.h"
-#include "GANSSDataBitAssist.h"
 #include "GANSSRefMeasurementAssist.h"
-#include "GANSSAlmanacModel.h"
 #include "GANSSUTCModel.h"
+#include "SeqOfGANSSTimeModel.h"
 
 #endif /* _GANSSGenericAssistDataElement_H_ */
 #include <asn_internal.h>

src/core/libs/supl/asn-rrlp/GANSSLocationInfo.h

@@ -10,12 +10,12 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "GANSSTODm.h"
-#include <NativeInteger.h>
-#include "GANSSTODUncertainty.h"
-#include "FixType.h"
-#include "PositionData.h"
 #include "Ext-GeographicalInformation.h"
+#include "FixType.h"
+#include "GANSSTODUncertainty.h"
+#include "GANSSTODm.h"
+#include "PositionData.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/GANSSNavModel.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NativeInteger.h>
 #include "SeqOfGANSSSatelliteElement.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/GANSSRefMeasurementAssist.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NativeInteger.h>
 #include "SeqOfGANSSRefMeasurementElement.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/GANSSRefMeasurementElement.h

@@ -50,8 +50,8 @@ extern "C"
 #endif
 
 /* Referred external types */
-#include "AdditionalDopplerFields.h"
 #include "AddionalAngleFields.h"
+#include "AdditionalDopplerFields.h"
 
 #endif /* _GANSSRefMeasurementElement_H_ */
 #include <asn_internal.h>

src/core/libs/supl/asn-rrlp/GANSSRefTimeInfo.h

@@ -10,9 +10,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NativeInteger.h>
 #include "GANSSTOD.h"
 #include "GANSSTODUncertainty.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/GANSSSatelliteElement.h

@@ -10,10 +10,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "SVID.h"
-#include <NativeInteger.h>
 #include "GANSSClockModel.h"
 #include "GANSSOrbitModel.h"
+#include "SVID.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/GANSSTOD-GSMTimeAssociation.h

@@ -12,10 +12,10 @@
 /* Including external dependencies */
 #include "BCCHCarrier.h"
 #include "BSIC.h"
-#include "FrameNumber.h"
-#include "TimeSlot.h"
 #include "BitNumber.h"
 #include "FrameDrift.h"
+#include "FrameNumber.h"
+#include "TimeSlot.h"
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/GANSSTimeModelElement.h

@@ -10,10 +10,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NativeInteger.h>
 #include "TA0.h"
 #include "TA1.h"
 #include "TA2.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/GPS-MsrElement.h

@@ -10,9 +10,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
+#include "MpathIndic.h"
 #include "SatelliteID.h"
 #include <NativeInteger.h>
-#include "MpathIndic.h"
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/GPS-MsrSetElement.h

@@ -10,9 +10,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NativeInteger.h>
 #include "GPSTOW24b.h"
 #include "SeqOfGPS-MsrElement.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/GPSTOWAssistElement.h

@@ -10,11 +10,11 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "SatelliteID.h"
-#include "TLMWord.h"
-#include "AntiSpoofFlag.h"
 #include "AlertFlag.h"
+#include "AntiSpoofFlag.h"
+#include "SatelliteID.h"
 #include "TLMReservedBits.h"
+#include "TLMWord.h"
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/GPSTimeAssistanceMeasurements.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NativeInteger.h>
 #include "GPSReferenceTimeUncertainty.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/GSMTime.h

@@ -12,9 +12,9 @@
 /* Including external dependencies */
 #include "BCCHCarrier.h"
 #include "BSIC.h"
+#include "BitNumber.h"
 #include "FrameNumber.h"
 #include "TimeSlot.h"
-#include "BitNumber.h"
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/INTEGER.c

@@ -3,9 +3,9 @@
  * All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
-#include <asn_internal.h>
 #include <INTEGER.h>
 #include <asn_codecs_prim.h> /* Encoder and decoder of a primitive type */
+#include <asn_internal.h>
 #include <errno.h>
 #include <inttypes.h>
 

src/core/libs/supl/asn-rrlp/LocationInfo.h

@@ -10,9 +10,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NativeInteger.h>
-#include "FixType.h"
 #include "Ext-GeographicalInformation.h"
+#include "FixType.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/MethodType.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "AccuracyOpt.h"
 #include "Accuracy.h"
+#include "AccuracyOpt.h"
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/MsrAssistBTS-R98-ExpOTD.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "ExpectedOTD.h"
 #include "ExpOTDUncertainty.h"
+#include "ExpectedOTD.h"
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/MsrAssistBTS.h

@@ -13,8 +13,8 @@
 #include "BCCHCarrier.h"
 #include "BSIC.h"
 #include "MultiFrameOffset.h"
-#include "TimeSlotScheme.h"
 #include "RoughRTD.h"
+#include "TimeSlotScheme.h"
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/MsrPosition-Req.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "PositionInstruct.h"
 #include "ExtensionContainer.h"
+#include "PositionInstruct.h"
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
@@ -57,12 +57,12 @@ extern "C"
 #endif
 
 /* Referred external types */
-#include "ReferenceAssistData.h"
-#include "MsrAssistData.h"
-#include "SystemInfoAssistData.h"
 #include "GPS-AssistData.h"
-#include "Rel98-MsrPosition-Req-Extension.h"
+#include "MsrAssistData.h"
+#include "ReferenceAssistData.h"
 #include "Rel5-MsrPosition-Req-Extension.h"
+#include "Rel98-MsrPosition-Req-Extension.h"
+#include "SystemInfoAssistData.h"
 
 #endif /* _MsrPosition_Req_H_ */
 #include <asn_internal.h>

src/core/libs/supl/asn-rrlp/MsrPosition-Rsp.h

@@ -59,14 +59,14 @@ extern "C"
 #endif
 
 /* Referred external types */
-#include "MultipleSets.h"
-#include "ReferenceIdentity.h"
-#include "OTD-MeasureInfo.h"
-#include "LocationInfo.h"
 #include "GPS-MeasureInfo.h"
 #include "LocationError.h"
-#include "Rel-98-MsrPosition-Rsp-Extension.h"
+#include "LocationInfo.h"
+#include "MultipleSets.h"
+#include "OTD-MeasureInfo.h"
+#include "ReferenceIdentity.h"
 #include "Rel-5-MsrPosition-Rsp-Extension.h"
+#include "Rel-98-MsrPosition-Rsp-Extension.h"
 
 #endif /* _MsrPosition_Rsp_H_ */
 #include <asn_internal.h>

src/core/libs/supl/asn-rrlp/MultipleSets.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NativeInteger.h>
 #include "ReferenceRelation.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/NULL.c

@@ -2,10 +2,10 @@
  * Copyright (c) 2003, 2005 Lev Walkin <vlm@lionet.info>. All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
-#include <asn_internal.h>
-#include <asn_codecs_prim.h>
-#include <NULL.h>
 #include <BOOLEAN.h> /* Implemented in terms of BOOLEAN type */
+#include <NULL.h>
+#include <asn_codecs_prim.h>
+#include <asn_internal.h>
 
 /*
  * NULL basic type description.

src/core/libs/supl/asn-rrlp/NativeEnumerated.c

@@ -9,8 +9,8 @@
  * implementation deals with the standard (machine-specific) representation
  * of them instead of using the platform-independent buffer.
  */
-#include <asn_internal.h>
 #include <NativeEnumerated.h>
+#include <asn_internal.h>
 
 /*
  * NativeEnumerated basic type description.

src/core/libs/supl/asn-rrlp/NativeInteger.c

@@ -10,8 +10,8 @@
  * implementation deals with the standard (machine-specific) representation
  * of them instead of using the platform-independent buffer.
  */
-#include <asn_internal.h>
 #include <NativeInteger.h>
+#include <asn_internal.h>
 
 /*
  * NativeInteger basic type description.

src/core/libs/supl/asn-rrlp/NativeInteger.h

@@ -12,8 +12,8 @@
 #ifndef _NativeInteger_H_
 #define _NativeInteger_H_
 
-#include <asn_application.h>
 #include <INTEGER.h>
+#include <asn_application.h>
 
 #ifdef __cplusplus
 extern "C"

src/core/libs/supl/asn-rrlp/NavModelElement.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "SatelliteID.h"
 #include "SatStatus.h"
+#include "SatelliteID.h"
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/NeighborIdentity.h

@@ -12,10 +12,10 @@
 /* Including external dependencies */
 #include "BSICAndCarrier.h"
 #include "CellID.h"
+#include "CellIDAndLAC.h"
 #include "MultiFrameCarrier.h"
 #include "RequestIndex.h"
 #include "SystemInfoIndex.h"
-#include "CellIDAndLAC.h"
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/OCTET_STRING.c

@@ -3,9 +3,9 @@
  * All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
-#include <asn_internal.h>
-#include <OCTET_STRING.h>
 #include <BIT_STRING.h> /* for .bits_unused member */
+#include <OCTET_STRING.h>
+#include <asn_internal.h>
 #include <errno.h>
 
 /*

src/core/libs/supl/asn-rrlp/OTD-Measurement.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "ModuloTimeSlot.h"
 #include "EOTDQuality.h"
+#include "ModuloTimeSlot.h"
 #include "OTDValue.h"
 #include <constr_SEQUENCE.h>
 

src/core/libs/supl/asn-rrlp/OTD-MeasurementWithID.h

@@ -10,9 +10,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "NeighborIdentity.h"
-#include "ModuloTimeSlot.h"
 #include "EOTDQuality.h"
+#include "ModuloTimeSlot.h"
+#include "NeighborIdentity.h"
 #include "OTDValue.h"
 #include <constr_SEQUENCE.h>
 

src/core/libs/supl/asn-rrlp/OTD-MsrElementFirst.h

@@ -10,9 +10,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NativeInteger.h>
 #include "ModuloTimeSlot.h"
 #include "StdResolution.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
@@ -46,8 +46,8 @@ extern "C"
 #endif
 
 /* Referred external types */
-#include "TOA-MeasurementsOfRef.h"
 #include "SeqOfOTD-FirstSetMsrs.h"
+#include "TOA-MeasurementsOfRef.h"
 
 #endif /* _OTD_MsrElementFirst_H_ */
 #include <asn_internal.h>

src/core/libs/supl/asn-rrlp/OTD-MsrElementRest.h

@@ -10,9 +10,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NativeInteger.h>
 #include "ModuloTimeSlot.h"
 #include "StdResolution.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
@@ -46,8 +46,8 @@ extern "C"
 #endif
 
 /* Referred external types */
-#include "TOA-MeasurementsOfRef.h"
 #include "SeqOfOTD-MsrsOfOtherSets.h"
+#include "TOA-MeasurementsOfRef.h"
 
 #endif /* _OTD_MsrElementRest_H_ */
 #include <asn_internal.h>

src/core/libs/supl/asn-rrlp/PDU.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NativeInteger.h>
 #include "RRLP-Component.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/PositionInstruct.h

@@ -10,11 +10,11 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
+#include "EnvironmentCharacter.h"
+#include "MeasureResponseTime.h"
 #include "MethodType.h"
 #include "PositionMethod.h"
-#include "MeasureResponseTime.h"
 #include "UseMultipleSets.h"
-#include "EnvironmentCharacter.h"
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/RRLP-Component.h

@@ -10,11 +10,11 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
+#include "AssistanceData.h"
 #include "MsrPosition-Req.h"
 #include "MsrPosition-Rsp.h"
-#include "AssistanceData.h"
-#include <NULL.h>
 #include "ProtocolError.h"
+#include <NULL.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/ReferenceAssistData.h

@@ -12,8 +12,8 @@
 /* Including external dependencies */
 #include "BCCHCarrier.h"
 #include "BSIC.h"
-#include "TimeSlotScheme.h"
 #include "BTSPosition.h"
+#include "TimeSlotScheme.h"
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/ReferenceIdentityType.h

@@ -12,9 +12,9 @@
 /* Including external dependencies */
 #include "BSICAndCarrier.h"
 #include "CellID.h"
+#include "CellIDAndLAC.h"
 #include "RequestIndex.h"
 #include "SystemInfoIndex.h"
-#include "CellIDAndLAC.h"
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/ReferenceTime.h

@@ -41,8 +41,8 @@ extern "C"
 #endif
 
 /* Referred external types */
-#include "GSMTime.h"
 #include "GPSTOWAssist.h"
+#include "GSMTime.h"
 
 #endif /* _ReferenceTime_H_ */
 #include <asn_internal.h>

src/core/libs/supl/asn-rrlp/Rel7-MsrPosition-Req-Extension.h

@@ -10,9 +10,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NULL.h>
 #include "GANSSPositioningMethod.h"
 #include "RequiredResponseTime.h"
+#include <NULL.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/Rel98-AssistanceData-Extension.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NULL.h>
 #include "GPSReferenceTimeUncertainty.h"
+#include <NULL.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/Rel98-MsrPosition-Req-Extension.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NULL.h>
 #include "GPSReferenceTimeUncertainty.h"
+#include <NULL.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/SgnTypeElement.h

@@ -11,8 +11,8 @@
 
 /* Including external dependencies */
 #include "GANSSSignalID.h"
-#include <NativeInteger.h>
 #include "SeqOfDGANSSSgnElement.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/SystemInfoAssistBTS-R98-ExpOTD.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NULL.h>
 #include "AssistBTSData-R98-ExpOTD.h"
+#include <NULL.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/SystemInfoAssistBTS.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NULL.h>
 #include "AssistBTSData.h"
+#include <NULL.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/TOA-MeasurementsOfRef.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "RefQuality.h"
 #include "NumOfMeasurements.h"
+#include "RefQuality.h"
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/UncompressedEphemeris.h

@@ -10,8 +10,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NativeInteger.h>
 #include "EphemerisSubframe1Reserved.h"
+#include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-rrlp/asn_SEQUENCE_OF.c

@@ -2,8 +2,8 @@
  * Copyright (c) 2003, 2004 Lev Walkin <vlm@lionet.info>. All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
-#include <asn_internal.h>
 #include <asn_SEQUENCE_OF.h>
+#include <asn_internal.h>
 
 typedef A_SEQUENCE_OF(void) asn_sequence;
 

src/core/libs/supl/asn-rrlp/asn_SET_OF.c

@@ -2,8 +2,8 @@
  * Copyright (c) 2003, 2004 Lev Walkin <vlm@lionet.info>. All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
-#include <asn_internal.h>
 #include <asn_SET_OF.h>
+#include <asn_internal.h>
 #include <errno.h>
 
 /*

src/core/libs/supl/asn-rrlp/asn_application.h

@@ -8,8 +8,10 @@
 #ifndef _ASN_APPLICATION_H_
 #define _ASN_APPLICATION_H_
 
+// clang-format off
 #include "asn_system.h" /* for platform-dependent types */
 #include "asn_codecs.h" /* for ASN.1 codecs specifics */
+// clang-format on
 
 #ifdef __cplusplus
 extern "C"

src/core/libs/supl/asn-rrlp/asn_codecs_prim.c

@@ -2,8 +2,8 @@
  * Copyright (c) 2003, 2004 Lev Walkin <vlm@lionet.info>. All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
-#include <asn_internal.h>
 #include <asn_codecs_prim.h>
+#include <asn_internal.h>
 #include <errno.h>
 
 /*

src/core/libs/supl/asn-rrlp/asn_internal.h

@@ -55,7 +55,10 @@ extern "C"
 #define ASN_DEBUG ASN_DEBUG_f
 #endif /* __GNUC__ */
 #else  /* EMIT_ASN_DEBUG != 1 */
-    static inline void ASN_DEBUG(const char *fmt, ...) { (void)fmt; }
+    static inline void ASN_DEBUG(const char *fmt, ...)
+    {
+        (void)fmt;
+    }
 #endif /* EMIT_ASN_DEBUG */
 #endif /* ASN_DEBUG */
 

src/core/libs/supl/asn-rrlp/asn_system.h

@@ -13,13 +13,13 @@
 #include "config.h"
 #endif
 
+#include <limits.h>    /* For LONG_MAX */
+#include <stdarg.h>    /* For va_start */
+#include <stddef.h>    /* for offsetof and ptrdiff_t */
 #include <stdio.h>     /* For snprintf(3) */
 #include <stdlib.h>    /* For *alloc(3) */
 #include <string.h>    /* For memcpy(3) */
 #include <sys/types.h> /* For size_t */
-#include <limits.h>    /* For LONG_MAX */
-#include <stdarg.h>    /* For va_start */
-#include <stddef.h>    /* for offsetof and ptrdiff_t */
 
 #ifdef WIN32
 
@@ -46,8 +46,8 @@ typedef unsigned short uint16_t;
 typedef unsigned int uint32_t;
 #endif /* ASSUMESTDTYPES */
 #define WIN32_LEAN_AND_MEAN
-#include <windows.h>
 #include <float.h>
+#include <windows.h>
 #define isnan _isnan
 #define finite _finite
 #define copysign _copysign

src/core/libs/supl/asn-rrlp/constr_SEQUENCE_OF.c

@@ -3,9 +3,9 @@
  * All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
+#include <asn_SEQUENCE_OF.h>
 #include <asn_internal.h>
 #include <constr_SEQUENCE_OF.h>
-#include <asn_SEQUENCE_OF.h>
 
 /*
  * The DER encoder of the SEQUENCE OF type.

src/core/libs/supl/asn-rrlp/constr_SET_OF.c

@@ -3,9 +3,9 @@
  * All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
+#include <asn_SET_OF.h>
 #include <asn_internal.h>
 #include <constr_SET_OF.h>
-#include <asn_SET_OF.h>
 
 /*
  * Number of bytes left for this structure.

src/core/libs/supl/asn-rrlp/constr_TYPE.h

@@ -39,12 +39,12 @@ extern "C"
     } asn_struct_ctx_t;
 
 #include <ber_decoder.h> /* Basic Encoding Rules decoder */
+#include <constraints.h> /* Subtype constraints support */
 #include <der_encoder.h> /* Distinguished Encoding Rules encoder */
-#include <xer_decoder.h> /* Decoder of XER (XML, text) */
-#include <xer_encoder.h> /* Encoder into XER (XML, text) */
 #include <per_decoder.h> /* Packet Encoding Rules decoder */
 #include <per_encoder.h> /* Packet Encoding Rules encoder */
-#include <constraints.h> /* Subtype constraints support */
+#include <xer_decoder.h> /* Decoder of XER (XML, text) */
+#include <xer_encoder.h> /* Encoder into XER (XML, text) */
 
     /*
      * Free the structure according to its specification.

src/core/libs/supl/asn-rrlp/constraints.c

@@ -1,5 +1,7 @@
+// clang-format off
 #include "asn_internal.h"
 #include "constraints.h"
+// clang-format on
 
 int asn_generic_no_constraint(asn_TYPE_descriptor_t *type_descriptor,
     const void *struct_ptr,

src/core/libs/supl/asn-rrlp/converter-sample.c

@@ -10,16 +10,15 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <stdio.h>
-#include <sys/types.h>
-#include <stdlib.h>   /* for atoi(3) */
-#include <unistd.h>   /* for getopt(3) */
-#include <string.h>   /* for strerror(3) */
-#include <sysexits.h> /* for EX_* exit codes */
-#include <errno.h>    /* for errno */
-
 #include <asn_application.h>
 #include <asn_internal.h> /* for _ASN_DEFAULT_STACK_MAX */
+#include <errno.h>        /* for errno */
+#include <stdio.h>
+#include <stdlib.h> /* for atoi(3) */
+#include <string.h> /* for strerror(3) */
+#include <sys/types.h>
+#include <sysexits.h> /* for EX_* exit codes */
+#include <unistd.h>   /* for getopt(3) */
 
 /* Convert "Type" defined by -DPDU into "asn_DEF_Type" */
 #define ASN_DEF_PDU(t) asn_DEF_##t

src/core/libs/supl/asn-rrlp/per_opentype.c

@@ -3,9 +3,9 @@
  * Redistribution and modifications are permitted subject to BSD license.
  */
 #include <asn_internal.h>
-#include <per_support.h>
 #include <constr_TYPE.h>
 #include <per_opentype.h>
+#include <per_support.h>
 
 typedef struct uper_ugot_key
 {

src/core/libs/supl/asn-rrlp/per_support.c

@@ -3,8 +3,8 @@
  * All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
-#include <asn_system.h>
 #include <asn_internal.h>
+#include <asn_system.h>
 #include <per_support.h>
 
 char *per_data_string(asn_per_data_t *pd)

src/core/libs/supl/asn-rrlp/xer_encoder.c

@@ -3,8 +3,8 @@
  * Redistribution and modifications are permitted subject to BSD license.
  */
 #include <asn_internal.h>
-#include <stdio.h>
 #include <errno.h>
+#include <stdio.h>
 
 /*
  * The XER encoder of any type. May be invoked by the application.

src/core/libs/supl/asn-rrlp/xer_support.c

@@ -24,7 +24,11 @@ typedef enum
 } pstate_e;
 
 static pxml_chunk_type_e final_chunk_type[] = {
-    PXML_TEXT, PXML_TAG_END, PXML_COMMENT_END, PXML_TAG_END, PXML_COMMENT_END,
+    PXML_TEXT,
+    PXML_TAG_END,
+    PXML_COMMENT_END,
+    PXML_TAG_END,
+    PXML_COMMENT_END,
 };
 
 static int _charclass[256] = {

src/core/libs/supl/asn-supl/.clang-format

@@ -1,5 +0,0 @@
----
-Language: Cpp
-DisableFormat: true
-...
-

src/core/libs/supl/asn-supl/BIT_STRING.c

@@ -2,7 +2,6 @@
  * Copyright (c) 2003, 2004 Lev Walkin <vlm@lionet.info>. All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
-#include <asn_internal.h>
 #include <BIT_STRING.h>
 #include <asn_internal.h>
 

src/core/libs/supl/asn-supl/BOOLEAN.c

@@ -2,9 +2,9 @@
  * Copyright (c) 2003, 2005 Lev Walkin <vlm@lionet.info>. All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
-#include <asn_internal.h>
-#include <asn_codecs_prim.h>
 #include <BOOLEAN.h>
+#include <asn_codecs_prim.h>
+#include <asn_internal.h>
 
 /*
  * BOOLEAN basic type description.

src/core/libs/supl/asn-supl/CellInfo.h

@@ -10,9 +10,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
+#include "CdmaCellInformation.h"
 #include "GsmCellInformation.h"
 #include "WcdmaCellInformation.h"
-#include "CdmaCellInformation.h"
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus

src/core/libs/supl/asn-supl/CellMeasuredResults.h

@@ -10,16 +10,16 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NativeInteger.h>
-#include "PrimaryCPICH-Info.h"
 #include "CPICH-Ec-N0.h"
 #include "CPICH-RSCP.h"
-#include "Pathloss.h"
-#include <constr_SEQUENCE.h>
 #include "CellParametersID.h"
-#include "TGSN.h"
+#include "Pathloss.h"
 #include "PrimaryCCPCH-RSCP.h"
+#include "PrimaryCPICH-Info.h"
+#include "TGSN.h"
+#include <NativeInteger.h>
 #include <constr_CHOICE.h>
+#include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
 extern "C"

src/core/libs/supl/asn-supl/ENUMERATED.c

@@ -3,10 +3,10 @@
  * All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
-#include <asn_internal.h>
 #include <ENUMERATED.h>
 #include <NativeEnumerated.h>
 #include <asn_codecs_prim.h> /* Encoder and decoder of a primitive type */
+#include <asn_internal.h>
 
 /*
  * ENUMERATED basic type description.

src/core/libs/supl/asn-supl/FQDN.c

@@ -25,11 +25,70 @@ static int permitted_alphabet_table_1[256] = {
     62, 63, 64, 0, 0, 0, 0, 0, /* pqrstuvwxyz      */
 };
 static int permitted_alphabet_code2value_1[64] = {
-    45,  46,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  65,
+    45,
-    66,  67,  68,  69,  70,  71,  72,  73,  74,  75,  76,  77,  78,
+    46,
-    79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,  90,  97,
+    48,
-    98,  99,  100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
+    49,
-    111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
+    50,
+    51,
+    52,
+    53,
+    54,
+    55,
+    56,
+    57,
+    65,
+    66,
+    67,
+    68,
+    69,
+    70,
+    71,
+    72,
+    73,
+    74,
+    75,
+    76,
+    77,
+    78,
+    79,
+    80,
+    81,
+    82,
+    83,
+    84,
+    85,
+    86,
+    87,
+    88,
+    89,
+    90,
+    97,
+    98,
+    99,
+    100,
+    101,
+    102,
+    103,
+    104,
+    105,
+    106,
+    107,
+    108,
+    109,
+    110,
+    111,
+    112,
+    113,
+    114,
+    115,
+    116,
+    117,
+    118,
+    119,
+    120,
+    121,
+    122,
 };
 
 static int check_permitted_alphabet_1(const void *sptr)

src/core/libs/supl/asn-supl/GeneralizedTime.c

@@ -6,8 +6,8 @@
 #ifndef _REENTRANT
 #define _REENTRANT /* for Sun */
 #endif
-#include <asn_internal.h>
 #include <GeneralizedTime.h>
+#include <asn_internal.h>
 #include <errno.h>
 
 #ifdef __CYGWIN__

src/core/libs/supl/asn-supl/IA5String.c

@@ -2,8 +2,8 @@
  * Copyright (c) 2003 Lev Walkin <vlm@lionet.info>. All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
-#include <asn_internal.h>
 #include <IA5String.h>
+#include <asn_internal.h>
 
 /*
  * IA5String basic type description.