commit d2a57decf383eb3faf3587739ad0b3181b7bb2d6
author Vernon Mauery <vernon.mauery@linux.intel.com> Mon Mar 25 12:45:28 2019 -0700
committer Vernon Mauery <vernon.mauery@linux.intel.com> Mon Apr 01 15:11:00 2019 -0700
tree e33f4e546bdf3284c511ef56e565dff06455c75e
parent 392050fa407b35b0ac5c0a3172d36d7e30d5b074

Remove old channel commands

New channel commands have been implemented in user_channel/channelcommands.cpp

This removes the old, unused command implementation

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

apphandler.cpp

diff --git a/apphandler.cpp b/apphandler.cpp
index 8875cd8..20104fe 100644
--- a/apphandler.cpp
+++ b/apphandler.cpp
@@ -1108,20 +1108,6 @@
     ipmi_register_callback(NETFUN_APP, IPMI_CMD_GET_ACPI, NULL,
                            ipmi_app_get_acpi_power_state, PRIVILEGE_ADMIN);
 
-// TODO: Below code and associated api's need to be removed later.
-// Its commented for now to avoid merge conflicts with upstream
-// changes and smooth upstream upgrades.
-#if 0
->>>>>>> IPMI Channel commands implementation
-    // <Get Channel Access>
-    ipmi_register_callback(NETFUN_APP, IPMI_CMD_GET_CHANNEL_ACCESS, NULL,
-                           ipmi_get_channel_access, PRIVILEGE_USER);
-
-    // <Get Channel Info Command>
-    ipmi_register_callback(NETFUN_APP, IPMI_CMD_GET_CHAN_INFO, NULL,
-                           ipmi_app_channel_info, PRIVILEGE_USER);
-#endif
-
     // <Get System GUID Command>
     ipmi_register_callback(NETFUN_APP, IPMI_CMD_GET_SYS_GUID, NULL,
                            ipmi_app_get_sys_guid, PRIVILEGE_USER);
@@ -1129,11 +1115,7 @@
     // <Get Channel Cipher Suites Command>
     ipmi_register_callback(NETFUN_APP, IPMI_CMD_GET_CHAN_CIPHER_SUITES, NULL,
                            getChannelCipherSuites, PRIVILEGE_CALLBACK);
-#if 0
-    // <Set Channel Access Command>
-    ipmi_register_callback(NETFUN_APP, IPMI_CMD_SET_CHAN_ACCESS, NULL,
-                           ipmi_set_channel_access, PRIVILEGE_ADMIN);
-#endif
+
     // <Get System Info Command>
     ipmi_register_callback(NETFUN_APP, IPMI_CMD_GET_SYSTEM_INFO, NULL,
                            ipmi_app_get_system_info, PRIVILEGE_USER);