diff options
| author | Ratan Gupta <ratagupt@in.ibm.com> | 2017-08-05 11:59:39 +0530 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-08-11 17:29:08 +0000 |
| commit | 11ddbd21ede92a1d46a4df5fa3d9328b9fe08486 (patch) | |
| tree | 2622bc7a6aa6edda19221db3a3b15690262a7c81 /dcmihandler.cpp | |
| parent | cc8feb4f72d1c4388f9a81727e36eb1bbc754251 (diff) | |
| download | phosphor-host-ipmid-11ddbd21ede92a1d46a4df5fa3d9328b9fe08486.tar.gz phosphor-host-ipmid-11ddbd21ede92a1d46a4df5fa3d9328b9fe08486.zip | |
dcmi: Put enum ipmi_netfn_sen_cmds inside namespace
The enum is defined in sensorhandler.h as well as here
it may happen that some cpp will include both header files
and it may lead to multiple definition error.
Change-Id: I848de8cbde42831303493862a7bdf8966176b9d1
Signed-off-by: Ratan Gupta <ratagupt@in.ibm.com>
Diffstat (limited to 'dcmihandler.cpp')
| -rw-r--r-- | dcmihandler.cpp | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/dcmihandler.cpp b/dcmihandler.cpp index 0508b81..5df6559 100644 --- a/dcmihandler.cpp +++ b/dcmihandler.cpp @@ -486,29 +486,39 @@ ipmi_ret_t setAssetTag(ipmi_netfn_t netfn, ipmi_cmd_t cmd, void register_netfn_dcmi_functions() { // <Get Power Limit> - printf("Registering NetFn:[0x%X], Cmd:[0x%X]\n",NETFUN_GRPEXT, IPMI_CMD_DCMI_GET_POWER_LIMIT); - ipmi_register_callback(NETFUN_GRPEXT, IPMI_CMD_DCMI_GET_POWER_LIMIT, NULL, getPowerLimit, - PRIVILEGE_USER); + printf("Registering NetFn:[0x%X], Cmd:[0x%X]\n", + NETFUN_GRPEXT, dcmi::Commands::GET_POWER_LIMIT); + + ipmi_register_callback(NETFUN_GRPEXT, dcmi::Commands::GET_POWER_LIMIT, + NULL, getPowerLimit, PRIVILEGE_USER); // <Set Power Limit> - printf("Registering NetFn:[0x%X], Cmd:[0x%X]\n",NETFUN_GRPEXT, IPMI_CMD_DCMI_SET_POWER_LIMIT); - ipmi_register_callback(NETFUN_GRPEXT, IPMI_CMD_DCMI_SET_POWER_LIMIT, NULL, setPowerLimit, - PRIVILEGE_OPERATOR); + printf("Registering NetFn:[0x%X], Cmd:[0x%X]\n", + NETFUN_GRPEXT, dcmi::Commands::SET_POWER_LIMIT); + + ipmi_register_callback(NETFUN_GRPEXT, dcmi::Commands::SET_POWER_LIMIT, + NULL, setPowerLimit, PRIVILEGE_OPERATOR); // <Activate/Deactivate Power Limit> - printf("Registering NetFn:[0x%X], Cmd:[0x%X]\n",NETFUN_GRPEXT, IPMI_CMD_DCMI_APPLY_POWER_LIMIT); - ipmi_register_callback(NETFUN_GRPEXT, IPMI_CMD_DCMI_APPLY_POWER_LIMIT, NULL, applyPowerLimit, - PRIVILEGE_OPERATOR); + printf("Registering NetFn:[0x%X], Cmd:[0x%X]\n", + NETFUN_GRPEXT, dcmi::Commands::APPLY_POWER_LIMIT); + + ipmi_register_callback(NETFUN_GRPEXT, dcmi::Commands::APPLY_POWER_LIMIT, + NULL, applyPowerLimit, PRIVILEGE_OPERATOR); // <Get Asset Tag> - printf("Registering NetFn:[0x%X], Cmd:[0x%X]\n",NETFUN_GRPEXT, IPMI_CMD_DCMI_GET_ASSET_TAG); - ipmi_register_callback(NETFUN_GRPEXT, IPMI_CMD_DCMI_GET_ASSET_TAG, NULL, getAssetTag, - PRIVILEGE_USER); + printf("Registering NetFn:[0x%X], Cmd:[0x%X]\n", + NETFUN_GRPEXT, dcmi::Commands::GET_ASSET_TAG); + + ipmi_register_callback(NETFUN_GRPEXT, dcmi::Commands::GET_ASSET_TAG, + NULL, getAssetTag, PRIVILEGE_USER); // <Set Asset Tag> - printf("Registering NetFn:[0x%X], Cmd:[0x%X]\n",NETFUN_GRPEXT, IPMI_CMD_DCMI_SET_ASSET_TAG); - ipmi_register_callback(NETFUN_GRPEXT, IPMI_CMD_DCMI_SET_ASSET_TAG, NULL, setAssetTag, - PRIVILEGE_OPERATOR); + printf("Registering NetFn:[0x%X], Cmd:[0x%X]\n", + NETFUN_GRPEXT, dcmi::Commands::SET_ASSET_TAG); + + ipmi_register_callback(NETFUN_GRPEXT, dcmi::Commands::SET_ASSET_TAG, + NULL, setAssetTag, PRIVILEGE_OPERATOR); return; } // 956379 |
