BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cli: don't initialize and scan for hardware unless needed 

If the -d <plugin> option is used, only initialize the specified plugin.
This commit is contained in:
Bert Vermeulen 2011-01-24 02:49:14 +01:00
parent eeebceea31
commit e54bcdc5d1
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
device.c
View File

@ -29,7 +29,6 @@ void device_scan(void)
{ {
GSList *plugins, *l; GSList *plugins, *l;
struct device_plugin *plugin; struct device_plugin *plugin;
int num_devices, num_probes, i;
plugins = list_hwplugins(); plugins = list_hwplugins();
@ -40,15 +39,23 @@ void device_scan(void)
*/ */
for (l = plugins; l; l = l->next) { for (l = plugins; l; l = l->next) {
plugin = l->data; plugin = l->data;
g_message("initializing %s plugin", plugin->name); device_plugin_init(plugin);
num_devices = plugin->init(NULL);
for (i = 0; i < num_devices; i++) {
num_probes
= (int)(unsigned long)plugin->get_device_info(i,
DI_NUM_PROBES);
device_new(plugin, i, num_probes);
}
} }
}
int device_plugin_init(struct device_plugin *plugin)
{
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, DI_NUM_PROBES);
device_new(plugin, i, num_probes);
}
return num_devices;
} }
void device_close_all(void) void device_close_all(void)
@ -65,6 +72,10 @@ void device_close_all(void)
GSList *device_list(void) GSList *device_list(void)
{ {
if (!devices)
device_scan();
return devices; return devices;
} }

1
sigrok-proto.h
View File

@ -35,6 +35,7 @@ void datastore_put(struct datastore *ds, void *data, unsigned int length,
/*--- device.c --------------------------------------------------------------*/ /*--- device.c --------------------------------------------------------------*/
void device_scan(void); void device_scan(void);
int device_plugin_init(struct device_plugin *plugin);
void device_close_all(void); void device_close_all(void);
GSList *device_list(void); GSList *device_list(void);
struct device *device_new(struct device_plugin *plugin, int plugin_index, struct device *device_new(struct device_plugin *plugin, int plugin_index,