X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=ftdi_eeprom%2Fmain.c;h=931045f8cbb978e20bd8247303a204aa9f1b8600;hp=03b24b3065f6d79bd17e61456787526ab520f88e;hb=4359228aaa6840b20f4cf6b61bf156b9354a0f80;hpb=d327f924c20f61561facfd9537fc495beb3fc315 diff --git a/ftdi_eeprom/main.c b/ftdi_eeprom/main.c index 03b24b3..931045f 100644 --- a/ftdi_eeprom/main.c +++ b/ftdi_eeprom/main.c @@ -16,7 +16,6 @@ /* TODO: - - Use new eeprom get/set functions - Remove 128 bytes limit - Merge Uwe's eeprom tool. Current features: - Init eeprom defaults based upon eeprom type @@ -115,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), @@ -143,7 +143,9 @@ int main(int argc, char *argv[]) normal variables */ int _read = 0, _erase = 0, _flash = 0; - unsigned char eeprom_buf[128]; // TODO: Kill this and look for other hardcoded places of 128 bytes + + int my_eeprom_size = 0; + unsigned char *eeprom_buf = NULL; char *filename; int size_check; int i, argc_filename; @@ -168,11 +170,15 @@ int main(int argc, char *argv[]) { if (strcmp(argv[1], "--read-eeprom") == 0) _read = 1; - if (strcmp(argv[1], "--erase-eeprom") == 0) + else if (strcmp(argv[1], "--erase-eeprom") == 0) _erase = 1; - if (strcmp(argv[1], "--flash-eeprom") == 0) + else if (strcmp(argv[1], "--flash-eeprom") == 0) _flash = 1; - + else + { + printf ("Can't open configuration file\n"); + exit (-1); + } argc_filename = 2; } else @@ -201,74 +207,21 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } - ftdi_eeprom_initdefaults (ftdi, "Acme Inc.", "FTDI Chip", NULL); - - eeprom_set_value(ftdi, VENDOR_ID, cfg_getint(cfg, "vendor_id")); - eeprom_set_value(ftdi, PRODUCT_ID, cfg_getint(cfg, "product_id")); - - // TODO: Support all chip types - char *type = cfg_getstr(cfg, "chip_type"); - if (!strcmp(type, "BM")) { - ftdi->type = TYPE_BM; - } else if (!strcmp(type, "R")) { - ftdi->type = TYPE_R; - } else { - ftdi->type = TYPE_AM; - } - - eeprom_set_value(ftdi, SELF_POWERED, cfg_getbool(cfg, "self_powered")); - eeprom_set_value(ftdi, REMOTE_WAKEUP, cfg_getbool(cfg, "remote_wakeup")); - eeprom_set_value(ftdi, MAX_POWER, cfg_getint(cfg, "max_power")); - - eeprom_set_value(ftdi, IN_IS_ISOCHRONOUS, cfg_getbool(cfg, "in_is_isochronous")); - eeprom_set_value(ftdi, OUT_IS_ISOCHRONOUS, cfg_getbool(cfg, "out_is_isochronous")); - eeprom_set_value(ftdi, SUSPEND_PULL_DOWNS, cfg_getbool(cfg, "suspend_pull_downs")); - - 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")); - - - ftdi->eeprom->manufacturer = cfg_getstr(cfg, "manufacturer"); - ftdi->eeprom->product = cfg_getstr(cfg, "product"); - ftdi->eeprom->serial = cfg_getstr(cfg, "serial"); - 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)); - eeprom_set_value(ftdi, CBUS_FUNCTION_1, str_to_cbus(cfg_getstr(cfg, "cbus1"), 13)); - eeprom_set_value(ftdi, CBUS_FUNCTION_2, str_to_cbus(cfg_getstr(cfg, "cbus2"), 13)); - eeprom_set_value(ftdi, CBUS_FUNCTION_3, str_to_cbus(cfg_getstr(cfg, "cbus3"), 13)); - eeprom_set_value(ftdi, 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; - if (cfg_getbool(cfg, "invert_rts")) invert |= INVERT_RTS; - if (cfg_getbool(cfg, "invert_cts")) invert |= INVERT_CTS; - if (cfg_getbool(cfg, "invert_dtr")) invert |= INVERT_DTR; - 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_set_value(ftdi, INVERT, invert); - if (_read > 0 || _erase > 0 || _flash > 0) { - int vendor_id = 0, product_id = 0; - eeprom_get_value(ftdi, VENDOR_ID, &vendor_id); - eeprom_get_value(ftdi, PRODUCT_ID, &product_id); + int vendor_id = cfg_getint(cfg, "vendor_id"); + int product_id = cfg_getint(cfg, "product_id"); i = ftdi_usb_open(ftdi, vendor_id, product_id); - if (i == 0) - { - // TODO: Do we know the eeprom size already? - printf("EEPROM size: %d\n", ftdi->eeprom->size); - } - else + if (i != 0) { + 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); @@ -276,10 +229,17 @@ 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) { - printf("FTDI read eeprom: %d\n", ftdi_read_eeprom(ftdi)); ftdi_eeprom_decode(ftdi, 0); /* Debug output */ @@ -304,10 +264,19 @@ int main(int argc, char *argv[]) printf("serial = \"%s\"\n", eeprom->serial); */ + eeprom_buf = malloc(my_eeprom_size); + ftdi_get_eeprom_buf(ftdi, eeprom_buf, my_eeprom_size); + + if (eeprom_buf == NULL) + { + fprintf(stderr, "Malloc failed, aborting\n"); + goto cleanup; + } if (filename != NULL && strlen(filename) > 0) { + FILE *fp = fopen (filename, "wb"); - fwrite (eeprom_buf, 1, 128, fp); + fwrite (eeprom_buf, 1, my_eeprom_size, fp); fclose (fp); } else @@ -318,6 +287,39 @@ int main(int argc, char *argv[]) goto cleanup; } + eeprom_set_value(ftdi, VENDOR_ID, cfg_getint(cfg, "vendor_id")); + eeprom_set_value(ftdi, PRODUCT_ID, cfg_getint(cfg, "product_id")); + + eeprom_set_value(ftdi, SELF_POWERED, cfg_getbool(cfg, "self_powered")); + eeprom_set_value(ftdi, REMOTE_WAKEUP, cfg_getbool(cfg, "remote_wakeup")); + eeprom_set_value(ftdi, MAX_POWER, cfg_getint(cfg, "max_power")); + + eeprom_set_value(ftdi, IN_IS_ISOCHRONOUS, cfg_getbool(cfg, "in_is_isochronous")); + eeprom_set_value(ftdi, OUT_IS_ISOCHRONOUS, cfg_getbool(cfg, "out_is_isochronous")); + eeprom_set_value(ftdi, SUSPEND_PULL_DOWNS, cfg_getbool(cfg, "suspend_pull_downs")); + + 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, HIGH_CURRENT, cfg_getbool(cfg, "high_current")); + eeprom_set_value(ftdi, CBUS_FUNCTION_0, str_to_cbus(cfg_getstr(cfg, "cbus0"), 13)); + eeprom_set_value(ftdi, CBUS_FUNCTION_1, str_to_cbus(cfg_getstr(cfg, "cbus1"), 13)); + eeprom_set_value(ftdi, CBUS_FUNCTION_2, str_to_cbus(cfg_getstr(cfg, "cbus2"), 13)); + eeprom_set_value(ftdi, CBUS_FUNCTION_3, str_to_cbus(cfg_getstr(cfg, "cbus3"), 13)); + eeprom_set_value(ftdi, 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; + if (cfg_getbool(cfg, "invert_rts")) invert |= INVERT_RTS; + if (cfg_getbool(cfg, "invert_cts")) invert |= INVERT_CTS; + if (cfg_getbool(cfg, "invert_dtr")) invert |= INVERT_DTR; + 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_set_value(ftdi, INVERT, invert); + if (_erase > 0) { printf("FTDI erase eeprom: %d\n", ftdi_erase_eeprom(ftdi)); @@ -335,7 +337,7 @@ int main(int argc, char *argv[]) } else { - printf ("Used eeprom space: %d bytes\n", 128-size_check); + printf ("Used eeprom space: %d bytes\n", my_eeprom_size-size_check); } if (_flash > 0) @@ -345,15 +347,17 @@ int main(int argc, char *argv[]) if (filename != NULL && strlen(filename) > 0) { FILE *fp = fopen(filename, "rb"); - fread(eeprom_buf, 1, 128, fp); + fread(eeprom_buf, 1, my_eeprom_size, fp); fclose(fp); + + ftdi_set_eeprom_buf(ftdi, eeprom_buf, my_eeprom_size); } } printf ("FTDI write eeprom: %d\n", ftdi_write_eeprom(ftdi)); } // Write to file? - if (filename != NULL && strlen(filename) > 0) + if (filename != NULL && strlen(filename) > 0 && !cfg_getbool(cfg, "flash_raw")) { fp = fopen(filename, "w"); if (fp == NULL) @@ -364,11 +368,15 @@ int main(int argc, char *argv[]) else printf ("Writing to file: %s\n", filename); - fwrite(eeprom_buf, 128, 1, fp); + ftdi_get_eeprom_buf(ftdi, eeprom_buf, my_eeprom_size); + + fwrite(eeprom_buf, my_eeprom_size, 1, fp); fclose(fp); } cleanup: + if (eeprom_buf) + free(eeprom_buf); if (_read > 0 || _erase > 0 || _flash > 0) { printf("FTDI close: %d\n", ftdi_usb_close(ftdi));