From ca41c8ee8dcc93a431fbc0b6746b5ea246d511f9 Mon Sep 17 00:00:00 2001 From: Uwe Bonnes Date: Fri, 10 Sep 2010 15:34:04 +0200 Subject: [PATCH] A set bit means load D2XX driver. Revers logic and names --- src/ftdi.c | 8 ++++---- src/ftdi.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ftdi.c b/src/ftdi.c index a461e19..ac0a651 100644 --- a/src/ftdi.c +++ b/src/ftdi.c @@ -2513,13 +2513,13 @@ int ftdi_eeprom_decode(struct ftdi_context *ftdi, unsigned char *buf, int size, eeprom->channel_a_type = buf[0x00] & 0x7; eeprom->high_current = buf[0x00] & HIGH_CURRENT_DRIVE_R; - eeprom->channel_a_driver = buf[0x00] & DRIVER_VCP; + eeprom->channel_a_driver = buf[0x00] & DRIVER_D2XX; eeprom->high_current_a = buf[0x00] & HIGH_CURRENT_DRIVE; // Addr 01: Channel B setting eeprom->channel_b_type = buf[0x01] & 0x7; - eeprom->channel_b_driver = buf[0x01] & DRIVER_VCP; + eeprom->channel_b_driver = buf[0x01] & DRIVER_D2XX; eeprom->high_current_b = buf[0x01] & HIGH_CURRENT_DRIVE; eeprom->suspend_dbus7 = buf[0x01] & SUSPEND_DBUS7; @@ -2722,12 +2722,12 @@ int ftdi_eeprom_decode(struct ftdi_context *ftdi, unsigned char *buf, int size, if (ftdi->type >= TYPE_2232C) fprintf(stdout,"Channel A has Mode %s%s%s\n", channel_mode[eeprom->channel_a_type], - (eeprom->channel_a_driver)?" VCP":"", + (eeprom->channel_a_driver)?" D2XX":"", (eeprom->high_current_a)?" High Currenr IO":""); if (ftdi->type >= TYPE_2232C) fprintf(stdout,"Channel B has Mode %s%s%s\n", channel_mode[eeprom->channel_b_type], - (eeprom->channel_b_driver)?" VCP":"", + (eeprom->channel_b_driver)?" D2XX":"", (eeprom->high_current_b)?" High Currenr IO":""); if ((ftdi->type == TYPE_2232H) || (ftdi->type == TYPE_4232H)) { diff --git a/src/ftdi.h b/src/ftdi.h index 8fc235f..24aec42 100644 --- a/src/ftdi.h +++ b/src/ftdi.h @@ -361,12 +361,12 @@ enum ftdi_cbus_func {/* FIXME: Recheck value, especially the last */ #define IS_SCHMITT 8 /** Driver Type. */ -#define DRIVER_VCP 0x08 +#define DRIVER_D2XX 0x08 #define SUSPEND_DBUS7 0x80 /** High current drive. */ -#define HIGH_CURRENT_DRIVE 0x10 +#define HIGH_CURRENT_DRIVE 0x10 #define HIGH_CURRENT_DRIVE_R 0x04 /** -- 1.7.1