X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=cd7e65d3cbbffa6d7a8ec949e02134c74af64c97;hp=f7c722b1aec63a6e47d440a565bb23824fadd461;hb=451dc5f33fbc4f559881acdf338c476a976fcbf2;hpb=58d8e4c6c50bb119d405d754a6fb122d932d6510

diff --git a/main.cpp b/main.cpp
index f7c722b1..cd7e65d3 100644
--- 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"
@@ -67,6 +68,7 @@ void usage()
 		"  -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"
@@ -79,6 +81,7 @@ int main(int argc, char *argv[])
 	shared_ptr<sigrok::Context> context;
 	string open_file, open_file_format, driver;
 	bool restore_sessions = true;
+	bool do_scan = true;
 
 	Application a(argc, argv);
 
@@ -102,7 +105,7 @@ int main(int argc, char *argv[])
 		};
 
 		const int c = getopt_long(argc, argv,
-			"l:Vhc?d:i:I:", long_options, nullptr);
+			"l:Vhc?d:Di:I:", long_options, nullptr);
 		if (c == -1)
 			break;
 
@@ -120,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
@@ -138,6 +145,10 @@ int main(int argc, char *argv[])
 			driver = optarg;
 			break;
 
+		case 'D':
+			do_scan = false;
+			break;
+
 		case 'i':
 			open_file = optarg;
 			break;
@@ -162,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
@@ -180,7 +193,7 @@ int main(int argc, char *argv[])
 
 		try {
 			// Create the device manager, initialise the drivers
-			pv::DeviceManager device_manager(context, driver);
+			pv::DeviceManager device_manager(context, driver, do_scan);
 
 			// Initialise the main window
 			pv::MainWindow w(device_manager);