A library to talk to FTDI chips branch, master, updated. v0.15-19-gf2a9b27

[libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx]

The branch, master has been updated
       via  f2a9b277ea0c6eb47fa129aa76c6f2994caa9858 (commit)
       via  5230676f38a45f0fa4a94c50088fc7c504c11d49 (commit)
      from  49c5ac7264ef3e1bed2a4a1e290028eb48b3bf44 (commit)


- Log -----------------------------------------------------------------
commit f2a9b277ea0c6eb47fa129aa76c6f2994caa9858
Author: Thomas Jarosch <thomas.jarosch@xxxxxxxxxxxxx>
Date:   Mon Mar 16 10:28:07 2009 +0100

    Updated ChangeLog and AUTHORS

commit 5230676f38a45f0fa4a94c50088fc7c504c11d49
Author: Matthias Richter <mail.to.mr@xxxxxx>
Date:   Mon Mar 16 10:27:53 2009 +0100

    Fix ftdi_read_chipid in some cases

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

Summary of changes:
 AUTHORS    |    1 +
 ChangeLog  |    1 +
 src/ftdi.c |    2 +-
 3 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 71a9903..17c9ad1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -20,6 +20,7 @@ see Changelog for full details:
   Marek Vavruša <marek@xxxxxxxxxxx>
   Marius Kintel <kintel@xxxxxx>
   Matthias Kranz <matthias@xxxxxxxxxx>
+  Matthias Richter <mail.to.mr@xxxxxx>
   Matthijs ten Berge <m.h.tenberge@xxxxxxxxxxxxxxxxxx>
   Max <max@xxxxxxxxxxxx>
   Mike Frysinger <vapier.adi@xxxxxxxxx>
diff --git a/ChangeLog b/ChangeLog
index 8a4511e..6c2b9da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 New in 0.16 - 2009-XX-XX
 ------------------------
+* Fixed ftdi_read_chipid in some cases (Matthias Richter)
 * eeprom decode function and small cleanups (Marius Kintel)
 * cmake system improvements (Marius Kintel and Intra2net)
 * Fix compilation in -ansi -pedantic mode (Matthias Janke)
diff --git a/src/ftdi.c b/src/ftdi.c
index e7a7274..74ba8d3 100644
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -2024,7 +2024,7 @@ int ftdi_read_chipid(struct ftdi_context *ftdi, unsigned 
int *chipid)
         if (usb_control_msg(ftdi->usb_dev, FTDI_DEVICE_IN_REQTYPE, 
SIO_READ_EEPROM_REQUEST, 0, 0x44, (char *)&b, 2, ftdi->usb_read_timeout) == 2)
         {
             b = b << 8 | b >> 8;
-            a = (a << 16) | b;
+            a = (a << 16) | (b & 0xFFFF);
             a = ftdi_read_chipid_shift(a) | ftdi_read_chipid_shift(a>>8)<<8
                 | ftdi_read_chipid_shift(a>>16)<<16 | 
ftdi_read_chipid_shift(a>>24)<<24;
             *chipid = a ^ 0xa5f0f7d1;


hooks/post-receive
-- 
A library to talk to FTDI chips

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