MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GnssSv struct: make it in sync between 3.0.c5, 4.0 and 5.0

Browse source 
Make GnssSv struct in sync between 3.0.c5, 4.0 and 5.0 to allow
3.0.C5 hal daemon to work with 4.0/5.0 location client API app

Change-Id: I421fc3a36055fa278ef42bca4816d07f18c75d68
CRs-fixed: 2541020
This commit is contained in:
Wei Chen 2019-10-08 14:28:08 -07:00
parent 5c568ca1bd
commit 755bba2813
2 changed files with 19 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
location/LocationDataTypes.h
View file

@ -567,28 +567,32 @@ typedef enum {
GNSS_SIGNAL_GALILEO_E5A = (1<<7), GNSS_SIGNAL_GALILEO_E5A = (1<<7),
/** GALILEO E5B RF Band */ /** GALILEO E5B RF Band */
GNSS_SIGNAL_GALILEO_E5B = (1<<8), GNSS_SIGNAL_GALILEO_E5B = (1<<8),
/** BEIDOU B1_I RF Band */ /** BEIDOU B1 RF Band */
GNSS_SIGNAL_BEIDOU_B1I = (1<<9), GNSS_SIGNAL_BEIDOU_B1 = (1<<9),
/** BEIDOU B1C RF Band */ /** BEIDOU B2 RF Band */
GNSS_SIGNAL_BEIDOU_B1C = (1<<10), GNSS_SIGNAL_BEIDOU_B2 = (1<<10),
/** BEIDOU B2_I RF Band */
GNSS_SIGNAL_BEIDOU_B2I = (1<<11),
/** BEIDOU B2A_I RF Band */
GNSS_SIGNAL_BEIDOU_B2AI = (1<<12),
/** QZSS L1CA RF Band */ /** QZSS L1CA RF Band */
GNSS_SIGNAL_QZSS_L1CA = (1<<13), GNSS_SIGNAL_QZSS_L1CA = (1<<11),
/** QZSS L1S RF Band */ /** QZSS L1S RF Band */
GNSS_SIGNAL_QZSS_L1S = (1<<14), GNSS_SIGNAL_QZSS_L1S = (1<<12),
/** QZSS L2 RF Band */ /** QZSS L2 RF Band */
GNSS_SIGNAL_QZSS_L2 = (1<<15), GNSS_SIGNAL_QZSS_L2 = (1<<13),
/** QZSS L5 RF Band */ /** QZSS L5 RF Band */
GNSS_SIGNAL_QZSS_L5 = (1<<16), GNSS_SIGNAL_QZSS_L5 = (1<<14),
/** SBAS L1 RF Band */ /** SBAS L1 RF Band */
GNSS_SIGNAL_SBAS_L1 = (1<<17), GNSS_SIGNAL_SBAS_L1 = (1<<15),
/** BEIDOU B1I RF Band */
GNSS_SIGNAL_BEIDOU_B1I = (1<<16),
/** BEIDOU B1C RF Band */
GNSS_SIGNAL_BEIDOU_B1C = (1<<17),
/** BEIDOU B2I RF Band */
GNSS_SIGNAL_BEIDOU_B2I = (1<<18),
/** BEIDOU B2AI RF Band */
GNSS_SIGNAL_BEIDOU_B2AI = (1<<19),
/** NAVIC L5 RF Band */ /** NAVIC L5 RF Band */
GNSS_SIGNAL_NAVIC_L5 = (1<<18), GNSS_SIGNAL_NAVIC_L5 = (1<<20),
/** BEIDOU B2A_Q RF Band */ /** BEIDOU B2A_Q RF Band */
GNSS_SIGNAL_BEIDOU_B2AQ = (1<<19) GNSS_SIGNAL_BEIDOU_B2AQ = (1<<21),
} GnssSignalTypeBits; } GnssSignalTypeBits;
#define GNSS_SIGNAL_TYPE_MASK_ALL\ #define GNSS_SIGNAL_TYPE_MASK_ALL\

43
utils/gps_extended_c.h
View file

