X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Falsa%2Fapi.c;h=e2efbf468dc944b21f56f7ac7b91808c4552d39f;hb=5a7587cd03d81e84a8e4538a1ec9ab36f3a077c2;hp=77025c1344bdbba444f88ddc3406b2c3f01e1176;hpb=9cd9f6b71c35c0203b7e8997ce9425d0dc6e0f4d;p=libsigrok.git diff --git a/hardware/alsa/api.c b/hardware/alsa/api.c index 77025c13..e2efbf46 100644 --- a/hardware/alsa/api.c +++ b/hardware/alsa/api.c @@ -1,8 +1,9 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * * Copyright (C) 2011 Daniel Ribeiro * Copyright (C) 2012 Uwe Hermann + * Copyright (C) 2012 Alexandru Gagniuc * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,113 +20,49 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "protocol.h" -#include "libsigrok.h" -#include "libsigrok-internal.h" - #include #include #include - -#define DEFAULT_PROBES 2 -#define SAMPLE_WIDTH 16 -#define DEFAULT_SAMPLERATE 44100 -// #define AUDIO_DEV "plughw:0,0" -#define AUDIO_DEV "default" +#include "libsigrok.h" +#include "libsigrok-internal.h" +#include "protocol.h" static const int hwcaps[] = { - SR_HWCAP_SAMPLERATE, - SR_HWCAP_LIMIT_SAMPLES, - SR_HWCAP_CONTINUOUS, + SR_CONF_SAMPLERATE, + SR_CONF_LIMIT_SAMPLES, + SR_CONF_CONTINUOUS, 0, }; -static const char *probe_names[] = { - "Channel 0", - "Channel 1", - NULL, -}; - SR_PRIV struct sr_dev_driver alsa_driver_info; static struct sr_dev_driver *di = &alsa_driver_info; static int clear_instances(void) { - /* TODO */ + struct drv_context *drvc; + + if (!(drvc = di->priv)) + return SR_OK; + + g_slist_free_full(drvc->instances, (GDestroyNotify)alsa_dev_inst_clear); + drvc->instances = NULL; return SR_OK; } static int hw_init(struct sr_context *sr_ctx) { - struct drv_context *drvc; - - if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) { - sr_err("Driver context malloc failed."); - return SR_ERR_MALLOC; - } - - drvc->sr_ctx = sr_ctx; - di->priv = drvc; - - return SR_OK; + return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN); } static GSList *hw_scan(GSList *options) { - struct drv_context *drvc; - struct dev_context *devc; - struct sr_dev_inst *sdi; - struct sr_probe *probe; - GSList *devices; - int i; - - (void)options; - - drvc = di->priv; - drvc->instances = NULL; - - devices = NULL; - - if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { - sr_err("Device context malloc failed."); - return NULL; - } - - if (!(sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, "alsa", NULL, NULL))) { - sr_err("Failed to create device instance."); - return NULL; - } - - /* Set the samplerate to a default value for now. */ - devc->cur_samplerate = DEFAULT_SAMPLERATE; - devc->num_probes = DEFAULT_PROBES; - - sdi->priv = devc; - sdi->driver = di; - - for (i = 0; probe_names[i]; i++) { - if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE, - probe_names[i]))) { - sr_err("Failed to create probe."); - return NULL; - } - sdi->probes = g_slist_append(sdi->probes, probe); - } - - drvc->instances = g_slist_append(drvc->instances, sdi); - devices = g_slist_append(devices, sdi); - - return devices; + return alsa_scan(options, di); } static GSList *hw_dev_list(void) { - struct drv_context *drvc; - - drvc = di->priv; - - return drvc->instances; + return ((struct drv_context *)(di->priv))->instances; } static int hw_dev_open(struct sr_dev_inst *sdi) @@ -135,22 +72,19 @@ static int hw_dev_open(struct sr_dev_inst *sdi) devc = sdi->priv; - sr_dbg("Opening audio device '%s' for stream capture.", AUDIO_DEV); - ret = snd_pcm_open(&devc->capture_handle, AUDIO_DEV, + if (!(devc->hwdev)) { + sr_err("devc->hwdev was NULL."); + return SR_ERR_BUG; + } + + sr_dbg("Opening audio device '%s' for stream capture.", devc->hwdev); + ret = snd_pcm_open(&devc->capture_handle, devc->hwdev, SND_PCM_STREAM_CAPTURE, 0); if (ret < 0) { sr_err("Can't open audio device: %s.", snd_strerror(ret)); return SR_ERR; } - sr_dbg("Allocating hardware parameter structure."); - ret = snd_pcm_hw_params_malloc(&devc->hw_params); - if (ret < 0) { - sr_err("Can't allocate hardware parameter structure: %s.", - snd_strerror(ret)); - return SR_ERR_MALLOC; - } - sr_dbg("Initializing hardware parameter structure."); ret = snd_pcm_hw_params_any(devc->capture_handle, devc->hw_params); if (ret < 0) { @@ -169,20 +103,12 @@ static int hw_dev_close(struct sr_dev_inst *sdi) devc = sdi->priv; - sr_dbg("Closing device."); - - if (devc->hw_params) { - sr_dbg("Freeing hardware parameters."); - snd_pcm_hw_params_free(devc->hw_params); - } else { - sr_dbg("No hardware parameters, no need to free."); - } - if (devc->capture_handle) { sr_dbg("Closing PCM device."); if ((ret = snd_pcm_close(devc->capture_handle)) < 0) { sr_err("Failed to close device: %s.", snd_strerror(ret)); + devc->capture_handle = NULL; } } else { sr_dbg("No capture handle, no need to close audio device."); @@ -198,68 +124,80 @@ static int hw_cleanup(void) return SR_OK; } -static int hw_info_get(int info_id, const void **data, - const struct sr_dev_inst *sdi) +static int config_get(int id, const void **data, const struct sr_dev_inst *sdi) { struct dev_context *devc; - if (info_id != SR_DI_HWCAPS) /* For SR_DI_HWCAPS sdi will be NULL. */ + switch (id) { + case SR_CONF_SAMPLERATE: devc = sdi->priv; - - switch (info_id) { - case SR_DI_HWCAPS: - *data = hwcaps; - break; - case SR_DI_NUM_PROBES: - *data = GINT_TO_POINTER(DEFAULT_PROBES); - break; - case SR_DI_PROBE_NAMES: - *data = probe_names; - break; - case SR_DI_CUR_SAMPLERATE: *data = &devc->cur_samplerate; break; default: - sr_err("Invalid info_id: %d.", info_id); return SR_ERR_ARG; } return SR_OK; } -static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, - const void *value) +static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) { struct dev_context *devc; devc = sdi->priv; - switch (hwcap) { - case SR_HWCAP_SAMPLERATE: - devc->cur_samplerate = *(const uint64_t *)value; + switch (id) { + case SR_CONF_SAMPLERATE: + alsa_set_samplerate(sdi, *(const uint64_t *)value); break; - case SR_HWCAP_LIMIT_SAMPLES: + case SR_CONF_LIMIT_SAMPLES: devc->limit_samples = *(const uint64_t *)value; break; default: - sr_err("Unknown capability: %d.", hwcap); + sr_err("Unknown capability: %d.", id); return SR_ERR; } return SR_OK; } +static int config_list(int key, const void **data, const struct sr_dev_inst *sdi) +{ + struct dev_context *devc; + + (void)sdi; + + switch (key) { + case SR_CONF_DEVICE_OPTIONS: + *data = hwcaps; + break; + case SR_CONF_SAMPLERATE: + if (!sdi || !sdi->priv) + return SR_ERR_ARG; + devc = sdi->priv; + if (!devc->supp_rates.list) { + sr_err("Instance did not contain a samplerate list."); + return SR_ERR_ARG; + } + *data = &devc->supp_rates; + break; + default: + return SR_ERR_ARG; + } + + return SR_OK; +} + static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) { - struct sr_datafeed_packet packet; - struct sr_datafeed_header header; - struct sr_datafeed_meta_analog meta; struct dev_context *devc; int count, ret; + char *endianness; devc = sdi->priv; devc->cb_data = cb_data; + devc->num_samples = 0; sr_dbg("Setting audio access type to RW/interleaved."); ret = snd_pcm_hw_params_set_access(devc->capture_handle, @@ -270,9 +208,14 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, } /* FIXME: Hardcoded for 16bits. */ - sr_dbg("Setting audio sample format to signed 16bit (little endian)."); + if (SND_PCM_FORMAT_S16 == SND_PCM_FORMAT_S16_LE) + endianness = "little endian"; + else + endianness = "big endian"; + sr_dbg("Setting audio sample format to signed 16bit (%s).", endianness); ret = snd_pcm_hw_params_set_format(devc->capture_handle, - devc->hw_params, SND_PCM_FORMAT_S16_LE); + devc->hw_params, + SND_PCM_FORMAT_S16); if (ret < 0) { sr_err("Can't set audio sample format: %s.", snd_strerror(ret)); return SR_ERR; @@ -280,8 +223,8 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, sr_dbg("Setting audio samplerate to %" PRIu64 "Hz.", devc->cur_samplerate); - ret = snd_pcm_hw_params_set_rate_near(devc->capture_handle, - devc->hw_params, (unsigned int *)&devc->cur_samplerate, 0); + ret = snd_pcm_hw_params_set_rate(devc->capture_handle, devc->hw_params, + (unsigned int)devc->cur_samplerate, 0); if (ret < 0) { sr_err("Can't set audio sample rate: %s.", snd_strerror(ret)); return SR_ERR; @@ -315,14 +258,13 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, sr_err("Unable to obtain poll descriptors count."); return SR_ERR; } - sr_spew("Obtained poll descriptor count: %d.", count); if (!(devc->ufds = g_try_malloc(count * sizeof(struct pollfd)))) { sr_err("Failed to malloc ufds."); return SR_ERR_MALLOC; } - sr_err("Getting %d poll descriptors.", count); + sr_spew("Getting %d poll descriptors.", count); ret = snd_pcm_poll_descriptors(devc->capture_handle, devc->ufds, count); if (ret < 0) { sr_err("Unable to obtain poll descriptors: %s.", @@ -332,19 +274,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, } /* Send header packet to the session bus. */ - sr_dbg("Sending SR_DF_HEADER packet."); - packet.type = SR_DF_HEADER; - packet.payload = (uint8_t *)&header; - header.feed_version = 1; - gettimeofday(&header.starttime, NULL); - sr_session_send(devc->cb_data, &packet); - - /* Send metadata about the SR_DF_ANALOG packets to come. */ - sr_dbg("Sending SR_DF_META_ANALOG packet."); - packet.type = SR_DF_META_ANALOG; - packet.payload = &meta; - meta.num_probes = devc->num_probes; - sr_session_send(devc->cb_data, &packet); + std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN); /* Poll every 10ms, or whenever some data comes in. */ sr_source_add(devc->ufds[0].fd, devc->ufds[0].events, 10, @@ -382,10 +312,11 @@ SR_PRIV struct sr_dev_driver alsa_driver_info = { .scan = hw_scan, .dev_list = hw_dev_list, .dev_clear = clear_instances, + .config_get = config_get, + .config_set = config_set, + .config_list = config_list, .dev_open = hw_dev_open, .dev_close = hw_dev_close, - .info_get = hw_info_get, - .dev_config_set = hw_dev_config_set, .dev_acquisition_start = hw_dev_acquisition_start, .dev_acquisition_stop = hw_dev_acquisition_stop, .priv = NULL,