sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pc-stlinkv2: READMEM_8BIT needs to read 2 bytes for 1 byte requested. 

Fix as seen in openocd.
SYSROM_PIDR2 has only 3 bits for the JEP106 identity code field, bits [6:4].
This commit is contained in:
Uwe Bonnes 2019-08-20 22:01:20 +02:00
parent 82be49f052
commit 44f471db53
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/platforms/pc-stlinkv2/stlinkv2.c
View File

@ -1095,6 +1095,7 @@ void stlink_readmem(ADIv5_AP_t *ap, void *dest, uint32_t src, size_t len)
{ {
if (len == 0) if (len == 0)
return; return;
size_t read_len = len;
uint8_t type; uint8_t type;
char *CMD; char *CMD;
if (src & 1 || len & 1) { if (src & 1 || len & 1) {
@ -1104,6 +1105,8 @@ void stlink_readmem(ADIv5_AP_t *ap, void *dest, uint32_t src, size_t len)
DEBUG(" Too large!\n"); DEBUG(" Too large!\n");
return; return;
} }
if (len == 1)
read_len ++; /* Fix read length as in openocd*/
} else if (src & 3 || len & 3) { } else if (src & 3 || len & 3) {
CMD = "READMEM_16BIT"; CMD = "READMEM_16BIT";
type = STLINK_DEBUG_APIV2_READMEM_16BIT; type = STLINK_DEBUG_APIV2_READMEM_16BIT;
@ -1120,7 +1123,7 @@ void stlink_readmem(ADIv5_AP_t *ap, void *dest, uint32_t src, size_t len)
src & 0xff, (src >> 8) & 0xff, (src >> 16) & 0xff, src & 0xff, (src >> 8) & 0xff, (src >> 16) & 0xff,
(src >> 24) & 0xff, (src >> 24) & 0xff,
len & 0xff, len >> 8, ap->apsel}; len & 0xff, len >> 8, ap->apsel};
int res = read_retry(cmd, 16, dest, len); int res = read_retry(cmd, 16, dest, read_len);
if (res == STLINK_ERROR_OK) { if (res == STLINK_ERROR_OK) {
uint8_t *p = (uint8_t*)dest; uint8_t *p = (uint8_t*)dest;
for (size_t i = 0; i < len ; i++) { for (size_t i = 0; i < len ; i++) {