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 
KfwumUploadFirmware() - code formatting
This commit is contained in:
Zdenek Styblik 2013-10-26 19:10:16 +00:00
parent d8f27165d1
commit 38121041c1
1 changed files with 52 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
ipmitool/lib/ipmi_fwum.c
View File

@ -1090,77 +1090,59 @@ static tKFWUM_Status KfwumFinishFirmwareImage(struct ipmi_intf * intf,
#define FWUM_MAX_UPLOAD_RETRY 6 #define FWUM_MAX_UPLOAD_RETRY 6
static tKFWUM_Status KfwumUploadFirmware(struct ipmi_intf * intf, static tKFWUM_Status KfwumUploadFirmware(struct ipmi_intf * intf,
unsigned char * pBuffer, unsigned long totalSize) unsigned char *pBuffer, unsigned long totalSize)
{ {
tKFWUM_Status status = KFWUM_STATUS_ERROR; tKFWUM_Status status = KFWUM_STATUS_ERROR;
unsigned long address = 0x0; unsigned long address = 0x0;
unsigned char writeSize; unsigned char writeSize;
unsigned char oldWriteSize; unsigned char oldWriteSize;
unsigned long lastAddress = 0; unsigned long lastAddress = 0;
unsigned char sequenceNumber = 0; unsigned char sequenceNumber = 0;
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;
{ /* Reach the end */
writeSize = saveFirmwareInfo.bufferSize - saveFirmwareInfo.overheadSize; if (address + writeSize > totalSize) {
writeSize = (totalSize - address);
/* Reach the end */ } else if (((address % KFWUM_PAGE_SIZE)
if( address + writeSize > totalSize ) + writeSize) > KFWUM_PAGE_SIZE) {
{ /* Reach boundary end */
writeSize = (totalSize - address); writeSize = (KFWUM_PAGE_SIZE - (address % KFWUM_PAGE_SIZE));
} }
/* Reach boundary end */ oldWriteSize = writeSize;
else if(((address % KFWUM_PAGE_SIZE) + writeSize) > KFWUM_PAGE_SIZE) status = KfwumSaveFirmwareImage(intf, sequenceNumber,
{ address, &pBuffer[address], &writeSize);
writeSize = (KFWUM_PAGE_SIZE - (address % KFWUM_PAGE_SIZE)); if ((status != KFWUM_STATUS_OK) && (retry-- != 0)) {
} address = lastAddress;
status = KFWUM_STATUS_OK;
oldWriteSize = writeSize; } else if ( writeSize == 0) {
status = KfwumSaveFirmwareImage(intf, sequenceNumber, address, status = KFWUM_STATUS_ERROR;
&pBuffer[address], &writeSize); } else {
if (writeSize != oldWriteSize) {
if((status != KFWUM_STATUS_OK) && (retry-- != 0)) printf("Adjusting length to %d bytes \n",
{ writeSize);
address = lastAddress; saveFirmwareInfo.bufferSize -= (oldWriteSize - writeSize);
status = KFWUM_STATUS_OK; }
} retry = FWUM_MAX_UPLOAD_RETRY;
else if( writeSize == 0 ) lastAddress = address;
{ address+= writeSize;
status = KFWUM_STATUS_ERROR; }
} if (status == KFWUM_STATUS_OK) {
else if ((address % 1024) == 0) {
{ KfwumShowProgress((const unsigned char *)\
if(writeSize != oldWriteSize) "Writting Firmware in Flash",
{ address, totalSize);
printf("Adjusting length to %d bytes \n", writeSize); }
saveFirmwareInfo.bufferSize -= (oldWriteSize - writeSize); sequenceNumber++;
} }
} while ((status == KFWUM_STATUS_OK) && (address < totalSize));
retry = FWUM_MAX_UPLOAD_RETRY; if (status == KFWUM_STATUS_OK) {
lastAddress = address; KfwumShowProgress((const unsigned char *)\
address+= writeSize; "Writting Firmware in Flash",
} 100, 100);
}
if(status == KFWUM_STATUS_OK) return(status);
{
if((address % 1024) == 0)
{
KfwumShowProgress((const unsigned char *)\
"Writting Firmware in Flash",address,totalSize);
}
sequenceNumber++;
}
}while((status == KFWUM_STATUS_OK) && (address < totalSize ));
if(status == KFWUM_STATUS_OK)
{
KfwumShowProgress((const unsigned char *)\
"Writting Firmware in Flash", 100 , 100 );
}
return(status);
} }
static tKFWUM_Status KfwumStartFirmwareUpgrade(struct ipmi_intf * intf) static tKFWUM_Status KfwumStartFirmwareUpgrade(struct ipmi_intf * intf)