cmsis-dap: add initial cmsis-dap support

[openocd.git] / src / target / adi_v5_swd.c

diff --git a/src/target/adi_v5_swd.c b/src/target/adi_v5_swd.c
index 5a3570d536f457734f084fcbb0e408ef78c9afa0..6ff858a85d627b1334d553c03a7ce69c53adf039 100644 (file)
--- a/src/target/adi_v5_swd.c
+++ b/src/target/adi_v5_swd.c
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  ***************************************************************************/
 
 /**
@@ -55,12 +55,16 @@
 
 #include <jtag/swd.h>
 
-
+/* YUK! - but this is currently a global.... */
+extern struct jtag_interface *jtag_interface;
 
 static int swd_queue_dp_read(struct adiv5_dap *dap, unsigned reg,
                uint32_t *data)
 {
-       // REVISIT status return vs ack ...
+       /* REVISIT status return vs ack ... */
+       const struct swd_driver *swd = jtag_interface->swd;
+       assert(swd);
+
        return swd->read_reg(swd_cmd(true,  false, reg), data);
 }
 
@@ -71,14 +75,17 @@ static int swd_queue_idcode_read(struct adiv5_dap *dap,
        if (status < 0)
                return status;
        *ack = status;
-       // ??
+       /* ?? */
        return ERROR_OK;
 }
 
 static int (swd_queue_dp_write)(struct adiv5_dap *dap, unsigned reg,
                uint32_t data)
 {
-       // REVISIT status return vs ack ...
+       /* REVISIT status return vs ack ... */
+       const struct swd_driver *swd = jtag_interface->swd;
+       assert(swd);
+
        return swd->write_reg(swd_cmd(false,  false, reg), data);
 }
 
@@ -86,16 +93,22 @@ static int (swd_queue_dp_write)(struct adiv5_dap *dap, unsigned reg,
 static int (swd_queue_ap_read)(struct adiv5_dap *dap, unsigned reg,
                uint32_t *data)
 {
-       // REVISIT  APSEL ...
-       // REVISIT status return ...
+       /* REVISIT  APSEL ... */
+       /* REVISIT status return ... */
+       const struct swd_driver *swd = jtag_interface->swd;
+       assert(swd);
+
        return swd->read_reg(swd_cmd(true,  true, reg), data);
 }
 
 static int (swd_queue_ap_write)(struct adiv5_dap *dap, unsigned reg,
                uint32_t data)
 {
-       // REVISIT  APSEL ...
-       // REVISIT status return ...
+       /* REVISIT  APSEL ... */
+       /* REVISIT status return ... */
+       const struct swd_driver *swd = jtag_interface->swd;
+       assert(swd);
+
        return swd->write_reg(swd_cmd(false,  true, reg), data);
 }
 
@@ -187,22 +200,19 @@ int dap_to_swd(struct target *target)
        return retval;
 }
 
-
-
 COMMAND_HANDLER(handle_swd_wcr)
 {
        int retval;
        struct target *target = get_current_target(CMD_CTX);
        struct arm *arm = target_to_arm(target);
-struct adiv5_dap *dap = arm->dap;
+       struct adiv5_dap *dap = arm->dap;
        uint32_t wcr;
        unsigned trn, scale = 0;
 
-
        switch (CMD_ARGC) {
        /* no-args: just dump state */
        case 0:
-               //retval = swd_queue_dp_read(dap, DP_WCR, &wcr);
+               /*retval = swd_queue_dp_read(dap, DP_WCR, &wcr); */
                retval = dap_queue_dp_read(dap, DP_WCR, &wcr);
                if (retval == ERROR_OK)
                        dap->ops->run(dap);
@@ -212,7 +222,7 @@ struct adiv5_dap *dap = arm->dap;
                }
 
                command_print(CMD_CTX,
-                       "turnaround=%d, prescale=%d",
+                       "turnaround=%" PRIu32 ", prescale=%" PRIu32,
                        WCR_TO_TRN(wcr),
                        WCR_TO_PRESCALE(wcr));
        return ERROR_OK;
@@ -283,7 +293,6 @@ static const struct command_registration swd_handlers[] = {
 
 static int swd_select(struct command_context *ctx)
 {
-       struct target *target = get_current_target(ctx);
        int retval;
 
        retval = register_commands(ctx, NULL, swd_handlers);
@@ -291,6 +300,8 @@ static int swd_select(struct command_context *ctx)
        if (retval != ERROR_OK)
                return retval;
 
+       const struct swd_driver *swd = jtag_interface->swd;
+
         /* be sure driver is in SWD mode; start
          * with hardware default TRN (1), it can be changed later
          */
@@ -299,14 +310,20 @@ static int swd_select(struct command_context *ctx)
                return ERROR_FAIL;
        }
 
-        retval = swd->init(1);
+       retval = swd->init(1);
        if (retval != ERROR_OK) {
                LOG_DEBUG("can't init SWD driver");
                return retval;
        }
 
        /* force DAP into SWD mode (not JTAG) */
-       retval = dap_to_swd(target);
+       /*retval = dap_to_swd(target);*/
+
+       if (ctx->current_target) {
+               /* force DAP into SWD mode (not JTAG) */
+               struct target *target = get_current_target(ctx);
+               retval = dap_to_swd(target);
+       }
 
        return retval;
 }
@@ -315,10 +332,13 @@ static int swd_init(struct command_context *ctx)
 {
        struct target *target = get_current_target(ctx);
        struct arm *arm = target_to_arm(target);
-struct adiv5_dap *dap = arm->dap;
+       struct adiv5_dap *dap = arm->dap;
        uint32_t idcode;
        int status;
 
+       /* Force the DAP's ops vector for SWD mode.
+        * messy - is there a better way? */
+       arm->dap->ops = &swd_dap_ops;
 
        /* FIXME validate transport config ... is the
         * configured DAP present (check IDCODE)?
@@ -334,7 +354,7 @@ struct adiv5_dap *dap = arm->dap;
        status = swd_queue_idcode_read(dap, &ack, &idcode);
 
        if (status == ERROR_OK)
-               LOG_INFO("SWD IDCODE %#8.8x", idcode);
+               LOG_INFO("SWD IDCODE %#8.8" PRIx32, idcode);
 
        return status;