Richard <news@muppet.plus.com> fixed bug in padding code
git-svn-id: svn://svn.berlios.de/openocd/trunk@923 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
parent
71f4a6e0a6
commit
8ca8313c43
|
@ -1052,10 +1052,9 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase)
|
||||||
{
|
{
|
||||||
u32 size_read;
|
u32 size_read;
|
||||||
|
|
||||||
if (buffer_size - run_size <= image->sections[section].size - section_offset)
|
size_read = run_size - buffer_size;
|
||||||
size_read = buffer_size - run_size;
|
if (size_read > image->sections[section].size - section_offset)
|
||||||
else
|
size_read = image->sections[section].size - section_offset;
|
||||||
size_read = image->sections[section].size - section_offset;
|
|
||||||
|
|
||||||
if ((retval = image_read_section(image, section, section_offset,
|
if ((retval = image_read_section(image, section, section_offset,
|
||||||
size_read, buffer + buffer_size, &size_read)) != ERROR_OK || size_read == 0)
|
size_read, buffer + buffer_size, &size_read)) != ERROR_OK || size_read == 0)
|
||||||
|
@ -1067,7 +1066,7 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase)
|
||||||
|
|
||||||
/* see if we need to pad the section */
|
/* see if we need to pad the section */
|
||||||
while (padding[section]--)
|
while (padding[section]--)
|
||||||
buffer[size_read++] = 0xff;
|
(buffer+buffer_size)[size_read++] = 0xff;
|
||||||
|
|
||||||
buffer_size += size_read;
|
buffer_size += size_read;
|
||||||
section_offset += size_read;
|
section_offset += size_read;
|
||||||
|
|
Loading…
Reference in New Issue