remove ipmi_ret_t
Since ipmi_ret_t declared in api.h has been gradually deprecated,
this submission will use ipmi::Cc in api.hpp instead.
Change-Id: I0f6ad7a6ffe7d35f76145acff04e8e0ae4d45685
Signed-off-by: George Liu <liuxiwei@ieisystem.com>
diff --git a/dbus-sdr/sensorcommands.cpp b/dbus-sdr/sensorcommands.cpp
index 4808f4b..f3b1720 100644
--- a/dbus-sdr/sensorcommands.cpp
+++ b/dbus-sdr/sensorcommands.cpp
@@ -153,9 +153,9 @@
.count();
});
-ipmi_ret_t getSensorConnection(ipmi::Context::ptr ctx, uint8_t sensnum,
- std::string& connection, std::string& path,
- std::vector<std::string>* interfaces)
+ipmi::Cc getSensorConnection(ipmi::Context::ptr ctx, uint8_t sensnum,
+ std::string& connection, std::string& path,
+ std::vector<std::string>* interfaces)
{
auto& sensorTree = getSensorTree();
if (!getSensorSubtree(sensorTree) && sensorTree.empty())
diff --git a/dbus-sdr/storagecommands.cpp b/dbus-sdr/storagecommands.cpp
index 1de8607..037e018 100644
--- a/dbus-sdr/storagecommands.cpp
+++ b/dbus-sdr/storagecommands.cpp
@@ -537,14 +537,14 @@
return ipmi::responseSuccess(fru.size(), accessType);
}
-ipmi_ret_t getFruSdrCount(ipmi::Context::ptr, size_t& count)
+ipmi::Cc getFruSdrCount(ipmi::Context::ptr, size_t& count)
{
count = deviceHashes.size();
return ipmi::ccSuccess;
}
-ipmi_ret_t getFruSdrs([[maybe_unused]] ipmi::Context::ptr ctx, size_t index,
- get_sdr::SensorDataFruRecord& resp)
+ipmi::Cc getFruSdrs([[maybe_unused]] ipmi::Context::ptr ctx, size_t index,
+ get_sdr::SensorDataFruRecord& resp)
{
if (deviceHashes.size() < index)
{
diff --git a/groupext.cpp b/groupext.cpp
index a3a806e..d71c6cf 100644
--- a/groupext.cpp
+++ b/groupext.cpp
@@ -5,12 +5,12 @@
#define GRPEXT_GET_GROUP_CMD 0
void registerNetFnGroupExtFunctions() __attribute__((constructor));
-ipmi_ret_t ipmi_groupext(ipmi_netfn_t, ipmi_cmd_t, ipmi_request_t,
- ipmi_response_t response, ipmi_data_len_t data_len,
- ipmi_context_t)
+ipmi::Cc ipmi_groupext(ipmi_netfn_t, ipmi_cmd_t, ipmi_request_t,
+ ipmi_response_t response, ipmi_data_len_t data_len,
+ ipmi_context_t)
{
// Generic return from IPMI commands.
- ipmi_ret_t rc = ipmi::ccSuccess;
+ ipmi::Cc rc = ipmi::ccSuccess;
uint8_t* p = (uint8_t*)response;
std::printf("IPMI GROUP EXTENSIONS\n");
diff --git a/include/dbus-sdr/sensorcommands.hpp b/include/dbus-sdr/sensorcommands.hpp
index 9184633..b64cbef 100644
--- a/include/dbus-sdr/sensorcommands.hpp
+++ b/include/dbus-sdr/sensorcommands.hpp
@@ -109,9 +109,9 @@
SensorSubTree& getSensorTree();
-ipmi_ret_t getSensorConnection(ipmi::Context::ptr ctx, uint8_t sensnum,
- std::string& connection, std::string& path,
- std::vector<std::string>* interfaces = nullptr);
+ipmi::Cc getSensorConnection(ipmi::Context::ptr ctx, uint8_t sensnum,
+ std::string& connection, std::string& path,
+ std::vector<std::string>* interfaces = nullptr);
struct IPMIThresholds
{
diff --git a/include/dbus-sdr/storagecommands.hpp b/include/dbus-sdr/storagecommands.hpp
index 21c7613..7a1fc92 100644
--- a/include/dbus-sdr/storagecommands.hpp
+++ b/include/dbus-sdr/storagecommands.hpp
@@ -123,10 +123,10 @@
{
constexpr const size_t type12Count = 2;
-ipmi_ret_t getFruSdrs(ipmi::Context::ptr ctx, size_t index,
- get_sdr::SensorDataFruRecord& resp);
+ipmi::Cc getFruSdrs(ipmi::Context::ptr ctx, size_t index,
+ get_sdr::SensorDataFruRecord& resp);
-ipmi_ret_t getFruSdrCount(ipmi::Context::ptr ctx, size_t& count);
+ipmi::Cc getFruSdrCount(ipmi::Context::ptr ctx, size_t& count);
std::vector<uint8_t> getType8SDRs(
ipmi::sensor::EntityInfoMap::const_iterator& entity, uint16_t recordId);
diff --git a/sensordatahandler.cpp b/sensordatahandler.cpp
index 05471b1..ae0b878 100644
--- a/sensordatahandler.cpp
+++ b/sensordatahandler.cpp
@@ -31,7 +31,7 @@
return std::make_pair(assertionStates, deassertionStates);
}
-ipmi_ret_t updateToDbus(IpmiUpdateData& msg)
+ipmi::Cc updateToDbus(IpmiUpdateData& msg)
{
sdbusplus::bus_t bus{ipmid_get_sd_bus_connection()};
try
@@ -196,8 +196,8 @@
updateInterface.c_str(), command.c_str());
}
-ipmi_ret_t eventdata(const SetSensorReadingReq&, const Info& sensorInfo,
- uint8_t data)
+ipmi::Cc eventdata(const SetSensorReadingReq&, const Info& sensorInfo,
+ uint8_t data)
{
auto msg =
makeDbusMsg("org.freedesktop.DBus.Properties", sensorInfo.sensorPath,
@@ -219,7 +219,7 @@
return updateToDbus(msg);
}
-ipmi_ret_t assertion(const SetSensorReadingReq& cmdData, const Info& sensorInfo)
+ipmi::Cc assertion(const SetSensorReadingReq& cmdData, const Info& sensorInfo)
{
std::bitset<16> assertionSet(getAssertionSet(cmdData).first);
std::bitset<16> deassertionSet(getAssertionSet(cmdData).second);
@@ -289,7 +289,7 @@
updateInterface.c_str(), command.c_str());
}
-ipmi_ret_t assertion(const SetSensorReadingReq& cmdData, const Info& sensorInfo)
+ipmi::Cc assertion(const SetSensorReadingReq& cmdData, const Info& sensorInfo)
{
auto msg = makeDbusMsg(sensorInfo.sensorInterface, sensorInfo.sensorPath,
"Notify", sensorInfo.sensorInterface);
diff --git a/sensordatahandler.hpp b/sensordatahandler.hpp
index 1cedda5..db80a69 100644
--- a/sensordatahandler.hpp
+++ b/sensordatahandler.hpp
@@ -51,7 +51,7 @@
* @param[in] msg - message to send
* @return failure status in IPMI error code
*/
-ipmi_ret_t updateToDbus(IpmiUpdateData& msg);
+ipmi::Cc updateToDbus(IpmiUpdateData& msg);
namespace get
{
@@ -500,8 +500,7 @@
* @param[in] sensorInfo - sensor d-bus info
* @return a IPMI error code
*/
-ipmi_ret_t assertion(const SetSensorReadingReq& cmdData,
- const Info& sensorInfo);
+ipmi::Cc assertion(const SetSensorReadingReq& cmdData, const Info& sensorInfo);
/** @brief Update d-bus based on a reading assertion
* @tparam T - type of d-bus property mapping this sensor
@@ -510,8 +509,8 @@
* @return a IPMI error code
*/
template <typename T>
-ipmi_ret_t readingAssertion(const SetSensorReadingReq& cmdData,
- const Info& sensorInfo)
+ipmi::Cc readingAssertion(const SetSensorReadingReq& cmdData,
+ const Info& sensorInfo)
{
auto msg =
makeDbusMsg("org.freedesktop.DBus.Properties", sensorInfo.sensorPath,
@@ -535,8 +534,7 @@
* @return an IPMI error code
*/
template <typename T>
-ipmi_ret_t readingData(const SetSensorReadingReq& cmdData,
- const Info& sensorInfo)
+ipmi::Cc readingData(const SetSensorReadingReq& cmdData, const Info& sensorInfo)
{
T raw_value = (sensorInfo.coefficientM * cmdData.reading) +
sensorInfo.scaledOffset;
@@ -564,16 +562,16 @@
* @param[in] sensorInfo - sensor d-bus info
* @return a IPMI error code
*/
-ipmi_ret_t eventdata(const SetSensorReadingReq& cmdData, const Info& sensorInfo,
- uint8_t data);
+ipmi::Cc eventdata(const SetSensorReadingReq& cmdData, const Info& sensorInfo,
+ uint8_t data);
/** @brief Update d-bus based on eventdata1 type sensor data
* @param[in] cmdData - input sensor data
* @param[in] sensorInfo - sensor d-bus info
* @return a IPMI error code
*/
-inline ipmi_ret_t eventdata1(const SetSensorReadingReq& cmdData,
- const Info& sensorInfo)
+inline ipmi::Cc eventdata1(const SetSensorReadingReq& cmdData,
+ const Info& sensorInfo)
{
return eventdata(cmdData, sensorInfo, cmdData.eventData1);
}
@@ -583,8 +581,8 @@
* @param[in] sensorInfo - sensor d-bus info
* @return a IPMI error code
*/
-inline ipmi_ret_t eventdata2(const SetSensorReadingReq& cmdData,
- const Info& sensorInfo)
+inline ipmi::Cc eventdata2(const SetSensorReadingReq& cmdData,
+ const Info& sensorInfo)
{
return eventdata(cmdData, sensorInfo, cmdData.eventData2);
}
@@ -594,8 +592,8 @@
* @param[in] sensorInfo - sensor d-bus info
* @return a IPMI error code
*/
-inline ipmi_ret_t eventdata3(const SetSensorReadingReq& cmdData,
- const Info& sensorInfo)
+inline ipmi::Cc eventdata3(const SetSensorReadingReq& cmdData,
+ const Info& sensorInfo)
{
return eventdata(cmdData, sensorInfo, cmdData.eventData3);
}
@@ -623,8 +621,7 @@
* @param[in] sensorInfo - sensor d-bus info
* @return a IPMI error code
*/
-ipmi_ret_t assertion(const SetSensorReadingReq& cmdData,
- const Info& sensorInfo);
+ipmi::Cc assertion(const SetSensorReadingReq& cmdData, const Info& sensorInfo);
} // namespace notify
diff --git a/sensorhandler.cpp b/sensorhandler.cpp
index c8d6d94..6940134 100644
--- a/sensorhandler.cpp
+++ b/sensorhandler.cpp
@@ -1122,9 +1122,9 @@
}
}
-ipmi_ret_t populate_record_from_dbus(get_sdr::SensorDataFullRecordBody* body,
- const ipmi::sensor::Info* info,
- ipmi_data_len_t)
+ipmi::Cc populate_record_from_dbus(get_sdr::SensorDataFullRecordBody* body,
+ const ipmi::sensor::Info* info,
+ ipmi_data_len_t)
{
/* Functional sensor case */
if (isAnalogSensor(info->propertyInterfaces.begin()->first))
@@ -1163,8 +1163,8 @@
return ipmi::ccSuccess;
};
-ipmi_ret_t ipmi_fru_get_sdr(ipmi_request_t request, ipmi_response_t response,
- ipmi_data_len_t data_len)
+ipmi::Cc ipmi_fru_get_sdr(ipmi_request_t request, ipmi_response_t response,
+ ipmi_data_len_t data_len)
{
auto req = reinterpret_cast<get_sdr::GetSdrReq*>(request);
auto resp = reinterpret_cast<get_sdr::GetSdrResp*>(response);
@@ -1254,8 +1254,8 @@
return ipmi::ccSuccess;
}
-ipmi_ret_t ipmi_entity_get_sdr(ipmi_request_t request, ipmi_response_t response,
- ipmi_data_len_t data_len)
+ipmi::Cc ipmi_entity_get_sdr(ipmi_request_t request, ipmi_response_t response,
+ ipmi_data_len_t data_len)
{
auto req = reinterpret_cast<get_sdr::GetSdrReq*>(request);
auto resp = reinterpret_cast<get_sdr::GetSdrResp*>(response);
@@ -1327,11 +1327,11 @@
return ipmi::ccSuccess;
}
-ipmi_ret_t ipmi_sen_get_sdr(ipmi_netfn_t, ipmi_cmd_t, ipmi_request_t request,
- ipmi_response_t response, ipmi_data_len_t data_len,
- ipmi_context_t)
+ipmi::Cc ipmi_sen_get_sdr(ipmi_netfn_t, ipmi_cmd_t, ipmi_request_t request,
+ ipmi_response_t response, ipmi_data_len_t data_len,
+ ipmi_context_t)
{
- ipmi_ret_t ret = ipmi::ccSuccess;
+ ipmi::Cc ret = ipmi::ccSuccess;
get_sdr::GetSdrReq* req = (get_sdr::GetSdrReq*)request;
get_sdr::GetSdrResp* resp = (get_sdr::GetSdrResp*)response;
@@ -1445,9 +1445,9 @@
return true;
}
-ipmi_ret_t ipmicmdPlatformEvent(ipmi_netfn_t, ipmi_cmd_t,
- ipmi_request_t request, ipmi_response_t,
- ipmi_data_len_t dataLen, ipmi_context_t)
+ipmi::Cc ipmicmdPlatformEvent(ipmi_netfn_t, ipmi_cmd_t, ipmi_request_t request,
+ ipmi_response_t, ipmi_data_len_t dataLen,
+ ipmi_context_t)
{
uint16_t generatorID;
size_t count;
diff --git a/sensorhandler.hpp b/sensorhandler.hpp
index 74b1862..385caf5 100644
--- a/sensorhandler.hpp
+++ b/sensorhandler.hpp
@@ -74,9 +74,9 @@
int set_sensor_dbus_state_y(uint8_t, const char*, const uint8_t);
int find_openbmc_path(uint8_t, dbus_interface_t*);
-ipmi_ret_t ipmi_sen_get_sdr(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
- ipmi_request_t request, ipmi_response_t response,
- ipmi_data_len_t data_len, ipmi_context_t context);
+ipmi::Cc ipmi_sen_get_sdr(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
+ ipmi_request_t request, ipmi_response_t response,
+ ipmi_data_len_t data_len, ipmi_context_t context);
ipmi::RspType<uint16_t> ipmiSensorReserveSdr();
diff --git a/storagehandler.cpp b/storagehandler.cpp
index c13c760..43cc142 100644
--- a/storagehandler.cpp
+++ b/storagehandler.cpp
@@ -282,9 +282,9 @@
ipmi::sel::operationSupport::overflow);
}
-ipmi_ret_t getSELEntry(ipmi_netfn_t, ipmi_cmd_t, ipmi_request_t request,
- ipmi_response_t response, ipmi_data_len_t data_len,
- ipmi_context_t)
+ipmi::Cc getSELEntry(ipmi_netfn_t, ipmi_cmd_t, ipmi_request_t request,
+ ipmi_response_t response, ipmi_data_len_t data_len,
+ ipmi_context_t)
{
if (*data_len != sizeof(ipmi::sel::GetSELEntryRequest))
{