From: Alexandru Gagniuc Date: Thu, 20 Dec 2012 17:33:49 +0000 (-0600) Subject: alsa: Split into api.c and protocol.c X-Git-Tag: dsupstream~426 X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=9cd9f6b71c35c0203b7e8997ce9425d0dc6e0f4d alsa: Split into api.c and protocol.c This is the driver model agreed upon for all drivers. As a result of the split, a devc->num_probes field had to be added in order to reduce the interdependence between api.c and protocol.c . Signed-off-by: Alexandru Gagniuc --- diff --git a/hardware/alsa/Makefile.am b/hardware/alsa/Makefile.am index f5f2a453..87c6b50b 100644 --- a/hardware/alsa/Makefile.am +++ b/hardware/alsa/Makefile.am @@ -23,7 +23,9 @@ if HW_ALSA noinst_LTLIBRARIES = libsigrokhwalsa.la libsigrokhwalsa_la_SOURCES = \ - alsa.c + protocol.h \ + protocol.c \ + api.c libsigrokhwalsa_la_CFLAGS = \ -I$(top_srcdir) diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c deleted file mode 100644 index 9dad6281..00000000 --- a/hardware/alsa/alsa.c +++ /dev/null @@ -1,479 +0,0 @@ -/* - * This file is part of the sigrok project. - * - * Copyright (C) 2011 Daniel Ribeiro - * Copyright (C) 2012 Uwe Hermann - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include -#include -#include -#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 NUM_PROBES 2 -#define SAMPLE_WIDTH 16 -#define DEFAULT_SAMPLERATE 44100 -// #define AUDIO_DEV "plughw:0,0" -#define AUDIO_DEV "default" - -static const int hwcaps[] = { - SR_HWCAP_SAMPLERATE, - SR_HWCAP_LIMIT_SAMPLES, - SR_HWCAP_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; - -/** Private, per-device-instance driver context. */ -struct dev_context { - uint64_t cur_samplerate; - uint64_t limit_samples; - uint64_t num_samples; - snd_pcm_t *capture_handle; - snd_pcm_hw_params_t *hw_params; - struct pollfd *ufds; - void *cb_data; -}; - -static int clear_instances(void) -{ - /* TODO */ - - 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; -} - -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; - - 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; -} - -static GSList *hw_dev_list(void) -{ - struct drv_context *drvc; - - drvc = di->priv; - - return drvc->instances; -} - -static int hw_dev_open(struct sr_dev_inst *sdi) -{ - struct dev_context *devc; - int ret; - - devc = sdi->priv; - - sr_dbg("Opening audio device '%s' for stream capture.", AUDIO_DEV); - ret = snd_pcm_open(&devc->capture_handle, AUDIO_DEV, - 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) { - sr_err("Can't initialize hardware parameter structure: %s.", - snd_strerror(ret)); - return SR_ERR; - } - - return SR_OK; -} - -static int hw_dev_close(struct sr_dev_inst *sdi) -{ - int ret; - struct dev_context *devc; - - 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)); - } - } else { - sr_dbg("No capture handle, no need to close audio device."); - } - - return SR_OK; -} - -static int hw_cleanup(void) -{ - clear_instances(); - - return SR_OK; -} - -static int hw_info_get(int info_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. */ - devc = sdi->priv; - - switch (info_id) { - case SR_DI_HWCAPS: - *data = hwcaps; - break; - case SR_DI_NUM_PROBES: - *data = GINT_TO_POINTER(NUM_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) -{ - struct dev_context *devc; - - devc = sdi->priv; - - switch (hwcap) { - case SR_HWCAP_SAMPLERATE: - devc->cur_samplerate = *(const uint64_t *)value; - break; - case SR_HWCAP_LIMIT_SAMPLES: - devc->limit_samples = *(const uint64_t *)value; - break; - default: - sr_err("Unknown capability: %d.", hwcap); - return SR_ERR; - } - - return SR_OK; -} - -static int receive_data(int fd, int revents, void *cb_data) -{ - struct sr_dev_inst *sdi; - struct dev_context *devc; - struct sr_datafeed_packet packet; - struct sr_datafeed_analog analog; - char inbuf[4096]; - int i, x, count, offset, samples_to_get; - uint16_t tmp16; - - (void)fd; - (void)revents; - - sdi = cb_data; - devc = sdi->priv; - - memset(&analog, 0, sizeof(struct sr_datafeed_analog)); - memset(inbuf, 0, sizeof(inbuf)); - - samples_to_get = MIN(4096 / 4, devc->limit_samples); - - sr_spew("Getting %d samples from audio device.", samples_to_get); - count = snd_pcm_readi(devc->capture_handle, inbuf, samples_to_get); - - if (count < 0) { - sr_err("Failed to read samples: %s.", snd_strerror(count)); - return FALSE; - } else if (count != samples_to_get) { - sr_spew("Only got %d/%d samples.", count, samples_to_get); - } - - analog.data = g_try_malloc0(count * sizeof(float) * NUM_PROBES); - if (!analog.data) { - sr_err("Failed to malloc sample buffer."); - return FALSE; - } - - offset = 0; - - for (i = 0; i < count; i++) { - for (x = 0; x < NUM_PROBES; x++) { - tmp16 = *(uint16_t *)(inbuf + (i * 4) + (x * 2)); - analog.data[offset++] = (float)tmp16; - } - } - - /* Send a sample packet with the analog values. */ - analog.num_samples = count; - analog.mq = SR_MQ_VOLTAGE; /* FIXME */ - analog.unit = SR_UNIT_VOLT; /* FIXME */ - packet.type = SR_DF_ANALOG; - packet.payload = &analog; - sr_session_send(devc->cb_data, &packet); - - g_free(analog.data); - - devc->num_samples += count; - - /* Stop acquisition if we acquired enough samples. */ - if (devc->limit_samples > 0) { - if (devc->num_samples >= devc->limit_samples) { - sr_info("Requested number of samples reached."); - sdi->driver->dev_acquisition_stop(sdi, cb_data); - } - } - - return TRUE; -} - -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; - - devc = sdi->priv; - devc->cb_data = cb_data; - - sr_dbg("Setting audio access type to RW/interleaved."); - ret = snd_pcm_hw_params_set_access(devc->capture_handle, - devc->hw_params, SND_PCM_ACCESS_RW_INTERLEAVED); - if (ret < 0) { - sr_err("Can't set audio access type: %s.", snd_strerror(ret)); - return SR_ERR; - } - - /* FIXME: Hardcoded for 16bits. */ - sr_dbg("Setting audio sample format to signed 16bit (little endian)."); - ret = snd_pcm_hw_params_set_format(devc->capture_handle, - devc->hw_params, SND_PCM_FORMAT_S16_LE); - if (ret < 0) { - sr_err("Can't set audio sample format: %s.", snd_strerror(ret)); - return SR_ERR; - } - - 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); - if (ret < 0) { - sr_err("Can't set audio sample rate: %s.", snd_strerror(ret)); - return SR_ERR; - } - - sr_dbg("Setting audio channel count to %d.", NUM_PROBES); - ret = snd_pcm_hw_params_set_channels(devc->capture_handle, - devc->hw_params, NUM_PROBES); - if (ret < 0) { - sr_err("Can't set channel count: %s.", snd_strerror(ret)); - return SR_ERR; - } - - sr_dbg("Setting audio parameters."); - ret = snd_pcm_hw_params(devc->capture_handle, devc->hw_params); - if (ret < 0) { - sr_err("Can't set parameters: %s.", snd_strerror(ret)); - return SR_ERR; - } - - sr_dbg("Preparing audio interface for use."); - ret = snd_pcm_prepare(devc->capture_handle); - if (ret < 0) { - sr_err("Can't prepare audio interface for use: %s.", - snd_strerror(ret)); - return SR_ERR; - } - - count = snd_pcm_poll_descriptors_count(devc->capture_handle); - if (count < 1) { - 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); - ret = snd_pcm_poll_descriptors(devc->capture_handle, devc->ufds, count); - if (ret < 0) { - sr_err("Unable to obtain poll descriptors: %s.", - snd_strerror(ret)); - g_free(devc->ufds); - return SR_ERR; - } - - /* 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 = NUM_PROBES; - sr_session_send(devc->cb_data, &packet); - - /* Poll every 10ms, or whenever some data comes in. */ - sr_source_add(devc->ufds[0].fd, devc->ufds[0].events, 10, - receive_data, (void *)sdi); - - // g_free(devc->ufds); /* FIXME */ - - return SR_OK; -} - -static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) -{ - struct sr_datafeed_packet packet; - struct dev_context *devc; - - devc = sdi->priv; - devc->cb_data = cb_data; - - sr_source_remove(devc->ufds[0].fd); - - /* Send end packet to the session bus. */ - sr_dbg("Sending SR_DF_END packet."); - packet.type = SR_DF_END; - sr_session_send(cb_data, &packet); - - return SR_OK; -} - -SR_PRIV struct sr_dev_driver alsa_driver_info = { - .name = "alsa", - .longname = "ALSA driver", - .api_version = 1, - .init = hw_init, - .cleanup = hw_cleanup, - .scan = hw_scan, - .dev_list = hw_dev_list, - .dev_clear = clear_instances, - .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, -}; diff --git a/hardware/alsa/api.c b/hardware/alsa/api.c new file mode 100644 index 00000000..77025c13 --- /dev/null +++ b/hardware/alsa/api.c @@ -0,0 +1,392 @@ +/* + * This file is part of the sigrok project. + * + * Copyright (C) 2011 Daniel Ribeiro + * Copyright (C) 2012 Uwe Hermann + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * 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" + +static const int hwcaps[] = { + SR_HWCAP_SAMPLERATE, + SR_HWCAP_LIMIT_SAMPLES, + SR_HWCAP_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 */ + + 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; +} + +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; +} + +static GSList *hw_dev_list(void) +{ + struct drv_context *drvc; + + drvc = di->priv; + + return drvc->instances; +} + +static int hw_dev_open(struct sr_dev_inst *sdi) +{ + struct dev_context *devc; + int ret; + + devc = sdi->priv; + + sr_dbg("Opening audio device '%s' for stream capture.", AUDIO_DEV); + ret = snd_pcm_open(&devc->capture_handle, AUDIO_DEV, + 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) { + sr_err("Can't initialize hardware parameter structure: %s.", + snd_strerror(ret)); + return SR_ERR; + } + + return SR_OK; +} + +static int hw_dev_close(struct sr_dev_inst *sdi) +{ + int ret; + struct dev_context *devc; + + 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)); + } + } else { + sr_dbg("No capture handle, no need to close audio device."); + } + + return SR_OK; +} + +static int hw_cleanup(void) +{ + clear_instances(); + + return SR_OK; +} + +static int hw_info_get(int info_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. */ + 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) +{ + struct dev_context *devc; + + devc = sdi->priv; + + switch (hwcap) { + case SR_HWCAP_SAMPLERATE: + devc->cur_samplerate = *(const uint64_t *)value; + break; + case SR_HWCAP_LIMIT_SAMPLES: + devc->limit_samples = *(const uint64_t *)value; + break; + default: + sr_err("Unknown capability: %d.", hwcap); + return SR_ERR; + } + + 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; + + devc = sdi->priv; + devc->cb_data = cb_data; + + sr_dbg("Setting audio access type to RW/interleaved."); + ret = snd_pcm_hw_params_set_access(devc->capture_handle, + devc->hw_params, SND_PCM_ACCESS_RW_INTERLEAVED); + if (ret < 0) { + sr_err("Can't set audio access type: %s.", snd_strerror(ret)); + return SR_ERR; + } + + /* FIXME: Hardcoded for 16bits. */ + sr_dbg("Setting audio sample format to signed 16bit (little endian)."); + ret = snd_pcm_hw_params_set_format(devc->capture_handle, + devc->hw_params, SND_PCM_FORMAT_S16_LE); + if (ret < 0) { + sr_err("Can't set audio sample format: %s.", snd_strerror(ret)); + return SR_ERR; + } + + 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); + if (ret < 0) { + sr_err("Can't set audio sample rate: %s.", snd_strerror(ret)); + return SR_ERR; + } + + sr_dbg("Setting audio channel count to %d.", devc->num_probes); + ret = snd_pcm_hw_params_set_channels(devc->capture_handle, + devc->hw_params, devc->num_probes); + if (ret < 0) { + sr_err("Can't set channel count: %s.", snd_strerror(ret)); + return SR_ERR; + } + + sr_dbg("Setting audio parameters."); + ret = snd_pcm_hw_params(devc->capture_handle, devc->hw_params); + if (ret < 0) { + sr_err("Can't set parameters: %s.", snd_strerror(ret)); + return SR_ERR; + } + + sr_dbg("Preparing audio interface for use."); + ret = snd_pcm_prepare(devc->capture_handle); + if (ret < 0) { + sr_err("Can't prepare audio interface for use: %s.", + snd_strerror(ret)); + return SR_ERR; + } + + count = snd_pcm_poll_descriptors_count(devc->capture_handle); + if (count < 1) { + 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); + ret = snd_pcm_poll_descriptors(devc->capture_handle, devc->ufds, count); + if (ret < 0) { + sr_err("Unable to obtain poll descriptors: %s.", + snd_strerror(ret)); + g_free(devc->ufds); + return SR_ERR; + } + + /* 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); + + /* Poll every 10ms, or whenever some data comes in. */ + sr_source_add(devc->ufds[0].fd, devc->ufds[0].events, 10, + alsa_receive_data, (void *)sdi); + + // g_free(devc->ufds); /* FIXME */ + + return SR_OK; +} + +static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) +{ + struct sr_datafeed_packet packet; + struct dev_context *devc; + + devc = sdi->priv; + devc->cb_data = cb_data; + + sr_source_remove(devc->ufds[0].fd); + + /* Send end packet to the session bus. */ + sr_dbg("Sending SR_DF_END packet."); + packet.type = SR_DF_END; + sr_session_send(cb_data, &packet); + + return SR_OK; +} + +SR_PRIV struct sr_dev_driver alsa_driver_info = { + .name = "alsa", + .longname = "ALSA driver", + .api_version = 1, + .init = hw_init, + .cleanup = hw_cleanup, + .scan = hw_scan, + .dev_list = hw_dev_list, + .dev_clear = clear_instances, + .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, +}; diff --git a/hardware/alsa/protocol.c b/hardware/alsa/protocol.c new file mode 100644 index 00000000..ff6a3f85 --- /dev/null +++ b/hardware/alsa/protocol.c @@ -0,0 +1,94 @@ +/* + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "protocol.h" +#include "libsigrok.h" +#include "libsigrok-internal.h" + +SR_PRIV int alsa_receive_data(int fd, int revents, void *cb_data) +{ + struct sr_dev_inst *sdi; + struct dev_context *devc; + struct sr_datafeed_packet packet; + struct sr_datafeed_analog analog; + char inbuf[4096]; + int i, x, count, offset, samples_to_get; + uint16_t tmp16; + + (void)fd; + (void)revents; + + sdi = cb_data; + devc = sdi->priv; + + memset(&analog, 0, sizeof(struct sr_datafeed_analog)); + memset(inbuf, 0, sizeof(inbuf)); + + samples_to_get = MIN(4096 / 4, devc->limit_samples); + + sr_spew("Getting %d samples from audio device.", samples_to_get); + count = snd_pcm_readi(devc->capture_handle, inbuf, samples_to_get); + + if (count < 0) { + sr_err("Failed to read samples: %s.", snd_strerror(count)); + return FALSE; + } else if (count != samples_to_get) { + sr_spew("Only got %d/%d samples.", count, samples_to_get); + } + + analog.data = g_try_malloc0(count * sizeof(float) * devc->num_probes); + if (!analog.data) { + sr_err("Failed to malloc sample buffer."); + return FALSE; + } + + offset = 0; + + for (i = 0; i < count; i++) { + for (x = 0; x < devc->num_probes; x++) { + tmp16 = *(uint16_t *)(inbuf + (i * 4) + (x * 2)); + analog.data[offset++] = (float)tmp16; + } + } + + /* Send a sample packet with the analog values. */ + analog.num_samples = count; + analog.mq = SR_MQ_VOLTAGE; /* FIXME */ + analog.unit = SR_UNIT_VOLT; /* FIXME */ + packet.type = SR_DF_ANALOG; + packet.payload = &analog; + sr_session_send(devc->cb_data, &packet); + + g_free(analog.data); + + devc->num_samples += count; + + /* Stop acquisition if we acquired enough samples. */ + if (devc->limit_samples > 0) { + if (devc->num_samples >= devc->limit_samples) { + sr_info("Requested number of samples reached."); + sdi->driver->dev_acquisition_stop(sdi, cb_data); + } + } + + return TRUE; +} diff --git a/hardware/alsa/protocol.h b/hardware/alsa/protocol.h new file mode 100644 index 00000000..c66fc1ec --- /dev/null +++ b/hardware/alsa/protocol.h @@ -0,0 +1,55 @@ +/* + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef LIBSIGROK_HARDWARE_ALSA_PROTOCOL_H +#define LIBSIGROK_HARDWARE_ALSA_PROTOCOL_H + +#include "libsigrok.h" +#include "libsigrok-internal.h" + +#include +#include + +/* 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) + +/** 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; + snd_pcm_t *capture_handle; + snd_pcm_hw_params_t *hw_params; + struct pollfd *ufds; + void *cb_data; +}; + +SR_PRIV int alsa_receive_data(int fd, int revents, void *cb_data); + +#endif /* LIBSIGROK_HARDWARE_ALSA_PROTOCOL_H */