luke/prjxray
1
0
Fork 0
mirror of https://github.com/openXC7/prjxray.git synced 2026-08-22 14:06:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

bittool: Specify action via a positional arg instead of a flag

Browse Source 
Action is a required option with no reasonable default.  Making it a
flag just requires the user to type extra for no benefit.

Signed-off-by: Rick Altherr <[email protected]>
Signed-off-by: Tim 'mithro' Ansell <[email protected]>
This commit is contained in:
Rick Altherr
2017-12-20 22:46:39 +01:00
committed by Tim 'mithro' Ansell
parent d799da0ad5
commit 86f22183f8
1 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/bittool.cc
+21 -14
View File
@@ -8,17 +8,24 @@
namespace xc7series = prjxray::xilinx::xc7series;
DEFINE_string(action, "list_config_packets", "");
struct Action {
std::string name;
std::function<int(int, char*[])> handler;
};
int ListConfigPackets(int argc, char *argv[]) {
auto in_file = prjxray::MemoryMappedFile::InitWithFile(argv[1]);
if (argc < 1) {
std::cerr << "ERROR: no input specified" << std::endl;
std::cerr << "Usage: " << argv[0]
<< "list_config_packets <bit_file>"
<< std::endl;
return 1;
}
auto in_file_name = argv[0];
auto in_file = prjxray::MemoryMappedFile::InitWithFile(in_file_name);
if (!in_file) {
std::cerr << "Unable to open bit file: " << argv[1]
std::cerr << "Unable to open bit file: " << in_file_name
<< std::endl;
return 1;
}
@@ -107,23 +114,23 @@ int main(int argc, char *argv[]) {
absl::StrCat("Usage: ", argv[0], " [options] [bitfile]"));
gflags::ParseCommandLineFlags(&argc, &argv, true);
if (argc != 2) {
std::cerr << "no input file provided" << std::endl;
return 1;
}
if (FLAGS_action.empty()) {
std::cerr << "no action specified" << std::endl;
if (argc < 2) {
std::cerr << "ERROR: no command specified" << std::endl;
std::cerr << "Usage: " << argv[0]
<< "<command> <command_options>" << std::endl;
return 1;
}
auto requested_action_str = argv[1];
auto requested_action = std::find_if(
std::begin(actions), std::end(actions),
[](const Action& t) { return t.name == FLAGS_action; });
[&](const Action& t) {
return t.name == requested_action_str; });
if (requested_action == std::end(actions)) {
std::cerr << "Unknown action: " << FLAGS_action << std::endl;
std::cerr << "Unknown action: "
<< requested_action_str << std::endl;
return 1;
}
return requested_action->handler(argc, argv);
return requested_action->handler(argc - 2, argv + 2);
}