The branch, master has been updated
via ce3940810901906eb00d67fe259d5540a9008630 (commit)
from 1343f5841f27b505b762d5259e6e7a08643ecd46 (commit)
- Log -----------------------------------------------------------------
commit ce3940810901906eb00d67fe259d5540a9008630
Author: Thomas Jarosch <thomas.jarosch@xxxxxxxxxxxxx>
Date: Fri May 6 15:17:13 2011 +0200
Correct ftdi_poll_modem_status() result code
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 1 +
src/ftdi.c | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index b0f7e42..9a507fa 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -38,6 +38,7 @@ see Changelog for full details:
Thimo Eichstaedt <abc@xxxxxxxxxx>
Thomas Fischl <fischl@xxxxxxxxx>
Tim Ansell <mithro@xxxxxxxxxx>
+ Tom Saunders <trsaunders@xxxxxxxxx>
Uwe Bonnes <bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Vladimir Yakovlev <nagos@xxxxxxxx>
Wilfried Holzke <libftdi@xxxxxxxxxx>
diff --git a/src/ftdi.c b/src/ftdi.c
index bb40984..41496ee 100644
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -1956,7 +1956,7 @@ int ftdi_poll_modem_status(struct ftdi_context *ftdi,
unsigned short *status)
if (libusb_control_transfer(ftdi->usb_dev, FTDI_DEVICE_IN_REQTYPE,
SIO_POLL_MODEM_STATUS_REQUEST, 0, ftdi->index, (unsigned char *)usb_val, 2,
ftdi->usb_read_timeout) != 2)
ftdi_error_return(-1, "getting modem status failed");
- *status = (usb_val[1] << 8) | usb_val[0];
+ *status = (usb_val[1] << 8) | (usb_val[0] & 0xFF);
return 0;
}
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
|
