From: David Brownell Date: Fri, 18 Dec 2009 17:59:40 +0000 (-0800) Subject: stellaris: fix min buffer length checks X-Git-Tag: v0.4.0-rc1~17 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7641934197abbd851127afcb0b7cebc30242f717;p=openocd stellaris: fix min buffer length checks Word count == size/4; cope. And increase buf_min so it's large enough to cover the overhead in my tests. Signed-off-by: David Brownell --- diff --git a/src/flash/nor/stellaris.c b/src/flash/nor/stellaris.c index 51fe677c..f414ca6f 100644 --- a/src/flash/nor/stellaris.c +++ b/src/flash/nor/stellaris.c @@ -826,10 +826,10 @@ static int stellaris_write_block(struct flash_bank *bank, int retval = ERROR_OK; /* power of two, and multiple of word size */ - static const unsigned buf_min = 32; + static const unsigned buf_min = 128; /* for small buffers it's faster not to download an algorithm */ - if (wcount < buf_min) + if (wcount * 4 < buf_min) return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; LOG_DEBUG("(bank=%p buffer=%p offset=%08" PRIx32 " wcount=%08" PRIx32 "", @@ -843,11 +843,8 @@ static int stellaris_write_block(struct flash_bank *bank, }; /* plus a buffer big enough for this data */ - if (wcount < buffer_size) { - buffer_size = wcount; - buffer_size += buf_min - 1; - buffer_size &= ~(buf_min - 1); - } + if (wcount * 4 < buffer_size) + buffer_size = wcount * 4; /* memory buffer */ while (target_alloc_working_area(target, buffer_size, &source) != ERROR_OK)