From b0cd81c61e92c24cd6046f769f06df196432e8c9 Mon Sep 17 00:00:00 2001 From: "MATTHEW I. HICKMAN" Date: Tue, 3 Sep 2019 16:28:45 -0500 Subject: Fixed several small bugs found via code review CQ:SW474830 Change-Id: I1ff22805b9bb3facf68d4d62ea66de169be9b98b Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/83213 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Daniel M Crowell --- src/include/usr/isteps/nvdimm/nvdimm.H | 4 ++-- src/include/usr/isteps/nvdimm/nvdimmreasoncodes.H | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/include/usr') diff --git a/src/include/usr/isteps/nvdimm/nvdimm.H b/src/include/usr/isteps/nvdimm/nvdimm.H index 2aae34c82..2f4430791 100644 --- a/src/include/usr/isteps/nvdimm/nvdimm.H +++ b/src/include/usr/isteps/nvdimm/nvdimm.H @@ -57,7 +57,7 @@ enum nvdimm_err_status * @param[in] i_nvdimmList - list of nvdimm targets * **/ -errlHndl_t nvdimm_restore(TARGETING::TargetHandleList &i_nvdimmList); +void nvdimm_restore(TARGETING::TargetHandleList &i_nvdimmList); /** @@ -456,7 +456,7 @@ void nvdimmAddPage4Regs(TARGETING::Target *i_nvdimm, errlHndl_t& io_err); * @return errlHndl_t - nullptr if successful, otherwise a pointer to * the error log. */ -errlHndl_t nvdimm_init(TARGETING::Target *i_nvdimm); +void nvdimm_init(TARGETING::Target *i_nvdimm); } diff --git a/src/include/usr/isteps/nvdimm/nvdimmreasoncodes.H b/src/include/usr/isteps/nvdimm/nvdimmreasoncodes.H index 72b77d835..8f27f3171 100644 --- a/src/include/usr/isteps/nvdimm/nvdimmreasoncodes.H +++ b/src/include/usr/isteps/nvdimm/nvdimmreasoncodes.H @@ -106,6 +106,7 @@ enum nvdimmModuleId NVDIMM_NVM_HEALTH_CHECK = 0x38, // Health check on the NVM (non-volatile memory)/flash NVDIMM_WAIT_OPER_OPS_COMPLETE = 0x39, NVDIMM_COMPARE_CKSUM = 0x3A, + NVDIMM_CHECK_FW_SLOT = 0x3B, }; /** @@ -196,6 +197,7 @@ enum nvdimmReasonCode NVDIMM_NVM_HEALTH_CHECK_FAILED = NVDIMM_COMP_ID | 0x4D, // !< An NVM health check on the NVDIMM failed NVDIMM_VENDOR_LOG_TIMEOUT = NVDIMM_COMP_ID | 0x4E, // Vendor log for FFDC timeout NVDIMM_VENDOR_LOG_CKSUM_FAILED = NVDIMM_COMP_ID | 0x4F, // Vendor log for FFDC checksum fail + NVDIMM_INVALID_FW_SLOT = NVDIMM_COMP_ID | 0x50, }; enum UserDetailsTypes -- cgit v1.2.3