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

ID: 46 - ipmi_fwum needs some re-work

Browse Source 
Rename KfwumValidFirmwareForBoard(), document

Commit renames KfwumValidFirmwareForBoard() to ipmi_kfwum_checkfwcompat() and
adds a bit of documentation about this function.
Code formatting of this function changed as well.
This commit is contained in:
Zdenek Styblik 2013-10-26 18:38:24 +00:00
parent 52634a708f
commit 068bcb02e4
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
ipmitool/lib/ipmi_fwum.c
View File

@ -180,8 +180,8 @@ static void KfwumFixTableVersionForOldFirmware(tKFWUM_InFirmwareInfo * pInfo);
static tKFWUM_Status KfwumGetTraceLog(struct ipmi_intf * intf); static tKFWUM_Status KfwumGetTraceLog(struct ipmi_intf * intf);
tKFWUM_Status KfwumValidFirmwareForBoard(tKFWUM_BoardInfo boardInfo, tKFWUM_Status ipmi_kfwum_checkfwcompat(tKFWUM_BoardInfo boardInfo,
tKFWUM_InFirmwareInfo firmInfo); tKFWUM_InFirmwareInfo firmInfo);
static void KfwumOutputInfo(tKFWUM_BoardInfo boardInfo, static void KfwumOutputInfo(tKFWUM_BoardInfo boardInfo,
tKFWUM_InFirmwareInfo firmInfo); tKFWUM_InFirmwareInfo firmInfo);
@ -353,7 +353,7 @@ static void KfwumMain(struct ipmi_intf * intf, tKFWUM_Task task)
status = KfwumGetDeviceInfo(intf, 0, &boardInfo); status = KfwumGetDeviceInfo(intf, 0, &boardInfo);
} }
if (status == KFWUM_STATUS_OK) { if (status == KFWUM_STATUS_OK) {
status = KfwumValidFirmwareForBoard(boardInfo,firmInfo); status = ipmi_kfwum_checkfwcompat(boardInfo,firmInfo);
} }
if (status == KFWUM_STATUS_OK) { if (status == KFWUM_STATUS_OK) {
unsigned char notUsed; unsigned char notUsed;
@ -1564,30 +1564,33 @@ void KfwumFixTableVersionForOldFirmware(tKFWUM_InFirmwareInfo * pInfo)
} }
} }
/* ipmi_kfwum_checkfwcompat - check whether firmware we're about to upload is
tKFWUM_Status KfwumValidFirmwareForBoard(tKFWUM_BoardInfo boardInfo, * compatible with board.
tKFWUM_InFirmwareInfo firmInfo) *
* @boardInfo:
* @firmInfo:
*
* returns KFWUM_STATUS_OK if compatible, otherwise KFWUM_STATUS_ERROR
*/
tKFWUM_Status ipmi_kfwum_checkfwcompat(tKFWUM_BoardInfo boardInfo,
tKFWUM_InFirmwareInfo firmInfo)
{ {
tKFWUM_Status status = KFWUM_STATUS_OK; tKFWUM_Status status = KFWUM_STATUS_OK;
if (boardInfo.iana != firmInfo.iana) {
if(boardInfo.iana != firmInfo.iana) lprintf(LOG_ERR,
{ "Board IANA does not match firmware IANA.");
printf("Board IANA does not match firmware IANA\n"); status = KFWUM_STATUS_ERROR;
status = KFWUM_STATUS_ERROR; }
} if (boardInfo.boardId != firmInfo.boardId) {
lprintf(LOG_ERR,
if(boardInfo.boardId != firmInfo.boardId) "Board IANA does not match firmware IANA.");
{ status = KFWUM_STATUS_ERROR;
printf("Board IANA does not match firmware IANA\n"); }
status = KFWUM_STATUS_ERROR; if (status == KFWUM_STATUS_ERROR) {
} lprintf(LOG_ERR,
"Firmware invalid for target board. Download of upgrade aborted.");
}
if(status == KFWUM_STATUS_ERROR) return status;
{
printf("Firmware invalid for target board. Download of upgrade aborted\n");
}
return status;
} }