interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

stlink: add STLINK_F_HAS_TARGET_VOLT 

Use an alias to STLINK_F_HAS_TRACE, both are added in the same version

Change-Id: Iabf2fdac407f5c4737c3da942323d60ee50c3470
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/4708
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Tested-by: Spencer Oliver <spen@spen-soft.co.uk>
This commit is contained in:
Antonio Borneo 2018-09-23 16:42:07 +02:00 committed by Spencer Oliver
parent 3148bf838d
commit ab9221f805
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jtag/drivers/stlink_usb.c
View File

@ -280,6 +280,7 @@ enum stlink_mode {
#define STLINK_F_HAS_TRACE (1UL << 0) #define STLINK_F_HAS_TRACE (1UL << 0)
/* aliases */ /* aliases */
#define STLINK_F_HAS_TARGET_VOLT STLINK_F_HAS_TRACE
struct speed_map { struct speed_map {
int speed; int speed;
@ -669,6 +670,7 @@ static int stlink_usb_version(void *handle)
h->version.jtag_api_max = STLINK_JTAG_API_V2; h->version.jtag_api_max = STLINK_JTAG_API_V2;
/* API for trace from J13 */ /* API for trace from J13 */
/* API for target voltage from J13 */
if (h->version.jtag >= 13) if (h->version.jtag >= 13)
flags |= STLINK_F_HAS_TRACE; flags |= STLINK_F_HAS_TRACE;
@ -694,8 +696,8 @@ static int stlink_usb_check_voltage(void *handle, float *target_voltage)
struct stlink_usb_handle_s *h = handle; struct stlink_usb_handle_s *h = handle;
uint32_t adc_results[2]; uint32_t adc_results[2];
/* only supported by stlink/v2 and for firmware >= 13 */ /* no error message, simply quit with error */
if (h->version.stlink == 1 || h->version.jtag < 13) if (!(h->version.flags & STLINK_F_HAS_TARGET_VOLT))
return ERROR_COMMAND_NOTFOUND; return ERROR_COMMAND_NOTFOUND;
stlink_usb_init_buffer(handle, h->rx_ep, 8); stlink_usb_init_buffer(handle, h->rx_ep, 8);