X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Falsa%2Falsa.c;h=d61246e4388721bc95b535cef0759752dd90c59d;hb=a0ecd83bc6e07ea412db5cd0108d50d89e36df8f;hp=4ec98a9e5a384b8f630b40f7699a4d151e8fe510;hpb=54ac5277c5e462f1778300b9bc3fdd4709ecb2dc;p=libsigrok.git diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c index 4ec98a9e..d61246e4 100644 --- a/hardware/alsa/alsa.c +++ b/hardware/alsa/alsa.c @@ -18,12 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" /* Must come before sigrok.h */ #include #include #include #include +#include #include -#include "config.h" #define NUM_PROBES 2 #define SAMPLE_WIDTH 16 @@ -53,10 +54,10 @@ static int hw_init(const char *deviceinfo) /* 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, SR_ST_ACTIVE, "alsa", NULL, NULL); if (!sdi) @@ -68,7 +69,7 @@ static int hw_init(const char *deviceinfo) return 1; free_alsa: - free(alsa); + g_free(alsa); return 0; } @@ -85,21 +86,21 @@ static int hw_opendev(int device_index) 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; } @@ -107,21 +108,28 @@ static int hw_opendev(int device_index) 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 = sr_get_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) @@ -219,13 +227,14 @@ static int receive_data(int fd, int revents, void *user_data) 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 sr_analog_sample *) @@ -245,7 +254,7 @@ static int receive_data(int fd, int revents, void *user_data) packet.unitsize = sample_size; packet.payload = outb; sr_session_bus(user_data, &packet); - free(outb); + g_free(outb); alsa->limit_samples -= count; } while (alsa->limit_samples > 0); @@ -273,7 +282,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) 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; } @@ -281,52 +290,53 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) 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; } @@ -343,7 +353,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) header.num_logic_probes = 0; header.protocol_id = SR_PROTO_RAW; sr_session_bus(session_device_id, &packet); - free(ufds); + g_free(ufds); return SR_OK; } @@ -356,17 +366,17 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id) } struct sr_device_plugin alsa_plugin_info = { - "alsa", - "ALSA driver", - 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, + .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, };