Menu
▾
▴
[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-335-gf4958d6
|
From: Øyvind H. <go...@us...> - 2010-06-16 07:43:27
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via f4958d61ef4188ed02629968d21c3a4de3a89121 (commit)
via 94f373b404b93a1e1b6c693061f2ed504e4d36aa (commit)
via 6de2b2d14b0b80f392d0faa05db915141cbd40cf (commit)
from 72d227cd5e32a6b141026e31ca4702cd69c79e62 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f4958d61ef4188ed02629968d21c3a4de3a89121
Author: Ãyvind Harboe <oyv...@zy...>
Date: Wed Jun 16 07:42:41 2010 +0200
mflash: -Wshadow warning fix
Signed-off-by: Ãyvind Harboe <oyv...@zy...>
diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index d307858..90e9888 100644
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -209,7 +209,7 @@ static int mg_init_gpio (void)
return ret;
}
-static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time)
+static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time_var)
{
uint8_t status, error;
struct target *target = mflash_bank->target;
@@ -220,7 +220,7 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time)
struct duration bench;
duration_start(&bench);
- while (time) {
+ while (time_var) {
ret = target_read_u8(target, mg_task_reg + MG_REG_STATUS, &status);
if (ret != ERROR_OK)
@@ -280,7 +280,7 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time)
else
LOG_ERROR("mflash: duration measurement failed: %d", ret);
- if (t > time)
+ if (t > time_var)
break;
}
commit 94f373b404b93a1e1b6c693061f2ed504e4d36aa
Author: Ãyvind Harboe <oyv...@zy...>
Date: Wed Jun 16 07:41:43 2010 +0200
arm_io: -Wshadow warning fix
Signed-off-by: Ãyvind Harboe <oyv...@zy...>
diff --git a/src/flash/nand/arm_io.c b/src/flash/nand/arm_io.c
index 7c7148e..7a6ceb3 100644
--- a/src/flash/nand/arm_io.c
+++ b/src/flash/nand/arm_io.c
@@ -100,7 +100,7 @@ int arm_nandwrite(struct arm_nand_data *nand, uint8_t *data, int size)
struct arm *armv4_5 = target->arch_info;
struct reg_param reg_params[3];
uint32_t target_buf;
- uint32_t exit = 0;
+ uint32_t exit_var = 0;
int retval;
/* Inputs:
@@ -153,11 +153,11 @@ int arm_nandwrite(struct arm_nand_data *nand, uint8_t *data, int size)
/* armv4 must exit using a hardware breakpoint */
if (armv4_5->is_armv4)
- exit = nand->copy_area->address + sizeof(code) - 4;
+ exit_var = nand->copy_area->address + sizeof(code) - 4;
/* use alg to write data from work area to NAND chip */
retval = target_run_algorithm(target, 0, NULL, 3, reg_params,
- nand->copy_area->address, exit, 1000, &algo);
+ nand->copy_area->address, exit_var, 1000, &algo);
if (retval != ERROR_OK)
LOG_ERROR("error executing hosted NAND write");
@@ -184,7 +184,7 @@ int arm_nandread(struct arm_nand_data *nand, uint8_t *data, uint32_t size)
struct arm *armv4_5 = target->arch_info;
struct reg_param reg_params[3];
uint32_t target_buf;
- uint32_t exit = 0;
+ uint32_t exit_var = 0;
int retval;
/* Inputs:
@@ -229,11 +229,11 @@ int arm_nandread(struct arm_nand_data *nand, uint8_t *data, uint32_t size)
/* armv4 must exit using a hardware breakpoint */
if (armv4_5->is_armv4)
- exit = nand->copy_area->address + sizeof(code) - 4;
+ exit_var = nand->copy_area->address + sizeof(code) - 4;
/* use alg to write data from NAND chip to work area */
retval = target_run_algorithm(target, 0, NULL, 3, reg_params,
- nand->copy_area->address, exit, 1000, &algo);
+ nand->copy_area->address, exit_var, 1000, &algo);
if (retval != ERROR_OK)
LOG_ERROR("error executing hosted NAND read");
commit 6de2b2d14b0b80f392d0faa05db915141cbd40cf
Author: Ãyvind Harboe <oyv...@zy...>
Date: Wed Jun 16 07:39:46 2010 +0200
nand: when verify failed, it didn't return an error
when the verify failed, it didn't return an error,
which breaks e.g. tcl scripts that rely on this for
exceptions to work.
Found by -Wshadow
Signed-off-by: Ãyvind Harboe <oyv...@zy...>
diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c
index 1272bf6..592277e 100644
--- a/src/flash/nand/tcl.c
+++ b/src/flash/nand/tcl.c
@@ -336,13 +336,14 @@ COMMAND_HANDLER(handle_nand_verify_command)
while (file.size > 0)
{
- int retval = nand_read_page(nand, dev.address / dev.page_size,
+ retval = nand_read_page(nand, dev.address / dev.page_size,
dev.page, dev.page_size, dev.oob, dev.oob_size);
if (ERROR_OK != retval)
{
command_print(CMD_CTX, "reading NAND flash page failed");
nand_fileio_cleanup(&dev);
- return nand_fileio_cleanup(&file);
+ nand_fileio_cleanup(&file);
+ return retval;
}
int bytes_read = nand_fileio_read(nand, &file);
@@ -350,7 +351,8 @@ COMMAND_HANDLER(handle_nand_verify_command)
{
command_print(CMD_CTX, "error while reading file");
nand_fileio_cleanup(&dev);
- return nand_fileio_cleanup(&file);
+ nand_fileio_cleanup(&file);
+ return ERROR_FAIL;
}
if ((dev.page && memcmp(dev.page, file.page, dev.page_size)) ||
@@ -359,7 +361,8 @@ COMMAND_HANDLER(handle_nand_verify_command)
command_print(CMD_CTX, "NAND flash contents differ "
"at 0x%8.8" PRIx32, dev.address);
nand_fileio_cleanup(&dev);
- return nand_fileio_cleanup(&file);
+ nand_fileio_cleanup(&file);
+ return ERROR_FAIL;
}
file.size -= bytes_read;
@@ -389,12 +392,13 @@ COMMAND_HANDLER(handle_nand_dump_command)
while (s.size > 0)
{
size_t size_written;
- int retval = nand_read_page(nand, s.address / nand->page_size,
+ retval = nand_read_page(nand, s.address / nand->page_size,
s.page, s.page_size, s.oob, s.oob_size);
if (ERROR_OK != retval)
{
command_print(CMD_CTX, "reading NAND flash page failed");
- return nand_fileio_cleanup(&s);
+ nand_fileio_cleanup(&s);
+ return retval;
}
if (NULL != s.page)
-----------------------------------------------------------------------
Summary of changes:
src/flash/mflash.c | 6 +++---
src/flash/nand/arm_io.c | 12 ++++++------
src/flash/nand/tcl.c | 16 ++++++++++------
3 files changed, 19 insertions(+), 15 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
