X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fasix-sigma%2Fasix-sigma.h;h=528e6617a6386076518f47473b9aa3b20af89835;hb=64fe661b87c119079516b9ba7b395bdd8af14994;hp=c65a8eb0469558e3bc269f10bbd15ee1dd87e27a;hpb=ea9cfed7a55260ab97f57150b57c42a28c3a85a7;p=libsigrok.git

diff --git a/hardware/asix-sigma/asix-sigma.h b/hardware/asix-sigma/asix-sigma.h
index c65a8eb0..528e6617 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>
@@ -22,6 +22,8 @@
 #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,
 	WRITE_TRIGGER_SELECT0	= 1,
@@ -77,7 +79,7 @@ enum sigma_read_register {
 struct clockselect_50 {
 	uint8_t async;
 	uint8_t fraction;
-	uint16_t disabled_probes;
+	uint16_t disabled_channels;
 };
 
 /* The effect of all these are still a bit unclear. */
@@ -124,7 +126,7 @@ struct triggerlut {
 
 /* Trigger configuration */
 struct sigma_trigger {
-	/* Only two probes can be used in mask. */
+	/* Only two channels can be used in mask. */
 	uint16_t risingmask;
 	uint16_t fallingmask;
 
@@ -174,20 +176,20 @@ struct sigma_state {
 };
 
 /* Private, per-device-instance driver context. */
-struct 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 num_channels;
 	int samples_per_event;
 	int capture_ratio;
 	struct sigma_trigger trigger;
 	int use_triggers;
 	struct sigma_state state;
-	gpointer session_id;
+	void *cb_data;
 };
 
 #endif