std_serial_dev_acquisition_stop(): Remove serial parameter

[libsigrok.git] / src / hardware / pce-322a / api.c

diff --git a/src/hardware/pce-322a/api.c b/src/hardware/pce-322a/api.c
index 8e408c1a7c51b8217f839e325735e189c89871fa..77d885ee4fe86f93e8cfda77ca4277d4cff9d823 100644 (file)
--- a/src/hardware/pce-322a/api.c
+++ b/src/hardware/pce-322a/api.c
@@ -59,12 +59,11 @@ static const uint64_t meas_ranges[][2] = {
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
-       struct drv_context *drvc;
        struct dev_context *devc;
        struct sr_config *src;
        struct sr_serial_dev_inst *serial;
        struct sr_dev_inst *sdi;
-       GSList *l, *devices;
+       GSList *l;
        const char *conn;
 
        conn = NULL;
@@ -81,9 +80,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        if (serial_open(serial, SERIAL_RDONLY) != SR_OK)
                return NULL;
 
-       devices = NULL;
-       drvc = di->context;
-
        sdi = g_malloc0(sizeof(struct sr_dev_inst));
        sdi->status = SR_ST_INACTIVE;
        sdi->vendor = g_strdup("PCE");
@@ -93,14 +89,11 @@ 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, "SPL");
-       drvc->instances = g_slist_append(drvc->instances, sdi);
-       devices = g_slist_append(devices, sdi);
 
        serial_close(serial);
 
-       return devices;
+       return std_scan_complete(di, g_slist_append(NULL, sdi));
 }
 
 static int dev_clear(const struct sr_dev_driver *di)
@@ -316,7 +309,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        devc = sdi->priv;
        devc->buffer_len = 0;
 
-       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;
@@ -328,10 +321,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-       pce_322a_disconnect(sdi);
-
-       return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
-                       sdi->conn, LOG_PREFIX);
+       return std_serial_dev_acquisition_stop(sdi, dev_close);
 }
 
 static struct sr_dev_driver pce_322a_driver_info = {