summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRoland Veloz <rveloz@us.ibm.com>2017-08-14 11:26:59 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2017-09-18 15:38:55 -0400
commit9511dde54f55257edd1c47ff709742638c21fbe8 (patch)
treefc172c35b1b70b3dfc2d6511c8d9d142cd92e253 /src
parent0ab063c088f59890c409b7d00e0bf6afcf07dc16 (diff)
downloadtalos-hostboot-9511dde54f55257edd1c47ff709742638c21fbe8.tar.gz
talos-hostboot-9511dde54f55257edd1c47ff709742638c21fbe8.zip
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 <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: ILYA SMIRNOV <ismirno@us.ibm.com> Reviewed-by: Donald Washburn <dwashbur@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
-rw-r--r--src/include/runtime/interface.h7
-rw-r--r--src/usr/isteps/pm/runtime/rt_pm.C6
2 files changed, 6 insertions, 7 deletions
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;
OpenPOWER on IntegriCloud