Skip to content

S
Software for White Rabbit PTP Core
Commit 4143c0f5 authored by Theodor-Adrian Stana's avatar Theodor-Adrian Stana Committed by Grzegorz Daniluk
Browse files
Options

flash-write: massaging flash data buffer 

There was somewhat of a bug in the spec_write_flash function of
flash-write. The memcpy function was not functioning 'as expected',
so I changed the fixed-size buffer for a pointer and malloc-ed it
to the size. This seems to fix the bug.

The issue about reading the flash status register has yet to be
fixed.
Signed-off-by: Theodor-Adrian Stana's avatarTheodor Stana <t.stana@cern.ch>
parent 233a5827
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
tools/flash-write.c
View file @ 4143c0f5
...@@ -82,8 +82,8 @@ extern void *BASE_SYSCON; ...@@ -82,8 +82,8 @@ extern void *BASE_SYSCON;
static int spec_write_flash(struct spec_device *spec, int addr, int len) static int spec_write_flash(struct spec_device *spec, int addr, int len)
{ {
uint8_t buf[len]; uint8_t *buf = malloc(len);
int i, r; int i, r, plen = len;
BASE_SYSCON = spec->mapaddr + SPEC_SYSCON_OFFSET; BASE_SYSCON = spec->mapaddr + SPEC_SYSCON_OFFSET;
...@@ -104,9 +104,9 @@ static int spec_write_flash(struct spec_device *spec, int addr, int len) ...@@ -104,9 +104,9 @@ static int spec_write_flash(struct spec_device *spec, int addr, int len)
return 1; return 1;
} }
/* Let's some data to the flash */
while (len) while (len)
{ {
int j;
/* Set write length */ /* Set write length */
i = len; i = len;
if (len > 256) if (len > 256)
...@@ -144,10 +144,10 @@ static int spec_write_flash(struct spec_device *spec, int addr, int len) ...@@ -144,10 +144,10 @@ static int spec_write_flash(struct spec_device *spec, int addr, int len)
// while (flash_rsr() & 0x01) // while (flash_rsr() & 0x01)
// ; // ;
/* Setup next length and address */ /* Setup next length, address and buffer pointer */
len -= i; len -= i;
addr += i; addr += i;
memcpy(buf, buf+i, len % 256); buf += i;
// if (i != len) { // if (i != len) {
// fprintf(stderr, "Tried to write %i bytes, retval %i\n", // fprintf(stderr, "Tried to write %i bytes, retval %i\n",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment