summaryrefslogtreecommitdiff
path: root/src/flash/lpc2000.c
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-10-15 11:44:36 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-10-15 11:44:36 +0000
commitccc2e3fe760a425f831b9e1f0e143d7d01d73a25 (patch)
treeccb4bbe1c3221f1438d12a04cdc203617d18d5ee /src/flash/lpc2000.c
parentaf41e6aac8d2aadf2bcfc84a77ac0f9ded8e7830 (diff)
downloadopenocd+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/flash/lpc2000.c')
-rw-r--r--src/flash/lpc2000.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/flash/lpc2000.c b/src/flash/lpc2000.c
index f449380e..830e380a 100644
--- a/src/flash/lpc2000.c
+++ b/src/flash/lpc2000.c
@@ -241,6 +241,7 @@ int lpc2000_build_sector_list(struct flash_bank_s *bank)
*/
int lpc2000_iap_call(flash_bank_t *bank, int code, u32 param_table[5], u32 result_table[2])
{
+ int retval;
lpc2000_flash_bank_t *lpc2000_info = bank->driver_priv;
target_t *target = bank->target;
mem_param_t mem_params[2];
@@ -263,7 +264,10 @@ int lpc2000_iap_call(flash_bank_t *bank, int code, u32 param_table[5], u32 resul
/* write IAP code to working area */
target_buffer_set_u32(target, jump_gate, ARMV4_5_BX(12));
target_buffer_set_u32(target, jump_gate + 4, ARMV4_5_B(0xfffffe, 0));
- target->type->write_memory(target, lpc2000_info->iap_working_area->address, 4, 2, jump_gate);
+ if((retval = target->type->write_memory(target, lpc2000_info->iap_working_area->address, 4, 2, jump_gate)) != ERROR_OK)
+ {
+ return retval;
+ }
}
armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC;