The branch, eeprom-new has been updated
via fa1def99efffbb03b8ab0b1d43a122348a118670 (commit)
from ade814a59b4660c5af865dd86cdd48cfa55e1ae5 (commit)
- Log -----------------------------------------------------------------
commit fa1def99efffbb03b8ab0b1d43a122348a118670
Author: Thomas Jarosch <thomas.jarosch@xxxxxxxxxxxxx>
Date: Sat Oct 23 19:38:05 2010 +0200
ftdi_eeprom compiles now. Still needs a lot of work
-----------------------------------------------------------------------
Summary of changes:
ftdi_eeprom/CMakeLists.txt | 3 +-
ftdi_eeprom/main.c | 102 ++++++++++++++++++++++---------------------
2 files changed, 54 insertions(+), 51 deletions(-)
diff --git a/ftdi_eeprom/CMakeLists.txt b/ftdi_eeprom/CMakeLists.txt
index fff31a8..3f1d7dc 100644
--- a/ftdi_eeprom/CMakeLists.txt
+++ b/ftdi_eeprom/CMakeLists.txt
@@ -9,7 +9,7 @@ if (FTDI_EEPROM)
LINK_DIRECTORIES(${Confuse_LIBRARY_DIRS})
SET(libs ${libs} ${Confuse_LIBRARIES})
- if(Confuse_FOUND_DISABLED_FOR_NOW)
+ if(Confuse_FOUND)
set(FTDI_BUILD_EEPROM True PARENT_SCOPE)
message(STATUS "Building ftdi_eeprom")
@@ -28,6 +28,7 @@ if (FTDI_EEPROM)
add_executable(ftdi_eeprom main.c)
target_link_libraries(ftdi_eeprom ftdi)
+ target_link_libraries(ftdi_eeprom ${Confuse_LIBRARIES})
else(Confuse_FOUND)
message(STATUS "libConfuse not found, won't build ftdi_eeprom")
diff --git a/ftdi_eeprom/main.c b/ftdi_eeprom/main.c
index 551973f..814d124 100644
--- a/ftdi_eeprom/main.c
+++ b/ftdi_eeprom/main.c
@@ -91,14 +91,14 @@ int main(int argc, char *argv[])
normal variables
*/
int _read = 0, _erase = 0, _flash = 0;
- unsigned char eeprom_buf[128];
+ unsigned char eeprom_buf[128]; // TODO: Kill this and
look for other hardcoded places of 128 bytes
char *filename;
int size_check;
int i, argc_filename;
FILE *fp;
struct ftdi_context ftdi;
- struct ftdi_eeprom eeprom;
+ struct ftdi_eeprom *eeprom;
printf("\nFTDI eeprom generator v%s\n", EEPROM_VERSION_STRING);
printf ("(c) Intra2net AG <opensource@xxxxxxxxxxxxx>\n");
@@ -144,40 +144,42 @@ int main(int argc, char *argv[])
printf("Hint: Self powered devices should have a max_power setting of
0.\n");
ftdi_init(&ftdi);
- ftdi_eeprom_initdefaults (&eeprom);
- eeprom.vendor_id = cfg_getint(cfg, "vendor_id");
- eeprom.product_id = cfg_getint(cfg, "product_id");
+ ftdi_eeprom_initdefaults (&ftdi, "Acme Inc.", "FTDI Chip", NULL);
+ eeprom = ftdi.eeprom;
+
+ eeprom->vendor_id = cfg_getint(cfg, "vendor_id");
+ eeprom->product_id = cfg_getint(cfg, "product_id");
char *type = cfg_getstr(cfg, "chip_type");
if (!strcmp(type, "BM")) {
- eeprom.chip_type = TYPE_BM;
+ ftdi.type = TYPE_BM;
} else if (!strcmp(type, "R")) {
- eeprom.chip_type = TYPE_R;
+ ftdi.type = TYPE_R;
} else {
- eeprom.chip_type = TYPE_AM;
+ ftdi.type = TYPE_AM;
}
- eeprom.self_powered = cfg_getbool(cfg, "self_powered");
- eeprom.remote_wakeup = cfg_getbool(cfg, "remote_wakeup");
- eeprom.max_power = cfg_getint(cfg, "max_power");
+ eeprom->self_powered = cfg_getbool(cfg, "self_powered");
+ eeprom->remote_wakeup = cfg_getbool(cfg, "remote_wakeup");
+ eeprom->max_power = cfg_getint(cfg, "max_power");
- eeprom.in_is_isochronous = cfg_getbool(cfg, "in_is_isochronous");
- eeprom.out_is_isochronous = cfg_getbool(cfg, "out_is_isochronous");
- eeprom.suspend_pull_downs = cfg_getbool(cfg, "suspend_pull_downs");
+ eeprom->in_is_isochronous = cfg_getbool(cfg, "in_is_isochronous");
+ eeprom->out_is_isochronous = cfg_getbool(cfg, "out_is_isochronous");
+ eeprom->suspend_pull_downs = cfg_getbool(cfg, "suspend_pull_downs");
- eeprom.use_serial = cfg_getbool(cfg, "use_serial");
- eeprom.change_usb_version = cfg_getbool(cfg, "change_usb_version");
- eeprom.usb_version = cfg_getint(cfg, "usb_version");
+ eeprom->use_serial = cfg_getbool(cfg, "use_serial");
+ eeprom->use_usb_version = cfg_getbool(cfg, "change_usb_version");
+ eeprom->usb_version = cfg_getint(cfg, "usb_version");
- eeprom.manufacturer = cfg_getstr(cfg, "manufacturer");
- eeprom.product = cfg_getstr(cfg, "product");
- eeprom.serial = cfg_getstr(cfg, "serial");
- eeprom.high_current = cfg_getbool(cfg, "high_current");
- eeprom.cbus_function[0] = str_to_cbus(cfg_getstr(cfg, "cbus0"), 13);
- eeprom.cbus_function[1] = str_to_cbus(cfg_getstr(cfg, "cbus1"), 13);
- eeprom.cbus_function[2] = str_to_cbus(cfg_getstr(cfg, "cbus2"), 13);
- eeprom.cbus_function[3] = str_to_cbus(cfg_getstr(cfg, "cbus3"), 13);
- eeprom.cbus_function[4] = str_to_cbus(cfg_getstr(cfg, "cbus4"), 9);
+ eeprom->manufacturer = cfg_getstr(cfg, "manufacturer");
+ eeprom->product = cfg_getstr(cfg, "product");
+ eeprom->serial = cfg_getstr(cfg, "serial");
+ eeprom->high_current = cfg_getbool(cfg, "high_current");
+ eeprom->cbus_function[0] = str_to_cbus(cfg_getstr(cfg, "cbus0"), 13);
+ eeprom->cbus_function[1] = str_to_cbus(cfg_getstr(cfg, "cbus1"), 13);
+ eeprom->cbus_function[2] = str_to_cbus(cfg_getstr(cfg, "cbus2"), 13);
+ eeprom->cbus_function[3] = str_to_cbus(cfg_getstr(cfg, "cbus3"), 13);
+ eeprom->cbus_function[4] = str_to_cbus(cfg_getstr(cfg, "cbus4"), 9);
int invert = 0;
if (cfg_getbool(cfg, "invert_rxd")) invert |= INVERT_RXD;
if (cfg_getbool(cfg, "invert_txd")) invert |= INVERT_TXD;
@@ -187,19 +189,19 @@ int main(int argc, char *argv[])
if (cfg_getbool(cfg, "invert_dsr")) invert |= INVERT_DSR;
if (cfg_getbool(cfg, "invert_dcd")) invert |= INVERT_DCD;
if (cfg_getbool(cfg, "invert_ri")) invert |= INVERT_RI;
- eeprom.invert = invert;
+ eeprom->invert = invert;
if (_read > 0 || _erase > 0 || _flash > 0)
{
- i = ftdi_usb_open(&ftdi, eeprom.vendor_id, eeprom.product_id);
+ i = ftdi_usb_open(&ftdi, eeprom->vendor_id, eeprom->product_id);
if (i == 0)
{
- printf("EEPROM size: %d\n", ftdi.eeprom_size);
+ printf("EEPROM size: %d\n", eeprom->size);
}
else
{
- printf("Unable to find FTDI devices under given vendor/product id:
0x%X/0x%X\n", eeprom.vendor_id, eeprom.product_id);
+ printf("Unable to find FTDI devices under given vendor/product id:
0x%X/0x%X\n", eeprom->vendor_id, eeprom->product_id);
printf("Error code: %d (%s)\n", i, ftdi_get_error_string(&ftdi));
printf("Retrying with default FTDI id.\n");
@@ -214,29 +216,29 @@ int main(int argc, char *argv[])
if (_read > 0)
{
- printf("FTDI read eeprom: %d\n", ftdi_read_eeprom(&ftdi, eeprom_buf));
+ printf("FTDI read eeprom: %d\n", ftdi_read_eeprom(&ftdi));
- ftdi_eeprom_decode(&eeprom, eeprom_buf, ftdi.eeprom_size);
+ ftdi_eeprom_decode(&ftdi, 0);
/* Debug output */
/*
const char* chip_types[] = {"other", "BM", "R"};
- printf("vendor_id = \"%04x\"\n", eeprom.vendor_id);
- printf("product_id = \"%04x\"\n", eeprom.product_id);
+ printf("vendor_id = \"%04x\"\n", eeprom->vendor_id);
+ printf("product_id = \"%04x\"\n", eeprom->product_id);
printf("chip_type = \"%s\"\n",
- (eeprom.chip_type > 0x06) || (eeprom.chip_type & 0x01) ? "unknown":
- chip_types[eeprom.chip_type>>1]);
- printf("self_powered = \"%s\"\n", eeprom.self_powered?"true":"false");
- printf("remote_wakeup = \"%s\"\n",
eeprom.remote_wakeup?"true":"false");
- printf("max_power = \"%d\"\n", eeprom.max_power);
- printf("in_is_isochronous = \"%s\"\n",
eeprom.in_is_isochronous?"true":"false");
- printf("out_is_isochronous = \"%s\"\n",
eeprom.out_is_isochronous?"true":"false");
- printf("suspend_pull_downs = \"%s\"\n",
eeprom.suspend_pull_downs?"true":"false");
- printf("use_serial = \"%s\"\n", eeprom.use_serial?"true":"false");
- printf("change_usb_version = \"%s\"\n",
eeprom.change_usb_version?"true":"false");
- printf("usb_version = \"%d\"\n", eeprom.usb_version);
- printf("manufacturer = \"%s\"\n", eeprom.manufacturer);
- printf("product = \"%s\"\n", eeprom.product);
- printf("serial = \"%s\"\n", eeprom.serial);
+ (eeprom->chip_type > 0x06) || (eeprom->chip_type & 0x01) ? "unknown":
+ chip_types[eeprom->chip_type>>1]);
+ printf("self_powered = \"%s\"\n", eeprom->self_powered?"true":"false");
+ printf("remote_wakeup = \"%s\"\n",
eeprom->remote_wakeup?"true":"false");
+ printf("max_power = \"%d\"\n", eeprom->max_power);
+ printf("in_is_isochronous = \"%s\"\n",
eeprom->in_is_isochronous?"true":"false");
+ printf("out_is_isochronous = \"%s\"\n",
eeprom->out_is_isochronous?"true":"false");
+ printf("suspend_pull_downs = \"%s\"\n",
eeprom->suspend_pull_downs?"true":"false");
+ printf("use_serial = \"%s\"\n", eeprom->use_serial?"true":"false");
+ printf("change_usb_version = \"%s\"\n",
eeprom->change_usb_version?"true":"false");
+ printf("usb_version = \"%d\"\n", eeprom->usb_version);
+ printf("manufacturer = \"%s\"\n", eeprom->manufacturer);
+ printf("product = \"%s\"\n", eeprom->product);
+ printf("serial = \"%s\"\n", eeprom->serial);
*/
if (filename != NULL && strlen(filename) > 0)
@@ -258,7 +260,7 @@ int main(int argc, char *argv[])
printf("FTDI erase eeprom: %d\n", ftdi_erase_eeprom(&ftdi));
}
- size_check = ftdi_eeprom_build(&eeprom, eeprom_buf);
+ size_check = ftdi_eeprom_build(&ftdi);
if (size_check == -1)
{
@@ -284,7 +286,7 @@ int main(int argc, char *argv[])
fclose(fp);
}
}
- printf ("FTDI write eeprom: %d\n", ftdi_write_eeprom(&ftdi,
eeprom_buf));
+ printf ("FTDI write eeprom: %d\n", ftdi_write_eeprom(&ftdi));
}
// Write to file?
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
|
