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_MEM_16BIT 

Change-Id: I51a160a105342ddbab99c4182d89650a436f5945
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/4711
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 15:28:05 +02:00 committed by Spencer Oliver
parent 85223bb500
commit 861730f732
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
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)
#define STLINK_F_HAS_SWD_SET_FREQ (1UL << 1) #define STLINK_F_HAS_SWD_SET_FREQ (1UL << 1)
#define STLINK_F_HAS_JTAG_SET_FREQ (1UL << 2) #define STLINK_F_HAS_JTAG_SET_FREQ (1UL << 2)
#define STLINK_F_HAS_MEM_16BIT (1UL << 3)
/* aliases */ /* aliases */
#define STLINK_F_HAS_TARGET_VOLT STLINK_F_HAS_TRACE #define STLINK_F_HAS_TARGET_VOLT STLINK_F_HAS_TRACE
@ -684,6 +685,10 @@ static int stlink_usb_version(void *handle)
if (h->version.jtag >= 24) if (h->version.jtag >= 24)
flags |= STLINK_F_HAS_JTAG_SET_FREQ; 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; break;
default: default:
break; break;
@ -1746,9 +1751,7 @@ static int stlink_usb_read_mem16(void *handle, uint32_t addr, uint16_t len,
assert(handle != NULL); assert(handle != NULL);
/* only supported by stlink/v2 and for firmware >= 26 */ if (!(h->version.flags & STLINK_F_HAS_MEM_16BIT))
if (h->jtag_api == STLINK_JTAG_API_V1 ||
(h->jtag_api == STLINK_JTAG_API_V2 && h->version.jtag < 26))
return ERROR_COMMAND_NOTFOUND; return ERROR_COMMAND_NOTFOUND;
/* data must be a multiple of 2 and half-word aligned */ /* data must be a multiple of 2 and half-word aligned */
@ -1785,9 +1788,7 @@ static int stlink_usb_write_mem16(void *handle, uint32_t addr, uint16_t len,
assert(handle != NULL); assert(handle != NULL);
/* only supported by stlink/v2 and for firmware >= 26 */ if (!(h->version.flags & STLINK_F_HAS_MEM_16BIT))
if (h->jtag_api == STLINK_JTAG_API_V1 ||
(h->jtag_api == STLINK_JTAG_API_V2 && h->version.jtag < 26))
return ERROR_COMMAND_NOTFOUND; return ERROR_COMMAND_NOTFOUND;
/* data must be a multiple of 2 and half-word aligned */ /* data must be a multiple of 2 and half-word aligned */
@ -1899,8 +1900,7 @@ static int stlink_usb_read_mem(void *handle, uint32_t addr, uint32_t size,
count *= size; count *= size;
/* switch to 8 bit if stlink does not support 16 bit memory read */ /* switch to 8 bit if stlink does not support 16 bit memory read */
if (size == 2 && (h->jtag_api == STLINK_JTAG_API_V1 || if (size == 2 && !(h->version.flags & STLINK_F_HAS_MEM_16BIT))
(h->jtag_api == STLINK_JTAG_API_V2 && h->version.jtag < 26)))
size = 1; size = 1;
while (count) { while (count) {
@ -1985,8 +1985,7 @@ static int stlink_usb_write_mem(void *handle, uint32_t addr, uint32_t size,
count *= size; count *= size;
/* switch to 8 bit if stlink does not support 16 bit memory read */ /* switch to 8 bit if stlink does not support 16 bit memory read */
if (size == 2 && (h->jtag_api == STLINK_JTAG_API_V1 || if (size == 2 && !(h->version.flags & STLINK_F_HAS_MEM_16BIT))
(h->jtag_api == STLINK_JTAG_API_V2 && h->version.jtag < 26)))
size = 1; size = 1;
while (count) { while (count) {