main: introduce -D cmdline option, don't auto-scan for devices

[pulseview.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 9c27f7b745d8e81b083025beb3a8bf7b6e364a44..cd7e65d3cbbffa6d7a8ec949e02134c74af64c97 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -36,6 +36,7 @@
 #include "pv/application.hpp"
 #include "pv/devicemanager.hpp"
 #include "pv/mainwindow.hpp"
+#include "pv/session.hpp"
 #ifdef ANDROID
 #include <libsigrokandroidutils/libsigrokandroidutils.h>
 #include "android/assetreader.hpp"
@@ -58,7 +59,7 @@ void usage()
 {
        fprintf(stdout,
                "Usage:\n"
-               "  %s [OPTION…] — %s\n"
+               "  %s [OPTIONS] [FILE]\n"
                "\n"
                "Help Options:\n"
                "  -h, -?, --help                  Show help option\n"
@@ -66,18 +67,21 @@ void usage()
                "Application Options:\n"
                "  -V, --version                   Show release version\n"
                "  -l, --loglevel                  Set libsigrok/libsigrokdecode loglevel\n"
+               "  -d, --driver                    Specify the device driver to use\n"
+               "  -D, --no-scan                   Don't auto-scan for devices, use -d spec only\n"
                "  -i, --input-file                Load input from file\n"
                "  -I, --input-format              Input format\n"
                "  -c, --clean                     Don't restore previous sessions on startup\n"
-               "\n", PV_BIN_NAME, PV_DESCRIPTION);
+               "\n", PV_BIN_NAME);
 }
 
 int main(int argc, char *argv[])
 {
        int ret = 0;
        shared_ptr<sigrok::Context> context;
-       string open_file, open_file_format;
+       string open_file, open_file_format, driver;
        bool restore_sessions = true;
+       bool do_scan = true;
 
        Application a(argc, argv);
 
@@ -93,6 +97,7 @@ int main(int argc, char *argv[])
                        {"help", no_argument, nullptr, 'h'},
                        {"version", no_argument, nullptr, 'V'},
                        {"loglevel", required_argument, nullptr, 'l'},
+                       {"driver", required_argument, nullptr, 'd'},
                        {"input-file", required_argument, nullptr, 'i'},
                        {"input-format", required_argument, nullptr, 'I'},
                        {"clean", no_argument, nullptr, 'c'},
@@ -100,7 +105,7 @@ int main(int argc, char *argv[])
                };
 
                const int c = getopt_long(argc, argv,
-                       "l:Vhc?i:I:", long_options, nullptr);
+                       "l:Vhc?d:Di:I:", long_options, nullptr);
                if (c == -1)
                        break;
 
@@ -118,6 +123,10 @@ int main(int argc, char *argv[])
                case 'l':
                {
                        const int loglevel = atoi(optarg);
+                       if (loglevel < 0 || loglevel > 5) {
+                               qDebug() << "ERROR: invalid log level spec.";
+                               break;
+                       }
                        context->set_log_level(sigrok::LogLevel::get(loglevel));
 
 #ifdef ENABLE_DECODE
@@ -132,6 +141,14 @@ int main(int argc, char *argv[])
                        break;
                }
 
+               case 'd':
+                       driver = optarg;
+                       break;
+
+               case 'D':
+                       do_scan = false;
+                       break;
+
                case 'i':
                        open_file = optarg;
                        break;
@@ -156,6 +173,8 @@ int main(int argc, char *argv[])
 
        // Initialise libsigrok
        context = sigrok::Context::create();
+       pv::Session::sr_context = context;
+
 #ifdef ANDROID
        context->set_resource_reader(&asset_reader);
 #endif
@@ -174,13 +193,20 @@ int main(int argc, char *argv[])
 
                try {
                        // Create the device manager, initialise the drivers
-                       pv::DeviceManager device_manager(context);
+                       pv::DeviceManager device_manager(context, driver, do_scan);
 
                        // Initialise the main window
-                       pv::MainWindow w(device_manager, open_file, open_file_format,
-                               restore_sessions);
+                       pv::MainWindow w(device_manager);
                        w.show();
 
+                       if (restore_sessions)
+                               w.restore_sessions();
+
+                       if (!open_file.empty())
+                               w.add_session_with_file(open_file, open_file_format);
+                       else
+                               w.add_default_session();
+
 #ifdef ENABLE_SIGNALS
                        if (SignalHandler::prepare_signals()) {
                                SignalHandler *const handler =