diff options
Diffstat (limited to 'src/usr/scom')
| -rw-r--r-- | src/usr/scom/scom.C | 17 | ||||
| -rw-r--r-- | src/usr/scom/scom.H | 4 | ||||
| -rw-r--r-- | src/usr/scom/scomtrans.C | 3 |
3 files changed, 5 insertions, 19 deletions
diff --git a/src/usr/scom/scom.C b/src/usr/scom/scom.C index b0ac02519..231440dc8 100644 --- a/src/usr/scom/scom.C +++ b/src/usr/scom/scom.C @@ -90,18 +90,13 @@ errlHndl_t scomPerformOp(DeviceFW::OperationType i_opType, uint64_t l_scomAddr = va_arg(i_args,uint64_t); - // if opMode is not specified as an argument va_arg - // will return NULL which is 0 - uint64_t l_opMode = va_arg(i_args,uint64_t); - l_err = checkIndirectAndDoScom(i_opType, i_target, io_buffer, io_buflen, i_accessType, - l_scomAddr, - l_opMode); + l_scomAddr); return l_err; } @@ -119,18 +114,13 @@ errlHndl_t scomMemBufPerformOp(DeviceFW::OperationType i_opType, uint64_t l_scomAddr = va_arg(i_args,uint64_t); - // if opMode is not specified as an argument va_arg - // will return NULL which is 0 - uint64_t l_opMode = va_arg(i_args,uint64_t); - l_err = checkIndirectAndDoScom(i_opType, i_target, io_buffer, io_buflen, i_accessType, - l_scomAddr, - l_opMode); + l_scomAddr); // Check for ATTR_CENTAUR_EC_ENABLE_RCE_WITH_OTHER_ERRORS_HW246685 // if ATTR set and MBSECCQ being read then set bit 16 @@ -174,8 +164,7 @@ errlHndl_t checkIndirectAndDoScom(DeviceFW::OperationType i_opType, void* io_buffer, size_t& io_buflen, int64_t i_accessType, - uint64_t i_addr, - uint64_t i_opMode) + uint64_t i_addr) { errlHndl_t l_err = NULL; diff --git a/src/usr/scom/scom.H b/src/usr/scom/scom.H index 817c255ec..3cb8d6b5b 100644 --- a/src/usr/scom/scom.H +++ b/src/usr/scom/scom.H @@ -162,7 +162,6 @@ errlHndl_t doScomOp(DeviceFW::OperationType i_opType, * @param[in] i_accessType Select from DeviceFW::AccessType enum * @see usr/devicefw/userif.H * @param[in] i_addr Scom Address Value. - * @param[in] i_opMode the fapi2::OpMode for this scom operation * * @return errlHndl_t */ @@ -171,8 +170,7 @@ errlHndl_t checkIndirectAndDoScom(DeviceFW::OperationType i_opType, void* io_buffer, size_t& io_buflen, int64_t i_accessType, - uint64_t i_addr, - uint64_t i_opMode); + uint64_t i_addr); /** * @brief Performs a SCom operation diff --git a/src/usr/scom/scomtrans.C b/src/usr/scom/scomtrans.C index 3c3c82588..f0923ae43 100644 --- a/src/usr/scom/scomtrans.C +++ b/src/usr/scom/scomtrans.C @@ -195,8 +195,7 @@ errlHndl_t startScomProcess(DeviceFW::OperationType i_opType, io_buffer, io_buflen, i_accessType, - l_addr, - l_opMode); + l_addr); } // @todo RTC:124196 need to move this to a more general location so that |
