X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fstlink_usb.c;h=852fa59a59dc118bc82fc2b6a6e455d66d0ea47c;hp=566c3bdbd647c3ddb127bf03e6173ef2da50602a;hb=85223bb500e0d7c1580de07939438aa45759df75;hpb=d705389f6797695816810a21d0f1ce5e7ad02ad2

diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
index 566c3bdbd6..852fa59a59 100644
--- a/src/jtag/drivers/stlink_usb.c
+++ b/src/jtag/drivers/stlink_usb.c
@@ -279,6 +279,7 @@ enum stlink_mode {
  */
 #define STLINK_F_HAS_TRACE              (1UL << 0)
 #define STLINK_F_HAS_SWD_SET_FREQ       (1UL << 1)
+#define STLINK_F_HAS_JTAG_SET_FREQ      (1UL << 2)
 
 /* aliases */
 #define STLINK_F_HAS_TARGET_VOLT        STLINK_F_HAS_TRACE
@@ -679,6 +680,10 @@ static int stlink_usb_version(void *handle)
 		if (h->version.jtag >= 22)
 			flags |= STLINK_F_HAS_SWD_SET_FREQ;
 
+		/* API to set JTAG frequency from J24 */
+		if (h->version.jtag >= 24)
+			flags |= STLINK_F_HAS_JTAG_SET_FREQ;
+
 		break;
 	default:
 		break;
@@ -758,8 +763,7 @@ static int stlink_usb_set_jtagclk(void *handle, uint16_t clk_divisor)
 
 	assert(handle != NULL);
 
-	/* only supported by stlink/v2 and for firmware >= 24 */
-	if (h->version.stlink == 1 || h->version.jtag < 24)
+	if (!(h->version.flags & STLINK_F_HAS_JTAG_SET_FREQ))
 		return ERROR_COMMAND_NOTFOUND;
 
 	stlink_usb_init_buffer(handle, h->rx_ep, 2);
@@ -2142,8 +2146,8 @@ static int stlink_speed_jtag(void *handle, int khz, bool query)
 	int speed_index;
 	struct stlink_usb_handle_s *h = handle;
 
-	/* only supported by stlink/v2 and for firmware >= 24 */
-	if (h->version.stlink == 1 || h->version.jtag < 24)
+	/* old firmware cannot change it */
+	if (!(h->version.flags & STLINK_F_HAS_JTAG_SET_FREQ))
 		return khz;
 
 	speed_index = stlink_match_speed_map(stlink_khz_to_speed_map_jtag,
@@ -2395,8 +2399,7 @@ static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
 	}
 
 	if (h->transport == HL_TRANSPORT_JTAG) {
-		/* jtag clock speed only supported by stlink/v2 and for firmware >= 24 */
-		if (h->version.stlink >= 2 && h->version.jtag >= 24) {
+		if (h->version.flags & STLINK_F_HAS_JTAG_SET_FREQ) {
 			stlink_dump_speed_map(stlink_khz_to_speed_map_jtag, ARRAY_SIZE(stlink_khz_to_speed_map_jtag));
 			stlink_speed(h, param->initial_interface_speed, false);
 		}