ID: 46 - ipmi_fwum needs some re-work

KfwumFinishFirmareImage() - code formatting
This commit is contained in:
Zdenek Styblik 2013-10-26 19:09:15 +00:00
parent 5a1e81a948
commit d8f27165d1

View File

@ -1055,41 +1055,36 @@ struct KfwumFinishFirmwareDownloadReq{
static tKFWUM_Status KfwumFinishFirmwareImage(struct ipmi_intf * intf, static tKFWUM_Status KfwumFinishFirmwareImage(struct ipmi_intf * intf,
tKFWUM_InFirmwareInfo firmInfo) tKFWUM_InFirmwareInfo firmInfo)
{ {
tKFWUM_Status status = KFWUM_STATUS_OK;
struct ipmi_rs *rsp; struct ipmi_rs *rsp;
struct ipmi_rq req; struct ipmi_rq req;
struct KfwumFinishFirmwareDownloadReq thisReq; struct KfwumFinishFirmwareDownloadReq thisReq;
thisReq.versionMaj = firmInfo.versMajor; thisReq.versionMaj = firmInfo.versMajor;
thisReq.versionMinSub = ((firmInfo.versMinor <<4) | firmInfo.versSubMinor); thisReq.versionMinSub = ((firmInfo.versMinor <<4)
| firmInfo.versSubMinor);
thisReq.versionSdr = firmInfo.sdrRev; thisReq.versionSdr = firmInfo.sdrRev;
thisReq.reserved = 0; thisReq.reserved = 0;
/* Byte 4 reserved, write 0 */ /* Byte 4 reserved, write 0 */
memset(&req, 0, sizeof(req)); memset(&req, 0, sizeof(req));
req.msg.netfn = IPMI_NETFN_FIRMWARE; req.msg.netfn = IPMI_NETFN_FIRMWARE;
req.msg.cmd = KFWUM_CMD_ID_FINISH_FIRMWARE_IMAGE; req.msg.cmd = KFWUM_CMD_ID_FINISH_FIRMWARE_IMAGE;
req.msg.data = (unsigned char *)&thisReq; req.msg.data = (unsigned char *)&thisReq;
req.msg.data_len = 4; req.msg.data_len = 4;
/* Infinite loop if BMC doesn't reply or replies 0xc0 every time. */
do do {
{
rsp = intf->sendrecv(intf, &req); rsp = intf->sendrecv(intf, &req);
} while (rsp == NULL || rsp->ccode == 0xc0); } while (rsp == NULL || rsp->ccode == 0xc0);
if (!rsp) {
if (!rsp) lprintf(LOG_ERR,
{ "Error in FWUM Firmware Finish Firmware Image Download Command.");
printf("Error in FWUM Firmware Finish Firmware Image Download Command\n"); return KFWUM_STATUS_ERROR;
status = KFWUM_STATUS_ERROR; } else if (rsp->ccode != 0) {
} lprintf(LOG_ERR,
else if (rsp->ccode) "FWUM Firmware Finish Firmware Image Download returned %x",
{
printf("FWUM Firmware Finish Firmware Image Download returned %x\n",
rsp->ccode); rsp->ccode);
status = KFWUM_STATUS_ERROR; return KFWUM_STATUS_ERROR;
} }
return KFWUM_STATUS_OK;
return status;
} }