Various log message cleanups.

[libsigrok.git] / src / device.c

diff --git a/src/device.c b/src/device.c
index 14b56b2f33a2ed269c95d8bcaeceb85e9c6fc3e8..1394fb3be34b6aa874dab6e15e111a5d01d58a66 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -536,6 +536,18 @@ SR_API int sr_dev_clear(const struct sr_dev_driver *driver)
                return SR_ERR_ARG;
        }
 
+       if (!driver->context) {
+               /*
+                * Driver was never initialized, nothing to do.
+                *
+                * No log message since this usually gets called for all
+                * drivers, whether they were initialized or not.
+                */
+               return SR_OK;
+       }
+
+       /* No log message here, too verbose and not very useful. */
+
        if (driver->dev_clear)
                ret = driver->dev_clear(driver);
        else
@@ -585,11 +597,21 @@ SR_API int sr_dev_open(struct sr_dev_inst *sdi)
 }
 
 /**
- * Close the specified device.
+ * Close the specified device instance.
+ *
+ * If the device instance is not open (sdi->status != SR_ST_ACTIVE),
+ * SR_ERR_DEV_CLOSED will be returned and no closing will be attempted.
+ *
+ * Note: sdi->status will be set to SR_ST_INACTIVE, regardless of whether
+ * there are any errors during closing of the device instance (any errors
+ * will be reported via error code and log message, though).
  *
  * @param sdi Device instance to use. Must not be NULL.
  *
- * @return SR_OK upon success, a negative error code upon errors.
+ * @retval SR_OK Success.
+ * @retval SR_ERR_ARG Invalid arguments.
+ * @retval SR_ERR_DEV_CLOSED Device instance was not active.
+ * @retval SR_ERR Other error.
  *
  * @since 0.2.0
  */
@@ -598,7 +620,7 @@ SR_API int sr_dev_close(struct sr_dev_inst *sdi)
        int ret;
 
        if (!sdi || !sdi->driver || !sdi->driver->dev_close)
-               return SR_ERR;
+               return SR_ERR_ARG;
 
        if (sdi->status != SR_ST_ACTIVE) {
                sr_err("%s: Device instance not active, can't close.",
@@ -606,7 +628,9 @@ SR_API int sr_dev_close(struct sr_dev_inst *sdi)
                return SR_ERR_DEV_CLOSED;
        }
 
-       sr_dbg("%s: Closing device.", sdi->driver->name)
+       sdi->status = SR_ST_INACTIVE;
+
+       sr_dbg("%s: Closing device instance.", sdi->driver->name);
 
        ret = sdi->driver->dev_close(sdi);