return SR_OK;
}
+#ifdef HAVE_LIBSERIALPORT
+
/*
* Standard sr_session_stop() API helper.
*
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;
}
return SR_OK;
}
+#endif
+
/*
* Standard driver dev_clear() helper.
*
driver->dev_close(sdi);
if (sdi->conn) {
- if (sdi->inst_type == SR_INST_SERIAL)
+#if HAVE_LIBSERIALPORT
+ if (sdi->inst_type == SR_INST_SERIAL)
sr_serial_dev_inst_free(sdi->conn);
+#endif
#if HAVE_LIBUSB_1_0
- else if (sdi->inst_type == SR_INST_USB)
+ if (sdi->inst_type == SR_INST_USB)
sr_usb_dev_inst_free(sdi->conn);
#endif
+ if (sdi->inst_type == SR_INST_SCPI)
+ sr_scpi_free(sdi->conn);
}
if (clear_private)
clear_private(sdi->priv);
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 && sdi->status == SR_ST_ACTIVE) {
+ serial_close(serial);
+ sdi->status = SR_ST_INACTIVE;
+ }
+
+ return SR_OK;
+}