X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fasix-sigma%2Fasix-sigma.h;h=0fbcd936f996de05122aae3e3d7e683600dc5e31;hb=3b412e3a305cf06ac9bbb91ca5025d1712617b71;hp=c4f31e822775f79f2ad48c7bf3e03aac6efce136;hpb=5b5ea7c6d25bb42de09b61d0a070d78252f2367b;p=libsigrok.git

diff --git a/hardware/asix-sigma/asix-sigma.h b/hardware/asix-sigma/asix-sigma.h
index c4f31e82..0fbcd936 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,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 subsystem-specific prefix string. */
+#define LOG_PREFIX "asix-sigma: "
+#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
+#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
+#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
+#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
+#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
 
 enum sigma_write_register {
 	WRITE_CLOCK_SELECT	= 0,
@@ -173,10 +182,12 @@ 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;
@@ -185,7 +196,7 @@ struct sigma {
 	struct sigma_trigger trigger;
 	int use_triggers;
 	struct sigma_state state;
-	gpointer session_id;
+	void *cb_data;
 };
 
 #endif