uni-t-dmm: use new sr_config struct

[libsigrok.git] / session_driver.c

diff --git a/session_driver.c b/session_driver.c
index 011b731201943665f4e2d459230a9a2ccdaa6aad..dfde8d799264f734e8d8c1b0450c294350981b63 100644 (file)
--- a/session_driver.c
+++ b/session_driver.c
@@ -53,8 +53,8 @@ struct session_vdev {
 
 static GSList *dev_insts = NULL;
 static const int hwcaps[] = {
-       SR_HWCAP_CAPTUREFILE,
-       SR_HWCAP_CAPTURE_UNITSIZE,
+       SR_CONF_CAPTUREFILE,
+       SR_CONF_CAPTURE_UNITSIZE,
        0,
 };
 
@@ -180,24 +180,24 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
        vdev = sdi->priv;
 
        switch (hwcap) {
-       case SR_HWCAP_SAMPLERATE:
+       case SR_CONF_SAMPLERATE:
                tmp_u64 = value;
                vdev->samplerate = *tmp_u64;
                sr_info("Setting samplerate to %" PRIu64 ".", vdev->samplerate);
                break;
-       case SR_HWCAP_SESSIONFILE:
+       case SR_CONF_SESSIONFILE:
                vdev->sessionfile = g_strdup(value);
                sr_info("Setting sessionfile to '%s'.", vdev->sessionfile);
                break;
-       case SR_HWCAP_CAPTUREFILE:
+       case SR_CONF_CAPTUREFILE:
                vdev->capturefile = g_strdup(value);
                sr_info("Setting capturefile to '%s'.", vdev->capturefile);
                break;
-       case SR_HWCAP_CAPTURE_UNITSIZE:
+       case SR_CONF_CAPTURE_UNITSIZE:
                tmp_u64 = value;
                vdev->unitsize = *tmp_u64;
                break;
-       case SR_HWCAP_CAPTURE_NUM_PROBES:
+       case SR_CONF_CAPTURE_NUM_PROBES:
                tmp_u64 = value;
                vdev->num_probes = *tmp_u64;
                break;
@@ -216,7 +216,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        struct session_vdev *vdev;
        struct sr_datafeed_header *header;
        struct sr_datafeed_packet *packet;
-       struct sr_datafeed_meta_logic meta;
        int ret;
 
        vdev = sdi->priv;
@@ -262,13 +261,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        gettimeofday(&header->starttime, NULL);
        sr_session_send(cb_data, packet);
 
-       /* Send metadata about the SR_DF_LOGIC packets to come. */
-       packet->type = SR_DF_META_LOGIC;
-       packet->payload = &meta;
-       meta.samplerate = vdev->samplerate;
-       meta.num_probes = vdev->num_probes;
-       sr_session_send(cb_data, packet);
-
        g_free(header);
        g_free(packet);