Replace 'probe' with 'channel' in most places.

[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 0fbcd936f996de05122aae3e3d7e683600dc5e31..528e6617a6386076518f47473b9aa3b20af89835 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.h
+++ b/hardware/asix-sigma/asix-sigma.h
@@ -22,14 +22,7 @@
 #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)
+#define LOG_PREFIX "asix-sigma"
 
 enum sigma_write_register {
        WRITE_CLOCK_SELECT      = 0,
@@ -86,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. */
@@ -133,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;
 
@@ -190,7 +183,7 @@ struct dev_context {
        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;