imi415/openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pavel Chromy - cleanup error messages

Browse Source 
git-svn-id: svn://svn.berlios.de/openocd/trunk@376 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe 2008-02-28 11:00:35 +00:00
parent 5f159928b1
commit fc37cdb2dd
1 changed files with 14 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/flash/flash.c
View File

@ -88,63 +88,40 @@ static int auto_erase = 0;
/* wafer thin wrapper for invoking the flash driver */
static int flash_driver_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
{
int retval=ERROR_OK;
if (bank->target->state != TARGET_HALTED)
{
ERROR("target not halted - aborting flash write");
retval=ERROR_TARGET_NOT_HALTED;
} else
{
retval=bank->driver->write(bank, buffer, offset, count);
}
int retval;
retval=bank->driver->write(bank, buffer, offset, count);
if (retval!=ERROR_OK)
{
ERROR("Writing to flash bank at address 0x%08x at offset 0x%8.8x", bank->base, offset);
ERROR("error writing to flash at address 0x%08x at offset 0x%8.8x", bank->base, offset);
}
return retval;
}
static int flash_driver_erase(struct flash_bank_s *bank, int first, int last)
{
int retval=ERROR_OK;
if (bank->target->state != TARGET_HALTED)
{
ERROR("target not halted - aborting flash erase");
retval=ERROR_TARGET_NOT_HALTED;
} else if ((first < 0) || (last < first) || (last >= bank->num_sectors))
{
ERROR("invalid flash sector");
retval=ERROR_FLASH_SECTOR_INVALID;
} else
{
retval=bank->driver->erase(bank, first, last);
}
int retval;
retval=bank->driver->erase(bank, first, last);
if (retval!=ERROR_OK)
{
ERROR("Failed erasing banks %d to %d", first, last);
ERROR("failed erasing banks %d to %d", first, last);
}
return retval;
}
int flash_driver_protect(struct flash_bank_s *bank, int set, int first, int last)
{
int retval;
if (bank->target->state != TARGET_HALTED)
{
ERROR("target not halted - aborting flash erase");
retval=ERROR_TARGET_NOT_HALTED;
} else if ((first < 0) || (last < first) || (last >= bank->num_sectors))
{
ERROR("invalid flash sector");
retval=ERROR_FLASH_SECTOR_INVALID;
} else
{
retval=bank->driver->protect(bank, set, first, last);
}
retval=bank->driver->protect(bank, set, first, last);
if (retval!=ERROR_OK)
{
ERROR("Failed protecting banks %d to %d", first, last);
ERROR("failed protecting banks %d to %d", first, last);
}
return retval;
}