target: split swd scan function into with and without a targetid

This gives the swd scan function an equivalent signature to the other scan commands allowing us to group them for the auto scan command

src/command.c

@@ -293,9 +293,9 @@ bool cmd_swd_scan(target_s *target, int argc, const char **argv)
 	bool scan_result = false;
 	TRY (EXCEPTION_ALL) {
 #if CONFIG_BMDA == 1
-		scan_result = bmda_swd_scan(targetid);
+		scan_result = bmda_swd_scan_targetid(targetid);
 #else
-		scan_result = adiv5_swd_scan(targetid);
+		scan_result = adiv5_swd_scan_targetid(targetid);
 #endif
 	}
 	CATCH () {
@@ -390,9 +390,9 @@ bool cmd_auto_scan(target_s *target, int argc, const char **argv)
 			gdb_out("JTAG scan found no devices, trying SWD!\n");
 
 #if CONFIG_BMDA == 1
-			scan_result = bmda_swd_scan(0);
+			scan_result = bmda_swd_scan();
 #else
-			scan_result = adiv5_swd_scan(0);
+			scan_result = adiv5_swd_scan();
 #endif
 			if (!scan_result) {
 				gdb_out("SWD scan found no devices.\n");

src/include/target.h

@@ -45,13 +45,15 @@ typedef target_addr32_t target_addr_t;
 typedef struct target_controller target_controller_s;
 
 #if CONFIG_BMDA == 1
-bool bmda_swd_scan(uint32_t targetid);
+bool bmda_swd_scan(void);
+bool bmda_swd_scan_targetid(uint32_t targetid);
 bool bmda_jtag_scan(void);
 #if defined(CONFIG_RVSWD) && defined(PLATFORM_HAS_RVSWD)
 bool bmda_rvswd_scan(void);
 #endif
 #endif
-bool adiv5_swd_scan(uint32_t targetid);
+bool adiv5_swd_scan(void);
+bool adiv5_swd_scan_targetid(uint32_t targetid);
 bool jtag_scan(void);
 
 size_t target_foreach(void (*callback)(size_t index, target_s *target, void *context), void *context);

src/platforms/hosted/cli.c

@@ -461,11 +461,11 @@ bool scan_for_targets(const bmda_cli_options_s *const opt)
 	if (opt->opt_scanmode == BMP_SCAN_JTAG)
 		return bmda_jtag_scan();
 	if (opt->opt_scanmode == BMP_SCAN_SWD)
-		return bmda_swd_scan(opt->opt_targetid);
+		return bmda_swd_scan_targetid(opt->opt_targetid);
 	if (bmda_jtag_scan())
 		return true;
 	DEBUG_WARN("JTAG scan found no devices, trying SWD.\n");
-	if (bmda_swd_scan(opt->opt_targetid))
+	if (bmda_swd_scan_targetid(opt->opt_targetid))
 		return true;
 	DEBUG_ERROR("SWD scan failed!\n");
 	return false;

src/platforms/hosted/platform.c

@@ -196,7 +196,12 @@ void platform_init(int argc, char **argv)
 	}
 }
 
-bool bmda_swd_scan(const uint32_t targetid)
+bool bmda_swd_scan(void)
+{
+	return bmda_swd_scan_targetid(0);
+}
+
+bool bmda_swd_scan_targetid(const uint32_t targetid)
 {
 	bmda_probe_info.is_jtag = false;
 	platform_max_frequency_set(max_frequency);
@@ -209,7 +214,7 @@ bool bmda_swd_scan(const uint32_t targetid)
 #ifdef ENABLE_GPIOD
 	case PROBE_TYPE_GPIOD:
 #endif
-		return adiv5_swd_scan(targetid);
+		return adiv5_swd_scan_targetid(targetid);
 
 #if HOSTED_BMP_ONLY == 0
 	case PROBE_TYPE_STLINK_V2:

src/target/adiv5_swd.c

@@ -155,7 +155,12 @@ uint32_t adiv5_swd_read_no_check(const uint16_t addr)
 	return res == SWD_ACK_OK ? data : 0;
 }
 
-bool adiv5_swd_scan(const uint32_t targetid)
+bool adiv5_swd_scan()
+{
+	return adiv5_swd_scan_targetid(0);
+}
+
+bool adiv5_swd_scan_targetid(const uint32_t targetid)
 {
 	/* Free the device list if any */
 	target_list_free();