port libftdi to libusb-1.0 branch, master, updated. v0.17-242-ge8d3297

[libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx]

The branch, master has been updated
       via  e8d329785e943218dcc2e1b0f216439cb58918c7 (commit)
      from  94c637b8aa9c19a1e8a669249f07624bda5d5270 (commit)


- Log -----------------------------------------------------------------
commit e8d329785e943218dcc2e1b0f216439cb58918c7
Author: Uwe Bonnes <bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date:   Wed Aug 31 18:31:20 2011 +0200

    ftdi_eeprom: Change sequenc of initialization to get the chip size right

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

Summary of changes:
 ftdi_eeprom/main.c |   23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/ftdi_eeprom/main.c b/ftdi_eeprom/main.c
index a765d8c..d1ec55d 100644
--- a/ftdi_eeprom/main.c
+++ b/ftdi_eeprom/main.c
@@ -214,11 +214,7 @@ int main(int argc, char *argv[])
 
         i = ftdi_usb_open(ftdi, vendor_id, product_id);
 
-        if (i == 0)
-        {
-            printf("FTDI read eeprom: %d\n", ftdi_read_eeprom(ftdi));
-        }
-        else
+        if (i != 0)
         {
             int default_pid = cfg_getint(cfg, "default_pid");
             printf("Unable to find FTDI devices under given vendor/product id: 
0x%X/0x%X\n", vendor_id, product_id);
@@ -232,11 +228,16 @@ int main(int argc, char *argv[])
                 exit (-1);
             }
         }
-        eeprom_get_value(ftdi, CHIP_SIZE, &my_eeprom_size);
-        // TODO: Do we know the eeprom size already?
-        printf("EEPROM size: %d\n", my_eeprom_size);
     }
-
+    ftdi_eeprom_initdefaults (ftdi, cfg_getstr(cfg, "manufacturer"), 
+                              cfg_getstr(cfg, "product"), 
+                              cfg_getstr(cfg, "serial"));
+    
+    printf("FTDI read eeprom: %d\n", ftdi_read_eeprom(ftdi));
+    eeprom_get_value(ftdi, CHIP_SIZE, &my_eeprom_size);
+    // TODO: Do we know the eeprom size already?
+    printf("EEPROM size: %d\n", my_eeprom_size);
+    
     if (_read > 0)
     {
 
@@ -279,10 +280,6 @@ int main(int argc, char *argv[])
         goto cleanup;
     }
 
-    ftdi_eeprom_initdefaults (ftdi, cfg_getstr(cfg, "manufacturer"), 
-                              cfg_getstr(cfg, "product"), 
-                              cfg_getstr(cfg, "serial"));
-
     eeprom_set_value(ftdi, VENDOR_ID, cfg_getint(cfg, "vendor_id"));
     eeprom_set_value(ftdi, PRODUCT_ID, cfg_getint(cfg, "product_id"));
 


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