sr: Some more s/device_instance/dev_inst/.

[libsigrok.git] / hardware / alsa / alsa.c

diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c
index b04b2216fbba23d4bbcf8db7362fc96154fbe7de..5842fdb874b7a7fa4937eec1036e861a44ff280f 100644 (file)
--- a/hardware/alsa/alsa.c
+++ b/hardware/alsa/alsa.c
@@ -54,7 +54,7 @@ static const char *probe_names[NUM_PROBES + 1] = {
        NULL,
 };
 
-static GSList *device_instances = NULL;
+static GSList *dev_insts = NULL;
 
 struct alsa {
        uint64_t cur_rate;
@@ -66,7 +66,7 @@ struct alsa {
 
 static int hw_init(const char *deviceinfo)
 {
-       struct sr_device_instance *sdi;
+       struct sr_dev_inst *sdi;
        struct alsa *alsa;
 
        /* Avoid compiler warnings. */
@@ -83,7 +83,7 @@ static int hw_init(const char *deviceinfo)
 
        sdi->priv = alsa;
 
-       device_instances = g_slist_append(device_instances, sdi);
+       dev_insts = g_slist_append(dev_insts, sdi);
 
        return 1;
 free_alsa:
@@ -93,33 +93,33 @@ free_alsa:
 
 static int hw_opendev(int device_index)
 {
-       struct sr_device_instance *sdi;
+       struct sr_dev_inst *sdi;
        struct alsa *alsa;
        int err;
 
-       if (!(sdi = sr_dev_inst_get(device_instances, device_index)))
+       if (!(sdi = sr_dev_inst_get(dev_insts, 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) {
-               sr_err("cannot open audio device %s (%s)", AUDIO_DEV,
+               sr_err("alsa: can't 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) {
-               sr_err("cannot allocate hardware parameter structure (%s)",
+               sr_err("alsa: can't 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) {
-               sr_err("cannot initialize hardware parameter structure (%s)",
-                      snd_strerror(err));
+               sr_err("alsa: can't initialize hardware parameter structure "
+                      "(%s)", snd_strerror(err));
                return SR_ERR;
        }
 
@@ -128,10 +128,10 @@ static int hw_opendev(int device_index)
 
 static int hw_closedev(int device_index)
 {
-       struct sr_device_instance *sdi;
+       struct sr_dev_inst *sdi;
        struct alsa *alsa;
 
-       if (!(sdi = sr_dev_inst_get(device_instances, device_index))) {
+       if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) {
                sr_err("alsa: %s: sdi was NULL", __func__);
                return SR_ERR; /* TODO: SR_ERR_ARG? */
        }
@@ -152,14 +152,13 @@ static int hw_closedev(int device_index)
 
 static int hw_cleanup(void)
 {
-       struct sr_device_instance *sdi;
+       struct sr_dev_inst *sdi;
 
-       if (!(sdi = sr_dev_inst_get(device_instances, 0))) {
+       if (!(sdi = sr_dev_inst_get(dev_insts, 0))) {
                sr_err("alsa: %s: sdi was NULL", __func__);
                return SR_ERR_BUG;
        }
 
-       g_free(sdi->priv);
        sr_dev_inst_free(sdi);
 
        return SR_OK;
@@ -167,11 +166,11 @@ static int hw_cleanup(void)
 
 static void *hw_get_device_info(int device_index, int device_info_id)
 {
-       struct sr_device_instance *sdi;
+       struct sr_dev_inst *sdi;
        struct alsa *alsa;
        void *info = NULL;
 
-       if (!(sdi = sr_dev_inst_get(device_instances, device_index)))
+       if (!(sdi = sr_dev_inst_get(dev_insts, device_index)))
                return NULL;
        alsa = sdi->priv;
 
@@ -211,10 +210,10 @@ static int *hw_get_capabilities(void)
 
 static int hw_set_configuration(int device_index, int capability, void *value)
 {
-       struct sr_device_instance *sdi;
+       struct sr_dev_inst *sdi;
        struct alsa *alsa;
 
-       if (!(sdi = sr_dev_inst_get(device_instances, device_index)))
+       if (!(sdi = sr_dev_inst_get(dev_insts, device_index)))
                return SR_ERR;
        alsa = sdi->priv;
 
@@ -234,7 +233,7 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 
 static int receive_data(int fd, int revents, void *user_data)
 {
-       struct sr_device_instance *sdi = user_data;
+       struct sr_dev_inst *sdi = user_data;
        struct alsa *alsa = sdi->priv;
        struct sr_datafeed_packet packet;
        struct sr_analog_sample *sample;
@@ -252,7 +251,7 @@ 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) {
-                       sr_err("Failed to read samples");
+                       sr_err("alsa: Failed to read samples");
                        return FALSE;
                }
 
@@ -292,7 +291,7 @@ static int receive_data(int fd, int revents, void *user_data)
 
 static int hw_start_acquisition(int device_index, gpointer session_device_id)
 {
-       struct sr_device_instance *sdi;
+       struct sr_dev_inst *sdi;
        struct alsa *alsa;
        struct sr_datafeed_packet packet;
        struct sr_datafeed_header header;
@@ -300,14 +299,14 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        int count;
        int err;
 
-       if (!(sdi = sr_dev_inst_get(device_instances, device_index)))
+       if (!(sdi = sr_dev_inst_get(dev_insts, 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) {
-               sr_err("cannot set access type (%s)", snd_strerror(err));
+               sr_err("alsa: can't set access type (%s)", snd_strerror(err));
                return SR_ERR;
        }
 
@@ -315,40 +314,40 @@ 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) {
-               sr_err("cannot set sample format (%s)", snd_strerror(err));
+               sr_err("alsa: can't 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) {
-               sr_err("cannot set sample rate (%s)", snd_strerror(err));
+               sr_err("alsa: can't 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) {
-               sr_err("cannot set channel count (%s)", snd_strerror(err));
+               sr_err("alsa: can't set channel count (%s)", snd_strerror(err));
                return SR_ERR;
        }
 
        err = snd_pcm_hw_params(alsa->capture_handle, alsa->hw_params);
        if (err < 0) {
-               sr_err("cannot set parameters (%s)", snd_strerror(err));
+               sr_err("alsa: can't set parameters (%s)", snd_strerror(err));
                return SR_ERR;
        }
 
        err = snd_pcm_prepare(alsa->capture_handle);
        if (err < 0) {
-               sr_err("cannot prepare audio interface for use (%s)",
+               sr_err("alsa: can't prepare audio interface for use (%s)",
                       snd_strerror(err));
                return SR_ERR;
        }
 
        count = snd_pcm_poll_descriptors_count(alsa->capture_handle);
        if (count < 1) {
-               sr_err("Unable to obtain poll descriptors count");
+               sr_err("alsa: Unable to obtain poll descriptors count");
                return SR_ERR;
        }
 
@@ -359,7 +358,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 
        err = snd_pcm_poll_descriptors(alsa->capture_handle, ufds, count);
        if (err < 0) {
-               sr_err("Unable to obtain poll descriptors (%s)",
+               sr_err("alsa: Unable to obtain poll descriptors (%s)",
                       snd_strerror(err));
                g_free(ufds);
                return SR_ERR;