BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

alsa: Always use glib's memory allocation functions.

This commit is contained in:
Uwe Hermann 2011-04-16 15:58:26 +02:00
parent 2e82a17b5a
commit 92b3101cfc
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hardware/alsa/alsa.c
View File

@ -18,12 +18,13 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "config.h" /* Must come before sigrok.h */
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include <sigrok.h> #include <sigrok.h>
#include <sigrok-internal.h>
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include "config.h"
#define NUM_PROBES 2 #define NUM_PROBES 2
#define SAMPLE_WIDTH 16 #define SAMPLE_WIDTH 16
@ -53,10 +54,10 @@ static int hw_init(const char *deviceinfo)
/* Avoid compiler warnings. */ /* Avoid compiler warnings. */
deviceinfo = deviceinfo; deviceinfo = deviceinfo;
alsa = malloc(sizeof(struct alsa)); if (!(alsa = g_try_malloc0(sizeof(struct alsa)))) {
if (!alsa) sr_err("alsa: %s: alsa malloc failed", __func__);
return 0; return 0;
memset(alsa, 0, sizeof(struct alsa)); }
sdi = sr_device_instance_new(0, SR_ST_ACTIVE, "alsa", NULL, NULL); sdi = sr_device_instance_new(0, SR_ST_ACTIVE, "alsa", NULL, NULL);
if (!sdi) if (!sdi)
@ -68,7 +69,7 @@ static int hw_init(const char *deviceinfo)
return 1; return 1;
free_alsa: free_alsa:
free(alsa); g_free(alsa);
return 0; return 0;
} }
@ -86,14 +87,14 @@ static int hw_opendev(int device_index)
SND_PCM_STREAM_CAPTURE, 0); SND_PCM_STREAM_CAPTURE, 0);
if (err < 0) { if (err < 0) {
sr_warn("cannot open audio device %s (%s)", AUDIO_DEV, sr_warn("cannot open audio device %s (%s)", AUDIO_DEV,
snd_strerror(err)); snd_strerror(err));
return SR_ERR; return SR_ERR;
} }
err = snd_pcm_hw_params_malloc(&alsa->hw_params); err = snd_pcm_hw_params_malloc(&alsa->hw_params);
if (err < 0) { if (err < 0) {
sr_warn("cannot allocate hardware parameter structure (%s)", sr_warn("cannot allocate hardware parameter structure (%s)",
snd_strerror(err)); snd_strerror(err));
return SR_ERR; return SR_ERR;
} }
@ -223,9 +224,10 @@ static int receive_data(int fd, int revents, void *user_data)
return FALSE; return FALSE;
} }
outb = malloc(sample_size * count); if (!(outb = g_try_malloc(sample_size * count))) {
if (!outb) sr_err("alsa: %s: outb malloc failed", __func__);
return FALSE; return FALSE;
}
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
sample = (struct sr_analog_sample *) sample = (struct sr_analog_sample *)
@ -245,7 +247,7 @@ static int receive_data(int fd, int revents, void *user_data)
packet.unitsize = sample_size; packet.unitsize = sample_size;
packet.payload = outb; packet.payload = outb;
sr_session_bus(user_data, &packet); sr_session_bus(user_data, &packet);
free(outb); g_free(outb);
alsa->limit_samples -= count; alsa->limit_samples -= count;
} while (alsa->limit_samples > 0); } while (alsa->limit_samples > 0);
@ -318,15 +320,16 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
return SR_ERR; return SR_ERR;
} }
ufds = malloc(count * sizeof(struct pollfd)); if (!(ufds = g_try_malloc(count * sizeof(struct pollfd)))) {
if (!ufds) sr_warn("alsa: %s: ufds malloc failed", __func__);
return SR_ERR_MALLOC; return SR_ERR_MALLOC;
}
err = snd_pcm_poll_descriptors(alsa->capture_handle, ufds, count); err = snd_pcm_poll_descriptors(alsa->capture_handle, ufds, count);
if (err < 0) { if (err < 0) {
sr_warn("Unable to obtain poll descriptors (%s)", sr_warn("Unable to obtain poll descriptors (%s)",
snd_strerror(err)); snd_strerror(err));
free(ufds); g_free(ufds);
return SR_ERR; return SR_ERR;
} }
@ -343,7 +346,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
header.num_logic_probes = 0; header.num_logic_probes = 0;
header.protocol_id = SR_PROTO_RAW; header.protocol_id = SR_PROTO_RAW;
sr_session_bus(session_device_id, &packet); sr_session_bus(session_device_id, &packet);
free(ufds); g_free(ufds);
return SR_OK; return SR_OK;
} }

2
sigrok.h
View File

@ -115,7 +115,7 @@ struct sr_datafeed_header {
int num_logic_probes; int num_logic_probes;
}; };
#if 0 #if defined(HAVE_LA_ALSA)
struct sr_analog_probe { struct sr_analog_probe {
uint8_t att; uint8_t att;
uint8_t res; /* Needs to be a power of 2, FIXME */ uint8_t res; /* Needs to be a power of 2, FIXME */