#include <stdio.h>
#include <glib.h>
#include <sigrok.h>
+#include <sigrok-internal.h>
extern struct sr_global *global;
GSList *devices = NULL;
-void device_scan(void)
+void sr_device_scan(void)
{
GSList *plugins, *l;
struct sr_device_plugin *plugin;
- plugins = list_hwplugins();
+ plugins = sr_list_hwplugins();
/*
* Initialize all plugins first. Since the init() call may involve
*/
for (l = plugins; l; l = l->next) {
plugin = l->data;
- device_plugin_init(plugin);
+ sr_device_plugin_init(plugin);
}
}
-int device_plugin_init(struct sr_device_plugin *plugin)
+int sr_device_plugin_init(struct sr_device_plugin *plugin)
{
int num_devices, num_probes, i;
- g_message("initializing %s plugin", plugin->name);
+ sr_info("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);
- device_new(plugin, i, num_probes);
+ sr_device_new(plugin, i, num_probes);
}
return num_devices;
}
-void device_close_all(void)
+void sr_device_close_all(void)
{
struct sr_device *device;
while (devices) {
device = devices->data;
- if (device->plugin)
+ if (device->plugin && device->plugin->close)
device->plugin->close(device->plugin_index);
- device_destroy(device);
+ sr_device_destroy(device);
}
}
-GSList *device_list(void)
+GSList *sr_device_list(void)
{
if (!devices)
- device_scan();
+ sr_device_scan();
return devices;
}
-struct sr_device *device_new(struct sr_device_plugin *plugin, int plugin_index,
+struct sr_device *sr_device_new(struct sr_device_plugin *plugin, int plugin_index,
int num_probes)
{
struct sr_device *device;
int i;
- device = g_malloc0(sizeof(struct sr_device));
+ if (!(device = g_try_malloc0(sizeof(struct sr_device)))) {
+ sr_err("dev: %s: device malloc failed", __func__);
+ return NULL;
+ }
+
device->plugin = plugin;
device->plugin_index = plugin_index;
devices = g_slist_append(devices, device);
for (i = 0; i < num_probes; i++)
- device_probe_add(device, NULL);
+ sr_device_probe_add(device, NULL);
return device;
}
-void device_clear(struct sr_device *device)
+void sr_device_clear(struct sr_device *device)
{
unsigned int pnum;
return;
for (pnum = 1; pnum <= g_slist_length(device->probes); pnum++)
- device_probe_clear(device, pnum);
+ sr_device_probe_clear(device, pnum);
}
-void device_destroy(struct sr_device *device)
+void sr_device_destroy(struct sr_device *device)
{
unsigned int pnum;
devices = g_slist_remove(devices, device);
if (device->probes) {
for (pnum = 1; pnum <= g_slist_length(device->probes); pnum++)
- device_probe_clear(device, pnum);
+ sr_device_probe_clear(device, pnum);
g_slist_free(device->probes);
}
g_free(device);
}
-void device_probe_clear(struct sr_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);
+ p = sr_device_probe_find(device, probenum);
if (!p)
return;
}
}
-void device_probe_add(struct sr_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;
probenum = g_slist_length(device->probes) + 1;
- p = g_malloc0(sizeof(struct probe));
+
+ if (!(p = g_try_malloc0(sizeof(struct sr_probe)))) {
+ sr_err("dev: %s: p malloc failed", __func__);
+ // return SR_ERR_MALLOC;
+ return; /* FIXME: should return int. */
+ }
+
p->index = probenum;
p->enabled = TRUE;
if (name) {
snprintf(probename, 16, "%d", probenum);
p->name = g_strdup(probename);
}
- p->name = g_strdup(name);
p->trigger = NULL;
device->probes = g_slist_append(device->probes, p);
}
-struct probe *probe_find(struct sr_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) {
}
/* TODO: return SIGROK_ERR if probenum not found */
-void device_probe_name(struct sr_device *device, int probenum, char *name)
+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);
+ p = sr_device_probe_find(device, probenum);
if (!p)
return;
}
/* TODO: return SIGROK_ERR if probenum not found */
-void device_trigger_clear(struct sr_device *device)
+void sr_device_trigger_clear(struct sr_device *device)
{
- struct probe *p;
+ struct sr_probe *p;
unsigned int pnum;
if (!device->probes)
return;
for (pnum = 1; pnum <= g_slist_length(device->probes); pnum++) {
- p = probe_find(device, pnum);
+ p = sr_device_probe_find(device, pnum);
if (p && p->trigger) {
g_free(p->trigger);
p->trigger = NULL;
}
/* TODO: return SIGROK_ERR if probenum not found */
-void device_trigger_set(struct sr_device *device, int probenum, char *trigger)
+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);
+ p = sr_device_probe_find(device, probenum);
if (!p)
return;
}
-gboolean device_has_hwcap(struct sr_device *device, int hwcap)
+gboolean sr_device_has_hwcap(struct sr_device *device, int hwcap)
{
int *capabilities, i;
+ if (!device || !device->plugin)
+ return FALSE;
+
if ((capabilities = device->plugin->get_capabilities()))
for (i = 0; capabilities[i]; i++)
if (capabilities[i] == hwcap)
projects / libsigrok.git / blobdiff