X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Falsa%2Fprotocol.c;h=eea2f5bd427159faff0ee160f4474952659037e8;hb=0ab702601d6b855f162340da9a19b1885ee16253;hp=7799d5bef267725c9bfdc9830b52c805f836b4ea;hpb=721ecf3d97aa6e84e6d61b3c25023e9177895025;p=libsigrok.git

diff --git a/hardware/alsa/protocol.c b/hardware/alsa/protocol.c
index 7799d5be..eea2f5bd 100644
--- a/hardware/alsa/protocol.c
+++ b/hardware/alsa/protocol.c
@@ -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,
@@ -121,7 +124,8 @@ 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;
 
 	/*
@@ -148,14 +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++) {
 		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);
 	}
@@ -177,7 +181,10 @@ scan_error_cleanup:
 	if (hw_params)
 		snd_pcm_hw_params_free(hw_params);
 	if (temp_handle)
-		snd_pcm_close(temp_handle);
+		if ((ret = snd_pcm_close(temp_handle)) < 0) {
+			sr_err("Failed to close device: %s.",
+			       snd_strerror(ret));
+		}
 }
 
 /**
@@ -211,12 +218,12 @@ SR_PRIV GSList *alsa_scan(GSList *options, struct sr_dev_driver *di)
 	/* 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;
 	}
 
@@ -224,13 +231,16 @@ SR_PRIV GSList *alsa_scan(GSList *options, struct sr_dev_driver *di)
 	while (snd_card_next(&card) >= 0 && card >= 0) {
 		snprintf(hwcard, sizeof(hwcard), "hw:%d", card);
 		if ((ret = snd_ctl_open(&handle, hwcard, 0)) < 0) {
-			sr_err("Cannot open (%d): %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 (%d): %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;
@@ -246,8 +256,8 @@ 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;
 			}
 
@@ -260,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);
@@ -269,22 +282,6 @@ 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);
-}
-
 /**
  * Set the samplerate of the ALSA device.
  *
@@ -313,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;
 	}
 
@@ -383,6 +380,7 @@ SR_PRIV int alsa_receive_data(int fd, int revents, void *cb_data)
 	}
 
 	/* 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 */