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 92d2ba68c1d6dcafee8ce59a20e445e261d063bd..465ebbaa8da7a1ec01dab337158e0959f1dcfb0d 100644 (file)
--- a/hardware/alsa/protocol.h
+++ b/hardware/alsa/protocol.h
@@ -28,22 +28,15 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "alsa: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN 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;
-       struct sr_samplerates supp_rates;
+       uint8_t num_channels;
+       uint64_t *samplerates;
        char *hwdev;
        snd_pcm_t *capture_handle;
        snd_pcm_hw_params_t *hw_params;
@@ -52,11 +45,8 @@ struct dev_context {
 };
 
 SR_PRIV GSList *alsa_scan(GSList *options, struct sr_dev_driver *di);
-SR_PRIV void alsa_dev_inst_clear(struct sr_dev_inst *sdi);
-
 SR_PRIV int alsa_set_samplerate(const struct sr_dev_inst *sdi,
                                uint64_t newrate);
-
 SR_PRIV int alsa_receive_data(int fd, int revents, void *cb_data);
 
 #endif