diff --git a/core/EngineHubProxyBase.h b/core/EngineHubProxyBase.h index c17b2c29..7b9f3ae8 100644 --- a/core/EngineHubProxyBase.h +++ b/core/EngineHubProxyBase.h @@ -101,6 +101,7 @@ typedef std::function // potential parameters: message queue: MsgTask * msgTask; // callback function to report back dr and ppe position and sv report typedef EngineHubProxyBase* (getEngHubProxyFn)(const MsgTask * msgTask, + IOsObserver* osObserver, GnssAdapterReportPositionEventCb positionEventCb, GnssAdapterReportSvEventCb svEventCb); diff --git a/gnss/GnssAdapter.cpp b/gnss/GnssAdapter.cpp index a57d1a40..f996ebee 100644 --- a/gnss/GnssAdapter.cpp +++ b/gnss/GnssAdapter.cpp @@ -3310,7 +3310,8 @@ GnssAdapter::initEngHubProxy() { getEngHubProxyFn* getter = (getEngHubProxyFn*) dlsym(handle, "getEngHubProxy"); if(getter != nullptr) { - EngineHubProxyBase* hubProxy = (*getter) (mMsgTask, reportPositionEventCb, + EngineHubProxyBase* hubProxy = (*getter) (mMsgTask, mSystemStatus->getOsObserver(), + reportPositionEventCb, reportSvEventCb); if (hubProxy != nullptr) { mEngHubProxy = hubProxy; diff --git a/gnss/GnssAdapter.h b/gnss/GnssAdapter.h index e047f75b..c1e17545 100644 --- a/gnss/GnssAdapter.h +++ b/gnss/GnssAdapter.h @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include diff --git a/utils/LocIpc.h b/utils/LocIpc.h index 8598a327..0c37a7ad 100644 --- a/utils/LocIpc.h +++ b/utils/LocIpc.h @@ -140,10 +140,10 @@ private: std::shared_ptr mSocket; struct sockaddr_un mDestAddr; - inline LocIpcSender( - const std::shared_ptr& mySocket, const char* destSocket) : mSocket(mySocket) { + inline LocIpcSender(const std::shared_ptr& mySocket, const char* destSocket) : + mSocket(mySocket), + mDestAddr({.sun_family = AF_UNIX, {}}) { if ((nullptr != mSocket) && (-1 != *mSocket) && (nullptr != destSocket)) { - mDestAddr.sun_family = AF_UNIX; snprintf(mDestAddr.sun_path, sizeof(mDestAddr.sun_path), "%s", destSocket); } }