Rename SR_HWOPT_* and SR_HWCAP_* to SR_CONF_*

[libsigrok.git] / hardware / tondaj-sl-814 / api.c

diff --git a/hardware/tondaj-sl-814/api.c b/hardware/tondaj-sl-814/api.c
index 17fbc2b1b4d91bfac21e93b866f3be132ecf8716..16099940e21dcf7a607c3596e8f011038dcbaf0c 100644 (file)
--- a/hardware/tondaj-sl-814/api.c
+++ b/hardware/tondaj-sl-814/api.c
@@ -27,23 +27,18 @@
 #define SERIALCOMM "9600/8e1"
 
 static const int hwopts[] = {
-       SR_HWOPT_CONN,
-       SR_HWOPT_SERIALCOMM,
+       SR_CONF_CONN,
+       SR_CONF_SERIALCOMM,
        0,
 };
 
 static const int hwcaps[] = {
-       SR_HWCAP_SOUNDLEVELMETER,
-       SR_HWCAP_LIMIT_SAMPLES,
-       SR_HWCAP_CONTINUOUS,
+       SR_CONF_SOUNDLEVELMETER,
+       SR_CONF_LIMIT_SAMPLES,
+       SR_CONF_CONTINUOUS,
        0,
 };
 
-static const char *probe_names[] = {
-       "P1",
-       NULL,
-};
-
 SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info;
 static struct sr_dev_driver *di = &tondaj_sl_814_driver_info;
 
@@ -93,7 +88,7 @@ static GSList *hw_scan(GSList *options)
        struct drv_context *drvc;
        struct dev_context *devc;
        struct sr_dev_inst *sdi;
-       struct sr_hwopt *opt;
+       struct sr_config *src;
        struct sr_probe *probe;
        GSList *devices, *l;
        const char *conn, *serialcomm;
@@ -104,26 +99,24 @@ static GSList *hw_scan(GSList *options)
 
        conn = serialcomm = NULL;
        for (l = options; l; l = l->next) {
-               if (!(opt = l->data)) {
+               if (!(src = l->data)) {
                        sr_err("Invalid option data, skipping.");
                        continue;
                }
-               switch (opt->hwopt) {
-               case SR_HWOPT_CONN:
-                       conn = opt->value;
+               switch (src->key) {
+               case SR_CONF_CONN:
+                       conn = src->value;
                        break;
-               case SR_HWOPT_SERIALCOMM:
-                       serialcomm = opt->value;
+               case SR_CONF_SERIALCOMM:
+                       serialcomm = src->value;
                        break;
                default:
-                       sr_err("Unknown option %d, skipping.", opt->hwopt);
+                       sr_err("Unknown option %d, skipping.", src->key);
                        break;
                }
        }
-       if (!conn) {
-               sr_dbg("Couldn't determine connection options.");
+       if (!conn)
                return NULL;
-       }
        if (!serialcomm)
                serialcomm = SERIALCOMM;
 
@@ -146,7 +139,7 @@ static GSList *hw_scan(GSList *options)
 
        sdi->priv = devc;
        sdi->driver = di;
-       probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, probe_names[0]);
+       probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1");
        if (!probe) {
                sr_err("Failed to create probe.");
                return NULL;
@@ -214,14 +207,7 @@ static int hw_info_get(int info_id, const void **data,
        case SR_DI_HWCAPS:
                *data = hwcaps;
                break;
-       case SR_DI_NUM_PROBES:
-               *data = GINT_TO_POINTER(1);
-               break;
-       case SR_DI_PROBE_NAMES:
-               *data = probe_names;
-               break;
        default:
-               sr_err("Unknown info_id: %d.", info_id);
                return SR_ERR_ARG;
        }
 
@@ -241,7 +227,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
        devc = sdi->priv;
 
        switch (hwcap) {
-       case SR_HWCAP_LIMIT_SAMPLES:
+       case SR_CONF_LIMIT_SAMPLES:
                devc->limit_samples = *(const uint64_t *)value;
                sr_dbg("Setting sample limit to %" PRIu64 ".",
                       devc->limit_samples);
@@ -259,7 +245,6 @@ 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;
 
        devc = sdi->priv;
@@ -273,13 +258,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.type = SR_DF_META_ANALOG;
-       packet.payload = &meta;
-       meta.num_probes = 1;
-       sr_session_send(devc->cb_data, &packet);
-
        /* Poll every 500ms, or whenever some data comes in. */
        sr_source_add(devc->serial->fd, G_IO_IN, 500,
                      tondaj_sl_814_receive_data, (void *)sdi);