X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.cpp;h=1156d6f5c87b2e79993f6cea7426e8411adc51e4;hp=02941f2f6785e02efcff07a80a6520c16d8e36d2;hb=f27ee56d9c2b18158f2a9451b295123288134611;hpb=ef6d8458be34101907f5c45c3de22a10e554e289

diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp
index 02941f2f..1156d6f5 100644
--- a/pv/dialogs/connect.cpp
+++ b/pv/dialogs/connect.cpp
@@ -18,8 +18,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <cassert>
+
+#include <libsigrok/libsigrok.h>
+
 #include "connect.h"
 
+#include "pv/devicemanager.h"
+#include "pv/device/device.h"
+
 extern "C" {
 /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
 #define __STDC_FORMAT_MACROS
@@ -27,13 +34,18 @@ extern "C" {
 #include <libsigrok/libsigrok.h>
 }
 
+using std::list;
+using std::shared_ptr;
+using std::string;
+
 extern sr_context *sr_ctx;
 
 namespace pv {
 namespace dialogs {
 
-Connect::Connect(QWidget *parent) :
+Connect::Connect(QWidget *parent, pv::DeviceManager &device_manager) :
 	QDialog(parent),
+	_device_manager(device_manager),
 	_layout(this),
 	_form(this),
 	_form_layout(&_form),
@@ -70,13 +82,20 @@ Connect::Connect(QWidget *parent) :
 	_layout.addWidget(&_button_box);
 }
 
-struct sr_dev_inst* Connect::get_selected_device() const
+shared_ptr<device::Device> Connect::get_selected_device() const
 {
 	const QListWidgetItem *const item = _device_list.currentItem();
 	if (!item)
-		return NULL;
+		return shared_ptr<device::Device>();
+
+	const sr_dev_inst *const sdi = (sr_dev_inst*)item->data(
+		Qt::UserRole).value<void*>();
+	assert(sdi);
 
-	return (sr_dev_inst*)item->data(Qt::UserRole).value<void*>();
+	const auto iter = _device_map.find(sdi);
+	assert(iter != _device_map.end());
+
+	return (*iter).second;
 }
 
 void Connect::populate_drivers()
@@ -95,12 +114,12 @@ void Connect::populate_drivers()
 		 * and sensors.
 		 */
 		bool supported_device = false;
-		if ((sr_config_list(drivers[i], SR_CONF_DEVICE_OPTIONS,
-				&gvar_opts, NULL) == SR_OK)) {
+		if ((sr_config_list(drivers[i], NULL, NULL,
+				SR_CONF_DEVICE_OPTIONS, &gvar_opts) == SR_OK)) {
 			hwopts = (const int32_t *)g_variant_get_fixed_array(gvar_opts,
 					&num_opts, sizeof(int32_t));
 			for (unsigned int j = 0; j < num_opts; j++)
-				if (hwopts[j] == SR_CONF_SAMPLERATE) {
+				if ((hwopts[j] & SR_CONF_MASK) == SR_CONF_SAMPLERATE) {
 					supported_device = true;
 					break;
 				}
@@ -116,6 +135,7 @@ void Connect::populate_drivers()
 void Connect::unset_connection()
 {
 	_device_list.clear();
+	_device_map.clear();
 	_serial_device.hide();
 	_form_layout.labelForField(&_serial_device)->hide();
 	_button_box.button(QDialogButtonBox::Ok)->setDisabled(true);
@@ -130,6 +150,7 @@ void Connect::set_serial_connection()
 void Connect::scan_pressed()
 {
 	_device_list.clear();
+	_device_map.clear();
 
 	const int index = _drivers.currentIndex();
 	if (index == -1)
@@ -148,35 +169,34 @@ void Connect::scan_pressed()
 		drvopts = g_slist_append(drvopts, src);
 	}
 
-	GSList *const devices = sr_driver_scan(driver, drvopts);
+	const list< shared_ptr<device::Device> > devices =
+		_device_manager.driver_scan(driver, drvopts);
+
+	g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
 
-	for (GSList *l = devices; l; l = l->next) {
+	for (shared_ptr<device::Device> dev_inst : devices)
+	{
+		assert(dev_inst);
+		const sr_dev_inst *const sdi = dev_inst->dev_inst();
+		assert(sdi);
 
-		sr_dev_inst *const sdi = (sr_dev_inst*)l->data;
+		const string title = dev_inst->format_device_title();
+		QString text = QString::fromUtf8(title.c_str());
 
-		QString text;
-		if (sdi->vendor && sdi->vendor[0])
-			text += QString("%1 ").arg(sdi->vendor);
-		if (sdi->model && sdi->model[0])
-			text += QString("%1 ").arg(sdi->model);
-		if (sdi->version && sdi->version[0])
-			text += QString("%1 ").arg(sdi->version);
-		if (sdi->probes) {
-			text += QString("with %1 probes").arg(
-				g_slist_length(sdi->probes));
+		if (sdi->channels) {
+			text += QString(" with %1 channels").arg(
+				g_slist_length(sdi->channels));
 		}
 
 		QListWidgetItem *const item = new QListWidgetItem(text,
 			&_device_list);
 		item->setData(Qt::UserRole, qVariantFromValue((void*)sdi));
 		_device_list.addItem(item);
+		_device_map[sdi] = dev_inst;
 	}
 
-	g_slist_free(devices);
-	g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
-
 	_device_list.setCurrentRow(0);
-	_button_box.button(QDialogButtonBox::Ok)->setDisabled(false);
+	_button_box.button(QDialogButtonBox::Ok)->setDisabled(_device_list.count() == 0);
 }
 
 void Connect::device_selected(int index)
@@ -189,8 +209,8 @@ void Connect::device_selected(int index)
 
 	unset_connection();
 
-	if ((sr_config_list(driver, SR_CONF_SCAN_OPTIONS,
-				&gvar_list, NULL) == SR_OK)) {
+	if ((sr_config_list(driver, NULL, NULL,
+				SR_CONF_SCAN_OPTIONS, &gvar_list) == SR_OK)) {
 		hwopts = (const int32_t *)g_variant_get_fixed_array(gvar_list,
 				&num_opts, sizeof(int32_t));