es519xx.c: Fix a few compiler warnings (clang).

[libsigrok.git] / hardware / asix-sigma / asix-sigma.h

diff --git a/hardware/asix-sigma/asix-sigma.h b/hardware/asix-sigma/asix-sigma.h
index 1320acec39eefdc1241abb2bdc8ba2c2b568ff7f..74178b1c7451490e351ce3c5197d8a2ed28aa4bf 100644 (file)
--- 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 ASIX_SIGMA_H
-#define 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,
@@ -124,18 +126,14 @@ struct triggerlut {
 
 /* Trigger configuration */
 struct sigma_trigger {
-       /* Single-pin trigger support (100 and 200 MHz).*/
-       uint8_t fast_pin;
-       uint8_t fast_fall;
+       /* Only two probes can be used in mask. */
+       uint16_t risingmask;
+       uint16_t fallingmask;
 
        /* Simple trigger support (<= 50 MHz). */
        uint16_t simplemask;
        uint16_t simplevalue;
 
-       /* Only two probes can be used in mask */
-       uint16_t risingmask;
-       uint16_t fallingmask;
-
        /* TODO: Advanced trigger support (boolean expressions). */
 };
 
@@ -161,4 +159,37 @@ enum triggerfunc {
        FUNC_NXOR,
 };
 
+struct sigma_state {
+       enum {
+               SIGMA_UNINITIALIZED = 0,
+               SIGMA_IDLE,
+               SIGMA_CAPTURE,
+               SIGMA_DOWNLOAD,
+       } state;
+
+       uint32_t stoppos, triggerpos;
+       uint16_t lastts;
+       uint16_t lastsample;
+
+       int triggerchunk;
+       int chunks_downloaded;
+};
+
+/* Private, per-device-instance driver context. */
+struct dev_context {
+       struct ftdi_context ftdic;
+       uint64_t cur_samplerate;
+       uint64_t period_ps;
+       uint64_t limit_msec;
+       struct timeval start_tv;
+       int cur_firmware;
+       int num_probes;
+       int samples_per_event;
+       int capture_ratio;
+       struct sigma_trigger trigger;
+       int use_triggers;
+       struct sigma_state state;
+       void *cb_data;
+};
+
 #endif