X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fasix-sigma%2Fasix-sigma.h;h=74178b1c7451490e351ce3c5197d8a2ed28aa4bf;hb=3544f848e0d7f67af8e11ce7ec344b34cd797df3;hp=10152bf581af987a28612e60b03872fbf4122636;hpb=94ba4bd6897d87af2ca45acc0505139d04785d44;p=libsigrok.git

diff --git a/hardware/asix-sigma/asix-sigma.h b/hardware/asix-sigma/asix-sigma.h
index 10152bf5..74178b1c 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,
@@ -173,9 +175,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 +189,7 @@ struct sigma {
 	struct sigma_trigger trigger;
 	int use_triggers;
 	struct sigma_state state;
-	gpointer session_id;
+	void *cb_data;
 };
 
 #endif