From: Spencer Oliver <spen@spen-soft.co.uk>
Date: Fri, 4 May 2012 11:48:56 +0000 (+0100)
Subject: stlink: stlink/v1 use v2 api if supported
X-Git-Tag: v0.6.0-rc1~93
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=18df479f0a96e9e6b50d7e3393adc90629c049f7

stlink: stlink/v1 use v2 api if supported

The api v2 is supported on the stlink/v1 if it has a least v11 firmware.

Change-Id: Idfdb5a7f5a5881326017451ae9b6004eeaa46a96
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/616
Tested-by: jenkins
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
Reviewed-by: Xiaofan <xiaofanc@gmail.com>
---

diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
index 4f9d132764..1de42efb92 100644
--- a/src/jtag/drivers/stlink_usb.c
+++ b/src/jtag/drivers/stlink_usb.c
@@ -400,10 +400,9 @@ static int stlink_usb_version(void *handle)
 	h->pid = buf_get_u32(h->databuf, 32, 16);
 
 	/* set the supported jtag api version
-	 * V1 doesn't support API V2 at all
-	 * V2 support API V2 since JTAG V13
+	 * API V2 is supported since JTAG V11
 	 */
-	if ((h->version.stlink == 2) && (h->version.jtag > 12))
+	if (h->version.jtag >= 11)
 		h->version.jtag_api_max = STLINK_JTAG_API_V2;
 	else
 		h->version.jtag_api_max = STLINK_JTAG_API_V1;