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 
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

56
ipmitool/lib/ipmi_fwum.c
View File

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