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

Merge "GPS GNSS adapter: connectivity support for engine hub"

Browse source
This commit is contained in:
Linux Build Service Account 2018-03-08 22:05:04 -08:00 committed by Gerrit - the friendly Code Review server
commit a197343e3c
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/EngineHubProxyBase.h
View file

@ -101,6 +101,7 @@ typedef std::function<void(const GnssSvNotification& svNotify, bool fromUlp)>
// potential parameters: message queue: MsgTask * msgTask; // potential parameters: message queue: MsgTask * msgTask;
// callback function to report back dr and ppe position and sv report // callback function to report back dr and ppe position and sv report
typedef EngineHubProxyBase* (getEngHubProxyFn)(const MsgTask * msgTask, typedef EngineHubProxyBase* (getEngHubProxyFn)(const MsgTask * msgTask,
IOsObserver* osObserver,
GnssAdapterReportPositionEventCb positionEventCb, GnssAdapterReportPositionEventCb positionEventCb,
GnssAdapterReportSvEventCb svEventCb); GnssAdapterReportSvEventCb svEventCb);

3
gnss/GnssAdapter.cpp
View file

@ -3310,7 +3310,8 @@ GnssAdapter::initEngHubProxy() {
getEngHubProxyFn* getter = (getEngHubProxyFn*) dlsym(handle, "getEngHubProxy"); getEngHubProxyFn* getter = (getEngHubProxyFn*) dlsym(handle, "getEngHubProxy");
if(getter != nullptr) { if(getter != nullptr) {
EngineHubProxyBase* hubProxy = (*getter) (mMsgTask, reportPositionEventCb, EngineHubProxyBase* hubProxy = (*getter) (mMsgTask, mSystemStatus->getOsObserver(),
reportPositionEventCb,
reportSvEventCb); reportSvEventCb);
if (hubProxy != nullptr) { if (hubProxy != nullptr) {
mEngHubProxy = hubProxy; mEngHubProxy = hubProxy;

1
gnss/GnssAdapter.h
View file

@ -32,6 +32,7 @@
#include <LocAdapterBase.h> #include <LocAdapterBase.h>
#include <LocDualContext.h> #include <LocDualContext.h>
#include <UlpProxyBase.h> #include <UlpProxyBase.h>
#include <IOsObserver.h>
#include <EngineHubProxyBase.h> #include <EngineHubProxyBase.h>
#include <LocationAPI.h> #include <LocationAPI.h>
#include <Agps.h> #include <Agps.h>

6
utils/LocIpc.h
View file

@ -140,10 +140,10 @@ private:
std::shared_ptr<int> mSocket; std::shared_ptr<int> mSocket;
struct sockaddr_un mDestAddr; struct sockaddr_un mDestAddr;
inline LocIpcSender( inline LocIpcSender(const std::shared_ptr<int>& mySocket, const char* destSocket) :
const std::shared_ptr<int>& mySocket, const char* destSocket) : mSocket(mySocket) { mSocket(mySocket),
mDestAddr({.sun_family = AF_UNIX, {}}) {
if ((nullptr != mSocket) && (-1 != *mSocket) && (nullptr != destSocket)) { if ((nullptr != mSocket) && (-1 != *mSocket) && (nullptr != destSocket)) {
mDestAddr.sun_family = AF_UNIX;
snprintf(mDestAddr.sun_path, sizeof(mDestAddr.sun_path), "%s", destSocket); snprintf(mDestAddr.sun_path, sizeof(mDestAddr.sun_path), "%s", destSocket);
} }
} }