luke/openFPGALoader
1
0
Fork 0
mirror of https://github.com/trabucayre/openFPGALoader.git synced 2026-08-31 18:26:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

dfu/main: add args to select altsetting and add filter to select corresponding interface

Browse Source
This commit is contained in:
Gwenhael Goavec-Merou
2021-10-03 12:39:06 +02:00
parent abef1f4968
commit ea613fa97a
5 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+12 -2
View File
@@ -59,6 +59,7 @@ struct arguments {
int index_chain;
unsigned int file_size;
bool external_flash;
int altsetting;
};
int parse_opt(int argc, char **argv, struct arguments *args, jtag_pins_conf_t *pins_config);
@@ -74,7 +75,7 @@ int main(int argc, char **argv)
/* command line args. */
struct arguments args = {0, false, false, false, 0, "", "", "-", "", -1,
0, "-", false, false, false, false, Device::WR_SRAM, false,
false, false, "", "", "", -1, 0, false};
false, false, "", "", "", -1, 0, false, -1};
/* parse arguments */
try {
if (parse_opt(argc, argv, &args, &pins_config))
@@ -267,12 +268,19 @@ int main(int argc, char **argv)
/* try to init DFU probe */
DFU *dfu = NULL;
uint16_t vid = 0, pid = 0;
int altsetting = -1;
if (board) {
vid = board->vid;
pid = board->pid;
altsetting = board->altsetting;
}
if (args.altsetting != -1) {
if (altsetting != -1)
printInfo("Board altsetting overridden");
altsetting = args.altsetting;
}
try {
dfu = new DFU(args.bit_file, vid, pid, args.verbose);
dfu = new DFU(args.bit_file, vid, pid, altsetting, args.verbose);
} catch (std::exception &e) {
printError("DFU init failed with: " + string(e.what()));
return EXIT_FAILURE;
@@ -486,6 +494,8 @@ int parse_opt(int argc, char **argv, struct arguments *args, jtag_pins_conf_t *p
options
.add_options()
("altsetting", "DFU interface altsetting (only for DFU mode)",
cxxopts::value<int>(args->altsetting))
("bitstream", "bitstream",
cxxopts::value<std::string>(args->bit_file))
("b,board", "board name, may be used instead of cable",