commit 97a7a76c7596b3caaa4f43171b1cefb07f454908
author Tom Joseph <tomjoseph@in.ibm.com> Mon Jul 06 10:37:18 2020 +0530
committer Tom Joseph <tomjoseph@in.ibm.com> Tue Jul 07 19:59:51 2020 +0530
tree 4020a3dd5548a508a3e77e714dbe3bfd2f85488f
parent a65c041a3f730b8ba670108b22299aa37c47017d

pldmtool: Refactor printStateEffecterPDR

Tested:

pldmtool platform GetPDR -d 2

nextRecordHandle: 3
responseCount: 29
recordHandle: 2
PDRHeaderVersion: 1
PDRType: 11
recordChangeNumber: 0
dataLength: 19

PLDMTerminusHandle: 0
effecterID: 1
entityType: Virtual Machine Manager
entityInstanceNumber: 0
containerID: 0
effecterSemanticID: 0
effecterInit: noInit
effecterDescriptionPDR: false
compositeEffecterCount: 1
stateSetID: Boot Progress
possibleStatesSize: 1
possibleStates: 1 2

Signed-off-by: Tom Joseph <tomjoseph@in.ibm.com>
Change-Id: I047b1c280a6b8323f7d4852de2c6388044abbfb6

pldmtool/pldm_platform_cmd.cpp

diff --git a/pldmtool/pldm_platform_cmd.cpp b/pldmtool/pldm_platform_cmd.cpp
index fc3827a..a122435 100644
--- a/pldmtool/pldm_platform_cmd.cpp
+++ b/pldmtool/pldm_platform_cmd.cpp
@@ -118,6 +118,9 @@
     const std::array<std::string_view, 4> sensorInit = {
         "noInit", "useInitPDR", "enableSensor", "disableSensor"};
 
+    const std::array<std::string_view, 4> effecterInit = {
+        "noInit", "useInitPDR", "enableEffecter", "disableEffecter"};
+
     std::string getEntityName(pldm::pdr::EntityType type)
     {
         try
@@ -464,43 +467,48 @@
         }
     }
 
-    void printStateEffecterPDR(uint8_t* data)
+    void printStateEffecterPDR(const uint8_t* data)
     {
-        if (data == NULL)
-        {
-            return;
-        }
-
-        struct pldm_state_effecter_pdr* pdr =
-            (struct pldm_state_effecter_pdr*)data;
+        auto pdr = reinterpret_cast<const pldm_state_effecter_pdr*>(data);
 
         std::cout << "PLDMTerminusHandle: " << pdr->terminus_handle
                   << std::endl;
         std::cout << "effecterID: " << pdr->effecter_id << std::endl;
-        std::cout << "entityType: " << pdr->entity_type << std::endl;
+        std::cout << "entityType: " << getEntityName(pdr->entity_type)
+                  << std::endl;
         std::cout << "entityInstanceNumber: " << pdr->entity_instance
                   << std::endl;
         std::cout << "containerID: " << pdr->container_id << std::endl;
         std::cout << "effecterSemanticID: " << pdr->effecter_semantic_id
                   << std::endl;
-        std::cout << "effecterInit: " << unsigned(pdr->effecter_init)
+        std::cout << "effecterInit: " << effecterInit[pdr->effecter_init]
                   << std::endl;
         std::cout << "effecterDescriptionPDR: "
-                  << (unsigned(pdr->has_description_pdr) ? "true" : "false")
-                  << std::endl;
+                  << (pdr->has_description_pdr ? "true" : "false") << std::endl;
         std::cout << "compositeEffecterCount: "
                   << unsigned(pdr->composite_effecter_count) << std::endl;
 
-        for (size_t i = 0; i < pdr->composite_effecter_count; ++i)
+        auto statesPtr = pdr->possible_states;
+        auto compositeEffecterCount = pdr->composite_effecter_count;
+
+        while (compositeEffecterCount--)
         {
-            struct state_effecter_possible_states* state =
-                (struct state_effecter_possible_states*)pdr->possible_states +
-                i * sizeof(state_effecter_possible_states);
-            std::cout << "stateSetID: " << state->state_set_id << std::endl;
+            auto state =
+                reinterpret_cast<const state_effecter_possible_states*>(
+                    statesPtr);
+            std::cout << "stateSetID: " << getStateSetName(state->state_set_id)
+                      << std::endl;
             std::cout << "possibleStatesSize: "
                       << unsigned(state->possible_states_size) << std::endl;
-            bitfield8_t* bf = reinterpret_cast<bitfield8_t*>(state->states);
-            std::cout << "possibleStates: " << unsigned(bf->byte) << std::endl;
+            std::cout << "possibleStates:";
+            printPossibleStates(state->possible_states_size, state->states);
+            std::cout << std::endl;
+
+            if (compositeEffecterCount)
+            {
+                statesPtr += sizeof(state_effecter_possible_states) +
+                             state->possible_states_size - 1;
+            }
         }
     }