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

Merge pull request #18 from japm48/patch-1 

Print error when no bitfile is specified
This commit is contained in:
Gwenhael Goavec-Merou 2020-02-16 16:51:27 +01:00 committed by GitHub
parent 563e748c69 2b2806b0b4
commit 6a2489cfac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.cpp
View File

@ -49,6 +49,7 @@ struct arguments {
bool list_fpga;
bool write_flash;
bool write_sram;
bool is_list_command;
};
#define LIST_CABLE 1
@ -86,11 +87,11 @@ int main(int argc, char **argv)
/* command line args. */
struct arguments args = {false, false, 0, "", "-", "-", "-",
false, false, false, false, true};
false, false, false, false, true, false};
/* parse arguments */
argp_parse(&argp, argc, argv, 0, 0, &args);
if (args.list_boards == true || args.list_cables == true || args.list_fpga) {
if (args.is_list_command) {
displaySupported(args);
return EXIT_SUCCESS;
}
@ -213,15 +214,24 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state)
arguments->bit_file = arg;
break;
case ARGP_KEY_END:
if (arguments->bit_file.empty() &&
!arguments->is_list_command &&
!arguments->reset) {
cout << "Error: bitfile not specified" << endl;
argp_usage(state);
}
break;
case LIST_CABLE:
arguments->list_cables = true;
arguments->is_list_command = true;
break;
case LIST_BOARD:
arguments->list_boards = true;
arguments->is_list_command = true;
break;
case LIST_FPGA:
arguments->list_fpga = true;
arguments->is_list_command = true;
break;
default:
return ARGP_ERR_UNKNOWN;
@ -275,3 +285,4 @@ void displaySupported(const struct arguments &args)
cout << endl;
}
}