X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=device.c;h=0cc5e55256978230eb565aa879ad22b74d31ff2e;hb=4bc5fd4568350e3d4025ea72158a8a611650a912;hp=9e4254adc6df4165cee94d5239e291f9ac803163;hpb=1afe89897cf100b1a3a5896184ddaca5705681cc;p=libsigrok.git diff --git a/device.c b/device.c index 9e4254ad..0cc5e552 100644 --- a/device.c +++ b/device.c @@ -20,17 +20,18 @@ #include #include #include +#include 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 @@ -39,26 +40,26 @@ void device_scan(void) */ 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; @@ -66,37 +67,41 @@ void device_close_all(void) device = devices->data; 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; @@ -106,10 +111,10 @@ void device_clear(struct sr_device *device) 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; @@ -121,17 +126,17 @@ void device_destroy(struct sr_device *device) 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 sr_probe *p; - p = probe_find(device, probenum); + p = sr_device_probe_find(device, probenum); if (!p) return; @@ -146,14 +151,20 @@ void device_probe_clear(struct sr_device *device, int probenum) } } -void 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) { @@ -166,7 +177,7 @@ void device_probe_add(struct sr_device *device, char *name) device->probes = g_slist_append(device->probes, p); } -struct sr_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 sr_probe *p, *found_probe; @@ -184,11 +195,12 @@ struct sr_probe *probe_find(struct sr_device *device, int probenum) } /* 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 sr_probe *p; - p = probe_find(device, probenum); + p = sr_device_probe_find(device, probenum); if (!p) return; @@ -198,7 +210,7 @@ void device_probe_name(struct sr_device *device, int probenum, char *name) } /* 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 sr_probe *p; unsigned int pnum; @@ -207,7 +219,7 @@ void device_trigger_clear(struct sr_device *device) 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; @@ -216,11 +228,12 @@ void device_trigger_clear(struct sr_device *device) } /* 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 sr_probe *p; - p = probe_find(device, probenum); + p = sr_device_probe_find(device, probenum); if (!p) return; @@ -231,10 +244,13 @@ void device_trigger_set(struct sr_device *device, int probenum, char *trigger) } -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)