diff options
| author | Matt Derksen <mderkse1@us.ibm.com> | 2019-01-14 16:34:04 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-01-21 08:50:48 -0600 |
| commit | ad1c30eb712f64b0cb826b9592090d4a218b2a81 (patch) | |
| tree | 88cd798ead90906e5ef5d280e240fd6cef43f91d /src/include/usr | |
| parent | 868b68df85eb7aeed7eba3392303fa3be854e2a6 (diff) | |
| download | blackbird-hostboot-ad1c30eb712f64b0cb826b9592090d4a218b2a81.tar.gz blackbird-hostboot-ad1c30eb712f64b0cb826b9592090d4a218b2a81.zip | |
Move NVDIMM operations under NVDIMM modules
Makes it easier to find and include NVDIMM operations.
Also makes it easier to exclude from non-nvdimm supported systems.
Change-Id: I870c2246e1bb9201e6e8032f1868e6e4e6a2b91a
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/70489
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>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Roland Veloz <rveloz@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/include/usr')
| -rw-r--r-- | src/include/usr/i2c/i2cif.H | 5 | ||||
| -rw-r--r-- | src/include/usr/isteps/nvdimm/nvdimmif.H (renamed from src/include/usr/i2c/nvdimmif.H) | 6 | ||||
| -rw-r--r-- | src/include/usr/isteps/nvdimm/nvdimmreasoncodes.H (renamed from src/include/usr/i2c/nvdimmddreasoncodes.H) | 12 |
3 files changed, 14 insertions, 9 deletions
diff --git a/src/include/usr/i2c/i2cif.H b/src/include/usr/i2c/i2cif.H index c33c83e32..4d9aa2ef0 100644 --- a/src/include/usr/i2c/i2cif.H +++ b/src/include/usr/i2c/i2cif.H @@ -26,6 +26,11 @@ #define __I2CIF_H #include <list> +// Handy macros to check i2c ranges +// Pass in an instance of a TARGETING::ATTR_I2C_BUS_SPEED_ARRAY_type +#define I2C_BUS_MAX_ENGINE(var) (sizeof(var)/sizeof(var[0])) +#define I2C_BUS_MAX_PORT(var) (sizeof(var[0])/sizeof(var[0][0])) + namespace I2C { diff --git a/src/include/usr/i2c/nvdimmif.H b/src/include/usr/isteps/nvdimm/nvdimmif.H index 2b60ac4de..4ddfcf970 100644 --- a/src/include/usr/i2c/nvdimmif.H +++ b/src/include/usr/isteps/nvdimm/nvdimmif.H @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/include/usr/i2c/nvdimmif.H $ */ +/* $Source: src/include/usr/isteps/nvdimm/nvdimmif.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2018 */ +/* Contributors Listed Below - COPYRIGHT 2013,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -26,7 +26,7 @@ #define __NVDIMMIF_H #include <list> -#include "eepromif.H" +#include <i2c/eepromif.H> namespace NVDIMM { diff --git a/src/include/usr/i2c/nvdimmddreasoncodes.H b/src/include/usr/isteps/nvdimm/nvdimmreasoncodes.H index 509d19d25..bde22b942 100644 --- a/src/include/usr/i2c/nvdimmddreasoncodes.H +++ b/src/include/usr/isteps/nvdimm/nvdimmreasoncodes.H @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/include/usr/i2c/nvdimmddreasoncodes.H $ */ +/* $Source: src/include/usr/isteps/nvdimm/nvdimmreasoncodes.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2018 */ +/* Contributors Listed Below - COPYRIGHT 2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -23,13 +23,13 @@ /* */ /* IBM_PROLOG_END_TAG */ /** - * @file nvdimmddreasoncodes.H + * @file nvdimmreasoncodes.H * - * @brief Reason codes and module ids for the NVDIMM device driver + * @brief Reason codes and module ids for the NVDIMM * */ -#ifndef __NVDIMMDDREASONCODES_H -#define __NVDIMMDDREASONCODES_H +#ifndef __NVDIMMREASONCODES_H +#define __NVDIMMREASONCODES_H // ----------------------------------------------- // Includes // ----------------------------------------------- |
