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

FR47367: Location client API for External AP

Browse source 
(1) In location data struct, change size_t to uint32_t as size_t
is machine dependent and can not be sent as part of payload
to the other processor.
(2) Change LocIpc ifdef to match with the file name

Change-Id: Ia3f029641106a547e18904be1e3fb56ec09de569
CRs-fixed: 2367517
This commit is contained in:
Wei Chen 2018-12-14 16:22:17 -08:00 committed by Gerrit - the friendly Code Review server
parent 15ea6ecb3f
commit 1d823b05ec
4 changed files with 48 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
location/LocationDataTypes.h
View file

@ -640,7 +640,7 @@ typedef struct {
} GnssAidingData; } GnssAidingData;
typedef struct { typedef struct {
size_t size; // set to sizeof(Location) uint32_t size; // set to sizeof(Location)
LocationFlagsMask flags; // bitwise OR of LocationFlagsBits to mark which params are valid LocationFlagsMask flags; // bitwise OR of LocationFlagsBits to mark which params are valid
uint64_t timestamp; // UTC timestamp for location fix, milliseconds since January 1, 1970 uint64_t timestamp; // UTC timestamp for location fix, milliseconds since January 1, 1970
double latitude; // in degrees double latitude; // in degrees
@ -657,7 +657,7 @@ typedef struct {
} Location; } Location;
struct LocationOptions { struct LocationOptions {
size_t size; // set to sizeof(LocationOptions) uint32_t size; // set to sizeof(LocationOptions)
uint32_t minInterval; // in milliseconds uint32_t minInterval; // in milliseconds
uint32_t minDistance; // in meters. if minDistance > 0, gnssSvCallback/gnssNmeaCallback/ uint32_t minDistance; // in meters. if minDistance > 0, gnssSvCallback/gnssNmeaCallback/
// gnssMeasurementsCallback may not be called // gnssMeasurementsCallback may not be called
@ -684,7 +684,7 @@ struct TrackingOptions : LocationOptions {
inline TrackingOptions() : inline TrackingOptions() :
LocationOptions(), powerMode(GNSS_POWER_MODE_INVALID), tbm(0) {} LocationOptions(), powerMode(GNSS_POWER_MODE_INVALID), tbm(0) {}
inline TrackingOptions(size_t s, GnssPowerMode m, uint32_t t) : inline TrackingOptions(uint32_t s, GnssPowerMode m, uint32_t t) :
LocationOptions(), powerMode(m), tbm(t) { LocationOptions::size = s; } LocationOptions(), powerMode(m), tbm(t) { LocationOptions::size = s; }
inline TrackingOptions(const LocationOptions& options) : inline TrackingOptions(const LocationOptions& options) :
LocationOptions(options), powerMode(GNSS_POWER_MODE_INVALID), tbm(0) {} LocationOptions(options), powerMode(GNSS_POWER_MODE_INVALID), tbm(0) {}
@ -708,7 +708,7 @@ struct BatchingOptions : LocationOptions {
inline BatchingOptions() : inline BatchingOptions() :
LocationOptions(), batchingMode(BATCHING_MODE_ROUTINE) {} LocationOptions(), batchingMode(BATCHING_MODE_ROUTINE) {}
inline BatchingOptions(size_t s, BatchingMode m) : inline BatchingOptions(uint32_t s, BatchingMode m) :
LocationOptions(), batchingMode(m) { LocationOptions::size = s; } LocationOptions(), batchingMode(m) { LocationOptions::size = s; }
inline BatchingOptions(const LocationOptions& options) : inline BatchingOptions(const LocationOptions& options) :
LocationOptions(options), batchingMode(BATCHING_MODE_ROUTINE) {} LocationOptions(options), batchingMode(BATCHING_MODE_ROUTINE) {}
@ -720,27 +720,27 @@ struct BatchingOptions : LocationOptions {
}; };
typedef struct { typedef struct {
size_t size; uint32_t size;
BatchingStatus batchingStatus; BatchingStatus batchingStatus;
} BatchingStatusInfo; } BatchingStatusInfo;
typedef struct { typedef struct {
size_t size; // set to sizeof(GeofenceOption) uint32_t size; // set to sizeof(GeofenceOption)
GeofenceBreachTypeMask breachTypeMask; // bitwise OR of GeofenceBreachTypeBits GeofenceBreachTypeMask breachTypeMask; // bitwise OR of GeofenceBreachTypeBits
uint32_t responsiveness; // in milliseconds uint32_t responsiveness; // in milliseconds
uint32_t dwellTime; // in seconds uint32_t dwellTime; // in seconds
} GeofenceOption; } GeofenceOption;
typedef struct { typedef struct {
size_t size; // set to sizeof(GeofenceInfo) uint32_t size; // set to sizeof(GeofenceInfo)
double latitude; // in degrees double latitude; // in degrees
double longitude; // in degrees double longitude; // in degrees
double radius; // in meters double radius; // in meters
} GeofenceInfo; } GeofenceInfo;
typedef struct { typedef struct {
size_t size; // set to sizeof(GeofenceBreachNotification) uint32_t size; // set to sizeof(GeofenceBreachNotification)
size_t count; // number of ids in array uint32_t count; // number of ids in array
uint32_t* ids; // array of ids that have breached uint32_t* ids; // array of ids that have breached
Location location; // location associated with breach Location location; // location associated with breach
GeofenceBreachType type; // type of breach GeofenceBreachType type; // type of breach
@ -748,7 +748,7 @@ typedef struct {
} GeofenceBreachNotification; } GeofenceBreachNotification;
typedef struct { typedef struct {
size_t size; // set to sizeof(GeofenceBreachNotification) uint32_t size; // set to sizeof(GeofenceBreachNotification)
GeofenceStatusAvailable available; // GEOFENCE_STATUS_AVAILABILE_NO/_YES GeofenceStatusAvailable available; // GEOFENCE_STATUS_AVAILABILE_NO/_YES
LocationTechnologyType techType; // GNSS LocationTechnologyType techType; // GNSS
} GeofenceStatusNotification; } GeofenceStatusNotification;
@ -882,7 +882,7 @@ typedef struct {
} GnssSystemTime; } GnssSystemTime;
typedef struct { typedef struct {
size_t size; // set to sizeof(GnssLocationInfo) uint32_t size; // set to sizeof(GnssLocationInfo)
GnssLocationInfoFlagMask flags; // bitwise OR of GnssLocationInfoBits for param validity GnssLocationInfoFlagMask flags; // bitwise OR of GnssLocationInfoBits for param validity
float altitudeMeanSeaLevel; // altitude wrt mean sea level float altitudeMeanSeaLevel; // altitude wrt mean sea level
float pdop; // position dilusion of precision float pdop; // position dilusion of precision
@ -918,7 +918,7 @@ typedef struct {
} GnssLocationInfoNotification; } GnssLocationInfoNotification;
typedef struct { typedef struct {
size_t size; // set to sizeof(GnssNiNotification) uint32_t size; // set to sizeof(GnssNiNotification)
GnssNiType type; // type of NI (Voice, SUPL, Control Plane) GnssNiType type; // type of NI (Voice, SUPL, Control Plane)
GnssNiOptionsMask options; // bitwise OR of GnssNiOptionsBits GnssNiOptionsMask options; // bitwise OR of GnssNiOptionsBits
uint32_t timeout; // time (seconds) to wait for user input uint32_t timeout; // time (seconds) to wait for user input
@ -931,7 +931,7 @@ typedef struct {
} GnssNiNotification; } GnssNiNotification;
typedef struct { typedef struct {
size_t size; // set to sizeof(GnssSv) uint32_t size; // set to sizeof(GnssSv)
uint16_t svId; // Unique Identifier uint16_t svId; // Unique Identifier
GnssSvType type; // type of SV (GPS, SBAS, GLONASS, QZSS, BEIDOU, GALILEO) GnssSvType type; // type of SV (GPS, SBAS, GLONASS, QZSS, BEIDOU, GALILEO)
float cN0Dbhz; // signal strength float cN0Dbhz; // signal strength
@ -943,7 +943,7 @@ typedef struct {
} GnssSv; } GnssSv;
struct GnssConfigSetAssistanceServer { struct GnssConfigSetAssistanceServer {
size_t size; // set to sizeof(GnssConfigSetAssistanceServer) uint32_t size; // set to sizeof(GnssConfigSetAssistanceServer)
GnssAssistanceType type; // SUPL or C2K GnssAssistanceType type; // SUPL or C2K
const char* hostName; // null terminated string const char* hostName; // null terminated string
uint32_t port; // port of server uint32_t port; // port of server
@ -960,7 +960,7 @@ struct GnssConfigSetAssistanceServer {
}; };
typedef struct { typedef struct {
size_t size; // set to sizeof(GnssMeasurementsData) uint32_t size; // set to sizeof(GnssMeasurementsData)
GnssMeasurementsDataFlagsMask flags; // bitwise OR of GnssMeasurementsDataFlagsBits GnssMeasurementsDataFlagsMask flags; // bitwise OR of GnssMeasurementsDataFlagsBits
int16_t svId; int16_t svId;
GnssSvType svType; GnssSvType svType;
@ -984,7 +984,7 @@ typedef struct {
} GnssMeasurementsData; } GnssMeasurementsData;
typedef struct { typedef struct {
size_t size; // set to sizeof(GnssMeasurementsClock) uint32_t size; // set to sizeof(GnssMeasurementsClock)
GnssMeasurementsClockFlagsMask flags; // bitwise OR of GnssMeasurementsClockFlagsBits GnssMeasurementsClockFlagsMask flags; // bitwise OR of GnssMeasurementsClockFlagsBits
int16_t leapSecond; int16_t leapSecond;
int64_t timeNs; int64_t timeNs;
@ -998,29 +998,29 @@ typedef struct {
} GnssMeasurementsClock; } GnssMeasurementsClock;
typedef struct { typedef struct {
size_t size; // set to sizeof(GnssSvNotification) uint32_t size; // set to sizeof(GnssSvNotification)
size_t count; // number of SVs in the GnssSv array uint32_t count; // number of SVs in the GnssSv array
bool gnssSignalTypeMaskValid; bool gnssSignalTypeMaskValid;
GnssSv gnssSvs[GNSS_SV_MAX]; // information on a number of SVs GnssSv gnssSvs[GNSS_SV_MAX]; // information on a number of SVs
} GnssSvNotification; } GnssSvNotification;
typedef struct { typedef struct {
size_t size; // set to sizeof(GnssNmeaNotification) uint32_t size; // set to sizeof(GnssNmeaNotification)
uint64_t timestamp; // timestamp uint64_t timestamp; // timestamp
const char* nmea; // nmea text const char* nmea; // nmea text
size_t length; // length of the nmea text uint32_t length; // length of the nmea text
} GnssNmeaNotification; } GnssNmeaNotification;
typedef struct { typedef struct {
size_t size; // set to sizeof(GnssDataNotification) uint32_t size; // set to sizeof(GnssDataNotification)
GnssDataMask gnssDataMask[GNSS_LOC_MAX_NUMBER_OF_SIGNAL_TYPES]; // bitwise OR of GnssDataBits GnssDataMask gnssDataMask[GNSS_LOC_MAX_NUMBER_OF_SIGNAL_TYPES]; // bitwise OR of GnssDataBits
double jammerInd[GNSS_LOC_MAX_NUMBER_OF_SIGNAL_TYPES]; // Jammer Indication double jammerInd[GNSS_LOC_MAX_NUMBER_OF_SIGNAL_TYPES]; // Jammer Indication
double agc[GNSS_LOC_MAX_NUMBER_OF_SIGNAL_TYPES]; // Automatic gain control double agc[GNSS_LOC_MAX_NUMBER_OF_SIGNAL_TYPES]; // Automatic gain control
} GnssDataNotification; } GnssDataNotification;
typedef struct { typedef struct {
size_t size; // set to sizeof(GnssMeasurementsNotification) uint32_t size; // set to sizeof(GnssMeasurementsNotification)
size_t count; // number of items in GnssMeasurements array uint32_t count; // number of items in GnssMeasurements array
GnssMeasurementsData measurements[GNSS_MEASUREMENTS_MAX]; GnssMeasurementsData measurements[GNSS_MEASUREMENTS_MAX];
GnssMeasurementsClock clock; // clock GnssMeasurementsClock clock; // clock
} GnssMeasurementsNotification; } GnssMeasurementsNotification;
@ -1028,7 +1028,7 @@ typedef struct {
typedef uint32_t GnssSvId; typedef uint32_t GnssSvId;
struct GnssSvIdSource{ struct GnssSvIdSource{
size_t size; // set to sizeof(GnssSvIdSource) uint32_t size; // set to sizeof(GnssSvIdSource)
GnssSvType constellation; // constellation for the sv to blacklist GnssSvType constellation; // constellation for the sv to blacklist
GnssSvId svId; // sv id to blacklist GnssSvId svId; // sv id to blacklist
}; };
@ -1039,7 +1039,7 @@ inline bool operator ==(GnssSvIdSource const& left, GnssSvIdSource const& right)
#define GNSS_SV_CONFIG_ALL_BITS_ENABLED_MASK ((uint64_t)0xFFFFFFFFFFFFFFFF) #define GNSS_SV_CONFIG_ALL_BITS_ENABLED_MASK ((uint64_t)0xFFFFFFFFFFFFFFFF)
typedef struct { typedef struct {
size_t size; // set to sizeof(GnssSvIdConfig) uint32_t size; // set to sizeof(GnssSvIdConfig)
// GLONASS - SV 65 maps to bit 0 // GLONASS - SV 65 maps to bit 0
#define GNSS_SV_CONFIG_GLO_INITIAL_SV_ID 65 #define GNSS_SV_CONFIG_GLO_INITIAL_SV_ID 65
@ -1059,7 +1059,7 @@ typedef struct {
} GnssSvIdConfig; } GnssSvIdConfig;
struct GnssConfig{ struct GnssConfig{
size_t size; // set to sizeof(GnssConfig) uint32_t size; // set to sizeof(GnssConfig)
GnssConfigFlagsMask flags; // bitwise OR of GnssConfigFlagsBits to mark which params are valid GnssConfigFlagsMask flags; // bitwise OR of GnssConfigFlagsBits to mark which params are valid
GnssConfigGpsLock gpsLock; GnssConfigGpsLock gpsLock;
GnssConfigSuplVersion suplVersion; GnssConfigSuplVersion suplVersion;
@ -1093,7 +1093,7 @@ struct GnssConfig{
}; };
typedef struct { typedef struct {
size_t size; // set to sizeof uint32_t size; // set to sizeof
bool mValid; bool mValid;
Location mLocation; Location mLocation;
double verticalAccuracyMeters; double verticalAccuracyMeters;
@ -1103,7 +1103,7 @@ typedef struct {
} GnssDebugLocation; } GnssDebugLocation;
typedef struct { typedef struct {
size_t size; // set to sizeof uint32_t size; // set to sizeof
bool mValid; bool mValid;
int64_t timeEstimate; int64_t timeEstimate;
float timeUncertaintyNs; float timeUncertaintyNs;
@ -1111,7 +1111,7 @@ typedef struct {
} GnssDebugTime; } GnssDebugTime;
typedef struct { typedef struct {
size_t size; // set to sizeof uint32_t size; // set to sizeof
uint32_t svid; uint32_t svid;
GnssSvType constellation; GnssSvType constellation;
GnssEphemerisType mEphemerisType; GnssEphemerisType mEphemerisType;
@ -1123,7 +1123,7 @@ typedef struct {
} GnssDebugSatelliteInfo; } GnssDebugSatelliteInfo;
typedef struct { typedef struct {
size_t size; // set to sizeof uint32_t size; // set to sizeof
GnssDebugLocation mLocation; GnssDebugLocation mLocation;
GnssDebugTime mTime; GnssDebugTime mTime;
std::vector<GnssDebugSatelliteInfo> mSatelliteInfo; std::vector<GnssDebugSatelliteInfo> mSatelliteInfo;
@ -1198,7 +1198,7 @@ typedef std::function<void(
collectiveResponseCallback is called for every geofence API call. collectiveResponseCallback is called for every geofence API call.
ids array and LocationError array are only valid until collectiveResponseCallback returns. */ ids array and LocationError array are only valid until collectiveResponseCallback returns. */
typedef std::function<void( typedef std::function<void(
size_t count, // number of locations in arrays uint32_t count, // number of locations in arrays
LocationError* errs, // array of LocationError associated to the request LocationError* errs, // array of LocationError associated to the request
uint32_t* ids // array of ids to be associated to the request uint32_t* ids // array of ids to be associated to the request
)> collectiveResponseCallback; )> collectiveResponseCallback;
@ -1214,7 +1214,7 @@ typedef std::function<void(
batchingCallback is called when delivering locations in a batching session. batchingCallback is called when delivering locations in a batching session.
broadcasted to all clients, no matter if a session has started by client */ broadcasted to all clients, no matter if a session has started by client */
typedef std::function<void( typedef std::function<void(
size_t count, // number of locations in array uint32_t count, // number of locations in array
Location* location, // array of locations Location* location, // array of locations
BatchingOptions batchingOptions // Batching options BatchingOptions batchingOptions // Batching options
)> batchingCallback; )> batchingCallback;
@ -1301,7 +1301,7 @@ typedef enum {
} LocationAdapterTypeBits; } LocationAdapterTypeBits;
typedef struct { typedef struct {
size_t size; // set to sizeof(LocationCallbacks) uint32_t size; // set to sizeof(LocationCallbacks)
capabilitiesCallback capabilitiesCb; // mandatory capabilitiesCallback capabilitiesCb; // mandatory
responseCallback responseCb; // mandatory responseCallback responseCb; // mandatory
collectiveResponseCallback collectiveResponseCb; // mandatory collectiveResponseCallback collectiveResponseCb; // mandatory

6
utils/LocIpc.h
View file

@ -27,8 +27,8 @@
* *
*/ */
#ifndef __LOC_SOCKET__ #ifndef __LOC_IPC__
#define __LOC_SOCKET__ #define __LOC_IPC__
#include <string> #include <string>
#include <memory> #include <memory>
@ -149,4 +149,4 @@ private:
} }
#endif //__LOC_SOCKET__ #endif //__LOC_IPC__

1
utils/gps_extended_c.h
View file

@ -1994,6 +1994,7 @@ typedef void (*LocAgpsCloseResultCb)(bool isSuccess, AGpsExtType agpsType, void*
#define SOCKET_DIR_TO_CLIENT "/dev/socket/loc_client/" #define SOCKET_DIR_TO_CLIENT "/dev/socket/loc_client/"
#define SOCKET_TO_LOCATION_CLIENT_BASE "/dev/socket/loc_client/toclient" #define SOCKET_TO_LOCATION_CLIENT_BASE "/dev/socket/loc_client/toclient"
#define SOCKET_TO_EXTERANL_AP_LOCATION_CLIENT_BASE "/dev/socket/loc_client/extap.toclient"
#ifdef __cplusplus #ifdef __cplusplus
} }

9
utils/log_util.h
View file

@ -47,6 +47,14 @@
#endif /* LOG_TAG */ #endif /* LOG_TAG */
// LE targets with no logcat support // LE targets with no logcat support
#ifdef FEATURE_EXTERNAL_AP
#include <syslog.h>
#define ALOGE(...) syslog(LOG_ERR, "LOC_LOGE: " __VA_ARGS__);
#define ALOGW(...) syslog(LOG_WARNING, "LOC_LOGW: " __VA_ARGS__);
#define ALOGI(...) syslog(LOG_NOTICE, "LOC_LOGI: " __VA_ARGS__);
#define ALOGD(...) syslog(LOG_DEBUG, "LOC_LOGD: " __VA_ARGS__);
#define ALOGV(...) syslog(LOG_NOTICE, "LOC_LOGV: " __VA_ARGS__);
#else /* FEATURE_EXTERNAL_AP */
#define TS_PRINTF(format, x...) \ #define TS_PRINTF(format, x...) \
{ \ { \
struct timeval tv; \ struct timeval tv; \
@ -64,6 +72,7 @@
#define ALOGI(format, x...) TS_PRINTF("I/%s (%d): " format , LOG_TAG, getpid(), ##x) #define ALOGI(format, x...) TS_PRINTF("I/%s (%d): " format , LOG_TAG, getpid(), ##x)
#define ALOGD(format, x...) TS_PRINTF("D/%s (%d): " format , LOG_TAG, getpid(), ##x) #define ALOGD(format, x...) TS_PRINTF("D/%s (%d): " format , LOG_TAG, getpid(), ##x)
#define ALOGV(format, x...) TS_PRINTF("V/%s (%d): " format , LOG_TAG, getpid(), ##x) #define ALOGV(format, x...) TS_PRINTF("V/%s (%d): " format , LOG_TAG, getpid(), ##x)
#endif /* FEATURE_EXTERNAL_AP */
#endif /* #if defined (USE_ANDROID_LOGGING) || defined (ANDROID) */ #endif /* #if defined (USE_ANDROID_LOGGING) || defined (ANDROID) */