X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbeaglelogic%2Fapi.c;h=3c8cc3b39f72c309c56cccaef94b04b06632285c;hb=5a971f66a37df7c4dbe7799b3c7fc7eb30055a61;hp=9a39e1de9487ec735f82231f5e25bf7866725eb0;hpb=aac29cc192ccf82b64e77b5e6b11b411da32deed;p=libsigrok.git

diff --git a/src/hardware/beaglelogic/api.c b/src/hardware/beaglelogic/api.c
index 9a39e1de..3c8cc3b3 100644
--- a/src/hardware/beaglelogic/api.c
+++ b/src/hardware/beaglelogic/api.c
@@ -65,12 +65,11 @@ static int init(struct sr_context *sr_ctx)
 	return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
-static struct dev_context * beaglelogic_devc_alloc(void)
+static struct dev_context *beaglelogic_devc_alloc(void)
 {
 	struct dev_context *devc;
 
-	/* Allocate zeroed structure */
-	devc = g_try_malloc0(sizeof(*devc));
+	devc = g_malloc0(sizeof(struct dev_context));
 
 	/* Default non-zero values (if any) */
 	devc->fd = -1;
@@ -137,9 +136,8 @@ static GSList *scan(GSList *options)
 
 	/* Fill the channels */
 	for (i = 0; i < maxch; i++) {
-		if (!(ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE,
-				beaglelogic_channel_names[i])))
-			return NULL;
+		ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE,
+				beaglelogic_channel_names[i]);
 		sdi->channels = g_slist_append(sdi->channels, ch);
 	}
 
@@ -363,7 +361,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 
 	/* Configure triggers & send header packet */
 	if ((trigger = sr_session_trigger_get(sdi->session))) {
-		devc->stl = soft_trigger_logic_new(sdi, trigger);
+		devc->stl = soft_trigger_logic_new(sdi, trigger, 0);
 		devc->trigger_fired = FALSE;
 	} else
 		devc->trigger_fired = TRUE;