darkkirb/android_device_lenovo_msm8937-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

land: gps: Hack to build with N

Browse source 
AOSP now has a conflicting GnssSvStatus struct.
Rename the one in the GPS HAL to QcomSvStatus.

Change-Id: Ie79c5471423ce0d39e34f1dd0a3e71d9edb016b0
This commit is contained in:
Luca Stefani 2016-09-02 10:54:33 +02:00 committed by karthick111
parent 088d6e179c
commit e8042e98d2
12 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gps/core/LocAdapterBase.cpp
View file

@ -80,7 +80,7 @@ void LocAdapterBase::
} }
void LocAdapterBase:: void LocAdapterBase::
reportSv(GnssSvStatus &svStatus, reportSv(QcomSvStatus &svStatus,
GpsLocationExtended &locationExtended, GpsLocationExtended &locationExtended,
void* svExt) void* svExt)
DEFAULT_IMPL() DEFAULT_IMPL()

2
gps/core/LocAdapterBase.h
View file

@ -92,7 +92,7 @@ public:
void* locationExt, void* locationExt,
enum loc_sess_status status, enum loc_sess_status status,
LocPosTechMask loc_technology_mask); LocPosTechMask loc_technology_mask);
virtual void reportSv(GnssSvStatus &svStatus, virtual void reportSv(QcomSvStatus &svStatus,
GpsLocationExtended &locationExtended, GpsLocationExtended &locationExtended,
void* svExt); void* svExt);
virtual void reportStatus(GpsStatusValue status); virtual void reportStatus(GpsStatusValue status);

2
gps/core/LocApiBase.cpp
View file

@ -253,7 +253,7 @@ void LocApiBase::reportPosition(UlpLocation &location,
); );
} }
void LocApiBase::reportSv(GnssSvStatus &svStatus, void LocApiBase::reportSv(QcomSvStatus &svStatus,
GpsLocationExtended &locationExtended, GpsLocationExtended &locationExtended,
void* svExt) void* svExt)
{ {

2
gps/core/LocApiBase.h
View file

@ -113,7 +113,7 @@ public:
enum loc_sess_status status, enum loc_sess_status status,
LocPosTechMask loc_technology_mask = LocPosTechMask loc_technology_mask =
LOC_POS_TECH_MASK_DEFAULT); LOC_POS_TECH_MASK_DEFAULT);
void reportSv(GnssSvStatus &svStatus, void reportSv(QcomSvStatus &svStatus,
GpsLocationExtended &locationExtended, GpsLocationExtended &locationExtended,
void* svExt); void* svExt);
void reportStatus(GpsStatusValue status); void reportStatus(GpsStatusValue status);

2
gps/core/UlpProxyBase.h
View file

