X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Falsa%2Fprotocol.h;h=17578594716295f6bd62de8425af177edd7e409d;hb=refs%2Ftags%2Fdsupstream;hp=92d2ba68c1d6dcafee8ce59a20e445e261d063bd;hpb=721ecf3d97aa6e84e6d61b3c25023e9177895025;p=libsigrok.git diff --git a/hardware/alsa/protocol.h b/hardware/alsa/protocol.h index 92d2ba68..17578594 100644 --- a/hardware/alsa/protocol.h +++ b/hardware/alsa/protocol.h @@ -28,14 +28,14 @@ #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) +/* 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) /** Private, per-device-instance driver context. */ struct dev_context { @@ -43,7 +43,7 @@ struct dev_context { uint64_t limit_samples; uint64_t num_samples; uint8_t num_probes; - struct sr_samplerates supp_rates; + uint64_t *samplerates; char *hwdev; snd_pcm_t *capture_handle; snd_pcm_hw_params_t *hw_params;