Centralise duplicated logging helper defines.

[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 9e35805a618bcb9eabf78518a12d5c9d4c9e50bc..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 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,
@@ -173,7 +175,8 @@ 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;
@@ -186,7 +189,7 @@ struct sigma {
        struct sigma_trigger trigger;
        int use_triggers;
        struct sigma_state state;
-       gpointer session_id;
+       void *cb_data;
 };
 
 #endif