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 
Remove duplicate Kontron IANA number

Commit removes/replaces duplicate Kontron IANA number which can be found in
'include/ipmitool/ipmi.h' as well. Therefore there is no need to have it here.
This commit is contained in:
Zdenek Styblik 2013-10-26 19:28:40 +00:00
parent da4b779adf
commit e24c7f75f2
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ipmitool/lib/ipmi_fwum.c
View File

@ -54,15 +54,10 @@ typedef enum eKFWUM_BoardList
KFWUM_BOARD_KONTRON_5002 = 5002, KFWUM_BOARD_KONTRON_5002 = 5002,
} tKFWUM_BoardList; } tKFWUM_BoardList;
typedef enum eKFWUM_IanaList
{
KFWUM_IANA_KONTRON = 15000,
} tKFWUM_IanaList;
typedef struct sKFWUM_BoardInfo typedef struct sKFWUM_BoardInfo
{ {
tKFWUM_BoardList boardId; tKFWUM_BoardList boardId;
tKFWUM_IanaList iana; IPMI_OEM iana;
} tKFWUM_BoardInfo; } tKFWUM_BoardInfo;
typedef enum eKFWUM_Status typedef enum eKFWUM_Status
@ -101,7 +96,7 @@ typedef struct sKFWUM_InFirmwareInfo
unsigned char versMinor; unsigned char versMinor;
unsigned char versSubMinor; unsigned char versSubMinor;
unsigned char sdrRev; unsigned char sdrRev;
tKFWUM_IanaList iana; IPMI_OEM iana;
} tKFWUM_InFirmwareInfo; } tKFWUM_InFirmwareInfo;
typedef struct sKFWUM_SaveFirmwareInfo typedef struct sKFWUM_SaveFirmwareInfo
@ -609,7 +604,7 @@ KfwumGetDeviceInfo(struct ipmi_intf *intf, unsigned char output,
printf("Firmware Revision : %u.%u%u", printf("Firmware Revision : %u.%u%u",
pGetDevId->fw_rev1, pGetDevId->fw_rev2 >> 4, pGetDevId->fw_rev1, pGetDevId->fw_rev2 >> 4,
pGetDevId->fw_rev2 & 0x0f); pGetDevId->fw_rev2 & 0x0f);
if (((pBoardInfo->iana == KFWUM_IANA_KONTRON) if (((pBoardInfo->iana == IPMI_OEM_KONTRON)
&& (pBoardInfo->boardId = KFWUM_BOARD_KONTRON_5002))) { && (pBoardInfo->boardId = KFWUM_BOARD_KONTRON_5002))) {
printf(" SDR %u", pGetDevId->aux_fw_rev[0]); printf(" SDR %u", pGetDevId->aux_fw_rev[0]);
} }