drivers: use new sr_config struct

[libsigrok.git] / hardware / agilent-dmm / api.c

diff --git a/hardware/agilent-dmm/api.c b/hardware/agilent-dmm/api.c
index 167d4cc83cdb44d89cd547eb7ea7ae6a01f11897..9bcca5887e29e9208ffcd25ebc143a91d6adf691 100644 (file)
--- a/hardware/agilent-dmm/api.c
+++ b/hardware/agilent-dmm/api.c
@@ -109,7 +109,7 @@ static GSList *hw_scan(GSList *options)
        struct sr_dev_inst *sdi;
        struct drv_context *drvc;
        struct dev_context *devc;
-       struct sr_hwopt *opt;
+       struct sr_config *src;
        struct sr_probe *probe;
        struct sr_serial_dev_inst *serial;
        GSList *l, *devices;
@@ -123,13 +123,13 @@ static GSList *hw_scan(GSList *options)
        devices = NULL;
        conn = serialcomm = NULL;
        for (l = options; l; l = l->next) {
-               opt = l->data;
-               switch (opt->hwopt) {
+               src = l->data;
+               switch (src->key) {
                case SR_HWOPT_CONN:
-                       conn = opt->value;
+                       conn = src->value;
                        break;
                case SR_HWOPT_SERIALCOMM:
-                       serialcomm = opt->value;
+                       serialcomm = src->value;
                        break;
                }
        }
@@ -309,7 +309,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;
 
        if (!(devc = sdi->priv)) {
@@ -329,13 +328,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 100ms, or whenever some data comes in. */
        sr_source_add(devc->serial->fd, G_IO_IN, 100, agdmm_receive_data, (void *)sdi);