arm-jtag-ew: Emit a warning if interface firmware version != 1.6

[openocd.git] / src / jtag / drivers / arm-jtag-ew.c

diff --git a/src/jtag/drivers/arm-jtag-ew.c b/src/jtag/drivers/arm-jtag-ew.c
index 44eaeff1f407b8f9baa13d4674b758cf28b0e52a..7712a9e2009e31795c3d15b034fa5432a72ccabe 100644 (file)
--- a/src/jtag/drivers/arm-jtag-ew.c
+++ b/src/jtag/drivers/arm-jtag-ew.c
@@ -184,9 +184,9 @@ static int armjtagew_speed(int speed)
 
 
     usb_out_buffer[0] = CMD_SET_TCK_FREQUENCY;
-       buf_set_u32(usb_out_buffer + 1, 0, 32, speed);
+       buf_set_u32(usb_out_buffer + 1, 0, 32, speed*1000);
 
-    result = armjtagew_usb_message(armjtagew_handle, 4, 4);
+    result = armjtagew_usb_message(armjtagew_handle, 5, 4);
 
     if (result < 0)
     {
@@ -196,7 +196,7 @@ static int armjtagew_speed(int speed)
 
        usb_out_buffer[0] = CMD_GET_TCK_FREQUENCY;
     result = armjtagew_usb_message(armjtagew_handle, 1, 4);
-       speed_real = (int)buf_get_u32(usb_in_buffer,0,32);
+       speed_real = (int)buf_get_u32(usb_in_buffer,0,32) / 1000;
        if (result < 0)
        {
         LOG_ERROR("ARM-JTAG-EW getting speed failed (%d)", result);
@@ -218,6 +218,14 @@ static int armjtagew_khz(int khz, int *jtag_speed)
        return ERROR_OK;
 }
 
+static int armjtagew_speed_div(int speed, int* khz)
+{
+       *khz = speed;
+
+       return ERROR_OK;
+}
+
+
 static int armjtagew_init(void)
 {
        int check_cnt;
@@ -488,6 +496,11 @@ static int armjtagew_get_version_info(void)
                        usb_in_buffer[1], usb_in_buffer[0], \
                        isgraph(usb_in_buffer[2]) ? usb_in_buffer[2] : 'X', \
                        sn, auxinfo);
+
+       if (1 != usb_in_buffer[1] || 6 != usb_in_buffer[0])
+       {
+               LOG_WARNING("ARM-JTAG-EW firmware version %d.%d is untested with this version of OpenOCD. You might experience unexpected behavior.", usb_in_buffer[1], usb_in_buffer[0]);
+       }
        return ERROR_OK;
 }
 
@@ -515,9 +528,11 @@ static const struct command_registration armjtagew_command_handlers[] = {
 struct jtag_interface armjtagew_interface = {
        .name = "arm-jtag-ew",
        .commands = armjtagew_command_handlers,
+       .transports = jtag_only,
 
        .execute_queue = armjtagew_execute_queue,
        .speed = armjtagew_speed,
+       .speed_div = armjtagew_speed_div,
        .khz = armjtagew_khz,
        .init = armjtagew_init,
        .quit = armjtagew_quit,