drivers: use new sr_config struct

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

diff --git a/hardware/alsa/api.c b/hardware/alsa/api.c
index 48a97cd4319d445a35a2f230160236100a5d5feb..f3948458144ca8725b0dc34ad0fdf533bdc3e98b 100644 (file)
--- a/hardware/alsa/api.c
+++ b/hardware/alsa/api.c
@@ -20,13 +20,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "protocol.h"
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
+#include "protocol.h"
 
 static const int hwcaps[] = {
        SR_HWCAP_SAMPLERATE,
@@ -35,11 +34,6 @@ static const int hwcaps[] = {
        0,
 };
 
-static const char *probe_names[] = {
-       "Channel 0", "Channel 1",
-       NULL,
-};
-
 SR_PRIV struct sr_dev_driver alsa_driver_info;
 static struct sr_dev_driver *di = &alsa_driver_info;
 
@@ -158,24 +152,17 @@ static int hw_info_get(int info_id, const void **data,
        case SR_DI_HWCAPS:
                *data = hwcaps;
                break;
-       case SR_DI_NUM_PROBES:
-               *data = &devc->num_probes;
-               break;
-       case SR_DI_PROBE_NAMES:
-               *data = probe_names;
-               break;
        case SR_DI_CUR_SAMPLERATE:
                *data = &devc->cur_samplerate;
                break;
        case SR_DI_SAMPLERATES:
                if (!devc->supp_rates.list) {
-                       sr_err("Instance did not contain a samplerate list");
+                       sr_err("Instance did not contain a samplerate list.");
                        return SR_ERR_ARG;
                }
                *data = &devc->supp_rates;
                break;
        default:
-               sr_err("Invalid info_id: %d.", info_id);
                return SR_ERR_ARG;
        }
 
@@ -209,10 +196,9 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 {
        struct sr_datafeed_packet packet;
        struct sr_datafeed_header header;
-       struct sr_datafeed_meta_analog meta;
        struct dev_context *devc;
        int count, ret;
-       char *endianess;
+       char *endianness;
 
        devc = sdi->priv;
        devc->cb_data = cb_data;
@@ -228,10 +214,10 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 
        /* FIXME: Hardcoded for 16bits. */
        if (SND_PCM_FORMAT_S16 == SND_PCM_FORMAT_S16_LE)
-               endianess = "lilltle endian";
+               endianness = "little endian";
        else
-               endianess = "big endian";
-       sr_dbg("Setting audio sample format to signed 16bit (%s).", endianess);
+               endianness = "big endian";
+       sr_dbg("Setting audio sample format to signed 16bit (%s).", endianness);
        ret = snd_pcm_hw_params_set_format(devc->capture_handle,
                                           devc->hw_params,
                                           SND_PCM_FORMAT_S16);
@@ -277,14 +263,13 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
                sr_err("Unable to obtain poll descriptors count.");
                return SR_ERR;
        }
-       sr_spew("Obtained poll descriptor count: %d.", count);
 
        if (!(devc->ufds = g_try_malloc(count * sizeof(struct pollfd)))) {
                sr_err("Failed to malloc ufds.");
                return SR_ERR_MALLOC;
        }
 
-       sr_err("Getting %d poll descriptors.", count);
+       sr_spew("Getting %d poll descriptors.", count);
        ret = snd_pcm_poll_descriptors(devc->capture_handle, devc->ufds, count);
        if (ret < 0) {
                sr_err("Unable to obtain poll descriptors: %s.",
@@ -301,13 +286,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        gettimeofday(&header.starttime, NULL);
        sr_session_send(devc->cb_data, &packet);
 
-       /* Send metadata about the SR_DF_ANALOG packets to come. */
-       sr_dbg("Sending SR_DF_META_ANALOG packet.");
-       packet.type = SR_DF_META_ANALOG;
-       packet.payload = &meta;
-       meta.num_probes = devc->num_probes;
-       sr_session_send(devc->cb_data, &packet);
-
        /* Poll every 10ms, or whenever some data comes in. */
        sr_source_add(devc->ufds[0].fd, devc->ufds[0].events, 10,
                      alsa_receive_data, (void *)sdi);