X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=device.c;h=d11eea5c358177ae1b33db7eae50de59e8b54407;hb=809c5f2011198a064a2e5e4028f19e63eb532ec1;hp=cc6b0549a65f0eae88b522f2d6160b1730d797c7;hpb=a1bb33afbde769156ad4bef7a60579da64aebbb7;p=libsigrok.git diff --git a/device.c b/device.c index cc6b0549..d11eea5c 100644 --- a/device.c +++ b/device.c @@ -19,161 +19,162 @@ #include #include -#include "sigrok.h" +#include -extern struct sigrok_global *global; +extern struct sr_global *global; GSList *devices = NULL; - -void device_scan(void) +void sr_device_scan(void) { GSList *plugins, *l; - struct device_plugin *plugin; - int num_devices, i; + struct sr_device_plugin *plugin; - plugins = list_hwplugins(); + plugins = sr_list_hwplugins(); - /* initialize all plugins first. Since the init() call may involve + /* + * Initialize all plugins first. Since the init() call may involve * a firmware upload and associated delay, we may as well get all * of these out of the way first. */ - for(l = plugins; l; l = l->next) - { + for (l = plugins; l; l = l->next) { plugin = l->data; - g_message("initializing %s plugin", plugin->name); - num_devices = plugin->init(NULL); - for(i = 0; i < num_devices; i++) - { - device_new(plugin, i); - } + sr_device_plugin_init(plugin); } } - -void device_close_all(void) +int sr_device_plugin_init(struct sr_device_plugin *plugin) { - struct device *device; + int num_devices, num_probes, i; - while(devices) - { - device = devices->data; - device->plugin->close(device->plugin_index); - device_destroy(device); + 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); } + return num_devices; } +void sr_device_close_all(void) +{ + struct sr_device *device; -GSList *device_list(void) + while (devices) { + device = devices->data; + if (device->plugin && device->plugin->close) + device->plugin->close(device->plugin_index); + sr_device_destroy(device); + } +} + +GSList *sr_device_list(void) { + if (!devices) + sr_device_scan(); + return devices; } - -struct device *device_new(struct device_plugin *plugin, int plugin_index) +struct sr_device *sr_device_new(struct sr_device_plugin *plugin, int plugin_index, + int num_probes) { - struct device *device; - int num_probes, i; - char probename[16]; + struct sr_device *device; + int i; - device = g_malloc0(sizeof(struct device)); + device = g_malloc0(sizeof(struct sr_device)); device->plugin = plugin; device->plugin_index = plugin_index; devices = g_slist_append(devices, device); - num_probes = (int) device->plugin->get_device_info(device->plugin_index, DI_NUM_PROBES); - for(i = 0; i < num_probes; i++) - { - snprintf(probename, 16, "%d", i+1); - device_probe_add(device, probename); - } + for (i = 0; i < num_probes; i++) + sr_device_probe_add(device, NULL); return device; } - -void device_clear(struct device *device) +void sr_device_clear(struct sr_device *device) { - int probenum; + unsigned int pnum; - /* TODO: plugin-specific clear call? */ + /* TODO: Plugin-specific clear call? */ - if(device->probes) - for(probenum = 1; probenum <= g_slist_length(device->probes); probenum++) - device_probe_clear(device, probenum); + if (!device->probes) + return; + for (pnum = 1; pnum <= g_slist_length(device->probes); pnum++) + sr_device_probe_clear(device, pnum); } - -void device_destroy(struct device *device) +void sr_device_destroy(struct sr_device *device) { - int probenum; + unsigned int pnum; - /* TODO: plugin-specific destroy call, need to decrease refcount in plugin */ + /* + * TODO: Plugin-specific destroy call, need to decrease refcount + * in plugin. + */ devices = g_slist_remove(devices, device); - if(device->probes) - { - for(probenum = 1; probenum <= g_slist_length(device->probes); probenum++) - device_probe_clear(device, probenum); + if (device->probes) { + for (pnum = 1; pnum <= g_slist_length(device->probes); pnum++) + sr_device_probe_clear(device, pnum); g_slist_free(device->probes); } g_free(device); - } - -void device_probe_clear(struct device *device, int probenum) +void sr_device_probe_clear(struct sr_device *device, int probenum) { - struct probe *p; + struct sr_probe *p; - p = probe_find(device, probenum); - if(!p) + p = sr_device_probe_find(device, probenum); + if (!p) return; - if(p->name) - { + if (p->name) { g_free(p->name); p->name = NULL; } - if(p->trigger) - { + if (p->trigger) { g_free(p->trigger); p->trigger = NULL; } - } - -void device_probe_add(struct device *device, char *name) +void sr_device_probe_add(struct sr_device *device, const char *name) { - struct probe *p; + struct sr_probe *p; + char probename[16]; + int probenum; - p = g_malloc0(sizeof(struct probe)); - p->index = g_slist_length(device->probes) + 1; + probenum = g_slist_length(device->probes) + 1; + p = g_malloc0(sizeof(struct sr_probe)); + p->index = probenum; p->enabled = TRUE; - p->name = g_strdup(name); + if (name) { + p->name = g_strdup(name); + } else { + snprintf(probename, 16, "%d", probenum); + p->name = g_strdup(probename); + } p->trigger = NULL; device->probes = g_slist_append(device->probes, p); - } - -struct probe *probe_find(struct device *device, int probenum) +struct sr_probe *sr_device_probe_find(struct sr_device *device, int probenum) { GSList *l; - struct probe *p, *found_probe; + struct sr_probe *p, *found_probe; found_probe = NULL; - for(l = device->probes; l; l = l->next) - { + for (l = device->probes; l; l = l->next) { p = l->data; - if(p->index == probenum) - { + if (p->index == probenum) { found_probe = p; break; } @@ -182,54 +183,67 @@ struct probe *probe_find(struct device *device, int probenum) return found_probe; } - -void device_probe_name(struct device *device, int probenum, char *name) +/* TODO: return SIGROK_ERR if probenum not found */ +void sr_device_probe_name(struct sr_device *device, int probenum, + const char *name) { - struct probe *p; + struct sr_probe *p; - p = probe_find(device, probenum); - if(!p) + p = sr_device_probe_find(device, probenum); + if (!p) return; - if(p->name) + if (p->name) g_free(p->name); p->name = g_strdup(name); - } - -void device_trigger_clear(struct device *device) +/* TODO: return SIGROK_ERR if probenum not found */ +void sr_device_trigger_clear(struct sr_device *device) { - struct probe *p; - int probenum; + struct sr_probe *p; + unsigned int pnum; - if(device->probes) - for(probenum = 1; probenum <= g_slist_length(device->probes); probenum++) - { - p = probe_find(device, probenum); - if(p && p->trigger) - { - g_free(p->trigger); - p->trigger = NULL; - } - } + if (!device->probes) + return; + for (pnum = 1; pnum <= g_slist_length(device->probes); pnum++) { + p = sr_device_probe_find(device, pnum); + if (p && p->trigger) { + g_free(p->trigger); + p->trigger = NULL; + } + } } - -void device_trigger_set(struct device *device, int probenum, char *trigger) +/* TODO: return SIGROK_ERR if probenum not found */ +void sr_device_trigger_set(struct sr_device *device, int probenum, + const char *trigger) { - struct probe *p; + struct sr_probe *p; - p = probe_find(device, probenum); - if(!p) + p = sr_device_probe_find(device, probenum); + if (!p) return; - if(p->trigger) + if (p->trigger) g_free(p->trigger); p->trigger = g_strdup(trigger); } +gboolean sr_device_has_hwcap(struct sr_device *device, int hwcap) +{ + int *capabilities, i; + + if (!device || !device->plugin) + return; + if ((capabilities = device->plugin->get_capabilities())) + for (i = 0; capabilities[i]; i++) + if (capabilities[i] == hwcap) + return TRUE; + + return FALSE; +}