diff options
| author | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-06-21 09:02:02 +0200 |
|---|---|---|
| committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-06-21 09:03:31 +0200 |
| commit | 8d1dcb9bcde55ff29c1967d86c5f8985620df923 (patch) | |
| tree | 5c65403523a7973d175119725d52ee9bff76baa2 | |
| parent | acee9d1c65bd97bbd5aa2b633e2455e87edbe836 (diff) | |
| download | openocd+libswd-8d1dcb9bcde55ff29c1967d86c5f8985620df923.tar.gz openocd+libswd-8d1dcb9bcde55ff29c1967d86c5f8985620df923.tar.bz2 openocd+libswd-8d1dcb9bcde55ff29c1967d86c5f8985620df923.tar.xz openocd+libswd-8d1dcb9bcde55ff29c1967d86c5f8985620df923.zip | |
cortex a8: add missing error handling
cortex examine was missing error handling.
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
| -rw-r--r-- | src/target/cortex_a8.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/target/cortex_a8.c b/src/target/cortex_a8.c index cfec48b6..933b42e4 100644 --- a/src/target/cortex_a8.c +++ b/src/target/cortex_a8.c @@ -1523,8 +1523,14 @@ static int cortex_a8_examine_first(struct target *target) /* We do one extra read to ensure DAP is configured, * we call ahbap_debugport_init(swjdp) instead */ - ahbap_debugport_init(swjdp); - mem_ap_read_atomic_u32(swjdp, armv7a->debug_base + CPUDBG_CPUID, &cpuid); + retval = ahbap_debugport_init(swjdp); + if (retval != ERROR_OK) + return retval; + + retval = mem_ap_read_atomic_u32(swjdp, armv7a->debug_base + CPUDBG_CPUID, &cpuid); + if (retval != ERROR_OK) + return retval; + if ((retval = mem_ap_read_atomic_u32(swjdp, armv7a->debug_base + CPUDBG_CPUID, &cpuid)) != ERROR_OK) { @@ -1559,7 +1565,9 @@ static int cortex_a8_examine_first(struct target *target) LOG_DEBUG("didr = 0x%08" PRIx32, didr); armv7a->armv4_5_common.core_type = ARM_MODE_MON; - cortex_a8_dpm_setup(cortex_a8, didr); + retval = cortex_a8_dpm_setup(cortex_a8, didr); + if (retval != ERROR_OK) + return retval; /* Setup Breakpoint Register Pairs */ cortex_a8->brp_num = ((didr >> 24) & 0x0F) + 1; |