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 
KfwumGetDeviceInfo() - simplify, code formatting
This commit is contained in:
Zdenek Styblik 2013-10-26 19:04:42 +00:00
parent 3df72b68bc
commit 700658e91e
1 changed files with 44 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
ipmitool/lib/ipmi_fwum.c
View File

@ -663,68 +663,50 @@ static tKFWUM_Status KfwumGetInfo(struct ipmi_intf * intf, unsigned char output,
* *intf: IPMI interface * *intf: IPMI interface
* output: when set to non zero, queried information is displayed * output: when set to non zero, queried information is displayed
* tKFWUM_BoardInfo: output ptr for IPMC/Board information * tKFWUM_BoardInfo: output ptr for IPMC/Board information
*
* returns KFWUM_STATUS_OK on success, otherwise KFWUM_STATUS_ERROR
*/ */
static tKFWUM_Status KfwumGetDeviceInfo(struct ipmi_intf *intf, static tKFWUM_Status KfwumGetDeviceInfo(struct ipmi_intf *intf,
unsigned char output, tKFWUM_BoardInfo *pBoardInfo) unsigned char output, tKFWUM_BoardInfo *pBoardInfo)
{ {
struct ipm_devid_rsp *pGetDevId; struct ipm_devid_rsp *pGetDevId;
tKFWUM_Status status = KFWUM_STATUS_OK;
struct ipmi_rs *rsp; struct ipmi_rs *rsp;
struct ipmi_rq req; struct ipmi_rq req;
/* Send Get Device Id */ /* Send Get Device Id */
if(status == KFWUM_STATUS_OK)
{
memset(&req, 0, sizeof(req)); memset(&req, 0, sizeof(req));
req.msg.netfn = IPMI_NETFN_APP; req.msg.netfn = IPMI_NETFN_APP;
req.msg.cmd = BMC_GET_DEVICE_ID; req.msg.cmd = BMC_GET_DEVICE_ID;
req.msg.data_len = 0; req.msg.data_len = 0;
rsp = intf->sendrecv(intf, &req); rsp = intf->sendrecv(intf, &req);
if (!rsp) if (rsp == NULL) {
{ lprintf(LOG_ERR, "Error in Get Device Id Command");
printf("Error in Get Device Id Command\n"); return KFWUM_STATUS_ERROR;
status = KFWUM_STATUS_ERROR; } else if (rsp->ccode != 0) {
lprintf(LOG_ERR, "Get Device Id returned %x",
rsp->ccode);
return KFWUM_STATUS_ERROR;
} }
else if (rsp->ccode)
{
printf("Get Device Id returned %x\n", rsp->ccode);
status = KFWUM_STATUS_ERROR;
}
}
if(status == KFWUM_STATUS_OK)
{
pGetDevId = (struct ipm_devid_rsp *)rsp->data; pGetDevId = (struct ipm_devid_rsp *)rsp->data;
pBoardInfo->iana = IPM_DEV_MANUFACTURER_ID(pGetDevId->manufacturer_id); pBoardInfo->iana = IPM_DEV_MANUFACTURER_ID(pGetDevId->manufacturer_id);
pBoardInfo->boardId = buf2short(pGetDevId->product_id); pBoardInfo->boardId = buf2short(pGetDevId->product_id);
if(output) if (output) {
{
printf("\nIPMC Info\n"); printf("\nIPMC Info\n");
printf("=========\n"); printf("=========\n");
printf("Manufacturer Id : %u\n",pBoardInfo->iana); printf("Manufacturer Id : %u\n",
printf("Board Id : %u\n",pBoardInfo->boardId); pBoardInfo->iana);
printf("Board Id : %u\n",
pBoardInfo->boardId);
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( if (((pBoardInfo->iana == KFWUM_IANA_KONTRON)
( && (pBoardInfo->boardId = KFWUM_BOARD_KONTRON_5002))) {
( pBoardInfo->iana == KFWUM_IANA_KONTRON) printf(" SDR %u", pGetDevId->aux_fw_rev[0]);
&&
(pBoardInfo->boardId = KFWUM_BOARD_KONTRON_5002)
)
)
{
printf(" SDR %u\n", pGetDevId->aux_fw_rev[0]);
} }
else
{
printf("\n"); printf("\n");
} }
} return KFWUM_STATUS_OK;
}
return status;
} }