libftdi-git Archives

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

From: libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx
To: libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx
Date: Fri, 24 Sep 2010 20:16:44 +0200 (CEST)
The branch, eeprom-new has been updated
       via  665cda0403fc795be8785c9545f357d039dda62d (commit)
      from  c2700d6da86375b156e16cafb52085fbf5594136 (commit)


- Log -----------------------------------------------------------------
commit 665cda0403fc795be8785c9545f357d039dda62d
Author: Uwe Bonnes <bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date:   Fri Sep 24 17:12:34 2010 +0200

    Simplify and correct user area calculation

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

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

diff --git a/src/ftdi.c b/src/ftdi.c
index bd81306..0ebb925 100644
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -2308,7 +2308,24 @@ int ftdi_eeprom_build(struct ftdi_context *ftdi)
         serial_size = strlen(eeprom->serial);
 
     // eeprom size exceeded?
-    user_area_size = (48 - (manufacturer_size + product_size + serial_size)) * 
2;
+
+    switch (ftdi->type) {
+    case TYPE_AM:
+    case TYPE_BM:
+       user_area_size = 96;
+       break;
+    case TYPE_2232C:
+       user_area_size = 94;
+       break;
+    case TYPE_R:
+       user_area_size = 92;
+       break;
+    case TYPE_2232H:
+    case TYPE_4232H:
+       user_area_size = 90;
+       break;
+    }
+    user_area_size  -= (manufacturer_size + product_size + serial_size) * 2;
     if (user_area_size < 0)
         ftdi_error_return(-1,"eeprom size exceeded");
 


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-139-g665cda0, libftdi-git <=