X-Git-Url: http://developer.intra2net.com/git/?a=blobdiff_plain;f=ftdi_eeprom%2Fmain.c;h=4eb0f5eafc6523d351e86e0acd90d761a0e830d4;hb=a182572280dafe54b975a688332ddd2649cf61b0;hp=ad7de9388193996157b9f0e91acd0d558ac9660d;hpb=be4bae37b3f851d7e06610fe474d84a3b2371efb;p=libftdi

diff --git a/ftdi_eeprom/main.c b/ftdi_eeprom/main.c
index ad7de93..4eb0f5e 100644
--- a/ftdi_eeprom/main.c
+++ b/ftdi_eeprom/main.c
@@ -16,7 +16,6 @@
 
 /*
  TODO:
-    - Remove 128 bytes limit
     - Merge Uwe's eeprom tool. Current features:
         - Init eeprom defaults based upon eeprom type
         - Read -> Already there
@@ -38,6 +37,7 @@
 #include <string.h>
 
 #include <confuse.h>
+#include <libusb.h>
 #include <ftdi.h>
 #include <ftdi_eeprom_version.h>
 
@@ -118,6 +118,7 @@ int main(int argc, char *argv[])
         CFG_STR("manufacturer", "Acme Inc.", 0),
         CFG_STR("product", "USB Serial Converter", 0),
         CFG_STR("serial", "08-15", 0),
+        CFG_INT("eeprom_type", 0x00, 0),
         CFG_STR("filename", "", 0),
         CFG_BOOL("flash_raw", cfg_false, 0),
         CFG_BOOL("high_current", cfg_false, 0),
@@ -143,6 +144,7 @@ int main(int argc, char *argv[])
     */
     int _read = 0, _erase = 0, _flash = 0;
 
+    const int max_eeprom_size = 256;
     int my_eeprom_size = 0;
     unsigned char *eeprom_buf = NULL;
     char *filename;
@@ -231,12 +233,11 @@ int main(int argc, char *argv[])
     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)
     {
         ftdi_eeprom_decode(ftdi, 0 /* debug: 1 */);
@@ -278,7 +279,7 @@ int main(int argc, char *argv[])
     eeprom_set_value(ftdi, USE_SERIAL, cfg_getbool(cfg, "use_serial"));
     eeprom_set_value(ftdi, USE_USB_VERSION, cfg_getbool(cfg, "change_usb_version"));
     eeprom_set_value(ftdi, USB_VERSION, cfg_getint(cfg, "usb_version"));
-
+    eeprom_set_value(ftdi, CHIP_TYPE, cfg_getint(cfg, "eeprom_type"));
 
     eeprom_set_value(ftdi, HIGH_CURRENT, cfg_getbool(cfg, "high_current"));
     eeprom_set_value(ftdi, CBUS_FUNCTION_0, str_to_cbus(cfg_getstr(cfg, "cbus0"), 13));
@@ -312,6 +313,7 @@ int main(int argc, char *argv[])
     }
 
     size_check = ftdi_eeprom_build(ftdi);
+    eeprom_get_value(ftdi, CHIP_SIZE, &my_eeprom_size);
 
     if (size_check == -1)
     {
@@ -332,15 +334,26 @@ int main(int argc, char *argv[])
         {
             if (filename != NULL && strlen(filename) > 0)
             {
-                eeprom_buf = malloc(my_eeprom_size);
+                eeprom_buf = malloc(max_eeprom_size);
                 FILE *fp = fopen(filename, "rb");
-                fread(eeprom_buf, 1, my_eeprom_size, fp);
+                if (fp == NULL)
+                {
+                    printf ("Can't open eeprom file %s.\n", filename);
+                    exit (-1);
+                }
+                my_eeprom_size = fread(eeprom_buf, 1, max_eeprom_size, fp);
                 fclose(fp);
+                if (my_eeprom_size < 128)
+                {
+                    printf ("Can't read eeprom file %s.\n", filename);
+                    exit (-1);
+                }
 
                 ftdi_set_eeprom_buf(ftdi, eeprom_buf, my_eeprom_size);
             }
         }
         printf ("FTDI write eeprom: %d\n", ftdi_write_eeprom(ftdi));
+        libusb_reset_device(ftdi->usb_dev);
     }
 
     // Write to file?