#include <stdio.h>
#include <glib.h>
#include <sigrok.h>
+#include <sigrok-internal.h>
extern struct sr_global *global;
{
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);
void sr_device_close_all(void)
{
+ int ret;
struct sr_device *device;
while (devices) {
device = devices->data;
- if (device->plugin && device->plugin->close)
- device->plugin->close(device->plugin_index);
+ if (device->plugin && device->plugin->closedev) {
+ ret = device->plugin->closedev(device->plugin_index);
+ if (ret != SR_OK) {
+ sr_err("dev: %s: could not close device %d",
+ __func__, device->plugin_index);
+ }
+ }
sr_device_destroy(device);
}
}
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);
}
}
-void sr_device_probe_add(struct sr_device *device, char *name)
+void sr_device_probe_add(struct sr_device *device, const char *name)
{
struct sr_probe *p;
char probename[16];
int probenum;
probenum = g_slist_length(device->probes) + 1;
- p = g_malloc0(sizeof(struct sr_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) {
return found_probe;
}
-/* TODO: return SIGROK_ERR if probenum not found */
-void sr_device_probe_name(struct sr_device *device, int probenum, char *name)
+/* TODO: return SR_ERR if probenum not found */
+void sr_device_probe_name(struct sr_device *device, int probenum,
+ const char *name)
{
struct sr_probe *p;
p->name = g_strdup(name);
}
-/* TODO: return SIGROK_ERR if probenum not found */
+/* TODO: return SR_ERR if probenum not found */
void sr_device_trigger_clear(struct sr_device *device)
{
struct sr_probe *p;
}
}
-/* TODO: return SIGROK_ERR if probenum not found */
-void sr_device_trigger_set(struct sr_device *device, int probenum, char *trigger)
+/* TODO: return SR_ERR if probenum not found */
+void sr_device_trigger_set(struct sr_device *device, int probenum,
+ const char *trigger)
{
struct sr_probe *p;
int *capabilities, i;
if (!device || !device->plugin)
- return;
+ return FALSE;
if ((capabilities = device->plugin->get_capabilities()))
for (i = 0; capabilities[i]; i++)