adi_v5: Remove strange IDCODE check from dap info handler

Otherwise it breaks SWD targets. The check seems really weird anyway since
it loops through *all* TAPs after the ADIv5 target but doesn't do anything
at all with the result, other than not setting the return values despite
returning ERROR_OK.

Remove a bogus initialization that was needed because of the odd
behaviour of this routine when an IDCODE wasn't found.

Change-Id: Ic086352f6af868b3406b00420291a0a671e3acac
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/1953
Tested-by: jenkins
Reviewed-by: Paul Fertser <fercerpav@gmail.com>

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index efddd66900adef5c85d5dad65301c941f4ad1718..2e56396ced0bfc02cf34e54b65c18491f8dcaf4b 100644 (file)
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -828,11 +828,10 @@ int dap_find_ap(struct adiv5_dap *dap, enum ap_type type_to_find, uint8_t *ap_nu
 }
 
 int dap_get_debugbase(struct adiv5_dap *dap, int ap,
 }
 
 int dap_get_debugbase(struct adiv5_dap *dap, int ap,

-                       uint32_t *out_dbgbase, uint32_t *out_apid)
+                       uint32_t *dbgbase, uint32_t *apid)

 {
        uint32_t ap_old;
        int retval;
 {
        uint32_t ap_old;
        int retval;

-       uint32_t dbgbase, apid;

 
        /* AP address is in bits 31:24 of DP_SELECT */
        if (ap >= 256)
 
        /* AP address is in bits 31:24 of DP_SELECT */
        if (ap >= 256)


@@ -841,33 +840,18 @@ int dap_get_debugbase(struct adiv5_dap *dap, int ap,
        ap_old = dap->ap_current;
        dap_ap_select(dap, ap);
 
        ap_old = dap->ap_current;
        dap_ap_select(dap, ap);
 

-       retval = dap_queue_ap_read(dap, AP_REG_BASE, &dbgbase);
+       retval = dap_queue_ap_read(dap, AP_REG_BASE, dbgbase);

        if (retval != ERROR_OK)
                return retval;
        if (retval != ERROR_OK)
                return retval;

-       retval = dap_queue_ap_read(dap, AP_REG_IDR, &apid);
+       retval = dap_queue_ap_read(dap, AP_REG_IDR, apid);

        if (retval != ERROR_OK)
                return retval;
        retval = dap_run(dap);
        if (retval != ERROR_OK)
                return retval;
 
        if (retval != ERROR_OK)
                return retval;
        retval = dap_run(dap);
        if (retval != ERROR_OK)
                return retval;
 

-       /* Excavate the device ID code */
-       struct jtag_tap *tap = dap->jtag_info->tap;
-       while (tap != NULL) {
-               if (tap->hasidcode)
-                       break;
-               tap = tap->next_tap;
-       }
-       if (tap == NULL || !tap->hasidcode)
-               return ERROR_OK;
-

        dap_ap_select(dap, ap_old);
 
        dap_ap_select(dap, ap_old);
 

-       /* The asignment happens only here to prevent modification of these
-        * values before they are certain. */
-       *out_dbgbase = dbgbase;
-       *out_apid = apid;
-

        return ERROR_OK;
 }
 
        return ERROR_OK;
 }
 


@@ -1353,7 +1337,7 @@ static int dap_info_command(struct command_context *cmd_ctx,
                struct adiv5_dap *dap, int ap)
 {
        int retval;
                struct adiv5_dap *dap, int ap)
 {
        int retval;

-       uint32_t dbgbase = 0, apid = 0; /* Silence gcc by initializing */
+       uint32_t dbgbase, apid;

        int romtable_present = 0;
        uint8_t mem_ap;
        uint32_t ap_old;
        int romtable_present = 0;
        uint8_t mem_ap;
        uint32_t ap_old;