libftdi-git Archives

Subject: port libftdi to libusb-1.0 branch, eeprom-new, updated. v0.17-171-g89e7cfb

From: libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx
To: libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx
Date: Wed, 19 Jan 2011 16:41:29 +0100 (CET)
The branch, eeprom-new has been updated
       via  89e7cfb530ba14c6a1353b217f6ae0569b81959c (commit)
      from  673ca43324bff1ec3b23e071e1977379dc0b5d7e (commit)


- Log -----------------------------------------------------------------
commit 89e7cfb530ba14c6a1353b217f6ae0569b81959c
Author: Vladimir Yakovlev <nagos@xxxxxxxx>
Date:   Wed Jan 19 16:38:25 2011 +0100

    Default USB PID differs for different devices. 0x6001 is valid only for 
FT245BM.
    FT2232HQ uses 0x6010. Now you can define a default fallback PID.
    
    In configuration file add this line:
            default_pid=0x6110

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

Summary of changes:
 ftdi_eeprom/main.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ftdi_eeprom/main.c b/ftdi_eeprom/main.c
index 25a3a5a..ad8eb8d 100644
--- a/ftdi_eeprom/main.c
+++ b/ftdi_eeprom/main.c
@@ -114,6 +114,7 @@ int main(int argc, char *argv[])
         CFG_BOOL("use_serial", cfg_false, 0),
         CFG_BOOL("change_usb_version", cfg_false, 0),
         CFG_INT("usb_version", 0, 0),
+        CFG_INT("default_pid", 0x6001, 0),
         CFG_INT("max_power", 0, 0),
         CFG_STR("manufacturer", "Acme Inc.", 0),
         CFG_STR("product", "USB Serial Converter", 0),
@@ -266,11 +267,12 @@ int main(int argc, char *argv[])
         }
         else
         {
+            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);
             printf("Error code: %d (%s)\n", i, ftdi_get_error_string(ftdi));
-            printf("Retrying with default FTDI id.\n");
+            printf("Retrying with default FTDI pid=%#04x.\n", default_pid);
 
-            i = ftdi_usb_open(ftdi, 0x0403, 0x6001);
+            i = ftdi_usb_open(ftdi, 0x0403, default_pid);
             if (i != 0)
             {
                 printf("Error: %s\n", ftdi->error_str);


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   

Current Thread
  • port libftdi to libusb-1.0 branch, eeprom-new, updated. v0.17-171-g89e7cfb, libftdi-git <=