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

[libsigrok.git] / hardware / alsa / protocol.h

diff --git a/hardware/alsa/protocol.h b/hardware/alsa/protocol.h
index e844bc740afabed26327654f0deb0c25b5ac5bce..465ebbaa8da7a1ec01dab337158e0959f1dcfb0d 100644 (file)
--- a/hardware/alsa/protocol.h
+++ b/hardware/alsa/protocol.h
@@ -28,21 +28,14 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "alsa: "
-#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 "alsa"
 
 /** Private, per-device-instance driver context. */
 struct dev_context {
        uint64_t cur_samplerate;
        uint64_t limit_samples;
        uint64_t num_samples;
-       uint8_t num_probes;
+       uint8_t num_channels;
        uint64_t *samplerates;
        char *hwdev;
        snd_pcm_t *capture_handle;