From 9375e99c7a748cba00994b582be7571b8cc271dc Mon Sep 17 00:00:00 2001 From: "William G. Hoffa" Date: Thu, 23 Feb 2017 21:33:34 -0500 Subject: Revert "Sending Firmware progress sensor is now synchronous" This reverts commit 9b188cdec934275ce65eab3ade91398fdec4ddb9. Change-Id: I6e61680c204734638b03f628abb1d0e4d4f590e8 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36983 Reviewed-by: STEWART E. SMITH Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Tested-by: Jenkins OP Build CI Reviewed-by: William G. Hoffa --- src/include/usr/ipmi/ipmi_reasoncodes.H | 3 +-- src/include/usr/ipmi/ipmisensor.H | 17 ++--------------- 2 files changed, 3 insertions(+), 17 deletions(-) (limited to 'src/include/usr/ipmi') diff --git a/src/include/usr/ipmi/ipmi_reasoncodes.H b/src/include/usr/ipmi/ipmi_reasoncodes.H index 8ba270cac..3fe746170 100644 --- a/src/include/usr/ipmi/ipmi_reasoncodes.H +++ b/src/include/usr/ipmi/ipmi_reasoncodes.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014,2016 */ +/* Contributors Listed Below - COPYRIGHT 2014,2017 */ /* [+] Google Inc. */ /* [+] International Business Machines Corp. */ /* */ @@ -38,7 +38,6 @@ namespace IPMI MOD_IPMIDCMI = 0x04, // IPMI::sensor MOD_IPMIRT = 0x05, // rt IPMI::send/IPMI::sendrecv MOD_IPMISRV_POSTEVENT = 0x06, // IpmiRP::postEvent - MOD_IPMI_PROG_SENSOR = 0x07, // IPMI::FirmwareProgressSensor }; enum IPMIReasonCode diff --git a/src/include/usr/ipmi/ipmisensor.H b/src/include/usr/ipmi/ipmisensor.H index a5746efab..c57a35076 100644 --- a/src/include/usr/ipmi/ipmisensor.H +++ b/src/include/usr/ipmi/ipmisensor.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014,2016 */ +/* Contributors Listed Below - COPYRIGHT 2014,2017 */ /* [+] Google Inc. */ /* [+] International Business Machines Corp. */ /* */ @@ -377,7 +377,7 @@ namespace SENSOR * @return Errorlog handle * */ - virtual errlHndl_t sendSetSensorReading( + errlHndl_t sendSetSensorReading( setSensorReadingRequest * i_data); /** @@ -496,19 +496,6 @@ namespace SENSOR errlHndl_t setBootProgressPhase( INITSERVICE::firmwareProgressPhase i_phase); - - /** - * - * @brief Synchronous implementation of sendSetSensor Reading used for - * avoiding a race condition. - * - * @param[in] i_data - the ipmi message data - * - * @return Errorlog handle - */ - errlHndl_t sendSetSensorReading( - setSensorReadingRequest * i_data ); - private: // @enum firmwareProgressOfsets // -- cgit v1.2.3