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

diff --git a/src/hardware/asix-sigma/protocol.c b/src/hardware/asix-sigma/protocol.c
index 94fd8de0..d040b37c 100644
--- a/src/hardware/asix-sigma/protocol.c
+++ b/src/hardware/asix-sigma/protocol.c
@@ -134,18 +134,6 @@ static int sigma_read_register(uint8_t reg, uint8_t *data, size_t len,
 	return sigma_read(data, len, devc);
 }
 
-static uint8_t sigma_get_register(uint8_t reg, struct dev_context *devc)
-{
-	uint8_t value;
-
-	if (1 != sigma_read_register(reg, &value, 1, devc)) {
-		sr_err("sigma_get_register: 1 byte expected");
-		return 0;
-	}
-
-	return value;
-}
-
 static int sigma_read_pos(uint32_t *stoppos, uint32_t *triggerpos,
 			  struct dev_context *devc)
 {
@@ -168,11 +156,17 @@ static int sigma_read_pos(uint32_t *stoppos, uint32_t *triggerpos,
 	*triggerpos = result[0] | (result[1] << 8) | (result[2] << 16);
 	*stoppos = result[3] | (result[4] << 8) | (result[5] << 16);
 
-	/* Not really sure why this must be done, but according to spec. */
+	/*
+	 * These "position" values point to after the event (end of
+	 * capture data, trigger condition matched). This is why they
+	 * get decremented here. Sample memory consists of 512-byte
+	 * chunks with meta data in the upper 64 bytes. Thus when the
+	 * decrements takes us into this upper part of the chunk, then
+	 * further move backwards to the end of the chunk's data part.
+	 */
 	if ((--*stoppos & 0x1ff) == 0x1ff)
 		*stoppos -= 64;
-
-	if ((*--triggerpos & 0x1ff) == 0x1ff)
+	if ((--*triggerpos & 0x1ff) == 0x1ff)
 		*triggerpos -= 64;
 
 	return 1;
@@ -913,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);
 	}
 
 	/*
@@ -1009,12 +1001,6 @@ static int download_capture(struct sr_dev_inst *sdi)
 
 	devc = sdi->priv;
 	dl_events_in_line = 64 * 7;
-	trg_line = ~0;
-	trg_event = ~0;
-
-	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;
@@ -1027,7 +1013,10 @@ static int download_capture(struct sr_dev_inst *sdi)
 	 */
 	sigma_set_register(WRITE_MODE, WMR_FORCESTOP | WMR_SDRAMWRITEEN, devc);
 	do {
-		modestatus = sigma_get_register(READ_MODE, devc);
+		if (sigma_read_register(READ_MODE, &modestatus, 1, devc) != 1) {
+			sr_err("failed while waiting for RMR_POSTTRIGGERED bit");
+			return FALSE;
+		}
 	} while (!(modestatus & RMR_POSTTRIGGERED));
 
 	/* Set SDRAM Read Enable. */
@@ -1037,7 +1026,12 @@ static int download_capture(struct sr_dev_inst *sdi)
 	sigma_read_pos(&stoppos, &triggerpos, devc);
 
 	/* Check if trigger has fired. */
-	modestatus = sigma_get_register(READ_MODE, devc);
+	if (sigma_read_register(READ_MODE, &modestatus, 1, devc) != 1) {
+		sr_err("failed to read READ_MODE register");
+		return FALSE;
+	}
+	trg_line = ~0;
+	trg_event = ~0;
 	if (modestatus & RMR_TRIGGERED) {
 		trg_line = triggerpos >> 9;
 		trg_event = triggerpos & 0x1ff;
@@ -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! */