commit 0b979b61c12ffe6ab8a27acf8ad2a0165d687195
author Vernon Mauery <vernon.mauery@linux.intel.com> Wed May 15 08:45:00 2019 -0700
committer Vernon Mauery <vernon.mauery@linux.intel.com> Fri Jun 14 16:59:29 2019 +0000
tree bfc896515978d25a972a5ec9a78291acf3a2cbdf
parent 6fd812d17402f1c8db242ea8b454fe896711ba71

Remove unused function convertCurrentChannelNum(uint8_t)

convertCurrentChannelNum(uint8_t) was deprecated in favor of an
actual working implementation. It was stubbed out for a while to
provide a broken, backwards-compatible interface, but now that all
of those have been removed in favor of the new interface that
actually works: convertCurrentChannelNum(uint8_t, uint8_t), the
old function can be removed.

Tested: Builds without any errors (means the old interface was removed)

Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
Change-Id: I3796e890c7cc34333116b71a97db268abf5f0e89

user_channel/channel_layer.cpp

diff --git a/user_channel/channel_layer.cpp b/user_channel/channel_layer.cpp
index 122b3ea..c6866c2 100644
--- a/user_channel/channel_layer.cpp
+++ b/user_channel/channel_layer.cpp
@@ -58,11 +58,6 @@
     return getChannelConfigObject().isValidChannel(chNum);
 }
 
-uint8_t convertCurrentChannelNum(const uint8_t chNum)
-{
-    return getChannelConfigObject().convertToChannelIndexNumber(chNum);
-}
-
 bool isValidAuthType(const uint8_t chNum, const EAuthType& authType)
 {
     return getChannelConfigObject().isValidAuthType(chNum, authType);

user_channel/channel_layer.hpp

diff --git a/user_channel/channel_layer.hpp b/user_channel/channel_layer.hpp
index 580c4ee..4eb51b7 100644
--- a/user_channel/channel_layer.hpp
+++ b/user_channel/channel_layer.hpp
@@ -295,15 +295,6 @@
     return chNum;
 }
 
-/** @brief provides function to convert current channel number (0xE)
- *
- *  @param[in] chNum - channel number as requested in commands.
- *
- *  @return same channel number or proper channel number for current channel
- * number (0xE).
- */
-uint8_t convertCurrentChannelNum(const uint8_t chNum);
-
 /** @brief to set channel access data
  *
  *  @param[in] chNum - channel number

user_channel/channel_mgmt.cpp

diff --git a/user_channel/channel_mgmt.cpp b/user_channel/channel_mgmt.cpp
index 6559a43..008ffd9 100644
--- a/user_channel/channel_mgmt.cpp
+++ b/user_channel/channel_mgmt.cpp
@@ -786,39 +786,6 @@
     return static_cast<EChannelProtocolType>(it->second);
 }
 
-uint8_t ChannelConfig::convertToChannelIndexNumber(const uint8_t chNum)
-{
-
-    // TODO: There is limitation in current design. we cannot detect exact
-    // LAN interface(eth0 or eth1) so Implementation may be updated
-    // when there is any design update to figure out all the interfaces
-    // independently based on the message.
-
-    static uint8_t curChannel = 0xFF;
-
-    if (curChannel == 0xFF)
-    {
-        auto it = interfaceMap.find(getInterfaceIndex());
-        if (it == interfaceMap.end())
-        {
-            log<level::ERR>("Invalid Interface type ",
-                            entry("InterfaceIndex: %d", getInterfaceIndex()));
-            throw std::invalid_argument("Invalid interface type.");
-        }
-
-        for (auto& channel : channelData)
-        {
-            std::string& interfaceName = it->second;
-            if (channel.chName == interfaceName)
-            {
-                curChannel = channel.chID;
-                break;
-            }
-        }
-    }
-    return ((chNum == currentChNum) ? curChannel : chNum);
-}
-
 Json ChannelConfig::readJsonFile(const std::string& configFile)
 {
     std::ifstream jsonFile(configFile);

user_channel/channel_mgmt.hpp

diff --git a/user_channel/channel_mgmt.hpp b/user_channel/channel_mgmt.hpp
index b044f66..80bd6d9 100644
--- a/user_channel/channel_mgmt.hpp
+++ b/user_channel/channel_mgmt.hpp
@@ -224,14 +224,6 @@
      */
     CommandPrivilege convertToPrivLimitIndex(const std::string& value);
 
-    /** @brief function to convert channel number to channel index
-     *
-     *  @param[in] chNum - channel number
-     *
-     *  @return channel index
-     */
-    uint8_t convertToChannelIndexNumber(const uint8_t chNum);
-
     /** @brief function to write persistent channel configuration to config file
      *
      *  @return 0 for success, -errno for failure.