jtag: usb_blaster: fix allocation of usb_blaster_device_desc

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

diff --git a/src/jtag/drivers/usb_blaster.c b/src/jtag/drivers/usb_blaster.c
index 088ae34f80f92cf50d96a860bb79cbaf5caeae45..2ef800dbeee97700d2e52646fafdce0e77a498e5 100644 (file)
--- a/src/jtag/drivers/usb_blaster.c
+++ b/src/jtag/drivers/usb_blaster.c
@@ -297,27 +297,6 @@ static void usb_blaster_write(int tck, int tms, int tdi)
        usb_blaster_addtowritebuffer(out_value, false);
 }
 
-static int usb_blaster_speed(int speed)
-{
-#if BUILD_USB_BLASTER_FTD2XX == 1
-       LOG_DEBUG("TODO: usb_blaster_speed() isn't implemented for libftd2xx!");
-#elif BUILD_USB_BLASTER_LIBFTDI == 1
-       LOG_DEBUG("TODO: usb_blaster_speed() isn't optimally implemented!");
-
-       /* TODO: libftdi's ftdi_set_baudrate chokes on high rates, use lowlevel
-        * usb function instead! And additionally allow user to throttle.
-        */
-       if (ftdi_set_baudrate(&ftdic, 3000000 / 4) < 0) {
-               LOG_ERROR("Can't set baud rate to max: %s",
-                       ftdi_get_error_string(&ftdic));
-               return ERROR_JTAG_DEVICE_ERROR;
-       }
-       ;
-#endif
-
-       return ERROR_OK;
-}
-
 static void usb_blaster_reset(int trst, int srst)
 {
        LOG_DEBUG("TODO: usb_blaster_reset(%d,%d) isn't implemented!",
@@ -359,7 +338,7 @@ static int usb_blaster_init(void)
        if (usb_blaster_device_desc == NULL) {
                LOG_WARNING("no usb_blaster device description specified, "
                        "using default 'USB-Blaster'");
-               usb_blaster_device_desc = "USB-Blaster";
+               usb_blaster_device_desc = strdup("USB-Blaster");
        }
 
 #if IS_WIN32 == 0
@@ -490,6 +469,11 @@ static int usb_blaster_quit(void)
        ftdi_deinit(&ftdic);
 #endif
 
+       if (usb_blaster_device_desc) {
+               free(usb_blaster_device_desc);
+               usb_blaster_device_desc = NULL;
+       }
+
        return ERROR_OK;
 }
 
@@ -588,7 +572,6 @@ struct jtag_interface usb_blaster_interface = {
 
        .execute_queue = bitbang_execute_queue,
 
-       .speed = usb_blaster_speed,
        .init = usb_blaster_init,
        .quit = usb_blaster_quit,
 };