X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fagilent-dmm%2Fapi.c;h=9bcca5887e29e9208ffcd25ebc143a91d6adf691;hb=4c0e310ca305ba776aa70d8062f467ac246c910b;hp=31c2fe110784dfc616a7620d3351206b920e2cae;hpb=6b8d6f93bb8df26ea04624009e2715cb6766b4f5;p=libsigrok.git

diff --git a/hardware/agilent-dmm/api.c b/hardware/agilent-dmm/api.c
index 31c2fe11..9bcca588 100644
--- 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;
 		}
 	}
@@ -250,7 +250,6 @@ static int hw_cleanup(void)
 static int hw_info_get(int info_id, const void **data,
        const struct sr_dev_inst *sdi)
 {
-
 	(void)sdi;
 
 	switch (info_id) {
@@ -310,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)) {
@@ -330,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);