imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stlink: fix printed version for new STM8 nucleo board 

The ST-LINK/V2.1 embedded in the new nucleo boards for STM8 does
not follow the normal versioning rules, and puts mass-storage and
swim version in the field normally used respectively for jtag and
mass-storage version.

Apply the check suggested by STMicroelectronics to discriminate
the two cases and print the correct version.

Change-Id: I0dd1da11013be3f1e56084489e28cfba98bb07af
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/4716
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-10-01 10:25:35 +02:00 committed by Spencer Oliver
parent 6807e6b23d
commit 5babb63462
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -665,10 +665,17 @@ static int stlink_usb_version(void *handle)
switch (h->pid) {
case STLINK_V2_1_PID:
case STLINK_V2_1_NO_MSD_PID:
/* JxMy : STM32 V2.1 - JTAG/SWD only */
jtag = x;
msd = y;
swim = 0;
if ((x <= 22 && y == 7) || (x >= 25 && y >= 7 && y <= 12)) {
/* MxSy : STM8 V2.1 - SWIM only */
msd = x;
swim = y;
jtag = 0;
} else {
/* JxMy : STM32 V2.1 - JTAG/SWD only */
jtag = x;
msd = y;
swim = 0;
}
break;
default:
jtag = x;