deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 18:47:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ID: 46 - ipmi_fwum needs some re-work

Browse Source 
KfwumStartFirmwareImage() - code formatting, simplify
This commit is contained in:
Zdenek Styblik 2013-10-26 19:07:04 +00:00
parent 0dddcfe450
commit f12b976ebc
1 changed files with 35 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ipmitool/lib/ipmi_fwum.c
View File

@ -878,10 +878,9 @@ struct KfwumStartFirmwareDownloadResp {
#endif #endif
static tKFWUM_Status KfwumStartFirmwareImage(struct ipmi_intf * intf, static tKFWUM_Status KfwumStartFirmwareImage(struct ipmi_intf * intf,
unsigned long length,unsigned short padding) unsigned long length, unsigned short padding)
{ {
tKFWUM_Status status = KFWUM_STATUS_OK; struct ipmi_rs *rsp;
struct ipmi_rs * rsp;
struct ipmi_rq req; struct ipmi_rq req;
struct KfwumStartFirmwareDownloadResp *pResp; struct KfwumStartFirmwareDownloadResp *pResp;
struct KfwumStartFirmwareDownloadReq thisReq; struct KfwumStartFirmwareDownloadReq thisReq;
@ -892,43 +891,31 @@ static tKFWUM_Status KfwumStartFirmwareImage(struct ipmi_intf * intf,
thisReq.paddingLSB = padding & 0x00ff; thisReq.paddingLSB = padding & 0x00ff;
thisReq.paddingMSB = (padding>> 8) & 0x00ff; thisReq.paddingMSB = (padding>> 8) & 0x00ff;
thisReq.useSequence = 0x01; thisReq.useSequence = 0x01;
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_START_FIRMWARE_IMAGE; req.msg.cmd = KFWUM_CMD_ID_START_FIRMWARE_IMAGE;
req.msg.data = (unsigned char *) &thisReq; req.msg.data = (unsigned char *) &thisReq;
/* Look for download type */ /* Look for download type */
if ( saveFirmwareInfo.downloadType == KFWUM_DOWNLOAD_TYPE_ADDRESS ) if (saveFirmwareInfo.downloadType == KFWUM_DOWNLOAD_TYPE_ADDRESS) {
{
req.msg.data_len = 5; req.msg.data_len = 5;
} } else {
else
{
req.msg.data_len = 6; req.msg.data_len = 6;
} }
rsp = intf->sendrecv(intf, &req); rsp = intf->sendrecv(intf, &req);
if (rsp == NULL) {
if (!rsp) lprintf(LOG_ERR,
{ "Error in FWUM Firmware Start Firmware Image Download Command.");
printf("Error in FWUM Firmware Start Firmware Image Download Command\n"); return KFWUM_STATUS_ERROR;
status = KFWUM_STATUS_ERROR; } else if (rsp->ccode) {
} lprintf(LOG_ERR,
else if (rsp->ccode) "FWUM Firmware Start Firmware Image Download returned %x",
{
printf("FWUM Firmware Start Firmware Image Download returned %x\n",
rsp->ccode); rsp->ccode);
status = KFWUM_STATUS_ERROR; return KFWUM_STATUS_ERROR;
} }
pResp = (struct KfwumStartFirmwareDownloadResp *)rsp->data;
if(status == KFWUM_STATUS_OK)
{
pResp = (struct KfwumStartFirmwareDownloadResp *) rsp->data;
printf("Bank holding new firmware : %d\n", pResp->bank); printf("Bank holding new firmware : %d\n", pResp->bank);
sleep(5); sleep(5);
} return KFWUM_STATUS_OK;
return status;
} }
#ifdef HAVE_PRAGMA_PACK #ifdef HAVE_PRAGMA_PACK