PEL: Get rid of the enum for a maint procedure
It simplifies the code to just use the string name of the procedure as defined
by the message registry schema, and make it be less maintenance to add
new procedures in the future, especially if they come from the registry
so the enum isn't even needed.
This will also make it the same as upcoming support for symbolic FRU
callouts, which will always just come from the registry or an external
user so would not need an enum.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: Ia8550235678ba1fc717a6b0875e2d7ff3888bfec
diff --git a/extensions/openpower-pels/pel_values.hpp b/extensions/openpower-pels/pel_values.hpp
index 163c6da..04c287d 100644
--- a/extensions/openpower-pels/pel_values.hpp
+++ b/extensions/openpower-pels/pel_values.hpp
@@ -26,19 +26,6 @@
using PELFieldValue = std::tuple<uint32_t, const char*, const char*>;
using PELValues = std::vector<PELFieldValue>;
-// The maintenance procedure enum
-const int mpEnumPos = 0;
-
-// The maintenance procedure value from the registry
-const int mpRegistryNamePos = 1;
-
-// The string name of the maintenance procedure
-const int mpNamePos = 2;
-
-using MaintenanceProcedureValue =
- std::tuple<MaintProcedure, const char*, const char*>;
-using MaintenanceProcedureValues = std::vector<MaintenanceProcedureValue>;
-
const std::string sectionVer = "Section Version";
const std::string subSection = "Sub-section type";
const std::string createdBy = "Created by";
@@ -85,19 +72,6 @@
const PELValues& fields);
/**
- * @brief Finds the entry in the maintenance procedure list
- * based on the enum passed in.
- *
- * The function asserts that a result is found.
- *
- * @param[in] procedure - The procedure enum
- *
- * @return const_iterator - Iterator for that list entry
- */
-MaintenanceProcedureValues::const_iterator
- getMaintProcedure(MaintProcedure procedure);
-
-/**
* @brief The values for the 'subsystem' field in the User Header
*/
extern const PELValues subsystemValues;
@@ -158,11 +132,9 @@
extern const std::map<bool, std::string> boolString;
/**
- * @brief All maintenance procedures.
- *
- * The procedure enum, registry name, and actual string value.
+ * @brief Map for maintenance procedures
*/
-extern const MaintenanceProcedureValues maintenanceProcedures;
+extern const std::map<std::string, std::string> maintenanceProcedures;
} // namespace pel_values
} // namespace pels