- int num_devices, num_probes, i;
-
- g_message("initializing %s plugin", plugin->name);
- num_devices = plugin->init(NULL);
- for (i = 0; i < num_devices; i++) {
- num_probes = (int)plugin->get_device_info(i, SR_DI_NUM_PROBES);
- sr_device_new(plugin, i, num_probes);
+ int num_devs, num_probes, i, j;
+ int num_initialized_devs = 0;
+ struct sr_dev *dev;
+ char **probe_names;
+
+ sr_dbg("initializing %s plugin", plugin->name);
+ num_devs = plugin->init(NULL);
+ for (i = 0; i < num_devs; i++) {
+ num_probes = GPOINTER_TO_INT(
+ plugin->get_dev_info(i, SR_DI_NUM_PROBES));
+ probe_names = (char **)plugin->get_dev_info(i,
+ SR_DI_PROBE_NAMES);
+
+ if (!probe_names) {
+ sr_warn("hwplugin: %s: plugin %s does not return a "
+ "list of probe names", __func__, plugin->name);
+ continue;
+ }
+
+ dev = sr_dev_new(plugin, i);
+ for (j = 0; j < num_probes; j++)
+ sr_dev_probe_add(dev, probe_names[j]);
+ num_initialized_devs++;