From 9511dde54f55257edd1c47ff709742638c21fbe8 Mon Sep 17 00:00:00 2001 From: Roland Veloz Date: Mon, 14 Aug 2017 11:26:59 -0500 Subject: Post merge corrections for method firmware_request Change-Id: Ic1a10749ad24765e1ff11544124286fc59051e1c RTC:175856 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44601 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: William G. Hoffa Tested-by: FSP CI Jenkins Reviewed-by: ILYA SMIRNOV Reviewed-by: Donald Washburn Reviewed-by: Daniel M. Crowell --- src/include/runtime/interface.h | 7 +++---- src/usr/isteps/pm/runtime/rt_pm.C | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/include/runtime/interface.h b/src/include/runtime/interface.h index 7fa1e86fb..7fe940a99 100644 --- a/src/include/runtime/interface.h +++ b/src/include/runtime/interface.h @@ -549,11 +549,10 @@ typedef struct hostInterfaces }; }; - // Created this enum to hold the base size of hbrt_fw_msg + + // Created a static constexpr to return the base size of hbrt_fw_msg // Can't do #define - sizeof not allowed to be used in #defines - // Can't do a constant, if you do, you will need to create - // an instance of this struct to get to it - enum { HBRT_FW_MSG_BASE_SIZE = sizeof(uint64_t) }; + static constexpr size_t HBRT_FW_MSG_BASE_SIZE = sizeof(uint64_t); /** * @brief Send a request to firmware, and receive a response diff --git a/src/usr/isteps/pm/runtime/rt_pm.C b/src/usr/isteps/pm/runtime/rt_pm.C index 862e92ce7..33d2014d1 100644 --- a/src/usr/isteps/pm/runtime/rt_pm.C +++ b/src/usr/isteps/pm/runtime/rt_pm.C @@ -466,13 +466,13 @@ namespace RTPM * @reasoncode RC_PM_RT_HCODE_UPDATE_ERR * @userdata1[0:31] Firmware Request return code * @userdata1[32:63] SCOM address - * @userdata2[0:31] Generic response code - if it exits - * @userdata2[32:63] Firmware Respone type + * @userdata2[0:31] Generic response code - if it exists + * @userdata2[32:63] Firmware Response type * @devdesc Firmware Request for * HCODE SCOM update error */ // - // Pack the generic responce code if the response + // Pack the generic response code if the response // is of type "RESP_GENERIC" // else just send the response type alone uint64_t l_userData2 = 0; -- cgit v1.2.1