summaryrefslogtreecommitdiffstats
path: root/src/usr/hwpf/plat
diff options
context:
space:
mode:
Diffstat (limited to 'src/usr/hwpf/plat')
-rw-r--r--src/usr/hwpf/plat/fapiPlatAttributeService.C4
-rw-r--r--src/usr/hwpf/plat/fapiPlatHwAccess.C37
-rw-r--r--src/usr/hwpf/plat/fapiPlatSystemConfig.C12
-rw-r--r--src/usr/hwpf/plat/fapiPlatUtil.C9
4 files changed, 22 insertions, 40 deletions
diff --git a/src/usr/hwpf/plat/fapiPlatAttributeService.C b/src/usr/hwpf/plat/fapiPlatAttributeService.C
index 41e1ada6b..e567a0c74 100644
--- a/src/usr/hwpf/plat/fapiPlatAttributeService.C
+++ b/src/usr/hwpf/plat/fapiPlatAttributeService.C
@@ -95,8 +95,8 @@ fapi::ReturnCode createAttrAccessError(
| (static_cast<uint64_t>(i_fapiAttrId)),
i_pFapiTarget ? i_pFapiTarget->getType(): NULL);
- fapi::ReturnCode l_rc = fapi::FAPI_RC_PLAT_ERR_SEE_DATA;
- l_rc.setPlatData(reinterpret_cast<void *>(l_pError));
+ fapi::ReturnCode l_rc;
+ l_rc.setPlatError(reinterpret_cast<void *> (l_pError));
return l_rc;
}
diff --git a/src/usr/hwpf/plat/fapiPlatHwAccess.C b/src/usr/hwpf/plat/fapiPlatHwAccess.C
index 8687fd7d7..5539caefc 100644
--- a/src/usr/hwpf/plat/fapiPlatHwAccess.C
+++ b/src/usr/hwpf/plat/fapiPlatHwAccess.C
@@ -90,8 +90,7 @@ fapi::ReturnCode platGetScom(const fapi::Target& i_target,
{
// Add the error log pointer as data to the ReturnCode
FAPI_ERR("platGetScom: deviceRead() returns error");
- l_rc = fapi::FAPI_RC_PLAT_ERR_SEE_DATA;
- l_rc.setPlatData(reinterpret_cast<void *> (l_err));
+ l_rc.setPlatError(reinterpret_cast<void *> (l_err));
}
else
{
@@ -106,7 +105,7 @@ fapi::ReturnCode platGetScom(const fapi::Target& i_target,
{
FAPI_ERR("platGetScom: ecmdDataBufferBase setBitLength() or setDoubleWord() returns error, ecmdRc 0x%.8X",
l_ecmdRc);
- l_rc = l_ecmdRc;
+ l_rc.setEcmdError(l_ecmdRc);
}
}
@@ -140,8 +139,7 @@ fapi::ReturnCode platPutScom(const fapi::Target& i_target,
{
// Add the error log pointer as data to the ReturnCode
FAPI_ERR("platPutScom: deviceWrite() returns error");
- l_rc = fapi::FAPI_RC_PLAT_ERR_SEE_DATA;
- l_rc.setPlatData(reinterpret_cast<void *> (l_err));
+ l_rc.setPlatError(reinterpret_cast<void *> (l_err));
}
FAPI_DBG(EXIT_MRK "platPutScom");
@@ -177,8 +175,7 @@ fapi::ReturnCode platPutScomUnderMask(const fapi::Target& i_target,
{
// Add the error log pointer as data to the ReturnCode
FAPI_ERR("platPutScomUnderMask: deviceRead() returns error");
- l_rc = fapi::FAPI_RC_PLAT_ERR_SEE_DATA;
- l_rc.setPlatData(reinterpret_cast<void *> (l_err));
+ l_rc.setPlatError(reinterpret_cast<void *> (l_err));
break;
}
@@ -203,8 +200,7 @@ fapi::ReturnCode platPutScomUnderMask(const fapi::Target& i_target,
{
// Add the error log pointer as data to the ReturnCode
FAPI_ERR("platPutScomUnderMask: deviceWrite() returns error");
- l_rc = fapi::FAPI_RC_PLAT_ERR_SEE_DATA;
- l_rc.setPlatData(reinterpret_cast<void *> (l_err));
+ l_rc.setPlatError(reinterpret_cast<void *> (l_err));
break;
}
@@ -274,8 +270,7 @@ fapi::ReturnCode platGetCfamRegister(const fapi::Target& i_target,
{
// Add the error log pointer as data to the ReturnCode
FAPI_ERR("platGetCfamRegister: verifyCfamAccessTarget() returns error");
- l_rc = fapi::FAPI_RC_PLAT_ERR_SEE_DATA;
- l_rc.setPlatData(reinterpret_cast<void *> (l_err));
+ l_rc.setPlatError(reinterpret_cast<void *> (l_err));
break;
}
@@ -297,8 +292,7 @@ fapi::ReturnCode platGetCfamRegister(const fapi::Target& i_target,
{
// Add the error log pointer as data to the ReturnCode
FAPI_ERR("platGetCfamRegister: deviceRead() returns error");
- l_rc = fapi::FAPI_RC_PLAT_ERR_SEE_DATA;
- l_rc.setPlatData(reinterpret_cast<void *> (l_err));
+ l_rc.setPlatError(reinterpret_cast<void *> (l_err));
break;
}
@@ -312,7 +306,7 @@ fapi::ReturnCode platGetCfamRegister(const fapi::Target& i_target,
{
FAPI_ERR("platGetCfamRegister: ecmdDataBufferBase setBitLength() or setWord() returns error, ecmdRc 0x%.8X",
l_ecmdRc);
- l_rc = l_ecmdRc;
+ l_rc.setEcmdError(l_ecmdRc);
}
} while(0);
@@ -340,8 +334,7 @@ fapi::ReturnCode platPutCfamRegister(const fapi::Target& i_target,
{
// Add the error log pointer as data to the ReturnCode
FAPI_ERR("platPutCfamRegister: verifyCfamAccessTarget() returns error");
- l_rc = fapi::FAPI_RC_PLAT_ERR_SEE_DATA;
- l_rc.setPlatData(reinterpret_cast<void *> (l_err));
+ l_rc.setPlatError(reinterpret_cast<void *> (l_err));
break;
}
@@ -363,8 +356,7 @@ fapi::ReturnCode platPutCfamRegister(const fapi::Target& i_target,
{
// Add the error log pointer as data to the ReturnCode
FAPI_ERR("platPutCfamRegister: deviceWrite() returns error");
- l_rc = fapi::FAPI_RC_PLAT_ERR_SEE_DATA;
- l_rc.setPlatData(reinterpret_cast<void *> (l_err));
+ l_rc.setPlatError(reinterpret_cast<void *> (l_err));
break;
}
@@ -432,8 +424,7 @@ fapi::ReturnCode platModifyCfamRegister(const fapi::Target& i_target,
{
// Add the error log pointer as data to the ReturnCode
FAPI_ERR("platModifyCfamRegister: verifyCfamAccessTarget() returns error");
- l_rc = fapi::FAPI_RC_PLAT_ERR_SEE_DATA;
- l_rc.setPlatData(reinterpret_cast<void *> (l_err));
+ l_rc.setPlatError(reinterpret_cast<void *> (l_err));
break;
}
@@ -455,8 +446,7 @@ fapi::ReturnCode platModifyCfamRegister(const fapi::Target& i_target,
{
// Add the error log pointer as data to the ReturnCode
FAPI_ERR("platModifyCfamRegister: deviceRead() returns error");
- l_rc = fapi::FAPI_RC_PLAT_ERR_SEE_DATA;
- l_rc.setPlatData(reinterpret_cast<void *> (l_err));
+ l_rc.setPlatError(reinterpret_cast<void *> (l_err));
break;
}
@@ -472,8 +462,7 @@ fapi::ReturnCode platModifyCfamRegister(const fapi::Target& i_target,
{
// Add the error log pointer as data to the ReturnCode
FAPI_ERR("platModifyCfamRegister: deviceWrite() returns error");
- l_rc = fapi::FAPI_RC_PLAT_ERR_SEE_DATA;
- l_rc.setPlatData(reinterpret_cast<void *> (l_err));
+ l_rc.setPlatError(reinterpret_cast<void *> (l_err));
break;
}
diff --git a/src/usr/hwpf/plat/fapiPlatSystemConfig.C b/src/usr/hwpf/plat/fapiPlatSystemConfig.C
index 31f10e05a..5aadd4b11 100644
--- a/src/usr/hwpf/plat/fapiPlatSystemConfig.C
+++ b/src/usr/hwpf/plat/fapiPlatSystemConfig.C
@@ -78,8 +78,7 @@ fapi::ReturnCode fapiGetChildChiplets(
i_chip.getType());
// Attach the error log to the fapi::ReturnCode
- l_rc = fapi::FAPI_RC_PLAT_ERR_SEE_DATA;
- l_rc.setPlatData(reinterpret_cast<void *> (l_pError));
+ l_rc.setPlatError(reinterpret_cast<void *> (l_pError));
}
else
{
@@ -120,8 +119,7 @@ fapi::ReturnCode fapiGetChildChiplets(
i_chipletType);
// Attach the error log to the fapi::ReturnCode
- l_rc = fapi::FAPI_RC_PLAT_ERR_SEE_DATA;
- l_rc.setPlatData(reinterpret_cast<void *> (l_pError));
+ l_rc.setPlatError(reinterpret_cast<void *> (l_pError));
}
}
@@ -228,8 +226,7 @@ fapi::ReturnCode fapiGetParentChip(
i_chiplet.getType());
// Attach the error log to the fapi::ReturnCode
- l_rc = fapi::FAPI_RC_PLAT_ERR_SEE_DATA;
- l_rc.setPlatData(reinterpret_cast<void *> (l_pError));
+ l_rc.setPlatError(reinterpret_cast<void *> (l_pError));
}
else
{
@@ -269,8 +266,7 @@ fapi::ReturnCode fapiGetParentChip(
l_chipList.size());
// Attach the error log to the fapi::ReturnCode
- l_rc = fapi::FAPI_RC_PLAT_ERR_SEE_DATA;
- l_rc.setPlatData(reinterpret_cast<void *> (l_pError));
+ l_rc.setPlatError(reinterpret_cast<void *> (l_pError));
}
else
{
diff --git a/src/usr/hwpf/plat/fapiPlatUtil.C b/src/usr/hwpf/plat/fapiPlatUtil.C
index 829eb757d..2f155bccd 100644
--- a/src/usr/hwpf/plat/fapiPlatUtil.C
+++ b/src/usr/hwpf/plat/fapiPlatUtil.C
@@ -143,8 +143,7 @@ fapi::ReturnCode fapiLoadInitFile(const fapi::Target & i_Target,
{
// Add the error log pointer as data to the ReturnCode
FAPI_ERR("fapiLoadInitFile: module_load failed");
- l_rc = fapi::FAPI_RC_PLAT_ERR_SEE_DATA;
- l_rc.setPlatData(reinterpret_cast<void *> (l_pError));
+ l_rc.setPlatError(reinterpret_cast<void *> (l_pError));
}
else
{
@@ -153,8 +152,7 @@ fapi::ReturnCode fapiLoadInitFile(const fapi::Target & i_Target,
{
// Add the error log pointer as data to the ReturnCode
FAPI_ERR("fapiLoadInitFile: module_address failed");
- l_rc = fapi::FAPI_RC_PLAT_ERR_SEE_DATA;
- l_rc.setPlatData(reinterpret_cast<void *> (l_pError));
+ l_rc.setPlatError(reinterpret_cast<void *> (l_pError));
}
else
{
@@ -184,8 +182,7 @@ fapi::ReturnCode fapiUnloadInitFile(const char * i_file, const char *& io_addr,
{
// Add the error log pointer as data to the ReturnCode
FAPI_ERR("fapiUnloadInitFile: module_unload failed %s", i_file);
- l_rc = fapi::FAPI_RC_PLAT_ERR_SEE_DATA;
- l_rc.setPlatData(reinterpret_cast<void *> (l_pError));
+ l_rc.setPlatError(reinterpret_cast<void *> (l_pError));
}
else
{
OpenPOWER on IntegriCloud