X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=src%2Fftdi.h;h=6fad94b74c831356ee1498b18bb63c1a1b21dd28;hp=df754e3e5991f577de2f2565906f5912b8ba6acf;hb=caec12943241837aa054c691f49c548bc2e87145;hpb=74e8e79d4e311001d0f890cdf0219d84b58bb70a

diff --git a/src/ftdi.h b/src/ftdi.h
index df754e3..6fad94b 100644
--- a/src/ftdi.h
+++ b/src/ftdi.h
@@ -19,7 +19,7 @@
 
 #include <libusb.h>
 
-/* Evne on 93xx66 at max 256 bytes are used (AN_121)*/
+/* Even on 93xx66 at max 256 bytes are used (AN_121)*/
 #define FTDI_MAX_EEPROM_SIZE 256
 
 /** FTDI chip type */
@@ -183,6 +183,8 @@ struct ftdi_eeprom
     /** remote wakeup */
     int remote_wakeup;
 
+    int is_not_pnp;
+
     /* Suspend on DBUS7 Low */
     int suspend_dbus7;
 
@@ -197,7 +199,9 @@ struct ftdi_eeprom
     int use_serial;
     /** usb version */
     int usb_version;
-    /** maximum power */
+    /** Use usb version on FT2232 devices*/
+    int use_usb_version;
+     /** maximum power */
     int max_power;
 
     /** manufacturer name */
@@ -245,12 +249,11 @@ struct ftdi_eeprom
     int group3_drive;
     int group3_schmitt;
     int group3_slew;
-    
 
     /** eeprom size in bytes. This doesn't get stored in the eeprom
         but is the only way to pass it to ftdi_eeprom_build. */
     int size;
-    /* EEPROM Type 46 for 93xx46, 56 for 93xx56 and 66 for 93xx66*/
+    /* EEPROM Type 0x46 for 93xx46, 0x56 for 93xx56 and 0x66 for 93xx66*/
     int chip;
     unsigned char buf[FTDI_MAX_EEPROM_SIZE];
 };
@@ -362,7 +365,9 @@ enum ftdi_cbus_func {/* FIXME: Recheck value, especially the last */
 /** Driver Type. */
 #define DRIVER_VCP 0x08
 
-#define SUSPEND_DBUS7 0x80
+#define USE_USB_VERSION_BIT 0x10
+
+#define SUSPEND_DBUS7_BIT 0x80
 
 /** High current drive. */
 #define HIGH_CURRENT_DRIVE   0x10
@@ -469,8 +474,8 @@ extern "C"
     int ftdi_set_event_char(struct ftdi_context *ftdi, unsigned char eventch, unsigned char enable);
     int ftdi_set_error_char(struct ftdi_context *ftdi, unsigned char errorch, unsigned char enable);
 
-    /* init and build eeprom from ftdi_eeprom structure */
-    void ftdi_eeprom_initdefaults(struct ftdi_context *ftdi, 
+    /* init eeprom for the given FTDI type */
+    int ftdi_eeprom_initdefaults(struct ftdi_context *ftdi, 
                                   char * manufacturer, char *product, 
                                   char * serial);
     int ftdi_eeprom_build(struct ftdi_context *ftdi);