*/
#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)
+#define STLINK_F_HAS_MEM_16BIT (1UL << 3)
/* aliases */
#define STLINK_F_HAS_TARGET_VOLT STLINK_F_HAS_TRACE
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;
+
+ /* API to read/write memory at 16 bit from J26 */
+ if (h->version.jtag >= 26)
+ flags |= STLINK_F_HAS_MEM_16BIT;
+
break;
default:
break;
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);
assert(handle != NULL);
- /* only supported by stlink/v2 and for firmware >= 26 */
- if (h->jtag_api == STLINK_JTAG_API_V1 ||
- (h->jtag_api == STLINK_JTAG_API_V2 && h->version.jtag < 26))
+ if (!(h->version.flags & STLINK_F_HAS_MEM_16BIT))
return ERROR_COMMAND_NOTFOUND;
/* data must be a multiple of 2 and half-word aligned */
assert(handle != NULL);
- /* only supported by stlink/v2 and for firmware >= 26 */
- if (h->jtag_api == STLINK_JTAG_API_V1 ||
- (h->jtag_api == STLINK_JTAG_API_V2 && h->version.jtag < 26))
+ if (!(h->version.flags & STLINK_F_HAS_MEM_16BIT))
return ERROR_COMMAND_NOTFOUND;
/* data must be a multiple of 2 and half-word aligned */
count *= size;
/* switch to 8 bit if stlink does not support 16 bit memory read */
- if (size == 2 && (h->jtag_api == STLINK_JTAG_API_V1 ||
- (h->jtag_api == STLINK_JTAG_API_V2 && h->version.jtag < 26)))
+ if (size == 2 && !(h->version.flags & STLINK_F_HAS_MEM_16BIT))
size = 1;
while (count) {
count *= size;
/* switch to 8 bit if stlink does not support 16 bit memory read */
- if (size == 2 && (h->jtag_api == STLINK_JTAG_API_V1 ||
- (h->jtag_api == STLINK_JTAG_API_V2 && h->version.jtag < 26)))
+ if (size == 2 && !(h->version.flags & STLINK_F_HAS_MEM_16BIT))
size = 1;
while (count) {
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,
}
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);
}