From 1a2ea5324960ca9f560d6011dba03b7b14a5ed01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Zieli=C5=84ski?= Date: Wed, 23 Nov 2022 11:34:18 +0100 Subject: [PATCH] [MOS-809] Remove dead code around celular channels Ditto --- .../service-cellular/CellularServiceAPI.cpp | 11 ---------- .../service-cellular/ServiceCellular.cpp | 15 -------------- .../service-cellular/CellularMessage.hpp | 20 ------------------- .../service-cellular/CellularServiceAPI.hpp | 3 --- .../service-cellular/ServiceCellular.hpp | 2 -- 5 files changed, 51 deletions(-) diff --git a/module-services/service-cellular/CellularServiceAPI.cpp b/module-services/service-cellular/CellularServiceAPI.cpp index 45c5d374c0b5cbcb13d68535a27f484302c38cfe..13abf66bb46f9d25e27f6b4fc1bcd8ecbcccdbf4 100644 --- a/module-services/service-cellular/CellularServiceAPI.cpp +++ b/module-services/service-cellular/CellularServiceAPI.cpp @@ -190,17 +190,6 @@ bool CellularServiceAPI::GetFirmwareVersion(sys::Service *serv, std::string &res return false; } -bool CellularServiceAPI::GetChannel(sys::Service *serv, CellularMux::Channel channel) -{ - auto msg = std::make_shared(channel); - return serv->bus.sendUnicast(std::move(msg), ServiceCellular::serviceName); -} - -bool CellularServiceAPI::GetDataChannel(sys::Service *serv) -{ - return GetChannel(serv, CellularMux::Channel::Data); -} - bool CellularServiceAPI::GetCSQ(sys::Service *serv, std::string &response) { diff --git a/module-services/service-cellular/ServiceCellular.cpp b/module-services/service-cellular/ServiceCellular.cpp index a3ce1816ddb39cea1367d7a7502cf93cae565642..584251b01c886b3c4a02d1e8f01e440ac6ff87c9 100644 --- a/module-services/service-cellular/ServiceCellular.cpp +++ b/module-services/service-cellular/ServiceCellular.cpp @@ -634,8 +634,6 @@ void ServiceCellular::registerMessageHandlers() } return sys::MessageNone{}; }); - - handle_CellularGetChannelMessage(); } void ServiceCellular::change_state(cellular::StateChange *msg) @@ -1513,19 +1511,6 @@ bool ServiceCellular::transmitDtmfTone(DTMFCode code) return resp.code == at::Result::Code::OK; } -void ServiceCellular::handle_CellularGetChannelMessage() -{ - connect(cellular::GetChannelMessage(), [&](sys::Message *req) { - auto getChannelMsg = static_cast(req); - LOG_DEBUG("Handle request for channel: %s", CellularMux::name(getChannelMsg->dataChannel).c_str()); - std::shared_ptr channelResponsMessage = - // MOS-809: find out if there's a need here for checking 'cmux' against nullptr - std::make_shared(cmux->get(getChannelMsg->dataChannel)); - LOG_DEBUG("channel ptr: %p", channelResponsMessage->dataChannelPtr); - bus.sendUnicast(std::move(channelResponsMessage), req->sender); - return sys::MessageNone{}; - }); -} bool ServiceCellular::handle_status_check(void) { LOG_INFO("Checking modem status."); diff --git a/module-services/service-cellular/service-cellular/CellularMessage.hpp b/module-services/service-cellular/service-cellular/CellularMessage.hpp index c2fc123eef87d912c5d861d22a556d36a95a55cd..71c718fc441ea9154d89cbe257b266b95f7c74ef 100644 --- a/module-services/service-cellular/service-cellular/CellularMessage.hpp +++ b/module-services/service-cellular/service-cellular/CellularMessage.hpp @@ -63,8 +63,6 @@ class CellularMessage : public sys::DataMessage GetScanModeResult, GetFirmwareVersion, ///< Asks for current firmware version GetFirmwareVersionResult, ///< Returns current firmware version - GetChannel, ///< Asks for channel, requres chnnel name - GetChannelResponse, ///< Returns channel (and it's name) GetCSQ, GetCREG, GetNWINFO, @@ -335,24 +333,6 @@ namespace cellular } }; - class GetChannelMessage : public CellularMessage - { - public: - explicit GetChannelMessage(CellularMux::Channel dataChannel = CellularMux::Channel::None) - : CellularMessage{Type::GetChannel}, dataChannel(dataChannel) - {} - CellularMux::Channel dataChannel; - }; - - class GetChannelResponseMessage : public CellularMessage - { - public: - explicit GetChannelResponseMessage(DLCChannel *dataChannelPtr = nullptr) - : CellularMessage{Type::GetChannelResponse}, dataChannelPtr(dataChannelPtr) - {} - DLCChannel *dataChannelPtr; - }; - class ResponseMessage : public sys::ResponseMessage { public: diff --git a/module-services/service-cellular/service-cellular/CellularServiceAPI.hpp b/module-services/service-cellular/service-cellular/CellularServiceAPI.hpp index 302f72c0ba7682c418524ef014584631078c1823..5f8088433f9b3af0b662008474826d7222ff18d3 100644 --- a/module-services/service-cellular/service-cellular/CellularServiceAPI.hpp +++ b/module-services/service-cellular/service-cellular/CellularServiceAPI.hpp @@ -82,9 +82,6 @@ namespace CellularServiceAPI bool SetScanMode(sys::Service *serv, std::string mode); bool GetScanMode(sys::Service *serv); bool GetFirmwareVersion(sys::Service *serv, std::string &response); - bool GetChannel(sys::Service *serv, - CellularMux::Channel channel); /// asynchronous, returns message CellureMessageChannelReady; - bool GetDataChannel(sys::Service *serv); bool GetCSQ(sys::Service *serv, std::string &response); bool GetCREG(sys::Service *serv, std::string &response); bool GetQNWINFO(sys::Service *serv, std::string &response); diff --git a/module-services/service-cellular/service-cellular/ServiceCellular.hpp b/module-services/service-cellular/service-cellular/ServiceCellular.hpp index 470b259a03dd25ad5012852cc83336f2d13e56a3..0f54295a510910106a229c94d1abab7b57ae1a66 100644 --- a/module-services/service-cellular/service-cellular/ServiceCellular.hpp +++ b/module-services/service-cellular/service-cellular/ServiceCellular.hpp @@ -202,8 +202,6 @@ class ServiceCellular : public sys::Service /// @} bool transmitDtmfTone(DTMFCode code); - /// Handle message CellularGetChannelMessage - void handle_CellularGetChannelMessage(); bool SetScanMode(std::string mode); std::string GetScanMode();