std_serial_dev_acquisition_stop(): Remove serial parameter

[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 bc59fd63c7f7def667d5be4cc29c33e49883be49..59481dfab92eacabd8d4f5f2cc479f9884e6311d 100644 (file)
--- a/src/hardware/colead-slm/api.c
+++ b/src/hardware/colead-slm/api.c
@@ -44,17 +44,12 @@ static const uint32_t devopts[] = {
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
-       struct drv_context *drvc;
        struct dev_context *devc;
        struct sr_dev_inst *sdi;
        struct sr_config *src;
-       GSList *devices, *l;
+       GSList *l;
        const char *conn, *serialcomm;
 
-       drvc = di->context;
-
-       devices = NULL;
-
        conn = serialcomm = NULL;
        for (l = options; l; l = l->next) {
                src = l->data;
@@ -81,12 +76,9 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        sdi->conn = sr_serial_dev_inst_new(conn, serialcomm);
        sdi->inst_type = SR_INST_SERIAL;
        sdi->priv = devc;
-       sdi->driver = di;
        sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
-       drvc->instances = g_slist_append(drvc->instances, sdi);
-       devices = g_slist_append(devices, sdi);
 
-       return devices;
+       return std_scan_complete(di, g_slist_append(NULL, sdi));
 }
 
 static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
@@ -135,7 +127,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
                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;
@@ -147,8 +139,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 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);
+       return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close);
 }
 
 static struct sr_dev_driver colead_slm_driver_info = {