sigma/la8/demo: s/SR_PROBE_ANALOG/SR_PROBE_LOGIC/.

[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 10152bf581af987a28612e60b03872fbf4122636..1a8ad43b48d6481fe6a9bbcc58c8bf1b71ce1ce2 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.h
+++ b/hardware/asix-sigma/asix-sigma.h
@@ -19,8 +19,17 @@
  * 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
+
+/* 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)
 
 enum sigma_write_register {
        WRITE_CLOCK_SELECT      = 0,
@@ -173,9 +182,11 @@ 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;
+       uint64_t period_ps;
        uint64_t limit_msec;
        struct timeval start_tv;
        int cur_firmware;
@@ -185,7 +196,7 @@ struct sigma {
        struct sigma_trigger trigger;
        int use_triggers;
        struct sigma_state state;
-       gpointer session_id;
+       void *session_dev_id;
 };
 
 #endif