jtag: usb_blaster: fix allocation of usb_blaster_device_desc

[openocd.git] / src / jtag / drivers / ftdi.c

diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c
index 46797d7dfe3952d0e3ca221849e0d4fb0c8dfef9..f04b390c1717b1c541c2e3e81fa9daa1cbda8ff3 100644 (file)
--- a/src/jtag/drivers/ftdi.c
+++ b/src/jtag/drivers/ftdi.c
@@ -175,7 +175,7 @@ static int ftdi_set_signal(const struct signal *s, char value)
 
        output = data ? output | s->data_mask : output & ~s->data_mask;
        if (s->oe_mask == s->data_mask)
-               direction = oe ? output | s->oe_mask : output & ~s->oe_mask;
+               direction = oe ? direction | s->oe_mask : direction & ~s->oe_mask;
        else
                output = oe ? output | s->oe_mask : output & ~s->oe_mask;
 
@@ -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;
 }
@@ -638,7 +643,7 @@ static int ftdi_initialize(void)
        if (retval == ERROR_OK)
                retval = mpsse_set_data_bits_high_byte(mpsse_ctx, output >> 8, direction >> 8);
        if (retval != ERROR_OK) {
-               LOG_ERROR("couldn't initialize FTDI with 'JTAGkey' layout");
+               LOG_ERROR("couldn't initialize FTDI with configured layout");
                return ERROR_JTAG_INIT_FAILED;
        }