@ -573,49 +573,6 @@ typedef uint8_t CarrierPhaseAmbiguityType;
#define CARRIER_PHASE_AMBIGUITY_RESOLUTION_FLOAT ((CarrierPhaseAmbiguityType)1) #define CARRIER_PHASE_AMBIGUITY_RESOLUTION_FLOAT ((CarrierPhaseAmbiguityType)1)
#define CARRIER_PHASE_AMBIGUITY_RESOLUTION_FIXED ((CarrierPhaseAmbiguityType)2) #define CARRIER_PHASE_AMBIGUITY_RESOLUTION_FIXED ((CarrierPhaseAmbiguityType)2)
/** GNSS Signal Type and RF Band */
typedef uint32_t GnssSignalTypeMask;
/** GPS L1CA Signal */
#define GNSS_SIGNAL_GPS_L1CA ((GnssSignalTypeMask)0x00000001ul)
/** GPS L1C Signal */
#define GNSS_SIGNAL_GPS_L1C ((GnssSignalTypeMask)0x00000002ul)
/** GPS L2 RF Band */
#define GNSS_SIGNAL_GPS_L2 ((GnssSignalTypeMask)0x00000004ul)
/** GPS L5 RF Band */
#define GNSS_SIGNAL_GPS_L5 ((GnssSignalTypeMask)0x00000008ul)
/** GLONASS G1 (L1OF) RF Band */
#define GNSS_SIGNAL_GLONASS_G1 ((GnssSignalTypeMask)0x00000010ul)
/** GLONASS G2 (L2OF) RF Band */
#define GNSS_SIGNAL_GLONASS_G2 ((GnssSignalTypeMask)0x00000020ul)
/** GALILEO E1 RF Band */
#define GNSS_SIGNAL_GALILEO_E1 ((GnssSignalTypeMask)0x00000040ul)
/** GALILEO E5A RF Band */
#define GNSS_SIGNAL_GALILEO_E5A ((GnssSignalTypeMask)0x00000080ul)
/** GALILEO E5B RF Band */
#define GNSS_SIGNAL_GALILIEO_E5B ((GnssSignalTypeMask)0x00000100ul)
/** BEIDOU B1_I RF Band */
#define GNSS_SIGNAL_BEIDOU_B1I ((GnssSignalTypeMask)0x00000200ul)
/** BEIDOU B1C RF Band */
#define GNSS_SIGNAL_BEIDOU_B1C ((GnssSignalTypeMask)0x00000400ul)
/** BEIDOU B2_I RF Band */
#define GNSS_SIGNAL_BEIDOU_B2I ((GnssSignalTypeMask)0x00000800ul)
/** BEIDOU B2A_I RF Band */
#define GNSS_SIGNAL_BEIDOU_B2AI ((GnssSignalTypeMask)0x00001000ul)
/** QZSS L1CA RF Band */
#define GNSS_SIGNAL_QZSS_L1CA ((GnssSignalTypeMask)0x00002000ul)
/** QZSS L1S RF Band */
#define GNSS_SIGNAL_QZSS_L1S ((GnssSignalTypeMask)0x00004000ul)
/** QZSS L2 RF Band */
#define GNSS_SIGNAL_QZSS_L2 ((GnssSignalTypeMask)0x00008000ul)
/** QZSS L5 RF Band */
#define GNSS_SIGNAL_QZSS_L5 ((GnssSignalTypeMask)0x00010000ul)
/** SBAS L1 RF Band */
#define GNSS_SIGNAL_SBAS_L1 ((GnssSignalTypeMask)0x00020000ul)
/** NAVIC L5 RF Band */
#define GNSS_SIGNAL_NAVIC_L5 ((GnssSignalTypeMask)0x00040000ul)
/** BEIDOU B2A_Q RF Band */
#define GNSS_SIGNAL_BEIDOU_B2AQ ((GnssSignalTypeMask)0x00080000ul)
typedef uint16_t GnssMeasUsageStatusBitMask; typedef uint16_t GnssMeasUsageStatusBitMask;
/** Used in fix */ /** Used in fix */
#define GNSS_MEAS_USED_IN_PVT ((GnssMeasUsageStatusBitMask)0x00000001ul) #define GNSS_MEAS_USED_IN_PVT ((GnssMeasUsageStatusBitMask)0x00000001ul)