remove IPMI_CC
Since IPMI_CC declared in api.h has been gradually deprecated,
this submission will use ipmi::cc in api.hpp instead.
Change-Id: Ia4858024e78903c52065f4e7e3e97df226883756
Signed-off-by: George Liu <liuxiwei@ieisystem.com>
diff --git a/strgfnhandler.cpp b/strgfnhandler.cpp
index b3005ff..2933195 100644
--- a/strgfnhandler.cpp
+++ b/strgfnhandler.cpp
@@ -28,7 +28,7 @@
char fruFilename[16] = {0};
size_t offset = 0;
size_t len = 0;
- ipmi_ret_t rc = IPMI_CC_INVALID;
+ ipmi_ret_t rc = ipmi::ccInvalidCommand;
const char* mode = nullptr;
// From the payload, extract the header that has fruid and the offsets
@@ -95,7 +95,7 @@
// to the number of bytes written
std::memcpy(response, &len, 1);
*dataLen = 1;
- rc = IPMI_CC_OK;
+ rc = ipmi::ccSuccess;
// Get the reference to global sd_bus object
sd_bus* bus_type = ipmid_get_sd_bus_connection();
@@ -114,8 +114,8 @@
void register_netfn_storage_write_fru()
{
std::printf("Registering NetFn:[0x%X], Cmd:[0x%X]\n", ipmi::netFnStorage,
- IPMI_CMD_WRITE_FRU_DATA);
+ ipmi::storage::cmdWriteFruData);
- ipmi_register_callback(ipmi::netFnStorage, IPMI_CMD_WRITE_FRU_DATA, nullptr,
- ipmiStorageWriteFruData, SYSTEM_INTERFACE);
+ ipmi_register_callback(ipmi::netFnStorage, ipmi::storage::cmdWriteFruData,
+ nullptr, ipmiStorageWriteFruData, SYSTEM_INTERFACE);
}
diff --git a/writefrudata.hpp b/writefrudata.hpp
index ad39ccc..35f8d16 100644
--- a/writefrudata.hpp
+++ b/writefrudata.hpp
@@ -3,12 +3,6 @@
#include <sdbusplus/bus.hpp>
-// IPMI commands for Storage net functions.
-enum ipmi_netfn_storage_cmds
-{
- IPMI_CMD_WRITE_FRU_DATA = 0x12
-};
-
// Format of write fru data command
struct write_fru_data_t
{