Add sr_dev_acquisition_start(), factor out SR_ERR_DEV_CLOSED check.

[libsigrok.git] / src / hardware / colead-slm / api.c

diff --git a/src/hardware/colead-slm/api.c b/src/hardware/colead-slm/api.c
index 85ccd86c2cea194a660691c157566d7766b7c165..f7a1c16ffc20ce8343f0a1fa5c3b74f428851e73 100644 (file)
--- a/src/hardware/colead-slm/api.c
+++ b/src/hardware/colead-slm/api.c
@@ -123,11 +123,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        struct dev_context *devc = sdi->priv;
        struct sr_serial_dev_inst *serial;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        sr_sw_limits_acquisition_start(&devc->limits);
-       std_session_send_df_header(sdi, LOG_PREFIX);
+       std_session_send_df_header(sdi);
 
        /* Poll every 150ms, or whenever some data comes in. */
        serial = sdi->conn;
@@ -137,12 +134,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
-                       sdi->conn, LOG_PREFIX);
-}
-
 static struct sr_dev_driver colead_slm_driver_info = {
        .name = "colead-slm",
        .longname = "Colead SLM",
@@ -158,7 +149,7 @@ static struct sr_dev_driver colead_slm_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(colead_slm_driver_info);