@ -61,7 +61,7 @@ public:
LocPosTechMask loc_technology_mask) { LocPosTechMask loc_technology_mask) {
return false; return false;
} }
inline virtual bool reportSv(GnssSvStatus &svStatus, inline virtual bool reportSv(QcomSvStatus &svStatus,
GpsLocationExtended &locationExtended, GpsLocationExtended &locationExtended,
void* svExt) { void* svExt) {
return false; return false;

4
gps/core/gps_extended_c.h
View file

@ -268,7 +268,7 @@ typedef struct {
/** Represents SV status. */ /** Represents SV status. */
typedef struct { typedef struct {
/** set to sizeof(GnssSvStatus) */ /** set to sizeof(QcomSvStatus) */
size_t size; size_t size;
/** Number of SVs currently visible. */ /** Number of SVs currently visible. */
@ -305,7 +305,7 @@ typedef struct {
*/ */
uint64_t bds_used_in_fix_mask; uint64_t bds_used_in_fix_mask;
} GnssSvStatus; } QcomSvStatus;
enum loc_sess_status { enum loc_sess_status {
LOC_SESS_SUCCESS, LOC_SESS_SUCCESS,

4
gps/loc_api/libloc_api_50001/LocEngAdapter.cpp
View file

@ -377,14 +377,14 @@ void LocEngAdapter::reportPosition(UlpLocation &location,
} }
} }
void LocInternalAdapter::reportSv(GnssSvStatus &svStatus, void LocInternalAdapter::reportSv(QcomSvStatus &svStatus,
GpsLocationExtended &locationExtended, GpsLocationExtended &locationExtended,
void* svExt){ void* svExt){
sendMsg(new LocEngReportSv(mLocEngAdapter, svStatus, sendMsg(new LocEngReportSv(mLocEngAdapter, svStatus,
locationExtended, svExt)); locationExtended, svExt));
} }
void LocEngAdapter::reportSv(GnssSvStatus &svStatus, void LocEngAdapter::reportSv(QcomSvStatus &svStatus,
GpsLocationExtended &locationExtended, GpsLocationExtended &locationExtended,
void* svExt) void* svExt)
{ {

4
gps/loc_api/libloc_api_50001/LocEngAdapter.h
View file

@ -55,7 +55,7 @@ public:
void* locationExt, void* locationExt,
enum loc_sess_status status, enum loc_sess_status status,
LocPosTechMask loc_technology_mask); LocPosTechMask loc_technology_mask);
virtual void reportSv(GnssSvStatus &svStatus, virtual void reportSv(QcomSvStatus &svStatus,
GpsLocationExtended &locationExtended, GpsLocationExtended &locationExtended,
void* svExt); void* svExt);
virtual void reportStatus(GpsStatusValue status); virtual void reportStatus(GpsStatusValue status);
@ -269,7 +269,7 @@ public:
void* locationExt, void* locationExt,
enum loc_sess_status status, enum loc_sess_status status,
LocPosTechMask loc_technology_mask); LocPosTechMask loc_technology_mask);
virtual void reportSv(GnssSvStatus &svStatus, virtual void reportSv(QcomSvStatus &svStatus,
GpsLocationExtended &locationExtended, GpsLocationExtended &locationExtended,
void* svExt); void* svExt);
virtual void reportStatus(GpsStatusValue status); virtual void reportStatus(GpsStatusValue status);

2
gps/loc_api/libloc_api_50001/loc_eng.cpp
View file

@ -828,7 +828,7 @@ void LocEngReportPosition::send() const {
// case LOC_ENG_MSG_REPORT_SV: // case LOC_ENG_MSG_REPORT_SV:
LocEngReportSv::LocEngReportSv(LocAdapterBase* adapter, LocEngReportSv::LocEngReportSv(LocAdapterBase* adapter,
GnssSvStatus &sv, QcomSvStatus &sv,
GpsLocationExtended &locExtended, GpsLocationExtended &locExtended,
void* svExt) : void* svExt) :
LocMsg(), mAdapter(adapter), mSvStatus(sv), LocMsg(), mAdapter(adapter), mSvStatus(sv),

4
gps/loc_api/libloc_api_50001/loc_eng_msg.h
View file

@ -105,11 +105,11 @@ struct LocEngReportPosition : public LocMsg {
struct LocEngReportSv : public LocMsg { struct LocEngReportSv : public LocMsg {
LocAdapterBase* mAdapter; LocAdapterBase* mAdapter;
const GnssSvStatus mSvStatus; const QcomSvStatus mSvStatus;
const GpsLocationExtended mLocationExtended; const GpsLocationExtended mLocationExtended;
const void* mSvExt; const void* mSvExt;
LocEngReportSv(LocAdapterBase* adapter, LocEngReportSv(LocAdapterBase* adapter,
GnssSvStatus &sv, QcomSvStatus &sv,
GpsLocationExtended &locExtended, GpsLocationExtended &locExtended,
void* svExtended); void* svExtended);
virtual void proc() const; virtual void proc() const;

2
gps/loc_api/libloc_api_50001/loc_eng_nmea.cpp
View file

@ -604,7 +604,7 @@ SIDE EFFECTS
===========================================================================*/ ===========================================================================*/
void loc_eng_nmea_generate_sv(loc_eng_data_s_type *loc_eng_data_p, void loc_eng_nmea_generate_sv(loc_eng_data_s_type *loc_eng_data_p,
const GnssSvStatus &svStatus, const GpsLocationExtended &locationExtended) const QcomSvStatus &svStatus, const GpsLocationExtended &locationExtended)
{ {
ENTRY_LOG(); ENTRY_LOG();

2
gps/loc_api/libloc_api_50001/loc_eng_nmea.h
View file

@ -37,7 +37,7 @@
void loc_eng_nmea_send(char *pNmea, int length, loc_eng_data_s_type *loc_eng_data_p); void loc_eng_nmea_send(char *pNmea, int length, loc_eng_data_s_type *loc_eng_data_p);
int loc_eng_nmea_put_checksum(char *pNmea, int maxSize); int loc_eng_nmea_put_checksum(char *pNmea, int maxSize);
void loc_eng_nmea_generate_sv(loc_eng_data_s_type *loc_eng_data_p, const GnssSvStatus &svStatus, const GpsLocationExtended &locationExtended); void loc_eng_nmea_generate_sv(loc_eng_data_s_type *loc_eng_data_p, const QcomSvStatus &svStatus, const GpsLocationExtended &locationExtended);
void loc_eng_nmea_generate_pos(loc_eng_data_s_type *loc_eng_data_p, const UlpLocation &location, const GpsLocationExtended &locationExtended, unsigned char generate_nmea); void loc_eng_nmea_generate_pos(loc_eng_data_s_type *loc_eng_data_p, const UlpLocation &location, const GpsLocationExtended &locationExtended, unsigned char generate_nmea);
#endif // LOC_ENG_NMEA_H #endif // LOC_ENG_NMEA_H