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 
Rename saveFirmwareInfo -> save_fw_nfo
This commit is contained in:
Zdenek Styblik 2013-10-26 19:29:29 +00:00
parent cd524c2d25
commit 935b215514
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ipmitool/lib/ipmi_fwum.c
View File

@ -108,7 +108,7 @@ typedef struct sKFWUM_SaveFirmwareInfo
extern int verbose; extern int verbose;
static unsigned char firmBuf[1024*512]; static unsigned char firmBuf[1024*512];
static tKFWUM_SaveFirmwareInfo saveFirmwareInfo; static tKFWUM_SaveFirmwareInfo save_fw_nfo;
static tKFWUM_Status KfwumGetFileSize(const char *pFileName, static tKFWUM_Status KfwumGetFileSize(const char *pFileName,
unsigned long *pFileSize); unsigned long *pFileSize);
@ -518,17 +518,17 @@ KfwumGetInfo(struct ipmi_intf *intf, unsigned char output,
* --> Address with small buffer size * --> Address with small buffer size
*/ */
if ((pGetInfo->protocolRevision) <= 0x05 || (rsp->data_len < 7 )) { if ((pGetInfo->protocolRevision) <= 0x05 || (rsp->data_len < 7 )) {
saveFirmwareInfo.downloadType = KFWUM_DOWNLOAD_TYPE_ADDRESS; save_fw_nfo.downloadType = KFWUM_DOWNLOAD_TYPE_ADDRESS;
saveFirmwareInfo.bufferSize = KFWUM_SMALL_BUFFER; save_fw_nfo.bufferSize = KFWUM_SMALL_BUFFER;
saveFirmwareInfo.overheadSize = KFWUM_OLD_CMD_OVERHEAD; save_fw_nfo.overheadSize = KFWUM_OLD_CMD_OVERHEAD;
if (verbose) { if (verbose) {
printf("Protocol Revision :"); printf("Protocol Revision :");
printf(" <= 5 detected, adjusting buffers\n"); printf(" <= 5 detected, adjusting buffers\n");
} }
} else { } else {
/* Both fw are using the new protocol */ /* Both fw are using the new protocol */
saveFirmwareInfo.downloadType = KFWUM_DOWNLOAD_TYPE_SEQUENCE; save_fw_nfo.downloadType = KFWUM_DOWNLOAD_TYPE_SEQUENCE;
saveFirmwareInfo.overheadSize = KFWUM_NEW_CMD_OVERHEAD; save_fw_nfo.overheadSize = KFWUM_NEW_CMD_OVERHEAD;
/* Buffer size depending on access type (Local or remote) */ /* Buffer size depending on access type (Local or remote) */
/* Look if we run remote or locally */ /* Look if we run remote or locally */
if (verbose) { if (verbose) {
@ -537,24 +537,24 @@ KfwumGetInfo(struct ipmi_intf *intf, unsigned char output,
} }
if (strstr(intf->name,"lan") != NULL) { if (strstr(intf->name,"lan") != NULL) {
/* also covers lanplus */ /* also covers lanplus */
saveFirmwareInfo.bufferSize = KFWUM_SMALL_BUFFER; save_fw_nfo.bufferSize = KFWUM_SMALL_BUFFER;
if (verbose) { if (verbose) {
printf("IOL payload size : %d\n", printf("IOL payload size : %d\n",
saveFirmwareInfo.bufferSize); save_fw_nfo.bufferSize);
} }
} else if ((strstr(intf->name,"open")!= NULL) } else if ((strstr(intf->name,"open")!= NULL)
&& intf->target_addr != IPMI_BMC_SLAVE_ADDR && intf->target_addr != IPMI_BMC_SLAVE_ADDR
&& (intf->target_addr != intf->my_addr)) { && (intf->target_addr != intf->my_addr)) {
saveFirmwareInfo.bufferSize = KFWUM_SMALL_BUFFER; save_fw_nfo.bufferSize = KFWUM_SMALL_BUFFER;
if (verbose) { if (verbose) {
printf("IPMB payload size : %d\n", printf("IPMB payload size : %d\n",
saveFirmwareInfo.bufferSize); save_fw_nfo.bufferSize);
} }
} else { } else {
saveFirmwareInfo.bufferSize = KFWUM_BIG_BUFFER; save_fw_nfo.bufferSize = KFWUM_BIG_BUFFER;
if (verbose) { if (verbose) {
printf("SMI payload size : %d\n", printf("SMI payload size : %d\n",
saveFirmwareInfo.bufferSize); save_fw_nfo.bufferSize);
} }
} }
} }
@ -794,7 +794,7 @@ KfwumStartFirmwareImage(struct ipmi_intf *intf, unsigned long length,
req.msg.cmd = KFWUM_CMD_ID_START_FIRMWARE_IMAGE; req.msg.cmd = KFWUM_CMD_ID_START_FIRMWARE_IMAGE;
req.msg.data = (unsigned char *) &thisReq; req.msg.data = (unsigned char *) &thisReq;
/* Look for download type */ /* Look for download type */
if (saveFirmwareInfo.downloadType == KFWUM_DOWNLOAD_TYPE_ADDRESS) { if (save_fw_nfo.downloadType == KFWUM_DOWNLOAD_TYPE_ADDRESS) {
req.msg.data_len = 5; req.msg.data_len = 5;
} else { } else {
req.msg.data_len = 6; req.msg.data_len = 6;
@ -859,7 +859,7 @@ KfwumSaveFirmwareImage(struct ipmi_intf *intf, unsigned char sequenceNumber,
memset(&req, 0, sizeof(req)); memset(&req, 0, sizeof(req));
req.msg.netfn = IPMI_NETFN_FIRMWARE; req.msg.netfn = IPMI_NETFN_FIRMWARE;
req.msg.cmd = KFWUM_CMD_ID_SAVE_FIRMWARE_IMAGE; req.msg.cmd = KFWUM_CMD_ID_SAVE_FIRMWARE_IMAGE;
if (saveFirmwareInfo.downloadType == KFWUM_DOWNLOAD_TYPE_ADDRESS) { if (save_fw_nfo.downloadType == KFWUM_DOWNLOAD_TYPE_ADDRESS) {
addr_req.addressLSB = address & 0x000000ff; addr_req.addressLSB = address & 0x000000ff;
addr_req.addressMid = (address >> 8) & 0x000000ff; addr_req.addressMid = (address >> 8) & 0x000000ff;
addr_req.addressMSB = (address >> 16) & 0x000000ff; addr_req.addressMSB = (address >> 16) & 0x000000ff;
@ -996,7 +996,7 @@ KfwumUploadFirmware(struct ipmi_intf *intf, unsigned char *pBuffer,
unsigned char retry = FWUM_MAX_UPLOAD_RETRY; unsigned char retry = FWUM_MAX_UPLOAD_RETRY;
unsigned char isLengthValid = 1; unsigned char isLengthValid = 1;
do { do {
writeSize = saveFirmwareInfo.bufferSize - saveFirmwareInfo.overheadSize; writeSize = save_fw_nfo.bufferSize - save_fw_nfo.overheadSize;
/* Reach the end */ /* Reach the end */
if (address + writeSize > totalSize) { if (address + writeSize > totalSize) {
writeSize = (totalSize - address); writeSize = (totalSize - address);
@ -1017,7 +1017,7 @@ KfwumUploadFirmware(struct ipmi_intf *intf, unsigned char *pBuffer,
if (writeSize != oldWriteSize) { if (writeSize != oldWriteSize) {
printf("Adjusting length to %d bytes \n", printf("Adjusting length to %d bytes \n",
writeSize); writeSize);
saveFirmwareInfo.bufferSize -= (oldWriteSize - writeSize); save_fw_nfo.bufferSize -= (oldWriteSize - writeSize);
} }
retry = FWUM_MAX_UPLOAD_RETRY; retry = FWUM_MAX_UPLOAD_RETRY;
lastAddress = address; lastAddress = address;