std_serial_dev_acquisition_stop(): Remove serial parameter

[libsigrok.git] / src / hardware / brymen-dmm / api.c

diff --git a/src/hardware/brymen-dmm/api.c b/src/hardware/brymen-dmm/api.c
index e9e534dfcede044e9014d552aea44d6b6889f0ab..cb7f875ab2ed271de476cf862f71916a9f0c6e56 100644 (file)
--- a/src/hardware/brymen-dmm/api.c
+++ b/src/hardware/brymen-dmm/api.c
@@ -32,14 +32,11 @@ static const uint32_t devopts[] = {
        SR_CONF_LIMIT_MSEC | SR_CONF_SET,
 };
 
-SR_PRIV struct sr_dev_driver brymen_bm857_driver_info;
-static struct sr_dev_driver *di = &brymen_bm857_driver_info;
-
-static GSList *brymen_scan(const char *conn, const char *serialcomm)
+static GSList *brymen_scan(struct sr_dev_driver *di, const char *conn,
+       const char *serialcomm)
 {
        struct sr_dev_inst *sdi;
        struct dev_context *devc;
-       struct drv_context *drvc;
        struct sr_serial_dev_inst *serial;
        GSList *devices;
        int ret;
@@ -77,29 +74,23 @@ static GSList *brymen_scan(const char *conn, const char *serialcomm)
        sr_sw_limits_init(&devc->sw_limits);
        sdi->inst_type = SR_INST_SERIAL;
        sdi->conn = serial;
-       drvc = di->context;
        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);
 
 scan_cleanup:
        serial_close(serial);
 
-       return devices;
+       return std_scan_complete(di, devices);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
-       struct drv_context *drvc;
        struct sr_config *src;
        GSList *devices, *l;
        const char *conn, *serialcomm;
 
        devices = NULL;
-       drvc = di->context;
-       drvc->instances = NULL;
 
        conn = serialcomm = NULL;
        for (l = options; l; l = l->next) {
@@ -118,10 +109,10 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
        if (serialcomm) {
                /* Use the provided comm specs. */
-               devices = brymen_scan(conn, serialcomm);
+               devices = brymen_scan(di, conn, serialcomm);
        } else {
                /* But 9600/8n1 should work all of the time. */
-               devices = brymen_scan(conn, "9600/8n1/dtr=1/rts=1");
+               devices = brymen_scan(di, conn, "9600/8n1/dtr=1/rts=1");
        }
 
        return devices;
@@ -137,10 +128,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       if (!(devc = sdi->priv)) {
-               sr_err("sdi->priv was NULL.");
-               return SR_ERR_BUG;
-       }
+       devc = sdi->priv;
 
        return sr_sw_limits_config_set(&devc->sw_limits, key, data);
 }
@@ -178,7 +166,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        devc = sdi->priv;
 
        sr_sw_limits_acquisition_start(&devc->sw_limits);
-       std_session_send_df_header(sdi, LOG_PREFIX);
+       std_session_send_df_header(sdi);
 
        /* Poll every 50ms, or whenever some data comes in. */
        serial = sdi->conn;
@@ -190,11 +178,10 @@ 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);
 }
 
-SR_PRIV struct sr_dev_driver brymen_bm857_driver_info = {
+static struct sr_dev_driver brymen_bm857_driver_info = {
        .name = "brymen-bm857",
        .longname = "Brymen BM857",
        .api_version = 1,
@@ -212,3 +199,4 @@ SR_PRIV struct sr_dev_driver brymen_bm857_driver_info = {
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(brymen_bm857_driver_info);