X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstlink-common.c;h=8f3431a23ea3679145cfd7228dbef2afb453f0c8;hb=ed7464f235c889cbad6a953ee1ea64a99bf69304;hp=2693eb9214e0140237b4059ee7141c91d3099820;hpb=ee772151c2aca1508b906982ad30944087e8143b;p=fw%2Fstlink diff --git a/src/stlink-common.c b/src/stlink-common.c index 2693eb9..8f3431a 100644 --- a/src/stlink-common.c +++ b/src/stlink-common.c @@ -348,19 +348,18 @@ void _parse_version(stlink_t *sl, stlink_version_t *slv) { void stlink_version(stlink_t *sl) { DLOG("*** looking up stlink version\n"); - stlink_version_t slv; sl->backend->version(sl); - _parse_version(sl, &slv); + _parse_version(sl, &sl->version); - DLOG("st vid = 0x%04x (expect 0x%04x)\n", slv.st_vid, USB_ST_VID); - DLOG("stlink pid = 0x%04x\n", slv.stlink_pid); - DLOG("stlink version = 0x%x\n", slv.stlink_v); - DLOG("jtag version = 0x%x\n", slv.jtag_v); - DLOG("swim version = 0x%x\n", slv.swim_v); - if (slv.jtag_v == 0) { + DLOG("st vid = 0x%04x (expect 0x%04x)\n", sl->version.st_vid, USB_ST_VID); + DLOG("stlink pid = 0x%04x\n", sl->version.stlink_pid); + DLOG("stlink version = 0x%x\n", sl->version.stlink_v); + DLOG("jtag version = 0x%x\n", sl->version.jtag_v); + DLOG("swim version = 0x%x\n", sl->version.swim_v); + if (sl->version.jtag_v == 0) { DLOG(" notice: the firmware doesn't support a jtag/swd interface\n"); } - if (slv.swim_v == 0) { + if (sl->version.swim_v == 0) { DLOG(" notice: the firmware doesn't support a swim interface\n"); } }