X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Falsa%2Fprotocol.c;h=2d95f8cb17565977c08e84451976c5926bb3716a;hb=17548571cc836edaf45e4707e74f6537605fc924;hp=666211b8432d37f7e3de0677122f333882131b0c;hpb=a1b9a9bf44b33ee9f3a6ac5ae59a1ced1e2c3281;p=libsigrok.git

diff --git a/hardware/alsa/protocol.c b/hardware/alsa/protocol.c
index 666211b8..2d95f8cb 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,
@@ -216,11 +219,11 @@ SR_PRIV GSList *alsa_scan(GSList *options, struct sr_dev_driver *di)
 	(void)options;
 
 	if ((ret = snd_ctl_card_info_malloc(&info)) < 0) {
-		sr_err("Failed to malloc card info: %s.", snd_strerror(ret));
+		sr_dbg("Failed to malloc card info: %s.", snd_strerror(ret));
 		return NULL;
 	}
 	if ((ret = snd_pcm_info_malloc(&pcminfo) < 0)) {
-		sr_err("Cannot malloc pcm info: %s.", snd_strerror(ret));
+		sr_dbg("Cannot malloc pcm info: %s.", snd_strerror(ret));
 		return NULL;
 	}
 
@@ -228,14 +231,14 @@ 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));
 			if ((ret = snd_ctl_close(handle)) < 0) {
-				sr_err("Cannot close device (%d): %s.",
+				sr_dbg("Cannot close device (%d): %s.",
 				       card, snd_strerror(ret));
 			}
 			continue;
@@ -253,7 +256,7 @@ 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): %s.",
+				sr_dbg("Cannot get device info (%s): %s.",
 				       hwdev, snd_strerror(ret));
 				continue;
 			}
@@ -268,7 +271,7 @@ SR_PRIV GSList *alsa_scan(GSList *options, struct sr_dev_driver *di)
 					     di, pcminfo);
 		}
 		if ((ret = snd_ctl_close(handle)) < 0) {
-			sr_err("Cannot close device (%d): %s.",
+			sr_dbg("Cannot close device (%d): %s.",
 			       card, snd_strerror(ret));
 		}
 	}
@@ -393,6 +396,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 */