From e24c7f75f2653f478be60bf1b7400ada95157582 Mon Sep 17 00:00:00 2001 From: Zdenek Styblik Date: Sat, 26 Oct 2013 19:28:40 +0000 Subject: [PATCH] ID: 46 - ipmi_fwum needs some re-work 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. --- ipmitool/lib/ipmi_fwum.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/ipmitool/lib/ipmi_fwum.c b/ipmitool/lib/ipmi_fwum.c index f7eea06..ddf9421 100644 --- a/ipmitool/lib/ipmi_fwum.c +++ b/ipmitool/lib/ipmi_fwum.c @@ -54,15 +54,10 @@ typedef enum eKFWUM_BoardList KFWUM_BOARD_KONTRON_5002 = 5002, } tKFWUM_BoardList; -typedef enum eKFWUM_IanaList -{ - KFWUM_IANA_KONTRON = 15000, -} tKFWUM_IanaList; - typedef struct sKFWUM_BoardInfo { tKFWUM_BoardList boardId; - tKFWUM_IanaList iana; + IPMI_OEM iana; } tKFWUM_BoardInfo; typedef enum eKFWUM_Status @@ -101,7 +96,7 @@ typedef struct sKFWUM_InFirmwareInfo unsigned char versMinor; unsigned char versSubMinor; unsigned char sdrRev; - tKFWUM_IanaList iana; + IPMI_OEM iana; } tKFWUM_InFirmwareInfo; typedef struct sKFWUM_SaveFirmwareInfo @@ -609,7 +604,7 @@ KfwumGetDeviceInfo(struct ipmi_intf *intf, unsigned char output, printf("Firmware Revision : %u.%u%u", pGetDevId->fw_rev1, pGetDevId->fw_rev2 >> 4, pGetDevId->fw_rev2 & 0x0f); - if (((pBoardInfo->iana == KFWUM_IANA_KONTRON) + if (((pBoardInfo->iana == IPMI_OEM_KONTRON) && (pBoardInfo->boardId = KFWUM_BOARD_KONTRON_5002))) { printf(" SDR %u", pGetDevId->aux_fw_rev[0]); }