Fix HW Keyword Handling
This commit fixes how we handle multiple planar passes.
For HW keywords above 2, we do not have an entry in the
system type map.
We cannot keep adding a new entry to the system type to dev.
tree map every time we get a new planar pass (when the new pass
does not need a new device tree).
This commit makes use of existing code that handles
constraints in the systems JSON and enables us to default
to a system type (which is basically our JSON name) when the
constraint is not met.
Tested:
Tested on a pass 4 planar and ensured we load the right device
tree.
Signed-off-by: Santosh Puranik <santosh.puranik@in.ibm.com>
Change-Id: Ibaf9785314ca3920072663d52fffecfca28c9445
diff --git a/const.hpp b/const.hpp
index 5cab687..ef0793e 100644
--- a/const.hpp
+++ b/const.hpp
@@ -49,12 +49,12 @@
constexpr uint8_t EXP_LOCATIN_CODE_MIN_LENGTH = 17;
static constexpr auto SE_KWD_LENGTH = 7;
static constexpr auto INVALID_NODE_NUMBER = -1;
-static constexpr auto RAINIER_2U = "50001001_0001";
-static constexpr auto RAINIER_2U_V2 = "50001001_0002";
-static constexpr auto RAINIER_4U = "50001000_0001";
-static constexpr auto RAINIER_4U_V2 = "50001000_0002";
-static constexpr auto RAINIER_1S4U = "50001002";
-static constexpr auto EVEREST = "50003000";
+static constexpr auto RAINIER_2U = "50001001.json";
+static constexpr auto RAINIER_2U_V2 = "50001001_v2.json";
+static constexpr auto RAINIER_4U = "50001000.json";
+static constexpr auto RAINIER_4U_V2 = "50001000_v2.json";
+static constexpr auto RAINIER_1S4U = "50001002.json";
+static constexpr auto EVEREST = "50003000.json";
constexpr uint8_t KW_VPD_START_TAG = 0x82;
constexpr uint8_t KW_VPD_END_TAG = 0x78;