luke
/
openFPGALoader
mirror of https://github.com/trabucayre/openFPGALoader.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

main.cpp: Rename ftdi_serial to serial 

Other cable type may provide a unique serial number to
This commit is contained in:
Uwe Bonnes 2023-06-26 13:09:09 +02:00
parent 1f5d6cb373
commit a2e316c120
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.cpp
View File

@ -50,7 +50,7 @@ struct arguments {
string secondary_bit_file; string secondary_bit_file;
string device; string device;
string cable; string cable;
string ftdi_serial; string serial;
int ftdi_channel; int ftdi_channel;
int status_pin; int status_pin;
uint32_t freq; uint32_t freq;
@ -214,9 +214,9 @@ int main(int argc, char **argv)
cable.config.interface = mapping[args.ftdi_channel]; cable.config.interface = mapping[args.ftdi_channel];
} }
if (!args.ftdi_serial.empty()) { if (!args.serial.empty()) {
if (cable.type != MODE_FTDI_SERIAL && cable.type != MODE_FTDI_BITBANG){ if (cable.type != MODE_FTDI_SERIAL && cable.type != MODE_FTDI_BITBANG){
printError("Error: FTDI serial param is for FTDI cables."); printError("Error: Serial number parameter not available for this cable!");
return EXIT_FAILURE; return EXIT_FAILURE;
} }
} }
@ -440,7 +440,7 @@ int main(int argc, char **argv)
Jtag *jtag; Jtag *jtag;
try { try {
jtag = new Jtag(cable, &pins_config, args.device, args.ftdi_serial, jtag = new Jtag(cable, &pins_config, args.device, args.serial,
args.freq, args.verbose, args.ip_adr, args.port, args.freq, args.verbose, args.ip_adr, args.port,
args.invert_read_edge, args.probe_firmware); args.invert_read_edge, args.probe_firmware);
} catch (std::exception &e) { } catch (std::exception &e) {
@ -634,7 +634,7 @@ int run_xvc_server(const struct arguments &args, const cable_t &cable,
try { try {
XVC_server *xvc = NULL; XVC_server *xvc = NULL;
xvc = new XVC_server(args.port, cable, pins_config, args.device, xvc = new XVC_server(args.port, cable, pins_config, args.device,
args.ftdi_serial, args.freq, args.verbose, args.ip_adr, args.serial, args.freq, args.verbose, args.ip_adr,
args.invert_read_edge, args.probe_firmware); args.invert_read_edge, args.probe_firmware);
/* create connection */ /* create connection */
xvc->open_connection(); xvc->open_connection();
@ -724,8 +724,8 @@ int parse_opt(int argc, char **argv, struct arguments *args,
("busdev-num", ("busdev-num",
"select a probe by it bus and device number (bus_num:device_addr)", "select a probe by it bus and device number (bus_num:device_addr)",
cxxopts::value<vector<string>>(bus_dev_num)) cxxopts::value<vector<string>>(bus_dev_num))
("ftdi-serial", "FTDI chip serial number", ("S,serial", "Debugger serial number(FTDI)",
cxxopts::value<string>(args->ftdi_serial)) cxxopts::value<string>(args->serial))
("ftdi-channel", ("ftdi-channel",
"FTDI chip channel number (channels 0-3 map to A-D)", "FTDI chip channel number (channels 0-3 map to A-D)",
cxxopts::value<int>(args->ftdi_channel)) cxxopts::value<int>(args->ftdi_channel))