This is an automated email from Gerrit.

Spencer Oliver ([email protected]) just uploaded a new patch set to Gerrit, 
which you can find at http://openocd.zylin.com/1627

-- gerrit

commit 5074d417c0369ef6de7dbfd298b2cd6fcf49da8b
Author: Søren Jørvang <[email protected]>
Date:   Tue Sep 17 14:21:38 2013 +0100

    bus_blaster: do not fail on missing get_latency_timer
    
    Patch submitted from Trac #64
    Seems certain clones do not correctly emulate the ftdi chip, if
    the call to read the latency timer fails then do not treat this as a
    failure.
    
    Change-Id: Iae671b926d101adf1010639d11ca46c58d0af524
    Signed-off-by: Spencer Oliver <[email protected]>

diff --git a/src/jtag/drivers/usb_blaster/ublast_access_ftd2xx.c 
b/src/jtag/drivers/usb_blaster/ublast_access_ftd2xx.c
index e350650..14351fb 100644
--- a/src/jtag/drivers/usb_blaster/ublast_access_ftd2xx.c
+++ b/src/jtag/drivers/usb_blaster/ublast_access_ftd2xx.c
@@ -136,12 +136,11 @@ static int ublast_ftd2xx_init(struct ublast_lowlevel *low)
        }
 
        status = FT_GetLatencyTimer(*ftdih, &latency_timer);
-       if (status != FT_OK) {
+       if (status != FT_OK)
                LOG_ERROR("unable to get latency timer: %s",
                                ftd2xx_status_string(status));
-               return ERROR_JTAG_INIT_FAILED;
-       }
-       LOG_DEBUG("current latency timer: %i", latency_timer);
+       else
+               LOG_DEBUG("current latency timer: %i", latency_timer);
 
        status = FT_SetBitMode(*ftdih, 0x00, 0);
        if (status != FT_OK) {
diff --git a/src/jtag/drivers/usb_blaster/ublast_access_ftdi.c 
b/src/jtag/drivers/usb_blaster/ublast_access_ftdi.c
index 23893e1..2527fe9 100644
--- a/src/jtag/drivers/usb_blaster/ublast_access_ftdi.c
+++ b/src/jtag/drivers/usb_blaster/ublast_access_ftdi.c
@@ -99,11 +99,10 @@ static int ublast_ftdi_init(struct ublast_lowlevel *low)
                return ERROR_JTAG_INIT_FAILED;
        }
 
-       if (ftdi_get_latency_timer(ftdic, &latency_timer) < 0) {
+       if (ftdi_get_latency_timer(ftdic, &latency_timer) < 0)
                LOG_ERROR("unable to get latency timer");
-               return ERROR_JTAG_INIT_FAILED;
-       }
-       LOG_DEBUG("current latency timer: %u", latency_timer);
+       else
+               LOG_DEBUG("current latency timer: %u", latency_timer);
 
        ftdi_disable_bitbang(ftdic);
        return ERROR_OK;

-- 

------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. 
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
_______________________________________________
OpenOCD-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to