X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fasix-sigma%2Fasix-sigma.h;h=4c9deff68bf480ddbf859fe8eb5c3bd747bad115;hb=0acdd79357633e90bb1a398e246ad96b39dceda9;hp=1a8ad43b48d6481fe6a9bbcc58c8bf1b71ce1ce2;hpb=47f4f073e0a7fe68a55001180c3c9092551f2108;p=libsigrok.git

diff --git a/hardware/asix-sigma/asix-sigma.h b/hardware/asix-sigma/asix-sigma.h
index 1a8ad43b..4c9deff6 100644
--- a/hardware/asix-sigma/asix-sigma.h
+++ b/hardware/asix-sigma/asix-sigma.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2010 HÃ¥vard Espeland <gus@ping.uio.no>,
  * Copyright (C) 2010 Martin Stensgård <mastensg@ping.uio.no>
@@ -22,14 +22,7 @@
 #ifndef LIBSIGROK_HARDWARE_ASIX_SIGMA_ASIX_SIGMA_H
 #define LIBSIGROK_HARDWARE_ASIX_SIGMA_ASIX_SIGMA_H
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "asix-sigma: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+#define LOG_PREFIX "asix-sigma"
 
 enum sigma_write_register {
 	WRITE_CLOCK_SELECT	= 0,
@@ -62,17 +55,17 @@ enum sigma_read_register {
 	READ_TEST		= 15,
 };
 
-#define REG_ADDR_LOW		(0 << 4)
-#define REG_ADDR_HIGH		(1 << 4)
-#define REG_DATA_LOW		(2 << 4)
-#define REG_DATA_HIGH_WRITE	(3 << 4)
-#define REG_READ_ADDR		(4 << 4)
-#define REG_DRAM_WAIT_ACK	(5 << 4)
+#define REG_ADDR_LOW		(0x0 << 4)
+#define REG_ADDR_HIGH		(0x1 << 4)
+#define REG_DATA_LOW		(0x2 << 4)
+#define REG_DATA_HIGH_WRITE	(0x3 << 4)
+#define REG_READ_ADDR		(0x4 << 4)
+#define REG_DRAM_WAIT_ACK	(0x5 << 4)
 
 /* Bit (1 << 4) can be low or high (double buffer / cache) */
-#define REG_DRAM_BLOCK		(6 << 4)
-#define REG_DRAM_BLOCK_BEGIN	(8 << 4)
-#define REG_DRAM_BLOCK_DATA	(10 << 4)
+#define REG_DRAM_BLOCK		(0x6 << 4)
+#define REG_DRAM_BLOCK_BEGIN	(0x8 << 4)
+#define REG_DRAM_BLOCK_DATA	(0xa << 4)
 
 #define LEDSEL0			6
 #define LEDSEL1			7
@@ -83,10 +76,29 @@ enum sigma_read_register {
 
 #define CHUNK_SIZE		1024
 
+/*
+ * The entire ASIX Sigma DRAM is an array of struct sigma_dram_line[1024];
+ */
+
+/* One "DRAM cluster" contains a timestamp and 7 samples, 16b total. */
+struct sigma_dram_cluster {
+	uint8_t		timestamp_lo;
+	uint8_t		timestamp_hi;
+	struct {
+		uint8_t	sample_hi;
+		uint8_t	sample_lo;
+	}		samples[7];
+};
+
+/* One "DRAM line" contains 64 "DRAM clusters", 1024b total. */
+struct sigma_dram_line {
+	struct sigma_dram_cluster	cluster[64];
+};
+
 struct clockselect_50 {
 	uint8_t async;
 	uint8_t fraction;
-	uint16_t disabled_probes;
+	uint16_t disabled_channels;
 };
 
 /* The effect of all these are still a bit unclear. */
@@ -133,7 +145,7 @@ struct triggerlut {
 
 /* Trigger configuration */
 struct sigma_trigger {
-	/* Only two probes can be used in mask. */
+	/* Only two channels can be used in mask. */
 	uint16_t risingmask;
 	uint16_t fallingmask;
 
@@ -174,12 +186,8 @@ struct sigma_state {
 		SIGMA_DOWNLOAD,
 	} state;
 
-	uint32_t stoppos, triggerpos;
 	uint16_t lastts;
 	uint16_t lastsample;
-
-	int triggerchunk;
-	int chunks_downloaded;
 };
 
 /* Private, per-device-instance driver context. */
@@ -190,13 +198,14 @@ struct dev_context {
 	uint64_t limit_msec;
 	struct timeval start_tv;
 	int cur_firmware;
-	int num_probes;
+	int num_channels;
+	int cur_channels;
 	int samples_per_event;
 	int capture_ratio;
 	struct sigma_trigger trigger;
 	int use_triggers;
 	struct sigma_state state;
-	void *session_dev_id;
+	void *cb_data;
 };
 
 #endif