diff options
| -rw-r--r-- | src/usr/hdat/hdattpmdata.C | 4 | ||||
| -rw-r--r-- | src/usr/runtime/populate_hbruntime.C | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/usr/hdat/hdattpmdata.C b/src/usr/hdat/hdattpmdata.C index 9337c7b9e..34f50e35f 100644 --- a/src/usr/hdat/hdattpmdata.C +++ b/src/usr/hdat/hdattpmdata.C @@ -175,10 +175,10 @@ errlHndl_t HdatTpmData::hdatLoadTpmData(uint32_t &o_size, uint32_t &o_count) // work here would just be duplicated later during the runtime istep. // add the format magic number - iv_hdatTpmData->hdatHdr.hdatStructId = HDAT::HDAT_HDIF_STRUCT_ID; + l_hdatTpmData->hdatHdr.hdatStructId = HDAT::HDAT_HDIF_STRUCT_ID; // add the eyecatcher - memcpy(iv_hdatTpmData->hdatHdr.hdatStructName, + memcpy(l_hdatTpmData->hdatHdr.hdatStructName, g_hdatTpmDataEyeCatch, strlen(g_hdatTpmDataEyeCatch)); diff --git a/src/usr/runtime/populate_hbruntime.C b/src/usr/runtime/populate_hbruntime.C index de2ddb439..40899ecf5 100644 --- a/src/usr/runtime/populate_hbruntime.C +++ b/src/usr/runtime/populate_hbruntime.C @@ -1569,13 +1569,6 @@ errlHndl_t populate_TpmInfoByNode(const uint64_t i_instance) break; } - // TODO RTC 190522 - Remove the following two lines of code once FSP - // adds missing eyecatch and magic number to non-master nodes - l_hdatTpmData->hdatHdr.hdatStructId = HDAT::HDAT_HDIF_STRUCT_ID; - memcpy(l_hdatTpmData->hdatHdr.hdatStructName, - HDAT::g_hdatTpmDataEyeCatch, - strlen(HDAT::g_hdatTpmDataEyeCatch)); - // check that hdat structure format and eye catch were filled out if(l_hdatTpmData->hdatHdr.hdatStructId != HDAT::HDAT_HDIF_STRUCT_ID) { |
