diff options
| author | Øyvind Harboe <oyvind.harboe@zylin.com> | 2011-03-31 23:39:10 +0200 |
|---|---|---|
| committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2011-03-31 23:46:56 +0200 |
| commit | 83ab5ad2408c7d67ea490986f887c432f229e0ef (patch) | |
| tree | fb4bb91b65a140dd643a5048b586ccd6dad92e50 | |
| parent | 667c65552e56aeb4d08aa1ec8b1fb9fc29117201 (diff) | |
| download | openocd+libswd-83ab5ad2408c7d67ea490986f887c432f229e0ef.tar.gz openocd+libswd-83ab5ad2408c7d67ea490986f887c432f229e0ef.tar.bz2 openocd+libswd-83ab5ad2408c7d67ea490986f887c432f229e0ef.tar.xz openocd+libswd-83ab5ad2408c7d67ea490986f887c432f229e0ef.zip | |
mips: mips_ejtag_get_impcode error propagation added
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
| -rw-r--r-- | src/target/mips_ejtag.c | 5 | ||||
| -rw-r--r-- | src/target/mips_m4k.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/target/mips_ejtag.c b/src/target/mips_ejtag.c index 8e1404f1..f9eaef19 100644 --- a/src/target/mips_ejtag.c +++ b/src/target/mips_ejtag.c @@ -261,8 +261,11 @@ int mips_ejtag_read_debug(struct mips_ejtag *ejtag_info, uint32_t* debug_reg) int mips_ejtag_init(struct mips_ejtag *ejtag_info) { uint32_t ejtag_version; + int retval; - mips_ejtag_get_impcode(ejtag_info, &ejtag_info->impcode); + retval = mips_ejtag_get_impcode(ejtag_info, &ejtag_info->impcode); + if (retval != ERROR_OK) + return retval; LOG_DEBUG("impcode: 0x%8.8" PRIx32 "", ejtag_info->impcode); /* get ejtag version */ diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c index 3a79273b..0508c35f 100644 --- a/src/target/mips_m4k.c +++ b/src/target/mips_m4k.c @@ -940,7 +940,9 @@ static int mips_m4k_examine(struct target *target) if (!target_was_examined(target)) { - mips_ejtag_get_idcode(ejtag_info, &idcode); + retval = mips_ejtag_get_idcode(ejtag_info, &idcode); + if (retval != ERROR_OK) + return retval; ejtag_info->idcode = idcode; if (((idcode >> 1) & 0x7FF) == 0x29) |