From: Spencer Oliver <spen@spen-soft.co.uk>
Date: Mon, 24 Sep 2012 11:29:47 +0000 (+0100)
Subject: ftdi: fix adapter_init rclk fallback
X-Git-Tag: v0.7.0-rc1~232
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e4df550ad9cb1ac1675054ff99cb2fc650dc6e29;p=openocd

ftdi: fix adapter_init rclk fallback

adapter_init expects jtag_get_speed (via ftdi_khz) to return a valid
fallback speed if the adapter does not support rclk. The call was failing
and so was the rest of the adapter init.

The makes the new ftdi driver emulate the old ftdi driver.

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

diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c
index 46797d7d..a8d396c0 100644
--- a/src/jtag/drivers/ftdi.c
+++ b/src/jtag/drivers/ftdi.c
@@ -247,6 +247,11 @@ static int ftdi_speed_div(int speed, int *khz)
 
 static int ftdi_khz(int khz, int *jtag_speed)
 {
+	if (khz == 0 && !mpsse_is_high_speed(mpsse_ctx)) {
+		LOG_DEBUG("RCLK not supported");
+		return ERROR_FAIL;
+	}
+
 	*jtag_speed = khz * 1000;
 	return ERROR_OK;
 }