]> git.sur5r.net Git - openocd/commitdiff
arm_adi_v5: correct ahbap_debugport_init mem-ap id (bug #23)
authorSpencer Oliver <ntfreak@users.sourceforge.net>
Fri, 21 May 2010 10:43:17 +0000 (11:43 +0100)
committerSpencer Oliver <ntfreak@users.sourceforge.net>
Fri, 21 May 2010 10:43:17 +0000 (11:43 +0100)
We request a id register read at the end of ahbap_debugport_init
but we never actually run the queue. In some cases this causes a
segfault.

Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>
src/target/arm_adi_v5.c

index 8b18fa3c125d53366aa50ed42757f9dc40945258..8f43f78a855f6acd7ca20bc146eccf5d4819724c 100644 (file)
@@ -967,6 +967,9 @@ int ahbap_debugport_init(struct adiv5_dap *dap)
        retval = dap_queue_ap_read(dap, AP_REG_IDR, &idreg);
        retval = dap_queue_ap_read(dap, AP_REG_BASE, &romaddr);
 
+       if ((retval = dap_run(dap)) != ERROR_OK)
+               return retval;
+
        LOG_DEBUG("MEM-AP #%" PRId32 " ID Register 0x%" PRIx32
                ", Debug ROM Address 0x%" PRIx32,
                dap->apsel, idreg, romaddr);