libftdi-git Archives

Subject: port libftdi to libusb-1.0 branch, master, updated. v0.17-46-g97c6b5f

From: libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx
To: libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx
Date: Thu, 16 Sep 2010 10:28:50 +0200 (CEST)
The branch, master has been updated
       via  97c6b5f63d77f28968f4ad19c6901f11598898c9 (commit)
       via  d5c913485ba3383260741489f0a70b06be3cf269 (commit)
       via  5b1e6a0ae2affa25cb0782222de8380936fa7b28 (commit)
      from  36335b9279fcb28e2eec4f7b6493a7e599e5fbf4 (commit)


- Log -----------------------------------------------------------------
commit 97c6b5f63d77f28968f4ad19c6901f11598898c9
Author: Thomas Jarosch <thomas.jarosch@xxxxxxxxxxxxx>
Date:   Thu Sep 16 10:28:45 2010 +0200

    Correct (signedness) issues detected by -Wall

commit d5c913485ba3383260741489f0a70b06be3cf269
Author: Thomas Jarosch <thomas.jarosch@xxxxxxxxxxxxx>
Date:   Thu Sep 16 10:25:53 2010 +0200

    Fix initialization order (found by -Wall)

commit 5b1e6a0ae2affa25cb0782222de8380936fa7b28
Author: Uwe Bonnes <bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date:   Wed Sep 8 11:01:51 2010 +0200

    Add -Wall to compiler flags

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt         |    2 ++
 examples/baud_test.c   |    4 ++--
 examples/serial_read.c |    4 +++-
 ftdipp/ftdi.cpp        |    2 +-
 src/ftdi.c             |    2 +-
 src/ftdi_stream.c      |    2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5ae9cd..796b0d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,8 @@ endif("${CMAKE_BUILD_TYPE}" STREQUAL "")
 set(CMAKE_COLOR_MAKEFILE ON)
 cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
 
+add_definitions(-Wall)
+
 # Debug build
 message("-- Build type: ${CMAKE_BUILD_TYPE}")
 if(${CMAKE_BUILD_TYPE} STREQUAL Debug)
diff --git a/examples/baud_test.c b/examples/baud_test.c
index 32b9beb..b53031b 100644
--- a/examples/baud_test.c
+++ b/examples/baud_test.c
@@ -52,8 +52,8 @@ int main(int argc, char **argv)
 {
     struct ftdi_context ftdic;
     int i, t;
-    char *txbuf;
-    char *rxbuf;
+    unsigned char *txbuf;
+    unsigned char *rxbuf;
     double start, duration, plan;
 
     // default values
diff --git a/examples/serial_read.c b/examples/serial_read.c
index c8f2ea4..5d05d66 100644
--- a/examples/serial_read.c
+++ b/examples/serial_read.c
@@ -14,7 +14,7 @@
 int main(int argc, char **argv)
 {
     struct ftdi_context ftdic;
-    char buf[1024];
+    unsigned char buf[1024];
     int f, i;
     int vid = 0x0403;
     int pid = 0x6001;
@@ -79,4 +79,6 @@ int main(int argc, char **argv)
 
     ftdi_usb_close(&ftdic);
     ftdi_deinit(&ftdic);
+
+    return 0;
 }
diff --git a/ftdipp/ftdi.cpp b/ftdipp/ftdi.cpp
index 03dd26b..c81eb5f 100644
--- a/ftdipp/ftdi.cpp
+++ b/ftdipp/ftdi.cpp
@@ -36,7 +36,7 @@ class Context::Private
 {
 public:
     Private()
-            :  ftdi(0), dev(0), open(false)
+            : open(false), ftdi(0), dev(0)
     {
         ftdi = ftdi_new();
     }
diff --git a/src/ftdi.c b/src/ftdi.c
index 525f9d1..30b5b55 100644
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -2659,7 +2659,7 @@ int ftdi_read_eeprom_location (struct ftdi_context *ftdi, 
int eeprom_addr, unsig
     if (ftdi == NULL || ftdi->usb_dev == NULL)
         ftdi_error_return(-2, "USB device unavailable");
 
-    if (libusb_control_transfer(ftdi->usb_dev, FTDI_DEVICE_IN_REQTYPE, 
SIO_READ_EEPROM_REQUEST, 0, eeprom_addr, (char *)eeprom_val, 2, 
ftdi->usb_read_timeout) != 2)
+    if (libusb_control_transfer(ftdi->usb_dev, FTDI_DEVICE_IN_REQTYPE, 
SIO_READ_EEPROM_REQUEST, 0, eeprom_addr, (unsigned char *)eeprom_val, 2, 
ftdi->usb_read_timeout) != 2)
         ftdi_error_return(-1, "reading eeprom failed");
 
     return 0;
diff --git a/src/ftdi_stream.c b/src/ftdi_stream.c
index c3eb465..d39fc2a 100644
--- a/src/ftdi_stream.c
+++ b/src/ftdi_stream.c
@@ -198,7 +198,7 @@ ftdi_readstream(struct ftdi_context *ftdi,
      */
     if (ftdi_set_bitmode(ftdi,  0xff, BITMODE_SYNCFF) < 0)
     {
-        fprintf(stderr,"Can't set synchronous fifo mode\n",
+        fprintf(stderr,"Can't set synchronous fifo mode: %s\n",
                 ftdi_get_error_string(ftdi));
         goto cleanup;
     }


hooks/post-receive
-- 
port libftdi to libusb-1.0

--
libftdi-git - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to libftdi-git+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx   

Current Thread
  • port libftdi to libusb-1.0 branch, master, updated. v0.17-46-g97c6b5f, libftdi-git <=