diff options
| author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-10-15 11:44:36 +0000 |
|---|---|---|
| committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-10-15 11:44:36 +0000 |
| commit | ccc2e3fe760a425f831b9e1f0e143d7d01d73a25 (patch) | |
| tree | ccb4bbe1c3221f1438d12a04cdc203617d18d5ee /src/target/embeddedice.c | |
| parent | af41e6aac8d2aadf2bcfc84a77ac0f9ded8e7830 (diff) | |
| download | openocd_libswd-ccc2e3fe760a425f831b9e1f0e143d7d01d73a25.tar.gz openocd_libswd-ccc2e3fe760a425f831b9e1f0e143d7d01d73a25.tar.bz2 openocd_libswd-ccc2e3fe760a425f831b9e1f0e143d7d01d73a25.tar.xz openocd_libswd-ccc2e3fe760a425f831b9e1f0e143d7d01d73a25.zip | |
Laurentiu Cocanu - memory read/write and exit() error path fixes
git-svn-id: svn://svn.berlios.de/openocd/trunk@1064 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target/embeddedice.c')
| -rw-r--r-- | src/target/embeddedice.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/target/embeddedice.c b/src/target/embeddedice.c index 7da32fa8..19021cab 100644 --- a/src/target/embeddedice.c +++ b/src/target/embeddedice.c @@ -222,15 +222,17 @@ int embeddedice_setup(target_t *target) int embeddedice_get_reg(reg_t *reg) { - if (embeddedice_read_reg(reg) != ERROR_OK) + int retval; + if ((retval = embeddedice_read_reg(reg)) != ERROR_OK) { LOG_ERROR("BUG: error scheduling EmbeddedICE register read"); - exit(-1); + return retval; } - if (jtag_execute_queue() != ERROR_OK) + if ((retval = jtag_execute_queue()) != ERROR_OK) { LOG_ERROR("register read failed"); + return retval; } return ERROR_OK; @@ -381,12 +383,13 @@ void embeddedice_set_reg(reg_t *reg, u32 value) int embeddedice_set_reg_w_exec(reg_t *reg, u8 *buf) { + int retval; embeddedice_set_reg(reg, buf_get_u32(buf, 0, reg->size)); - if (jtag_execute_queue() != ERROR_OK) + if ((retval = jtag_execute_queue()) != ERROR_OK) { LOG_ERROR("register write failed"); - exit(-1); + return retval; } return ERROR_OK; } |