update oemcommands.hpp to use new API
All the command handler numbers and netfn numbers were done
using the old API. This updates all the enums to be ipmi::Cmd
or ipmi::NetFn types. This improves readability by eliminating
unneeded static_casts and brings the legacy code to the present.
One minor fix, otherwise the code is the same. The call to
registerFilter was passing a netfn instead of a priority. It compiled
but it was incorrect. This updates it to use the correct parameter.
Tested: builds and produces the same binary output (other than the
aforementioned registerFilter fix)
Change-Id: I7e83123245b3f340088f8ec75a31b7611d0ecda0
Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
diff --git a/src/manufacturingcommands.cpp b/src/manufacturingcommands.cpp
index c7ab5cf..38c44d9 100644
--- a/src/manufacturingcommands.cpp
+++ b/src/manufacturingcommands.cpp
@@ -773,43 +773,33 @@
void register_mtm_commands()
{
// <Get SM Signal>
- ipmi::registerHandler(
- ipmi::prioOemBase, ipmi::netFnOemOne,
- static_cast<ipmi::Cmd>(IPMINetfnIntelOEMGeneralCmd::cmdGetSmSignal),
- ipmi::Privilege::Admin, ipmi::appMTMGetSignal);
+ ipmi::registerHandler(ipmi::prioOemBase, ipmi::intel::netFnGeneral,
+ ipmi::intel::general::cmdGetSmSignal,
+ ipmi::Privilege::Admin, ipmi::appMTMGetSignal);
- ipmi::registerHandler(
- ipmi::prioOemBase, ipmi::netFnOemOne,
- static_cast<ipmi::Cmd>(IPMINetfnIntelOEMGeneralCmd::cmdSetSmSignal),
- ipmi::Privilege::Admin, ipmi::appMTMSetSignal);
+ ipmi::registerHandler(ipmi::prioOemBase, ipmi::intel::netFnGeneral,
+ ipmi::intel::general::cmdSetSmSignal,
+ ipmi::Privilege::Admin, ipmi::appMTMSetSignal);
- ipmi::registerHandler(
- ipmi::prioOemBase, ipmi::netFnOemOne,
- static_cast<ipmi::Cmd>(IPMINetfnIntelOEMGeneralCmd::cmdMtmKeepAlive),
- ipmi::Privilege::Admin, ipmi::mtmKeepAlive);
+ ipmi::registerHandler(ipmi::prioOemBase, ipmi::intel::netFnGeneral,
+ ipmi::intel::general::cmdMtmKeepAlive,
+ ipmi::Privilege::Admin, ipmi::mtmKeepAlive);
- ipmi::registerHandler(
- ipmi::prioOemBase, ipmi::netFnOemOne,
- static_cast<ipmi::Cmd>(
- IPMINetfnIntelOEMGeneralCmd::cmdSetManufacturingData),
- ipmi::Privilege::Admin, ipmi::setManufacturingData);
+ ipmi::registerHandler(ipmi::prioOemBase, ipmi::intel::netFnGeneral,
+ ipmi::intel::general::cmdSetManufacturingData,
+ ipmi::Privilege::Admin, ipmi::setManufacturingData);
- ipmi::registerHandler(
- ipmi::prioOemBase, ipmi::netFnOemOne,
- static_cast<ipmi::Cmd>(
- IPMINetfnIntelOEMGeneralCmd::cmdGetManufacturingData),
- ipmi::Privilege::Admin, ipmi::getManufacturingData);
+ ipmi::registerHandler(ipmi::prioOemBase, ipmi::intel::netFnGeneral,
+ ipmi::intel::general::cmdGetManufacturingData,
+ ipmi::Privilege::Admin, ipmi::getManufacturingData);
- ipmi::registerHandler(
- ipmi::prioOemBase, netfunIntelAppOEM,
- static_cast<ipmi_cmd_t>(
- IPMINetfnIntelOEMGeneralCmd::cmdSlotI2CMasterWriteRead),
- ipmi::Privilege::Admin, ipmi::appSlotI2CMasterWriteRead);
+ ipmi::registerHandler(ipmi::prioOemBase, ipmi::intel::netFnApp,
+ ipmi::intel::general::cmdSlotI2CMasterWriteRead,
+ ipmi::Privilege::Admin,
+ ipmi::appSlotI2CMasterWriteRead);
- ipmi::registerFilter(ipmi::netFnOemOne,
+ ipmi::registerFilter(ipmi::prioOemBase,
[](ipmi::message::Request::ptr request) {
return ipmi::mfgFilterMessage(request);
});
-
- return;
}