From: Paul Fertser <fercerpav@gmail.com>
Date: Fri, 4 Nov 2016 11:18:21 +0000 (+0300)
Subject: jtag: drivers: cmsis-dap: fix operation with SAMD10 Xplained board
X-Git-Tag: v0.10.0-rc1~43
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=aa2c38d50cfc30b651b47cfe93dcc4238c887d68;p=openocd

jtag: drivers: cmsis-dap: fix operation with SAMD10 Xplained board

Change-Id: I9164edeb83c9a9106e74798e98b9517177e83358
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/3856
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
---

diff --git a/src/jtag/drivers/cmsis_dap_usb.c b/src/jtag/drivers/cmsis_dap_usb.c
index 7791840e..dd37522a 100644
--- a/src/jtag/drivers/cmsis_dap_usb.c
+++ b/src/jtag/drivers/cmsis_dap_usb.c
@@ -316,9 +316,11 @@ static int cmsis_dap_usb_open(void)
 	int packet_size = PACKET_SIZE;
 
 	/* atmel cmsis-dap uses 512 byte reports */
+	/* except when it doesn't e.g. with mEDBG on SAMD10 Xplained
+	 * board */
 	/* TODO: HID report descriptor should be parsed instead of
 	 * hardcoding a match by VID */
-	if (target_vid == 0x03eb)
+	if (target_vid == 0x03eb && target_pid != 0x2145)
 		packet_size = 512 + 1;
 
 	cmsis_dap_handle->packet_buffer = malloc(packet_size);