drivers: rename and reorganize config get/set

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

diff --git a/hardware/alsa/api.c b/hardware/alsa/api.c
index 48a97cd4319d445a35a2f230160236100a5d5feb..4349bc813196660fc64d4118b4004125806ab798 100644 (file)
--- a/hardware/alsa/api.c
+++ b/hardware/alsa/api.c
@@ -20,26 +20,20 @@
  * 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,
-       SR_HWCAP_LIMIT_SAMPLES,
-       SR_HWCAP_CONTINUOUS,
+       SR_CONF_SAMPLERATE,
+       SR_CONF_LIMIT_SAMPLES,
+       SR_CONF_CONTINUOUS,
        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;
 
@@ -146,58 +140,49 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static int hw_info_get(int info_id, const void **data,
-                      const struct sr_dev_inst *sdi)
+static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
 
-       if (info_id != SR_DI_HWCAPS) /* For SR_DI_HWCAPS sdi will be NULL. */
+       if (id != SR_DI_HWCAPS) /* For SR_DI_HWCAPS sdi will be NULL. */
                devc = sdi->priv;
 
-       switch (info_id) {
+       switch (id) {
        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;
        }
 
        return SR_OK;
 }
 
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
-                            const void *value)
+static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
 
        devc = sdi->priv;
 
-       switch (hwcap) {
-       case SR_HWCAP_SAMPLERATE:
+       switch (id) {
+       case SR_CONF_SAMPLERATE:
                alsa_set_samplerate(sdi, *(const uint64_t *)value);
                break;
-       case SR_HWCAP_LIMIT_SAMPLES:
+       case SR_CONF_LIMIT_SAMPLES:
                devc->limit_samples = *(const uint64_t *)value;
                break;
        default:
-               sr_err("Unknown capability: %d.", hwcap);
+               sr_err("Unknown capability: %d.", id);
                return SR_ERR;
        }
 
@@ -209,10 +194,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 +212,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 +261,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 +284,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);
@@ -344,10 +320,10 @@ SR_PRIV struct sr_dev_driver alsa_driver_info = {
        .scan = hw_scan,
        .dev_list = hw_dev_list,
        .dev_clear = clear_instances,
+       .config_get = config_get,
+       .config_set = config_set,
        .dev_open = hw_dev_open,
        .dev_close = hw_dev_close,
-       .info_get = hw_info_get,
-       .dev_config_set = hw_dev_config_set,
        .dev_acquisition_start = hw_dev_acquisition_start,
        .dev_acquisition_stop = hw_dev_acquisition_stop,
        .priv = NULL,