Drop link-mso19/nexus-osciprime in preparation for release.

[libsigrok.git] / hardware / openbench-logic-sniffer / api.c

diff --git a/hardware/openbench-logic-sniffer/api.c b/hardware/openbench-logic-sniffer/api.c
index 60a6fe6a3d6e310bd623b60d833a8ee77e6aa7dc..cd2d0e0609eb13bc58c7cac22acd5e3ba3aaeb3d 100644 (file)
--- a/hardware/openbench-logic-sniffer/api.c
+++ b/hardware/openbench-logic-sniffer/api.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  *
@@ -55,7 +55,7 @@ static struct sr_dev_driver *di = &ols_driver_info;
 
 static int hw_init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
+       return std_hw_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *hw_scan(GSList *options)
@@ -280,6 +280,9 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
        int ret;
        uint64_t tmp_u64;
 
+       if (sdi->status != SR_ST_ACTIVE)
+               return SR_ERR_DEV_CLOSED;
+
        devc = sdi->priv;
 
        switch (id) {
@@ -366,12 +369,12 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        int num_channels;
        int i;
 
+       if (sdi->status != SR_ST_ACTIVE)
+               return SR_ERR_DEV_CLOSED;
+
        devc = sdi->priv;
        serial = sdi->conn;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR;
-
        if (ols_configure_probes(sdi) != SR_OK) {
                sr_err("Failed to configure probes.");
                return SR_ERR;
@@ -484,7 +487,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        devc->num_transfers = devc->num_samples = devc->num_bytes = 0;
 
        /* Send header packet to the session bus. */
-       std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
+       std_session_send_df_header(cb_data, LOG_PREFIX);
 
        sr_source_add(serial->fd, G_IO_IN, -1, ols_receive_data, cb_data);