X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fasix-sigma%2Fprotocol.c;h=d040b37ca59143868dcb9212e570763f449ba6f4;hb=4704f64551dd917c2616b4162e7e816fb57113da;hp=a9c1695686c10c4f6b41742fd4f09eb291d79453;hpb=f73b00b647ccca65e1aaba21a1b826f3f4b965ab;p=libsigrok.git

diff --git a/src/hardware/asix-sigma/protocol.c b/src/hardware/asix-sigma/protocol.c
index a9c16956..d040b37c 100644
--- a/src/hardware/asix-sigma/protocol.c
+++ b/src/hardware/asix-sigma/protocol.c
@@ -907,10 +907,8 @@ static void sigma_decode_dram_cluster(struct sigma_dram_cluster *dram_cluster,
 		}
 
 		/* Only send trigger if explicitly enabled. */
-		if (devc->use_triggers) {
-			packet.type = SR_DF_TRIGGER;
-			sr_session_send(sdi, &packet);
-		}
+		if (devc->use_triggers)
+			std_session_send_df_trigger(sdi);
 	}
 
 	/*
@@ -1004,10 +1002,6 @@ static int download_capture(struct sr_dev_inst *sdi)
 	devc = sdi->priv;
 	dl_events_in_line = 64 * 7;
 
-	dram_line = g_try_malloc0(chunks_per_read * sizeof(*dram_line));
-	if (!dram_line)
-		return FALSE;
-
 	sr_info("Downloading sample data.");
 	devc->state.state = SIGMA_DOWNLOAD;
 
@@ -1020,7 +1014,7 @@ static int download_capture(struct sr_dev_inst *sdi)
 	sigma_set_register(WRITE_MODE, WMR_FORCESTOP | WMR_SDRAMWRITEEN, devc);
 	do {
 		if (sigma_read_register(READ_MODE, &modestatus, 1, devc) != 1) {
-			sr_err("sigma: failed while waiting for RMR_POSTTRIGGERED bit");
+			sr_err("failed while waiting for RMR_POSTTRIGGERED bit");
 			return FALSE;
 		}
 	} while (!(modestatus & RMR_POSTTRIGGERED));
@@ -1033,7 +1027,7 @@ static int download_capture(struct sr_dev_inst *sdi)
 
 	/* Check if trigger has fired. */
 	if (sigma_read_register(READ_MODE, &modestatus, 1, devc) != 1) {
-		sr_err("sigma: failed to read READ_MODE register");
+		sr_err("failed to read READ_MODE register");
 		return FALSE;
 	}
 	trg_line = ~0;
@@ -1063,6 +1057,9 @@ static int download_capture(struct sr_dev_inst *sdi)
 	} else {
 		dl_first_line = 0;
 	}
+	dram_line = g_try_malloc0(chunks_per_read * sizeof(*dram_line));
+	if (!dram_line)
+		return FALSE;
 	dl_lines_done = 0;
 	while (dl_lines_total > dl_lines_done) {
 		/* We can download only up-to 32 DRAM lines in one go! */