port libftdi to libusb-1.0 branch, master, updated. v0.17-245-g6a6fcd8

[libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx]

The branch, master has been updated
       via  6a6fcd890466852a9749738585a68b48aaa02136 (commit)
      from  d4b5af27db53a281adb134aaa91b75335accb57d (commit)


- Log -----------------------------------------------------------------
commit 6a6fcd890466852a9749738585a68b48aaa02136
Author: Uwe Bonnes <bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date:   Wed Aug 31 19:16:52 2011 +0200

    Use default vendor/product strings for EEPROM when user doesn't supply some

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

Summary of changes:
 src/ftdi.c |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/src/ftdi.c b/src/ftdi.c
index 612376b..dca79e1 100644
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -2253,6 +2253,25 @@ int ftdi_eeprom_initdefaults(struct ftdi_context *ftdi, 
char * manufacturer,
         if (eeprom->product)
             strcpy(eeprom->product, product);
     }
+    else
+    {
+        const char* default_product;
+        switch(ftdi->type)
+        {
+        case TYPE_AM:    default_product = "AM"; break;
+        case TYPE_BM:    default_product = "BM"; break;
+        case TYPE_2232C: default_product = "Dual RS232"; break;
+        case TYPE_R:     default_product = "FT232R USB UART"; break;
+        case TYPE_2232H: default_product = "Dual RS232-HS"; break;
+        case TYPE_4232H: default_product = "FT4232H"; break;
+        case TYPE_232H:  default_product = "Single-RS232-HS"; break;
+        default:
+        ftdi_error_return(-3, "Unknown chip type");
+        }
+        eeprom->product = malloc(strlen(default_product) +1);
+        if (eeprom->product)
+            strcpy(eeprom->product, default_product);
+    }
 
     if (eeprom->serial)
         free (eeprom->serial);


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