summaryrefslogtreecommitdiff
path: root/src/jtag/ft2232.c
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-04-20 06:40:45 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-04-20 06:40:45 +0000
commit2710aba7013b17740bb68ca27c74afe15de62df9 (patch)
treeb03fc953bc23ae4641a266943c7a41552cca749a /src/jtag/ft2232.c
parentc401b8dd4f9b1697a98fd60fb7368f79743aaab1 (diff)
downloadopenocd+libswd-2710aba7013b17740bb68ca27c74afe15de62df9.tar.gz
openocd+libswd-2710aba7013b17740bb68ca27c74afe15de62df9.tar.bz2
openocd+libswd-2710aba7013b17740bb68ca27c74afe15de62df9.tar.xz
openocd+libswd-2710aba7013b17740bb68ca27c74afe15de62df9.zip
Zach Welch <zw@superlucidity.net> fix ft2232/presto warnings
git-svn-id: svn://svn.berlios.de/openocd/trunk@1476 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/jtag/ft2232.c')
-rw-r--r--src/jtag/ft2232.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c
index d26b8e1c..f4c3e4b5 100644
--- a/src/jtag/ft2232.c
+++ b/src/jtag/ft2232.c
@@ -158,7 +158,7 @@ ft2232_layout_t ft2232_layouts[] =
{ "stm32stick", stm32stick_init, stm32stick_reset, NULL },
{ "axm0432_jtag", axm0432_jtag_init, axm0432_jtag_reset, NULL },
{"sheevaplug", sheevaplug_init, sheevaplug_reset, NULL },
- { NULL, NULL, NULL },
+ { NULL, NULL, NULL, NULL },
};
static u8 nTRST, nTRSTnOE, nSRST, nSRSTnOE;
@@ -233,7 +233,7 @@ int ft2232_write(u8* buf, int size, u32* bytes_written)
}
-int ft2232_read(u8* buf, int size, u32* bytes_read)
+int ft2232_read(u8* buf, u32 size, u32* bytes_read)
{
#if BUILD_FT2232_FTD2XX == 1
DWORD dw_bytes_read;
@@ -1607,7 +1607,7 @@ static int ft2232_init_ftd2xx(u16 vid, u16 pid, int more, int* try_more)
if (status == FT_OK)
{
char** desc_array = malloc( sizeof(char*) * (num_devices + 1) );
- int i;
+ u32 i;
for (i = 0; i < num_devices; i++)
desc_array[i] = malloc(64);