From d30694acf6d4c1156c8a8e6da919b183213408e8 Mon Sep 17 00:00:00 2001 From: Dante Russo Date: Tue, 5 Apr 2016 15:16:21 -0700 Subject: [PATCH] Rename GnssSvStatus to QtiGnssSvStatus Change-Id: Ieeeb03af37440214f4762d495d949b4ab59ed237 --- core/LocAdapterBase.cpp | 2 +- core/LocAdapterBase.h | 2 +- core/LocApiBase.cpp | 2 +- core/LocApiBase.h | 2 +- core/UlpProxyBase.h | 2 +- core/gps_extended_c.h | 4 ++-- .../libloc_api-rpc-glue/src/LocApiRpc.cpp | 2 +- loc_api/libloc_api_50001/LocEngAdapter.cpp | 4 ++-- loc_api/libloc_api_50001/LocEngAdapter.h | 4 ++-- loc_api/libloc_api_50001/loc_eng.cpp | 2 +- loc_api/libloc_api_50001/loc_eng_msg.h | 4 ++-- loc_api/libloc_api_50001/loc_eng_nmea.cpp | 2 +- loc_api/libloc_api_50001/loc_eng_nmea.h | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/core/LocAdapterBase.cpp b/core/LocAdapterBase.cpp index 8fdb8cbb..4f6b9c56 100644 --- a/core/LocAdapterBase.cpp +++ b/core/LocAdapterBase.cpp @@ -80,7 +80,7 @@ void LocAdapterBase:: } void LocAdapterBase:: - reportSv(GnssSvStatus &svStatus, + reportSv(QtiGnssSvStatus &svStatus, GpsLocationExtended &locationExtended, void* svExt) DEFAULT_IMPL() diff --git a/core/LocAdapterBase.h b/core/LocAdapterBase.h index 4ed1704f..57e77ee1 100644 --- a/core/LocAdapterBase.h +++ b/core/LocAdapterBase.h @@ -98,7 +98,7 @@ public: void* locationExt, enum loc_sess_status status, LocPosTechMask loc_technology_mask); - virtual void reportSv(GnssSvStatus &svStatus, + virtual void reportSv(QtiGnssSvStatus &svStatus, GpsLocationExtended &locationExtended, void* svExt); virtual void reportStatus(GpsStatusValue status); diff --git a/core/LocApiBase.cpp b/core/LocApiBase.cpp index dcd35fec..c09439ea 100644 --- a/core/LocApiBase.cpp +++ b/core/LocApiBase.cpp @@ -253,7 +253,7 @@ void LocApiBase::reportPosition(UlpLocation &location, ); } -void LocApiBase::reportSv(GnssSvStatus &svStatus, +void LocApiBase::reportSv(QtiGnssSvStatus &svStatus, GpsLocationExtended &locationExtended, void* svExt) { diff --git a/core/LocApiBase.h b/core/LocApiBase.h index 713ca916..8a885585 100644 --- a/core/LocApiBase.h +++ b/core/LocApiBase.h @@ -113,7 +113,7 @@ public: enum loc_sess_status status, LocPosTechMask loc_technology_mask = LOC_POS_TECH_MASK_DEFAULT); - void reportSv(GnssSvStatus &svStatus, + void reportSv(QtiGnssSvStatus &svStatus, GpsLocationExtended &locationExtended, void* svExt); void reportStatus(GpsStatusValue status); diff --git a/core/UlpProxyBase.h b/core/UlpProxyBase.h index 50a43fd9..45bfae42 100644 --- a/core/UlpProxyBase.h +++ b/core/UlpProxyBase.h @@ -64,7 +64,7 @@ public: (void)loc_technology_mask; return false; } - inline virtual bool reportSv(GnssSvStatus &svStatus, + inline virtual bool reportSv(QtiGnssSvStatus &svStatus, GpsLocationExtended &locationExtended, void* svExt) { (void)svStatus; diff --git a/core/gps_extended_c.h b/core/gps_extended_c.h index 9b73fd59..bb683f1d 100644 --- a/core/gps_extended_c.h +++ b/core/gps_extended_c.h @@ -268,7 +268,7 @@ typedef struct { /** Represents SV status. */ typedef struct { - /** set to sizeof(GnssSvStatus) */ + /** set to sizeof(QtiGnssSvStatus) */ size_t size; /** Number of SVs currently visible. */ @@ -305,7 +305,7 @@ typedef struct { */ uint64_t bds_used_in_fix_mask; -} GnssSvStatus; +} QtiGnssSvStatus; enum loc_sess_status { LOC_SESS_SUCCESS, diff --git a/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/src/LocApiRpc.cpp b/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/src/LocApiRpc.cpp index c7447543..b946aecf 100644 --- a/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/src/LocApiRpc.cpp +++ b/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/src/LocApiRpc.cpp @@ -797,7 +797,7 @@ void LocApiRpc::reportPosition(const rpc_loc_parsed_position_s_type *location_re void LocApiRpc::reportSv(const rpc_loc_gnss_info_s_type *gnss_report_ptr) { - GnssSvStatus SvStatus = {0}; + QtiGnssSvStatus SvStatus = {0}; GpsLocationExtended locationExtended = {0}; locationExtended.size = sizeof(locationExtended); int num_svs_max = 0; diff --git a/loc_api/libloc_api_50001/LocEngAdapter.cpp b/loc_api/libloc_api_50001/LocEngAdapter.cpp index 592662df..c674fdf1 100644 --- a/loc_api/libloc_api_50001/LocEngAdapter.cpp +++ b/loc_api/libloc_api_50001/LocEngAdapter.cpp @@ -375,14 +375,14 @@ void LocEngAdapter::reportPosition(UlpLocation &location, } } -void LocInternalAdapter::reportSv(GnssSvStatus &svStatus, +void LocInternalAdapter::reportSv(QtiGnssSvStatus &svStatus, GpsLocationExtended &locationExtended, void* svExt){ sendMsg(new LocEngReportSv(mLocEngAdapter, svStatus, locationExtended, svExt)); } -void LocEngAdapter::reportSv(GnssSvStatus &svStatus, +void LocEngAdapter::reportSv(QtiGnssSvStatus &svStatus, GpsLocationExtended &locationExtended, void* svExt) { diff --git a/loc_api/libloc_api_50001/LocEngAdapter.h b/loc_api/libloc_api_50001/LocEngAdapter.h index a193e818..d6295d1c 100644 --- a/loc_api/libloc_api_50001/LocEngAdapter.h +++ b/loc_api/libloc_api_50001/LocEngAdapter.h @@ -55,7 +55,7 @@ public: void* locationExt, enum loc_sess_status status, LocPosTechMask loc_technology_mask); - virtual void reportSv(GnssSvStatus &svStatus, + virtual void reportSv(QtiGnssSvStatus &svStatus, GpsLocationExtended &locationExtended, void* svExt); virtual void reportStatus(GpsStatusValue status); @@ -269,7 +269,7 @@ public: void* locationExt, enum loc_sess_status status, LocPosTechMask loc_technology_mask); - virtual void reportSv(GnssSvStatus &svStatus, + virtual void reportSv(QtiGnssSvStatus &svStatus, GpsLocationExtended &locationExtended, void* svExt); virtual void reportStatus(GpsStatusValue status); diff --git a/loc_api/libloc_api_50001/loc_eng.cpp b/loc_api/libloc_api_50001/loc_eng.cpp index d2fc5bc6..2336600e 100644 --- a/loc_api/libloc_api_50001/loc_eng.cpp +++ b/loc_api/libloc_api_50001/loc_eng.cpp @@ -828,7 +828,7 @@ void LocEngReportPosition::send() const { // case LOC_ENG_MSG_REPORT_SV: LocEngReportSv::LocEngReportSv(LocAdapterBase* adapter, - GnssSvStatus &sv, + QtiGnssSvStatus &sv, GpsLocationExtended &locExtended, void* svExt) : LocMsg(), mAdapter(adapter), mSvStatus(sv), diff --git a/loc_api/libloc_api_50001/loc_eng_msg.h b/loc_api/libloc_api_50001/loc_eng_msg.h index 9c7b9bcd..31cf9507 100644 --- a/loc_api/libloc_api_50001/loc_eng_msg.h +++ b/loc_api/libloc_api_50001/loc_eng_msg.h @@ -105,11 +105,11 @@ struct LocEngReportPosition : public LocMsg { struct LocEngReportSv : public LocMsg { LocAdapterBase* mAdapter; - const GnssSvStatus mSvStatus; + const QtiGnssSvStatus mSvStatus; const GpsLocationExtended mLocationExtended; const void* mSvExt; LocEngReportSv(LocAdapterBase* adapter, - GnssSvStatus &sv, + QtiGnssSvStatus &sv, GpsLocationExtended &locExtended, void* svExtended); virtual void proc() const; diff --git a/loc_api/libloc_api_50001/loc_eng_nmea.cpp b/loc_api/libloc_api_50001/loc_eng_nmea.cpp index d60ecfc4..28e59112 100644 --- a/loc_api/libloc_api_50001/loc_eng_nmea.cpp +++ b/loc_api/libloc_api_50001/loc_eng_nmea.cpp @@ -707,7 +707,7 @@ SIDE EFFECTS ===========================================================================*/ void loc_eng_nmea_generate_sv(loc_eng_data_s_type *loc_eng_data_p, - const GnssSvStatus &svStatus, const GpsLocationExtended &locationExtended) + const QtiGnssSvStatus &svStatus, const GpsLocationExtended &locationExtended) { ENTRY_LOG(); diff --git a/loc_api/libloc_api_50001/loc_eng_nmea.h b/loc_api/libloc_api_50001/loc_eng_nmea.h index 066943aa..f7ef7fb0 100644 --- a/loc_api/libloc_api_50001/loc_eng_nmea.h +++ b/loc_api/libloc_api_50001/loc_eng_nmea.h @@ -37,7 +37,7 @@ 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); -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 QtiGnssSvStatus &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); #endif // LOC_ENG_NMEA_H