X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Falsa%2Fprotocol.c;h=eea2f5bd427159faff0ee160f4474952659037e8;hb=fe9d5abefcebb3a382d990e069d93c28e9541e35;hp=ebc175a5762ad9689771d935dc67bb5ea19dc0c7;hpb=65faa197ae4c607c9c127af99af6c8e5b6acd7b3;p=libsigrok.git diff --git a/hardware/alsa/protocol.c b/hardware/alsa/protocol.c index ebc175a5..eea2f5bd 100644 --- a/hardware/alsa/protocol.c +++ b/hardware/alsa/protocol.c @@ -20,9 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "protocol.h" #include "libsigrok.h" #include "libsigrok-internal.h" +#include "protocol.h" /* * There is no way to get a list of supported samplerates from ALSA. We could @@ -39,8 +39,10 @@ static const unsigned int rates[] = { 5512, 8000, 11025, + 12000, 16000, 22050, + 24000, 32000, 44100, 48000, @@ -49,7 +51,8 @@ static const unsigned int rates[] = { 96000, 176400, 192000, - 384000, /* Yes, there are sound cards that go this high */ + 384000, + 768000, /* Yes, there are sound cards that go this high. */ }; static void alsa_scan_handle_dev(GSList **devices, @@ -67,6 +70,7 @@ static void alsa_scan_handle_dev(GSList **devices, uint64_t *devrates = NULL; snd_pcm_t *temp_handle = NULL; snd_pcm_hw_params_t *hw_params = NULL; + char p_name[32]; drvc = di->priv; @@ -107,8 +111,7 @@ static void alsa_scan_handle_dev(GSList **devices, */ snd_pcm_hw_params_get_rate_min(hw_params, &minrate, 0); snd_pcm_hw_params_get_rate_max(hw_params, &maxrate, 0); - for (i = 0, offset = 0; i < ARRAY_SIZE(rates); i++) - { + for (i = 0, offset = 0; i < ARRAY_SIZE(rates); i++) { rate = rates[i]; if (rate < minrate) continue; @@ -121,18 +124,19 @@ static void alsa_scan_handle_dev(GSList **devices, } hwrates[offset++] = 0; - snd_pcm_close(temp_handle); + if ((ret = snd_pcm_close(temp_handle)) < 0) + sr_err("Failed to close device: %s.", snd_strerror(ret)); temp_handle = NULL; /* * Now we are done querying the hardware parameters. - * If we made it here, we know everything we want to know, and it's time - * to create our sigrok device. + * If we made it here, we know everything we want to know, and it's + * time to create our sigrok device. */ sr_info("Device %s has %d channels.", alsaname, channels); if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "ALSA:", cardname, snd_pcm_info_get_name(pcminfo)))) { - sr_err("Device instance malloc failed."); + sr_err("Failed to create device instance."); goto scan_error_cleanup; } if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { @@ -148,15 +152,14 @@ static void alsa_scan_handle_dev(GSList **devices, devc->num_probes = channels; devc->hw_params = hw_params; memcpy(devrates, hwrates, offset * sizeof(uint64_t)); - devc->supp_rates.list = devrates; + devc->samplerates = devrates; sdi->priv = devc; sdi->driver = di; for (i = 0; i < devc->num_probes; i++) { - char p_name[32]; snprintf(p_name, sizeof(p_name), "Ch_%d", i); - if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, p_name))) + if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE, p_name))) goto scan_error_cleanup; sdi->probes = g_slist_append(sdi->probes, probe); } @@ -168,7 +171,7 @@ static void alsa_scan_handle_dev(GSList **devices, scan_error_cleanup: if (devc) { if (devc->hwdev) - g_free((void*)devc->hwdev); + g_free(devc->hwdev); g_free(devc); } if (devrates) @@ -178,14 +181,17 @@ scan_error_cleanup: if (hw_params) snd_pcm_hw_params_free(hw_params); if (temp_handle) - snd_pcm_close(temp_handle); - return; + if ((ret = snd_pcm_close(temp_handle)) < 0) { + sr_err("Failed to close device: %s.", + snd_strerror(ret)); + } } /** - * \brief Scan all alsa devices, and translate them to sigrok devices + * Scan all alsa devices, and translate them to sigrok devices. + * + * Each alsa device (not alsa card) gets its own sigrok device. * - * Each alsa device (not alsa card) gets its own sigrok device * For example, * hw:1,0 == sigrok device 0 * hw:1,1 == sigrok device 1 @@ -193,9 +199,9 @@ scan_error_cleanup: * hw:2,1 == sigrok device 3 * hw:2,2 == sigrok device 4 * [...] - * \n + * * We don't currently look at alsa subdevices. We only use subdevice 0. - * Every input device will have a its own channels (Left, Right, etc). Each of + * Every input device will have its own channels (left, right, etc). Each of * those channels gets mapped to a different sigrok probe. A device with 4 * channels will have 4 probes from sigrok's perspective. */ @@ -206,36 +212,39 @@ SR_PRIV GSList *alsa_scan(GSList *options, struct sr_dev_driver *di) int card, ret, dev; snd_ctl_card_info_t *info; snd_pcm_info_t *pcminfo; - const char* cardname; + const char *cardname; + char hwcard[32], hwdev[32]; + /* TODO */ (void)options; - if (snd_ctl_card_info_malloc(&info) < 0) { - sr_err("Cannot malloc card info."); + if ((ret = snd_ctl_card_info_malloc(&info)) < 0) { + sr_dbg("Failed to malloc card info: %s.", snd_strerror(ret)); return NULL; } - if (snd_pcm_info_malloc(&pcminfo) < 0) { - sr_err("Cannot malloc pcm info."); + if ((ret = snd_pcm_info_malloc(&pcminfo) < 0)) { + sr_dbg("Cannot malloc pcm info: %s.", snd_strerror(ret)); return NULL; } card = -1; while (snd_card_next(&card) >= 0 && card >= 0) { - char hwcard[32]; snprintf(hwcard, sizeof(hwcard), "hw:%d", card); if ((ret = snd_ctl_open(&handle, hwcard, 0)) < 0) { - sr_err("Cannot open (%i): %s", card, snd_strerror(ret)); + sr_dbg("Cannot open (%d): %s.", card, snd_strerror(ret)); continue; } if ((ret = snd_ctl_card_info(handle, info)) < 0) { - sr_err("Cannot get hardware info (%i): %s", + sr_dbg("Cannot get hardware info (%d): %s.", card, snd_strerror(ret)); - snd_ctl_close(handle); + if ((ret = snd_ctl_close(handle)) < 0) { + sr_dbg("Cannot close device (%d): %s.", + card, snd_strerror(ret)); + } continue; } dev = -1; while (snd_ctl_pcm_next_device(handle, &dev) >= 0 && dev >= 0) { - char hwdev[32]; snprintf(hwdev, sizeof(hwdev), "%s,%d", hwcard, dev); /* * TODO: We always use subdevice 0, but we have yet to @@ -247,13 +256,13 @@ SR_PRIV GSList *alsa_scan(GSList *options, struct sr_dev_driver *di) snd_pcm_info_set_stream(pcminfo, SND_PCM_STREAM_CAPTURE); if ((ret = snd_ctl_pcm_info(handle, pcminfo)) < 0) { - sr_err("Cannot get device info: %s", - snd_strerror(ret)); + sr_dbg("Cannot get device info (%s): %s.", + hwdev, snd_strerror(ret)); continue; } cardname = snd_ctl_card_info_get_name(info); - sr_info("card %i: %s [%s], device %i: %s [%s]", + sr_info("card %d: %s [%s], device %d: %s [%s]", card, snd_ctl_card_info_get_id(info), cardname, dev, snd_pcm_info_get_id(pcminfo), snd_pcm_info_get_name(pcminfo)); @@ -261,7 +270,10 @@ SR_PRIV GSList *alsa_scan(GSList *options, struct sr_dev_driver *di) alsa_scan_handle_dev(&devices, cardname, hwdev, di, pcminfo); } - snd_ctl_close(handle); + if ((ret = snd_ctl_close(handle)) < 0) { + sr_dbg("Cannot close device (%d): %s.", + card, snd_strerror(ret)); + } } snd_pcm_info_free(pcminfo); @@ -270,37 +282,24 @@ SR_PRIV GSList *alsa_scan(GSList *options, struct sr_dev_driver *di) return devices; } -/* - * Helper to be used with g_slist_free_full(); for properly freeing an alsa - * dev instance. - */ -SR_PRIV void alsa_dev_inst_clear(struct sr_dev_inst *sdi) -{ - struct dev_context *devc; - - if (!(devc = sdi->priv)) - return; - - snd_pcm_hw_params_free(devc->hw_params); - g_free((void*)devc->supp_rates.list); - sr_dev_inst_free(sdi); -} - -/* - * Sets the samplerate of the ALSA device +/** + * Set the samplerate of the ALSA device. * * Changes the samplerate of the given ALSA device if the specified samplerate * is supported by the hardware. + * * The new samplerate is recorded, but it is not applied to the hardware. The * samplerate is applied to the hardware only when acquisition is started via * dev_acquisition_start(), and cannot be changed during acquisition. To change * the samplerate, several steps are needed: + * * 1) If acquisition is running, it must first be stopped. * 2) dev_config_set() must be called with the new samplerate. * 3) When starting a new acquisition, the new samplerate is applied. + * */ SR_PRIV int alsa_set_samplerate(const struct sr_dev_inst *sdi, - const uint64_t newrate) + uint64_t newrate) { struct dev_context *devc; size_t i; @@ -311,14 +310,14 @@ SR_PRIV int alsa_set_samplerate(const struct sr_dev_inst *sdi, i = 0; do { - if (newrate == devc->supp_rates.list[i]) { + if (newrate == devc->samplerates[i]) { rate = newrate; break; } - } while (devc->supp_rates.list[i++] != 0); + } while (devc->samplerates[i++] != 0); if (!rate) { - sr_err("Sample rate " PRIu64 " not supported.", newrate); + sr_err("Sample rate %" PRIu64 " not supported.", newrate); return SR_ERR_ARG; } @@ -335,7 +334,7 @@ SR_PRIV int alsa_receive_data(int fd, int revents, void *cb_data) int16_t inbuf[4096]; int i, x, count, offset, samples_to_get; int16_t tmp16; - const float s16norm = 1 / (float)(1<<15); + const float s16norm = 1 / (float)(1 << 15); (void)fd; (void)revents; @@ -375,12 +374,13 @@ SR_PRIV int alsa_receive_data(int fd, int revents, void *cb_data) */ for (i = 0; i < count; i += devc->num_probes) { for (x = 0; x < devc->num_probes; x++) { - tmp16 = inbuf[i+x]; + tmp16 = inbuf[i + x]; analog.data[offset++] = tmp16 * s16norm; } } /* Send a sample packet with the analog values. */ + analog.probes = sdi->probes; analog.num_samples = count; analog.mq = SR_MQ_VOLTAGE; /* FIXME */ analog.unit = SR_UNIT_VOLT; /* FIXME */ @@ -400,4 +400,3 @@ SR_PRIV int alsa_receive_data(int fd, int revents, void *cb_data) return TRUE; } -