Introduce standard cleanup helper

[libsigrok.git] / src / hardware / yokogawa-dlm / api.c

diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c
index 9e943f23a2a67119183539700b8735328d1a8e61..25a292ad5f9691256e1b1132ebd64df4e69fd343 100644 (file)
--- a/src/hardware/yokogawa-dlm/api.c
+++ b/src/hardware/yokogawa-dlm/api.c
@@ -18,6 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include "scpi.h"
 #include "protocol.h"
@@ -91,7 +92,6 @@ static struct sr_dev_inst *probe_usbtmc_device(struct sr_scpi_dev_inst *scpi)
                goto fail;
 
        sdi = g_malloc0(sizeof(struct sr_dev_inst));
-       sdi->status = SR_ST_ACTIVE;
        sdi->vendor = g_strdup(MANUFACTURER_NAME);
        sdi->model = g_strdup(model_name);
        sdi->version = g_strdup(hw_info->firmware_version);
@@ -111,9 +111,6 @@ static struct sr_dev_inst *probe_usbtmc_device(struct sr_scpi_dev_inst *scpi)
        if (dlm_device_init(sdi, model_index) != SR_OK)
                goto fail;
 
-       sr_scpi_close(sdi->conn);
-
-       sdi->status = SR_ST_INACTIVE;
        return sdi;
 
 fail:
@@ -179,13 +176,6 @@ static int dev_close(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int cleanup(const struct sr_dev_driver *di)
-{
-       dev_clear(di);
-
-       return SR_OK;
-}
-
 /**
  * Check which category a given channel group belongs to.
  *
@@ -235,7 +225,6 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
        if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
                return SR_ERR;
 
-       ret = SR_ERR_NA;
        model = devc->model_config;
        state = devc->model_state;
 
@@ -625,7 +614,7 @@ static int dlm_check_channels(GSList *channels)
        return SR_OK;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
        GSList *l;
        gboolean digital_added;
@@ -633,8 +622,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        struct dev_context *devc;
        struct sr_scpi_dev_inst *scpi;
 
-       (void)cb_data;
-
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
@@ -677,16 +664,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
-       struct sr_datafeed_packet packet;
-
-       (void)cb_data;
 
-       packet.type = SR_DF_END;
-       packet.payload = NULL;
-       sr_session_send(sdi, &packet);
+       std_session_send_df_end(sdi, LOG_PREFIX);
 
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
@@ -707,7 +689,7 @@ SR_PRIV struct sr_dev_driver yokogawa_dlm_driver_info = {
        .longname = "Yokogawa DL/DLM",
        .api_version = 1,
        .init = init,
-       .cleanup = cleanup,
+       .cleanup = std_cleanup,
        .scan = scan,
        .dev_list = dev_list,
        .dev_clear = dev_clear,