Skip to content

USB bus and address device selection #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

USB bus and address device selection #35

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78d2748
Added USB bus and address support
davidecryptalabs Jul 23, 2024
4fc1c3b
Bugfixing, use open string function
davidecryptalabs Jul 23, 2024
db8e031
Typos fixed
davidecryptalabs Jul 23, 2024
b3a0a85
Fixed max bus and address argument value
davidecryptalabs Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 33 additions & 7 deletions ftx_prog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ static int ignore_crc_error = 0;
static bool use_8b_strings = false;
static const char *save_path = NULL, *restore_path = NULL;

static int bus = 0;
static int addr = 0;

/* ------------ Bit Definitions for EEPROM Decoding ------------ */

enum cbus_mode {
Expand Down Expand Up @@ -145,7 +148,9 @@ enum arg_type {
arg_ignore_crc_error,
arg_erase_eeprom,
arg_dbus_config,
arg_cbus_config
arg_cbus_config,
arg_bus,
arg_addr,
};

struct args_required_t
Expand Down Expand Up @@ -188,6 +193,8 @@ const struct args_required_t req_info[] =
{arg_ignore_crc_error, 0},
{arg_erase_eeprom, 0},
{arg_cbus_config,1},
{arg_bus, 1},
{arg_addr, 1},
};


Expand Down Expand Up @@ -227,6 +234,8 @@ static const char* arg_type_strings[] = {
"--erase-eeprom",
"--dbus-config",
"--cbus-config",
"--bus",
"--addr",
NULL
};
static const char* rs232_strings[] = {
Expand Down Expand Up @@ -320,7 +329,8 @@ static const char *arg_type_help[] = {
" # Erase the EEPROM and exit",
"dbus_cfg",
"cbus_cfg",

" <bus> # Specify USB bus of the device to use",
" <address> # Specify USB address of the device to use",
};

static const char *bool_strings[] = {
Expand Down Expand Up @@ -1182,6 +1192,12 @@ static int process_args (int argc, char *argv[], struct eeprom_fields *ee)
case arg_new_pid:
ee->usb_pid = unsigned_val(argv[i++], 0xffff);
break;
case arg_bus:
bus = unsigned_val(argv[i++], 255);
break;
case arg_addr:
addr = unsigned_val(argv[i++], 255);
break;
}
}

Expand Down Expand Up @@ -1273,11 +1289,21 @@ int main (int argc, char *argv[])
return -1;
}

if (ftdi_usb_open_desc(&ftdi, ee.old_vid, ee.old_pid, NULL, ee.old_serno)) {
fprintf(stderr, "ftdi_usb_open() failed for %04x:%04x:%s %s\n",
ee.old_vid, ee.old_pid,
ee.old_serno ? ee.old_serno : "", ftdi_get_error_string(&ftdi));
exit(ENODEV);
if(bus & addr) {
char device_string[10];
snprintf(device_string,10,"d:%03d/%03d",bus, addr);
if (ftdi_usb_open_string(&ftdi, device_string)) {
fprintf(stderr, "ftdi_usb_open_bus_addr() failed for %03d:%03d %s\n",
bus, addr, ftdi_get_error_string(&ftdi));
exit(ENODEV);
}
} else {
if (ftdi_usb_open_desc(&ftdi, ee.old_vid, ee.old_pid, NULL, ee.old_serno)) {
fprintf(stderr, "ftdi_usb_open() failed for %04x:%04x:%s %s\n",
ee.old_vid, ee.old_pid,
ee.old_serno ? ee.old_serno : "", ftdi_get_error_string(&ftdi));
exit(ENODEV);
}
}
atexit(&do_close);

Expand Down