X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=device.c;h=fc2635b59750c8bcfc52834e6c3c29321ab469d9;hb=f38bdf5678d35a1493c17a5c260fc1120d93bd93;hp=dd3a4000bcc6b9f9405ba673aca5035eedb8acfe;hpb=2bf4aca64ad435a09359662446762840ac55db1d;p=libsigrok.git

diff --git a/device.c b/device.c
index dd3a4000..fc2635b5 100644
--- a/device.c
+++ b/device.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <glib.h>
 #include <sigrok.h>
+#include <sigrok-internal.h>
 
 extern struct sr_global *global;
 
@@ -30,7 +31,7 @@ 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
@@ -48,7 +49,7 @@ 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);
@@ -85,7 +86,11 @@ struct sr_device *sr_device_new(struct sr_device_plugin *plugin, int plugin_inde
 	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);
@@ -131,7 +136,7 @@ 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 sr_device_probe_clear(struct sr_device *device, int probenum)
 	}
 }
 
-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) {
@@ -166,7 +177,7 @@ void sr_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;
@@ -183,12 +194,13 @@ struct sr_probe *probe_find(struct sr_device *device, int probenum)
 	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 = probe_find(device, probenum);
+	p = sr_device_probe_find(device, probenum);
 	if (!p)
 		return;
 
@@ -197,7 +209,7 @@ void sr_device_probe_name(struct sr_device *device, int probenum, char *name)
 	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;
@@ -207,7 +219,7 @@ void sr_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;
@@ -215,12 +227,13 @@ void sr_device_trigger_clear(struct sr_device *device)
 	}
 }
 
-/* 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;
 
-	p = probe_find(device, probenum);
+	p = sr_device_probe_find(device, probenum);
 	if (!p)
 		return;
 
@@ -235,6 +248,9 @@ 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)