diff options
| author | Spencer Oliver <ntfreak@users.sourceforge.net> | 2011-08-10 22:23:29 +0100 |
|---|---|---|
| committer | Spencer Oliver <ntfreak@users.sourceforge.net> | 2011-08-11 21:36:54 +0100 |
| commit | 85cf298667fbb64ebffed4a1db57223535a888c9 (patch) | |
| tree | 958f1bc2f08b48ebb20d3bfc649a990488e71f14 /src/jtag/drivers/usb_blaster.c | |
| parent | 738b91ddb430a0b42ab8eb3ae6ba725110231713 (diff) | |
ftd2xx: fix build warnings
Due to build warnings introduced in newer versions of ftd2xx we
use strings to report errors rather than result codes. This also
gives us the same behaviour as libftdi.
Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>
Diffstat (limited to 'src/jtag/drivers/usb_blaster.c')
| -rw-r--r-- | src/jtag/drivers/usb_blaster.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/jtag/drivers/usb_blaster.c b/src/jtag/drivers/usb_blaster.c index 382240f5..c5c356ce 100644 --- a/src/jtag/drivers/usb_blaster.c +++ b/src/jtag/drivers/usb_blaster.c @@ -97,6 +97,7 @@ /* USB_BLASTER access library includes */ #if BUILD_USB_BLASTER_FTD2XX == 1 #include <ftd2xx.h> +#include "ftd2xx_common.h" #elif BUILD_USB_BLASTER_LIBFTDI == 1 #include <ftdi.h> #endif @@ -135,7 +136,7 @@ static int usb_blaster_buf_write( if (status != FT_OK) { *bytes_written = dw_bytes_written; - LOG_ERROR("FT_Write returned: %" PRIu32, status); + LOG_ERROR("FT_Write returned: %s", ftd2xx_status_string(status)); return ERROR_JTAG_DEVICE_ERROR; } *bytes_written = dw_bytes_written; @@ -168,7 +169,7 @@ usb_blaster_buf_read(uint8_t *buf, unsigned size, uint32_t *bytes_read) if (status != FT_OK) { *bytes_read = dw_bytes_read; - LOG_ERROR("FT_Read returned: %" PRIu32, status); + LOG_ERROR("FT_Read returned: %s", ftd2xx_status_string(status)); return ERROR_JTAG_DEVICE_ERROR; } #ifdef _DEBUG_JTAG_IO_ @@ -384,7 +385,8 @@ static int usb_blaster_init(void) { DWORD num_devices; - LOG_ERROR("unable to open ftdi device: %" PRIu32, status); + LOG_ERROR("unable to open ftdi device: %s", + ftd2xx_status_string(status)); status = FT_ListDevices(&num_devices, NULL, FT_LIST_NUMBER_ONLY); if (status == FT_OK) @@ -402,7 +404,7 @@ static int usb_blaster_init(void) if (status == FT_OK) { - LOG_ERROR("ListDevices: %" PRIu32, num_devices); + LOG_ERROR("ListDevices: %" PRIu32, (uint32_t)num_devices); for (i = 0; i < num_devices; i++) LOG_ERROR("%i: %s", i, desc_array[i]); } @@ -421,14 +423,16 @@ static int usb_blaster_init(void) status = FT_SetLatencyTimer(ftdih, 2); if (status != FT_OK) { - LOG_ERROR("unable to set latency timer: %" PRIu32, status); + LOG_ERROR("unable to set latency timer: %s", + ftd2xx_status_string(status)); return ERROR_JTAG_INIT_FAILED; } status = FT_GetLatencyTimer(ftdih, &latency_timer); if (status != FT_OK) { - LOG_ERROR("unable to get latency timer: %" PRIu32, status); + 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); @@ -436,7 +440,8 @@ static int usb_blaster_init(void) status = FT_SetBitMode(ftdih, 0x00, 0); if (status != FT_OK) { - LOG_ERROR("unable to disable bit i/o mode: %" PRIu32, status); + LOG_ERROR("unable to disable bit i/o mode: %s", + ftd2xx_status_string(status)); return ERROR_JTAG_INIT_FAILED; } #elif BUILD_USB_BLASTER_LIBFTDI == 1 |