X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fasix-sigma%2Fprotocol.h;h=d2a190c99ee2bc14dea6c736166b0d9da130bebc;hb=9334ed6ccd219934e288d9833ae7f684e21a8fd7;hp=cd7bc23953ccc2cc71d46cf9f28eb482f30fe3e1;hpb=80e717b3cfac82d63c98614fe6179fb0e4fdaf8d;p=libsigrok.git

diff --git a/src/hardware/asix-sigma/protocol.h b/src/hardware/asix-sigma/protocol.h
index cd7bc239..d2a190c9 100644
--- a/src/hardware/asix-sigma/protocol.h
+++ b/src/hardware/asix-sigma/protocol.h
@@ -4,6 +4,7 @@
  * Copyright (C) 2010-2012 HÃ¥vard Espeland <gus@ping.uio.no>,
  * Copyright (C) 2010 Martin Stensgård <mastensg@ping.uio.no>
  * Copyright (C) 2010 Carl Henrik Lunde <chlunde@ping.uio.no>
+ * Copyright (C) 2020 Gerhard Sittig <gerhard.sittig@gmx.net>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -123,8 +124,8 @@ enum sigma_read_register {
 	READ_TEST		= 15,
 };
 
-#define LEDSEL0			6
-#define LEDSEL1			7
+#define TRGSEL2_LEDSEL0		(1 << 6)
+#define TRGSEL2_LEDSEL1		(1 << 7)
 
 /* WRITE_MODE register fields. */
 #define WMR_SDRAMWRITEEN	(1 << 0)
@@ -146,6 +147,22 @@ enum sigma_read_register {
 #define RMR_POSTTRIGGERED	(1 << 6)
 /* not used: bit position 7 */
 
+/*
+ * Trigger options. First and second write are similar, but _some_
+ * positions change their meaning.
+ */
+#define TRGOPT_TRGIEN		(1 << 7)
+#define TRGOPT_TRGOEN		(1 << 6)
+#define TRGOPT_TRGOINEN		(1 << 5) /* 1st write */
+#define TRGOPT_TRGINEG		TRGOPT1_TRGOINEN /* 2nd write */
+#define TRGOPT_TRGOEVNTEN	(1 << 4) /* 1st write */
+#define TRGOPT_TRGOPIN		TRGOPT1_TRGOEVNTEN /* 2nd write */
+#define TRGOPT_TRGOOUTEN	(1 << 3) /* 1st write */
+#define TRGOPT_TRGOLONG		TRGOPT1_TRGOOUTEN /* 2nd write */
+#define TRGOPT_TRGOUTR_OUT	(1 << 1)
+#define TRGOPT_TRGOUTR_EN	(1 << 0)
+#define TRGOPT_CLEAR_MASK	(TRGOPT_TRGOINEN | TRGOPT_TRGOEVNTEN | TRGOPT_TRGOOUTEN)
+
 /*
  * Layout of the sample data DRAM, which will be downloaded to the PC:
  *
@@ -189,18 +206,14 @@ enum sigma_read_register {
 
 struct sigma_dram_line {
 	struct sigma_dram_cluster {
-		uint8_t timestamp_lo;
-		uint8_t timestamp_hi;
-		struct sigma_dram_event {
-			uint8_t sample_hi;
-			uint8_t sample_lo;
-		} samples[EVENTS_PER_CLUSTER];
+		uint16_t timestamp;
+		uint16_t samples[EVENTS_PER_CLUSTER];
 	} cluster[CLUSTERS_PER_ROW];
 };
 
 struct clockselect_50 {
 	uint8_t async;
-	uint8_t fraction;
+	uint64_t fraction;
 	uint16_t disabled_channels;
 };
 
@@ -330,15 +343,18 @@ struct dev_context {
 extern SR_PRIV const uint64_t samplerates[];
 extern SR_PRIV const size_t samplerates_count;
 
-SR_PRIV int sigma_write_register(uint8_t reg, uint8_t *data, size_t len,
-				 struct dev_context *devc);
-SR_PRIV int sigma_set_register(uint8_t reg, uint8_t value, struct dev_context *devc);
-SR_PRIV int sigma_write_trigger_lut(struct triggerlut *lut, struct dev_context *devc);
+SR_PRIV int sigma_write_register(struct dev_context *devc,
+	uint8_t reg, uint8_t *data, size_t len);
+SR_PRIV int sigma_set_register(struct dev_context *devc,
+	uint8_t reg, uint8_t value);
+SR_PRIV int sigma_write_trigger_lut(struct dev_context *devc,
+	struct triggerlut *lut);
 SR_PRIV int sigma_normalize_samplerate(uint64_t want_rate, uint64_t *have_rate);
 SR_PRIV int sigma_set_samplerate(const struct sr_dev_inst *sdi);
 SR_PRIV int sigma_set_acquire_timeout(struct dev_context *devc);
 SR_PRIV int sigma_convert_trigger(const struct sr_dev_inst *sdi);
 SR_PRIV int sigma_receive_data(int fd, int revents, void *cb_data);
-SR_PRIV int sigma_build_basic_trigger(struct triggerlut *lut, struct dev_context *devc);
+SR_PRIV int sigma_build_basic_trigger(struct dev_context *devc,
+	struct triggerlut *lut);
 
 #endif