The branch, eeprom-new has been updated
via ec0dcd3fab853d056067830b261f46494eed96b8 (commit)
from a9dddb4dd1f45377a7d978adfd6b2b7ec25779c6 (commit)
- Log -----------------------------------------------------------------
commit ec0dcd3fab853d056067830b261f46494eed96b8
Author: Uwe Bonnes <bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Sat Oct 2 17:05:38 2010 +0200
Rename Bit pattern SUSPEND_DBUS7 to SUSPEND_DBUS7_BIT
-----------------------------------------------------------------------
Summary of changes:
src/ftdi.c | 8 ++++----
src/ftdi.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/ftdi.c b/src/ftdi.c
index b613721..8deabd0 100644
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -2581,10 +2581,10 @@ int ftdi_eeprom_build(struct ftdi_context *ftdi)
output[0x01] |= DRIVER_VCP;
else
output[0x01] &= ~DRIVER_VCP;
- if(eeprom->suspend_dbus7 == SUSPEND_DBUS7)
- output[0x01] |= SUSPEND_DBUS7;
+ if(eeprom->suspend_dbus7 == SUSPEND_DBUS7_BIT)
+ output[0x01] |= SUSPEND_DBUS7_BIT;
else
- output[0x01] &= ~SUSPEND_DBUS7;
+ output[0x01] &= ~SUSPEND_DBUS7_BIT;
if (eeprom->suspend_pull_downs == 1)
output[0x0A] |= 0x4;
@@ -2856,7 +2856,7 @@ int ftdi_eeprom_decode(struct ftdi_context *ftdi, int
verbose)
eeprom->channel_b_driver = buf[0x01] & DRIVER_VCP;
if(ftdi->type == TYPE_2232H)
- eeprom->suspend_dbus7 = buf[0x01] & SUSPEND_DBUS7;
+ eeprom->suspend_dbus7 = buf[0x01] & SUSPEND_DBUS7_BIT;
eeprom->chip = buf[0x18];
eeprom->group0_drive = buf[0x0c] & DRIVE_16MA;
diff --git a/src/ftdi.h b/src/ftdi.h
index 2f9dc0c..5fe1b4a 100644
--- a/src/ftdi.h
+++ b/src/ftdi.h
@@ -363,7 +363,7 @@ enum ftdi_cbus_func {/* FIXME: Recheck value, especially
the last */
/** Driver Type. */
#define DRIVER_VCP 0x08
-#define SUSPEND_DBUS7 0x80
+#define SUSPEND_DBUS7_BIT 0x80
/** High current drive. */
#define HIGH_CURRENT_DRIVE 0x10
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
|
