msm8974-common: gps: Hack HAL for N
* Replace GnssSvStatus with HaxxSvStatus Change-Id: Ib96e5caff7db7cf2a7bd1cd5d9ef147c9c4b70d7
This commit is contained in:
parent
f066fa2e3a
commit
0551f61a2a
@ -80,7 +80,7 @@ void LocAdapterBase::
|
|||||||
}
|
}
|
||||||
|
|
||||||
void LocAdapterBase::
|
void LocAdapterBase::
|
||||||
reportSv(GnssSvStatus &svStatus,
|
reportSv(HaxxSvStatus &svStatus,
|
||||||
GpsLocationExtended &locationExtended,
|
GpsLocationExtended &locationExtended,
|
||||||
void* svExt)
|
void* svExt)
|
||||||
DEFAULT_IMPL()
|
DEFAULT_IMPL()
|
||||||
|
@ -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(HaxxSvStatus &svStatus,
|
||||||
GpsLocationExtended &locationExtended,
|
GpsLocationExtended &locationExtended,
|
||||||
void* svExt);
|
void* svExt);
|
||||||
virtual void reportStatus(GpsStatusValue status);
|
virtual void reportStatus(GpsStatusValue status);
|
||||||
|
@ -253,7 +253,7 @@ void LocApiBase::reportPosition(UlpLocation &location,
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
void LocApiBase::reportSv(GnssSvStatus &svStatus,
|
void LocApiBase::reportSv(HaxxSvStatus &svStatus,
|
||||||
GpsLocationExtended &locationExtended,
|
GpsLocationExtended &locationExtended,
|
||||||
void* svExt)
|
void* svExt)
|
||||||
{
|
{
|
||||||
|
@ -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(HaxxSvStatus &svStatus,
|
||||||
GpsLocationExtended &locationExtended,
|
GpsLocationExtended &locationExtended,
|
||||||
void* svExt);
|
void* svExt);
|
||||||
void reportStatus(GpsStatusValue status);
|
void reportStatus(GpsStatusValue status);
|
||||||
|
@ -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(HaxxSvStatus &svStatus,
|
||||||
GpsLocationExtended &locationExtended,
|
GpsLocationExtended &locationExtended,
|
||||||
void* svExt) {
|
void* svExt) {
|
||||||
return false;
|
return false;
|
||||||
|
@ -256,7 +256,7 @@ typedef struct {
|
|||||||
|
|
||||||
/** Represents SV status. */
|
/** Represents SV status. */
|
||||||
typedef struct {
|
typedef struct {
|
||||||
/** set to sizeof(GnssSvStatus) */
|
/** set to sizeof(HaxxSvStatus) */
|
||||||
size_t size;
|
size_t size;
|
||||||
|
|
||||||
/** Number of SVs currently visible. */
|
/** Number of SVs currently visible. */
|
||||||
@ -293,7 +293,7 @@ typedef struct {
|
|||||||
*/
|
*/
|
||||||
uint64_t bds_used_in_fix_mask;
|
uint64_t bds_used_in_fix_mask;
|
||||||
|
|
||||||
} GnssSvStatus;
|
} HaxxSvStatus;
|
||||||
|
|
||||||
enum loc_sess_status {
|
enum loc_sess_status {
|
||||||
LOC_SESS_SUCCESS,
|
LOC_SESS_SUCCESS,
|
||||||
|
@ -377,14 +377,14 @@ void LocEngAdapter::reportPosition(UlpLocation &location,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void LocInternalAdapter::reportSv(GnssSvStatus &svStatus,
|
void LocInternalAdapter::reportSv(HaxxSvStatus &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(HaxxSvStatus &svStatus,
|
||||||
GpsLocationExtended &locationExtended,
|
GpsLocationExtended &locationExtended,
|
||||||
void* svExt)
|
void* svExt)
|
||||||
{
|
{
|
||||||
|
@ -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(HaxxSvStatus &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(HaxxSvStatus &svStatus,
|
||||||
GpsLocationExtended &locationExtended,
|
GpsLocationExtended &locationExtended,
|
||||||
void* svExt);
|
void* svExt);
|
||||||
virtual void reportStatus(GpsStatusValue status);
|
virtual void reportStatus(GpsStatusValue status);
|
||||||
|
@ -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,
|
HaxxSvStatus &sv,
|
||||||
GpsLocationExtended &locExtended,
|
GpsLocationExtended &locExtended,
|
||||||
void* svExt) :
|
void* svExt) :
|
||||||
LocMsg(), mAdapter(adapter), mSvStatus(sv),
|
LocMsg(), mAdapter(adapter), mSvStatus(sv),
|
||||||
|
@ -105,11 +105,11 @@ struct LocEngReportPosition : public LocMsg {
|
|||||||
|
|
||||||
struct LocEngReportSv : public LocMsg {
|
struct LocEngReportSv : public LocMsg {
|
||||||
LocAdapterBase* mAdapter;
|
LocAdapterBase* mAdapter;
|
||||||
const GnssSvStatus mSvStatus;
|
const HaxxSvStatus mSvStatus;
|
||||||
const GpsLocationExtended mLocationExtended;
|
const GpsLocationExtended mLocationExtended;
|
||||||
const void* mSvExt;
|
const void* mSvExt;
|
||||||
LocEngReportSv(LocAdapterBase* adapter,
|
LocEngReportSv(LocAdapterBase* adapter,
|
||||||
GnssSvStatus &sv,
|
HaxxSvStatus &sv,
|
||||||
GpsLocationExtended &locExtended,
|
GpsLocationExtended &locExtended,
|
||||||
void* svExtended);
|
void* svExtended);
|
||||||
virtual void proc() const;
|
virtual void proc() const;
|
||||||
|
@ -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 HaxxSvStatus &svStatus, const GpsLocationExtended &locationExtended)
|
||||||
{
|
{
|
||||||
ENTRY_LOG();
|
ENTRY_LOG();
|
||||||
|
|
||||||
|
@ -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 HaxxSvStatus &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
|
||||||
|
Loading…
Reference in New Issue
Block a user