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 
Dismantle KfwumMain() - start fw upgrade

Commit moves start-fw-upgrade out of KfwumMain(). It also changes return type of
KfwumStartFirmwareUpgrade().
This commit is contained in:
Zdenek Styblik 2013-10-26 19:26:38 +00:00
parent 770e61663f
commit 5416af78a5
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ipmitool/lib/ipmi_fwum.c
View File

@ -152,7 +152,7 @@ static tKFWUM_Status KfwumFinishFirmwareImage(struct ipmi_intf *intf,
tKFWUM_InFirmwareInfo firmInfo); tKFWUM_InFirmwareInfo firmInfo);
static tKFWUM_Status KfwumUploadFirmware(struct ipmi_intf *intf, static tKFWUM_Status KfwumUploadFirmware(struct ipmi_intf *intf,
unsigned char *pBuffer, unsigned long totalSize); unsigned char *pBuffer, unsigned long totalSize);
static tKFWUM_Status KfwumStartFirmwareUpgrade(struct ipmi_intf *intf); int KfwumStartFirmwareUpgrade(struct ipmi_intf *intf);
static tKFWUM_Status KfwumGetInfoFromFirmware(unsigned char *pBuf, static tKFWUM_Status KfwumGetInfoFromFirmware(unsigned char *pBuf,
unsigned long bufSize, tKFWUM_InFirmwareInfo *pInfo); unsigned long bufSize, tKFWUM_InFirmwareInfo *pInfo);
static void KfwumFixTableVersionForOldFirmware(tKFWUM_InFirmwareInfo *pInfo); static void KfwumFixTableVersionForOldFirmware(tKFWUM_InFirmwareInfo *pInfo);
@ -219,7 +219,7 @@ ipmi_fwum_main(struct ipmi_intf *intf, int argc, char **argv)
printf("Upgrading using file name %s\n", fileName); printf("Upgrading using file name %s\n", fileName);
rc = KfwumMain(intf, KFWUM_TASK_UPGRADE); rc = KfwumMain(intf, KFWUM_TASK_UPGRADE);
} else { } else {
rc = KfwumMain(intf, KFWUM_TASK_START_UPGRADE); rc = KfwumStartFirmwareUpgrade(intf);
} }
} else if (strncmp(argv[0], "tracelog", 8) == 0) { } else if (strncmp(argv[0], "tracelog", 8) == 0) {
rc = KfwumGetTraceLog(intf); rc = KfwumGetTraceLog(intf);
@ -352,7 +352,9 @@ KfwumMain(struct ipmi_intf *intf, tKFWUM_Task task)
if ((status == KFWUM_STATUS_OK) if ((status == KFWUM_STATUS_OK)
&& ((task == KFWUM_TASK_UPGRADE) && ((task == KFWUM_TASK_UPGRADE)
|| (task == KFWUM_TASK_START_UPGRADE))) { || (task == KFWUM_TASK_START_UPGRADE))) {
status = KfwumStartFirmwareUpgrade(intf); if (KfwumStartFirmwareUpgrade(intf) != 0) {
status = KFWUM_STATUS_ERROR;
}
} }
if (status == KFWUM_STATUS_OK) { if (status == KFWUM_STATUS_OK) {
return 0; return 0;
@ -1082,10 +1084,10 @@ KfwumUploadFirmware(struct ipmi_intf *intf, unsigned char *pBuffer,
return(status); return(status);
} }
static tKFWUM_Status int
KfwumStartFirmwareUpgrade(struct ipmi_intf *intf) KfwumStartFirmwareUpgrade(struct ipmi_intf *intf)
{ {
tKFWUM_Status status = KFWUM_STATUS_OK; int rc = 0;
struct ipmi_rs *rsp; struct ipmi_rs *rsp;
struct ipmi_rq req; struct ipmi_rq req;
/* Upgrade type, wait BMC shutdown */ /* Upgrade type, wait BMC shutdown */
@ -1101,7 +1103,7 @@ KfwumStartFirmwareUpgrade(struct ipmi_intf *intf)
if (rsp == NULL) { if (rsp == NULL) {
lprintf(LOG_ERR, lprintf(LOG_ERR,
"Error in FWUM Firmware Start Firmware Upgrade Command"); "Error in FWUM Firmware Start Firmware Upgrade Command");
status = KFWUM_STATUS_ERROR; rc = (-1);
} else if (rsp->ccode) { } else if (rsp->ccode) {
if (rsp->ccode == 0xd5) { if (rsp->ccode == 0xd5) {
lprintf(LOG_ERR, lprintf(LOG_ERR,
@ -1111,9 +1113,9 @@ KfwumStartFirmwareUpgrade(struct ipmi_intf *intf)
"FWUM Firmware Start Firmware Upgrade returned %x", "FWUM Firmware Start Firmware Upgrade returned %x",
rsp->ccode); rsp->ccode);
} }
status = KFWUM_STATUS_ERROR; rc = (-1);
} }
return status; return rc;
} }
/* String table */ /* String table */