X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=std.c;h=ab4fd76df09639029afefffedef326e957bc32ec;hb=31034792da84daa5163b7d72bb98664c65aa7cc0;hp=22123fc5d743dc527ca31af3e3cdca549cf8b31d;hpb=1477a9a6dc4f470cb91c64c71c139825e8329adb;p=libsigrok.git

diff --git a/std.c b/std.c
index 22123fc5..ab4fd76d 100644
--- a/std.c
+++ b/std.c
@@ -101,6 +101,8 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi,
 	return SR_OK;
 }
 
+#ifdef HAVE_LIBSERIALPORT
+
 /*
  * Standard sr_session_stop() API helper.
  *
@@ -163,6 +165,8 @@ SR_PRIV int std_dev_acquisition_stop_serial(struct sr_dev_inst *sdi,
 	return SR_OK;
 }
 
+#endif
+
 /*
  * Standard driver dev_clear() helper.
  *
@@ -203,12 +207,18 @@ SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver,
 			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_USBTMC)
+				sr_usbtmc_dev_inst_free(sdi->conn);
+			if (sdi->inst_type == SR_INST_SCPI)
+				sr_scpi_free(sdi->conn);
 		}
 		if (clear_private)
 			clear_private(sdi->priv);