X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fadi_v5_swd.c;h=6af77488481098931f561433cb76bd962ebaaaf8;hp=39f38572c541d07c3866a96ad34802289d65b681;hb=374127301ec1d72033b9d573b72c7abdfd61990d;hpb=7cd2617384f4ac620c468343c1f2009fbfa2fc79;ds=sidebyside

diff --git a/src/target/adi_v5_swd.c b/src/target/adi_v5_swd.c
index 39f38572c5..6af7748848 100644
--- a/src/target/adi_v5_swd.c
+++ b/src/target/adi_v5_swd.c
@@ -50,17 +50,15 @@
 #include "arm_adi_v5.h"
 #include <helper/time_support.h>
 
-#include <jtag/transport.h>
+#include <transport/transport.h>
 #include <jtag/interface.h>
 
 #include <jtag/swd.h>
 
-
-
 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 ... */
 	return swd->read_reg(swd_cmd(true,  false, reg), data);
 }
 
@@ -71,14 +69,14 @@ 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 ... */
 	return swd->write_reg(swd_cmd(false,  false, reg), data);
 }
 
@@ -86,16 +84,16 @@ 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 ... */
 	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 ... */
 	return swd->write_reg(swd_cmd(false,  true, reg), data);
 }
 
@@ -194,15 +192,14 @@ 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);
@@ -315,11 +312,10 @@ 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;
 
-
 	/* FIXME validate transport config ... is the
 	 * configured DAP present (check IDCODE)?
 	 * Is *only* one DAP configured?