X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fasix-sigma%2Fasix-sigma.h;h=528e6617a6386076518f47473b9aa3b20af89835;hb=499b17e9c043e1ec92e71095289d63f09b981eea;hp=0c672491df30d70b7c1f87c905800310b7ee2b62;hpb=9996570987d362a324384ed041040e884628853e;p=libsigrok.git

diff --git a/hardware/asix-sigma/asix-sigma.h b/hardware/asix-sigma/asix-sigma.h
index 0c672491..528e6617 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>
@@ -19,8 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGROK_ASIX_SIGMA_H
-#define SIGROK_ASIX_SIGMA_H
+#ifndef LIBSIGROK_HARDWARE_ASIX_SIGMA_ASIX_SIGMA_H
+#define LIBSIGROK_HARDWARE_ASIX_SIGMA_ASIX_SIGMA_H
+
+#define LOG_PREFIX "asix-sigma"
 
 enum sigma_write_register {
 	WRITE_CLOCK_SELECT	= 0,
@@ -77,7 +79,7 @@ enum sigma_read_register {
 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. */
@@ -124,7 +126,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;
 
@@ -173,18 +175,21 @@ struct sigma_state {
 	int chunks_downloaded;
 };
 
-struct sigma {
+/* Private, per-device-instance driver context. */
+struct dev_context {
 	struct ftdi_context ftdic;
 	uint64_t cur_samplerate;
-	uint32_t limit_msec;
+	uint64_t period_ps;
+	uint64_t limit_msec;
 	struct timeval start_tv;
 	int cur_firmware;
-	int num_probes;
+	int num_channels;
 	int samples_per_event;
 	int capture_ratio;
 	struct sigma_trigger trigger;
+	int use_triggers;
 	struct sigma_state state;
-	gpointer session_id;
+	void *cb_data;
 };
 
 #endif