summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Horton <brianh@linux.ibm.com>2013-04-25 10:54:53 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2013-04-29 10:03:02 -0500
commit60f7382c8d36e07234eee36f48c006cfdd0ab402 (patch)
tree5212a76c04ffb2757a8c8ad4846777d2553cc516
parent62e3f7ebe1426c9113937048a8bfe9754c6c719c (diff)
downloadblackbird-hostboot-60f7382c8d36e07234eee36f48c006cfdd0ab402.tar.gz
blackbird-hostboot-60f7382c8d36e07234eee36f48c006cfdd0ab402.zip
correct ErrlUserDetailsLogRegister Target parameter
make the TARGETING::Target * parameter be const. Change-Id: I04c2fadfb50ca8e9c0ccff39dc3c55c150ec9193 RTC: 70341 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4211 Tested-by: Jenkins Server Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com> Reviewed-by: Bradley W. Bishop <bradleyb@us.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
-rw-r--r--src/include/usr/errl/errludlogregister.H8
-rw-r--r--src/usr/errl/errludlogregister.C9
-rw-r--r--src/usr/errl/test/errltest.H8
-rw-r--r--src/usr/errl/test/errluserdetailtest.H8
4 files changed, 15 insertions, 18 deletions
diff --git a/src/include/usr/errl/errludlogregister.H b/src/include/usr/errl/errludlogregister.H
index 060f017d5..d9443cd93 100644
--- a/src/include/usr/errl/errludlogregister.H
+++ b/src/include/usr/errl/errludlogregister.H
@@ -61,7 +61,7 @@ public:
* and addToLog() in order to push the data to the error log.
*
*/
- ErrlUserDetailsLogRegister(TARGETING::Target * i_pTarget);
+ ErrlUserDetailsLogRegister(const TARGETING::Target * i_pTarget);
/**
* @brief Constructor - target and register type/address
@@ -79,7 +79,7 @@ public:
* interface (DeviceFW::AccessType) types.
*
*/
- ErrlUserDetailsLogRegister(TARGETING::Target * i_pTarget,
+ ErrlUserDetailsLogRegister(const TARGETING::Target * i_pTarget,
DeviceFW::AccessType i_accessType, ...);
/**
@@ -100,7 +100,7 @@ public:
* Note that this can only be used for devicefw/userif.H register
* interface (DeviceFW::AccessType) types.
*/
- ErrlUserDetailsLogRegister(TARGETING::Target * i_pTarget,
+ ErrlUserDetailsLogRegister(const TARGETING::Target * i_pTarget,
void *i_dataBuf,
size_t i_dataSize,
DeviceFW::AccessType i_accessType, ...);
@@ -257,7 +257,7 @@ private:
uint8_t i_accessType, ...);
// allow for multiple calls to addData by user
- TARGETING::Target * iv_pTarget;
+ const TARGETING::Target * iv_pTarget;
uint32_t iv_dataSize;
};
diff --git a/src/usr/errl/errludlogregister.C b/src/usr/errl/errludlogregister.C
index 244b8d5ec..96b17c614 100644
--- a/src/usr/errl/errludlogregister.C
+++ b/src/usr/errl/errludlogregister.C
@@ -163,7 +163,8 @@ void ErrlUserDetailsLogRegister::readRegister(
TRACDCOMP(g_trac_errl, "LogRegister: deviceOpValist()");
errlHndl_t errl;
- errl = DeviceFW::deviceOpValist(DeviceFW::READ, iv_pTarget,
+ errl = DeviceFW::deviceOpValist(DeviceFW::READ,
+ const_cast<TARGETING::Target *>(iv_pTarget),
&reg_data, reg_size,
(DeviceFW::AccessType) i_accessType, i_args);
@@ -327,7 +328,7 @@ void ErrlUserDetailsLogRegister::__addDataBuffer(
//------------------------------------------------------------------------------
ErrlUserDetailsLogRegister::ErrlUserDetailsLogRegister(
- TARGETING::Target * i_pTarget)
+ const TARGETING::Target * i_pTarget)
: iv_pTarget(i_pTarget), iv_dataSize(0)
{
TRACDCOMP(g_trac_errl, "LogRegister: target %p",
@@ -340,7 +341,7 @@ ErrlUserDetailsLogRegister::ErrlUserDetailsLogRegister(
//------------------------------------------------------------------------------
ErrlUserDetailsLogRegister::ErrlUserDetailsLogRegister(
- TARGETING::Target * i_pTarget,
+ const TARGETING::Target * i_pTarget,
DeviceFW::AccessType i_accessType, ...)
: iv_pTarget(i_pTarget), iv_dataSize(0)
{
@@ -359,7 +360,7 @@ ErrlUserDetailsLogRegister::ErrlUserDetailsLogRegister(
//------------------------------------------------------------------------------
ErrlUserDetailsLogRegister::ErrlUserDetailsLogRegister(
- TARGETING::Target * i_pTarget,
+ const TARGETING::Target * i_pTarget,
void *i_dataBuf,
size_t i_dataSize,
DeviceFW::AccessType i_accessType, ...)
diff --git a/src/usr/errl/test/errltest.H b/src/usr/errl/test/errltest.H
index f02a8ca98..97ac196be 100644
--- a/src/usr/errl/test/errltest.H
+++ b/src/usr/errl/test/errltest.H
@@ -423,16 +423,14 @@ public:
HWAS::SRCI_PRIORITY_LOW,
HWAS::DECONFIG,
HWAS::GARD_PoreError);
- // TODO: RTC 45780
- // SENTINEL not logged properly // deconfigCount++;
- // SENTINEL not logged properly // gardCount++;
+ deconfigCount++;
+ gardCount++;
errl->addHwCallout(TARGETING::MASTER_PROCESSOR_CHIP_TARGET_SENTINEL,
HWAS::SRCI_PRIORITY_MED,
HWAS::DECONFIG,
HWAS::GARD_NULL);
- // TODO: RTC 45780
- // SENTINEL not logged properly // deconfigCount++;
+ deconfigCount++;
errl->addProcedureCallout(
HWAS::EPUB_PRC_MEMORY_PLUGGING_ERROR,
diff --git a/src/usr/errl/test/errluserdetailtest.H b/src/usr/errl/test/errluserdetailtest.H
index 9349d82e8..d264fdca4 100644
--- a/src/usr/errl/test/errluserdetailtest.H
+++ b/src/usr/errl/test/errluserdetailtest.H
@@ -530,9 +530,8 @@ public:
HWAS::SRCI_PRIORITY_LOW,
HWAS::DECONFIG,
HWAS::GARD_PoreError).addToLog(errl);
- // TODO: RTC 45780
- // SENTINEL not logged properly // deconfigCount++;
- // SENTINEL not logged properly // gardCount++;
+ deconfigCount++;
+ gardCount++;
ErrlUserDetailsCallout(
&HWAS::TARGET_IS_SENTINEL,
@@ -540,8 +539,7 @@ public:
HWAS::SRCI_PRIORITY_MED,
HWAS::DECONFIG,
HWAS::GARD_NULL).addToLog(errl);
- // TODO: RTC 45780
- // SENTINEL not logged properly // deconfigCount++;
+ deconfigCount++;
// find a proc target
PredicateCTM procChipFilter(CLASS_CHIP,TYPE_PROC);
OpenPOWER on IntegriCloud