ID: 46 - ipmi_fwum needs some re-work

KfwumUploadFirmware() - code formatting
This commit is contained in:
Zdenek Styblik 2013-10-26 19:10:16 +00:00
parent d8f27165d1
commit 38121041c1

View File

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