Use std_serial_dev_close() to replace matching dev_close functions.

[libsigrok.git] / std.c

diff --git a/std.c b/std.c
index ab4fd76df09639029afefffedef326e957bc32ec..415d1138b5529a372eb2c2d2b50a49e3444070ed 100644 (file)
--- a/std.c
+++ b/std.c
@@ -143,7 +143,7 @@ SR_PRIV int std_dev_acquisition_stop_serial(struct sr_dev_inst *sdi,
 
        sr_dbg("%sStopping acquisition.", prefix);
 
-       if ((ret = sr_source_remove(serial->fd)) < 0) {
+       if ((ret = serial_source_remove(serial)) < 0) {
                sr_err("%sFailed to remove source: %d.", prefix, ret);
                return ret;
        }
@@ -215,8 +215,6 @@ SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver,
                        if (sdi->inst_type == SR_INST_USB)
                                sr_usb_dev_inst_free(sdi->conn);
 #endif
-                       if (sdi->inst_type == SR_INST_USBTMC)
-                               sr_usbtmc_dev_inst_free(sdi->conn);
                        if (sdi->inst_type == SR_INST_SCPI)
                                sr_scpi_free(sdi->conn);
                }
@@ -232,3 +230,16 @@ SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver,
 
        return ret;
 }
+
+SR_PRIV int std_serial_dev_close(struct sr_dev_inst *sdi)
+{
+       struct sr_serial_dev_inst *serial;
+
+       serial = sdi->conn;
+       if (serial && serial->fd != -1) {
+               serial_close(serial);
+               sdi->status = SR_ST_INACTIVE;
+       }
+
+       return SR_OK;
+}