Various log message cleanups.

[libsigrok.git] / src / hardware / chronovu-la / api.c

diff --git a/src/hardware/chronovu-la/api.c b/src/hardware/chronovu-la/api.c
index 3ccac06b8e9ef30cc7f91c007ee9756e539a6a0f..8824abbd0d3f274ab2269bc84a7b64ea45e04f45 100644 (file)
--- a/src/hardware/chronovu-la/api.c
+++ b/src/hardware/chronovu-la/api.c
@@ -251,7 +251,6 @@ static int dev_open(struct sr_dev_inst *sdi)
                       ret, ftdi_get_error_string(devc->ftdic));
                goto err_ftdi_free;
        }
-       sr_dbg("Device opened successfully.");
 
        /* Purge RX/TX buffers in the FTDI chip. */
        if ((ret = ftdi_usb_purge_buffers(devc->ftdic)) < 0) {
@@ -259,7 +258,6 @@ static int dev_open(struct sr_dev_inst *sdi)
                       ret, ftdi_get_error_string(devc->ftdic));
                goto err_ftdi_free;
        }
-       sr_dbg("FTDI buffers purged successfully.");
 
        /* Enable flow control in the FTDI chip. */
        if ((ret = ftdi_setflowctrl(devc->ftdic, SIO_RTS_CTS_HS)) < 0) {
@@ -267,20 +265,16 @@ static int dev_open(struct sr_dev_inst *sdi)
                       ret, ftdi_get_error_string(devc->ftdic));
                goto err_ftdi_free;
        }
-       sr_dbg("FTDI flow control enabled successfully.");
 
        /* Wait 100ms. */
        g_usleep(100 * 1000);
 
-       sdi->status = SR_ST_ACTIVE;
-
-       if (ret == SR_OK)
-               return SR_OK;
+       return SR_OK;
 
 err_ftdi_free:
        ftdi_free(devc->ftdic); /* Close device (if open), free FTDI context. */
        devc->ftdic = NULL;
-       return ret;
+       return SR_ERR;
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
@@ -288,17 +282,16 @@ static int dev_close(struct sr_dev_inst *sdi)
        int ret;
        struct dev_context *devc;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_OK;
-
        devc = sdi->priv;
 
-       if (devc->ftdic && (ret = ftdi_usb_close(devc->ftdic)) < 0)
+       if (!devc->ftdic)
+               return SR_ERR_BUG;
+
+       if ((ret = ftdi_usb_close(devc->ftdic)) < 0)
                sr_err("Failed to close FTDI device (%d): %s.",
                       ret, ftdi_get_error_string(devc->ftdic));
-       sdi->status = SR_ST_INACTIVE;
 
-       return SR_OK;
+       return (ret == 0) ? SR_OK : SR_ERR;
 }
 
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
@@ -337,9 +330,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 
        (void)cg;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        devc = sdi->priv;
 
        switch (key) {
@@ -484,9 +474,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        uint8_t buf[8];
        int bytes_to_write, bytes_written;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        devc = sdi->priv;
 
        if (!devc->ftdic) {
@@ -532,8 +519,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
                return SR_ERR;
        }
 
-       sr_dbg("Hardware acquisition started successfully.");
-
        std_session_send_df_header(sdi);
 
        /* Time when we should be done (for detecting trigger timeouts). */