PLDM: Refactor the code
This commit refactors the code as IBM's OEM state
sets where moved to oem/ibm/libpldm/state_set.h
and 7f9523cda174e2c6b0b05c7446a9a8799d302c97 commit
had broken the compilation of pldm master with
oem-ibm enabled.
Signed-off-by: Pavithra Barithaya <pavithra.b@ibm.com>
Change-Id: I676e105ed549b6d19874e6077d1f5dbe0f9b9675
diff --git a/pldmtool/oem/ibm/oem_ibm_state_set.hpp b/pldmtool/oem/ibm/oem_ibm_state_set.hpp
index 74fe895..bf530a1 100644
--- a/pldmtool/oem/ibm/oem_ibm_state_set.hpp
+++ b/pldmtool/oem/ibm/oem_ibm_state_set.hpp
@@ -1,3 +1,5 @@
+#include "oem/ibm/libpldm/state_set.h"
+
#include "oem/ibm/libpldmresponder/oem_ibm_handler.hpp"
/** @brief PLDM OEM State Set range as per DSP0249_1.1.0 specification
@@ -60,8 +62,7 @@
extern const std::map<uint16_t, std::string> OemIBMstateSet{
{PLDM_OEM_IBM_FIRMWARE_UPDATE_STATE, "OEM IBM Firmware Update State"},
{PLDM_OEM_IBM_BOOT_STATE, "OEM IBM Boot State"},
- {pldm::responder::oem_ibm_platform::PLDM_OEM_IBM_VERIFICATION_STATE,
- "OEM IBM Verification State"},
+ {PLDM_OEM_IBM_VERIFICATION_STATE, "OEM IBM Verification State"},
{PLDM_OEM_IBM_SYSTEM_POWER_STATE, "OEM IBM System Power State"}};
/** @brief Map for PLDM OEM IBM firmware update possible state values
@@ -98,8 +99,7 @@
*/
extern const std::map<uint16_t, const std::map<uint8_t, std::string>>
populateOemIBMStateMaps{
- {pldm::responder::oem_ibm_platform::PLDM_OEM_IBM_VERIFICATION_STATE,
- SetOemIBMVerStateValues},
+ {PLDM_OEM_IBM_VERIFICATION_STATE, SetOemIBMVerStateValues},
{PLDM_OEM_IBM_SYSTEM_POWER_STATE, SetOemIBMSysPowerStatesValues},
{PLDM_OEM_IBM_BOOT_STATE, SetOemIBMBootStateValues},
{PLDM_OEM_IBM_FIRMWARE_UPDATE_STATE, SetOemIBMFWUpdateStateValues},