5 files changed, 0 insertions(+), 51 deletions(-)

M module-services/service-cellular/CellularServiceAPI.cpp
M module-services/service-cellular/ServiceCellular.cpp
M module-services/service-cellular/service-cellular/CellularMessage.hpp
M module-services/service-cellular/service-cellular/CellularServiceAPI.hpp
M module-services/service-cellular/service-cellular/ServiceCellular.hpp

@@ 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<cellular::GetChannelMessage>(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)
 {
 

@@ 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<cellular::GetChannelMessage *>(req);
-        LOG_DEBUG("Handle request for channel: %s", CellularMux::name(getChannelMsg->dataChannel).c_str());
-        std::shared_ptr<cellular::GetChannelResponseMessage> channelResponsMessage =
-            // MOS-809: find out if there's a need here for checking 'cmux' against nullptr
-            std::make_shared<cellular::GetChannelResponseMessage>(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.");

@@ 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:

@@ 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);

@@ 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();