* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h" /* Must come before sigrok.h */
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <sigrok.h>
#include <alsa/asoundlib.h>
-#include "config.h"
+#include "sigrok.h"
+#include "sigrok-internal.h"
#define NUM_PROBES 2
#define SAMPLE_WIDTH 16
#define AUDIO_DEV "plughw:0,0"
static int capabilities[] = {
- HWCAP_SAMPLERATE,
- HWCAP_LIMIT_SAMPLES,
- HWCAP_CONTINUOUS,
+ SR_HWCAP_SAMPLERATE,
+ SR_HWCAP_LIMIT_SAMPLES,
+ SR_HWCAP_CONTINUOUS,
+};
+
+static const char* probe_names[NUM_PROBES + 1] = {
+ "0",
+ "1",
+ NULL,
};
static GSList *device_instances = NULL;
gpointer session_id;
};
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *deviceinfo)
{
struct sr_device_instance *sdi;
struct alsa *alsa;
/* Avoid compiler warnings. */
deviceinfo = deviceinfo;
- alsa = malloc(sizeof(struct alsa));
- if (!alsa)
+ if (!(alsa = g_try_malloc0(sizeof(struct alsa)))) {
+ sr_err("alsa: %s: alsa malloc failed", __func__);
return 0;
- memset(alsa, 0, sizeof(struct alsa));
+ }
- sdi = sr_device_instance_new(0, ST_ACTIVE, "alsa", NULL, NULL);
+ sdi = sr_device_instance_new(0, SR_ST_ACTIVE, "alsa", NULL, NULL);
if (!sdi)
goto free_alsa;
return 1;
free_alsa:
- free(alsa);
+ g_free(alsa);
return 0;
}
struct alsa *alsa;
int err;
- if (!(sdi = get_sr_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_get_device_instance(device_instances, device_index)))
return SR_ERR;
alsa = sdi->priv;
err = snd_pcm_open(&alsa->capture_handle, AUDIO_DEV,
SND_PCM_STREAM_CAPTURE, 0);
if (err < 0) {
- g_warning("cannot open audio device %s (%s)", AUDIO_DEV,
- snd_strerror(err));
+ sr_warn("cannot open audio device %s (%s)", AUDIO_DEV,
+ snd_strerror(err));
return SR_ERR;
}
err = snd_pcm_hw_params_malloc(&alsa->hw_params);
if (err < 0) {
- g_warning("cannot allocate hardware parameter structure (%s)",
- snd_strerror(err));
+ sr_warn("cannot allocate hardware parameter structure (%s)",
+ snd_strerror(err));
return SR_ERR;
}
err = snd_pcm_hw_params_any(alsa->capture_handle, alsa->hw_params);
if (err < 0) {
- g_warning("cannot initialize hardware parameter structure (%s)",
+ sr_warn("cannot initialize hardware parameter structure (%s)",
snd_strerror(err));
return SR_ERR;
}
return SR_OK;
}
-static void hw_closedev(int device_index)
+static int hw_closedev(int device_index)
{
struct sr_device_instance *sdi;
struct alsa *alsa;
- if (!(sdi = get_sr_device_instance(device_instances, device_index)))
- return;
- alsa = sdi->priv;
- if (!alsa)
- return;
+ if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
+ sr_err("alsa: %s: sdi was NULL", __func__);
+ return SR_ERR; /* TODO: SR_ERR_ARG? */
+ }
+
+ if (!(alsa = sdi->priv)) {
+ sr_err("alsa: %s: sdi->priv was NULL", __func__);
+ return SR_ERR; /* TODO: SR_ERR_ARG? */
+ }
+ // TODO: Return values of snd_*?
if (alsa->hw_params)
snd_pcm_hw_params_free(alsa->hw_params);
if (alsa->capture_handle)
snd_pcm_close(alsa->capture_handle);
+
+ return SR_OK;
}
static void hw_cleanup(void)
{
struct sr_device_instance *sdi;
- if (!(sdi = get_sr_device_instance(device_instances, 0)))
+ if (!(sdi = sr_get_device_instance(device_instances, 0)))
return;
free(sdi->priv);
struct alsa *alsa;
void *info = NULL;
- if (!(sdi = get_sr_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_get_device_instance(device_instances, device_index)))
return NULL;
alsa = sdi->priv;
switch (device_info_id) {
- case DI_INSTANCE:
+ case SR_DI_INSTANCE:
info = sdi;
break;
- case DI_NUM_PROBES:
+ case SR_DI_NUM_PROBES:
info = GINT_TO_POINTER(NUM_PROBES);
break;
- case DI_CUR_SAMPLERATE:
+ case SR_DI_PROBE_NAMES:
+ info = probe_names;
+ break;
+ case SR_DI_CUR_SAMPLERATE:
info = &alsa->cur_rate;
break;
- // case DI_PROBE_TYPE:
- // info = GINT_TO_POINTER(PROBE_TYPE_ANALOG);
+ // case SR_DI_PROBE_TYPE:
+ // info = GINT_TO_POINTER(SR_PROBE_TYPE_ANALOG);
// break;
}
/* Avoid compiler warnings. */
device_index = device_index;
- return ST_ACTIVE;
+ return SR_ST_ACTIVE;
}
static int *hw_get_capabilities(void)
struct sr_device_instance *sdi;
struct alsa *alsa;
- if (!(sdi = get_sr_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_get_device_instance(device_instances, device_index)))
return SR_ERR;
alsa = sdi->priv;
switch (capability) {
- case HWCAP_PROBECONFIG:
+ case SR_HWCAP_PROBECONFIG:
return SR_OK;
- case HWCAP_SAMPLERATE:
+ case SR_HWCAP_SAMPLERATE:
alsa->cur_rate = *(uint64_t *) value;
return SR_OK;
- case HWCAP_LIMIT_SAMPLES:
+ case SR_HWCAP_LIMIT_SAMPLES:
alsa->limit_samples = *(uint64_t *) value;
return SR_OK;
default:
{
struct sr_device_instance *sdi = user_data;
struct alsa *alsa = sdi->priv;
- struct datafeed_packet packet;
- struct analog_sample *sample;
- unsigned int sample_size = sizeof(struct analog_sample) +
- (NUM_PROBES * sizeof(struct analog_probe));
+ struct sr_datafeed_packet packet;
+ struct sr_analog_sample *sample;
+ unsigned int sample_size = sizeof(struct sr_analog_sample) +
+ (NUM_PROBES * sizeof(struct sr_analog_probe));
char *outb;
char inb[4096];
int i, x, count;
count = snd_pcm_readi(alsa->capture_handle, inb,
MIN(4096/4, alsa->limit_samples));
if (count < 1) {
- g_warning("Failed to read samples");
+ sr_warn("Failed to read samples");
return FALSE;
}
- outb = malloc(sample_size * count);
- if (!outb)
+ if (!(outb = g_try_malloc(sample_size * count))) {
+ sr_err("alsa: %s: outb malloc failed", __func__);
return FALSE;
+ }
for (i = 0; i < count; i++) {
- sample = (struct analog_sample *)
+ sample = (struct sr_analog_sample *)
(outb + (i * sample_size));
sample->num_probes = NUM_PROBES;
}
}
- packet.type = DF_ANALOG;
+ packet.type = SR_DF_ANALOG;
packet.length = count * sample_size;
packet.unitsize = sample_size;
packet.payload = outb;
- session_bus(user_data, &packet);
- free(outb);
+ sr_session_bus(user_data, &packet);
+ g_free(outb);
alsa->limit_samples -= count;
} while (alsa->limit_samples > 0);
- packet.type = DF_END;
- session_bus(user_data, &packet);
+ packet.type = SR_DF_END;
+ sr_session_bus(user_data, &packet);
return TRUE;
}
{
struct sr_device_instance *sdi;
struct alsa *alsa;
- struct datafeed_packet packet;
- struct datafeed_header header;
+ struct sr_datafeed_packet packet;
+ struct sr_datafeed_header header;
struct pollfd *ufds;
int count;
int err;
- if (!(sdi = get_sr_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_get_device_instance(device_instances, device_index)))
return SR_ERR;
alsa = sdi->priv;
err = snd_pcm_hw_params_set_access(alsa->capture_handle,
alsa->hw_params, SND_PCM_ACCESS_RW_INTERLEAVED);
if (err < 0) {
- g_warning("cannot set access type (%s)", snd_strerror(err));
+ sr_warn("cannot set access type (%s)", snd_strerror(err));
return SR_ERR;
}
err = snd_pcm_hw_params_set_format(alsa->capture_handle,
alsa->hw_params, SND_PCM_FORMAT_S16_LE);
if (err < 0) {
- g_warning("cannot set sample format (%s)", snd_strerror(err));
+ sr_warn("cannot set sample format (%s)", snd_strerror(err));
return SR_ERR;
}
err = snd_pcm_hw_params_set_rate_near(alsa->capture_handle,
alsa->hw_params, (unsigned int *) &alsa->cur_rate, 0);
if (err < 0) {
- g_warning("cannot set sample rate (%s)", snd_strerror(err));
+ sr_warn("cannot set sample rate (%s)", snd_strerror(err));
return SR_ERR;
}
err = snd_pcm_hw_params_set_channels(alsa->capture_handle,
alsa->hw_params, NUM_PROBES);
if (err < 0) {
- g_warning("cannot set channel count (%s)", snd_strerror(err));
+ sr_warn("cannot set channel count (%s)", snd_strerror(err));
return SR_ERR;
}
err = snd_pcm_hw_params(alsa->capture_handle, alsa->hw_params);
if (err < 0) {
- g_warning("cannot set parameters (%s)", snd_strerror(err));
+ sr_warn("cannot set parameters (%s)", snd_strerror(err));
return SR_ERR;
}
err = snd_pcm_prepare(alsa->capture_handle);
if (err < 0) {
- g_warning("cannot prepare audio interface for use (%s)",
+ sr_warn("cannot prepare audio interface for use (%s)",
snd_strerror(err));
return SR_ERR;
}
count = snd_pcm_poll_descriptors_count(alsa->capture_handle);
if (count < 1) {
- g_warning("Unable to obtain poll descriptors count");
+ sr_warn("Unable to obtain poll descriptors count");
return SR_ERR;
}
- ufds = malloc(count * sizeof(struct pollfd));
- if (!ufds)
+ if (!(ufds = g_try_malloc(count * sizeof(struct pollfd)))) {
+ sr_warn("alsa: %s: ufds malloc failed", __func__);
return SR_ERR_MALLOC;
+ }
err = snd_pcm_poll_descriptors(alsa->capture_handle, ufds, count);
if (err < 0) {
- g_warning("Unable to obtain poll descriptors (%s)",
+ sr_warn("Unable to obtain poll descriptors (%s)",
snd_strerror(err));
- free(ufds);
+ g_free(ufds);
return SR_ERR;
}
alsa->session_id = session_device_id;
- source_add(ufds[0].fd, ufds[0].events, 10, receive_data, sdi);
+ sr_source_add(ufds[0].fd, ufds[0].events, 10, receive_data, sdi);
- packet.type = DF_HEADER;
- packet.length = sizeof(struct datafeed_header);
+ packet.type = SR_DF_HEADER;
+ packet.length = sizeof(struct sr_datafeed_header);
packet.payload = (unsigned char *) &header;
header.feed_version = 1;
gettimeofday(&header.starttime, NULL);
header.samplerate = alsa->cur_rate;
header.num_analog_probes = NUM_PROBES;
header.num_logic_probes = 0;
- header.protocol_id = PROTO_RAW;
- session_bus(session_device_id, &packet);
- free(ufds);
+ header.protocol_id = SR_PROTO_RAW;
+ sr_session_bus(session_device_id, &packet);
+ g_free(ufds);
return SR_OK;
}
session_device_id = session_device_id;
}
-struct device_plugin alsa_plugin_info = {
- "alsa",
- 1,
- hw_init,
- hw_cleanup,
- hw_opendev,
- hw_closedev,
- hw_get_device_info,
- hw_get_status,
- hw_get_capabilities,
- hw_set_configuration,
- hw_start_acquisition,
- hw_stop_acquisition,
+struct sr_device_plugin alsa_plugin_info = {
+ .name = "alsa",
+ .longname = "ALSA driver",
+ .api_version = 1,
+ .init = hw_init,
+ .cleanup = hw_cleanup,
+ .opendev = hw_opendev,
+ .closedev = hw_closedev,
+ .get_device_info = hw_get_device_info,
+ .get_status = hw_get_status,
+ .get_capabilities = hw_get_capabilities,
+ .set_configuration = hw_set_configuration,
+ .start_acquisition = hw_start_acquisition,
+ .stop_acquisition = hw_stop_acquisition,
};
projects / libsigrok.git / blobdiff