hosted/jlink: add delay after jlink_select_interface, skip entirely i…

…f already selected
blackmagic-debug · Jul 28, 2023 · db67fa1 · db67fa1
1 parent f1ec3d4
commit db67fa1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/platforms/hosted/jlink.c b/src/platforms/hosted/jlink.c
@@ -337,13 +337,22 @@ static uint8_t jlink_selected_interface(void)
 
 bool jlink_select_interface(const uint8_t interface)
 {
- if (!jlink_interface_available(interface))
+ if (!jlink_interface_available(interface)) {
+ DEBUG_ERROR("Interface [%u] %s is not available\n", interface, jlink_interface_to_string(interface));
  return false;
+ }
+
+ /* If the requested interface is already selected, we're done */
+ if (jlink_selected_interface() == interface)
+ return true;
 
+ /* Select the requested interface */
  uint8_t buffer[4U];
  if (!jlink_simple_request_8(JLINK_CMD_INTERFACE_SET_SELECTED, interface, buffer, sizeof(buffer)))
  return false;
 
+ /* Give the J-Link some time to switch interfaces */
+ platform_delay(10U);
  return true;
 }
 

diff --git a/src/platforms/hosted/jlink_jtag.c b/src/platforms/hosted/jlink_jtag.c
@@ -52,7 +52,6 @@ bool jlink_jtag_init(void)
  DEBUG_ERROR("Failed to select JTAG interface\n");
  return false;
  }
- platform_delay(10);
 
  /* Ensure we're in JTAG mode */
  DEBUG_PROBE("%s: Switch to JTAG\n", __func__);

diff --git a/src/platforms/hosted/jlink_swd.c b/src/platforms/hosted/jlink_swd.c
@@ -92,7 +92,6 @@ bool jlink_swd_init(adiv5_debug_port_s *dp)
  DEBUG_ERROR("Failed to select SWD interface\n");
  return false;
  }
- platform_delay(10);
 
  /* Set up the underlying SWD functions using the implementation below */
  swd_proc.seq_in = jlink_swd_seq_in;