From: Bert Vermeulen <redacted>
Date: Tue, 10 Dec 2013 23:33:11 +0000 (+0100)
Subject: std: Don't build serial helpers without libserialport present.
X-Git-Tag: libsigrok-0.3.0~444
X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=1e7134dc8cff3f28a312e41c997ed488fb071e96

std: Don't build serial helpers without libserialport present.
---

diff --git a/std.c b/std.c
index 9fac390d..ca9c25e1 100644
--- a/std.c
+++ b/std.c
@@ -134,6 +134,30 @@ SR_PRIV int std_serial_dev_open(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
+/*
+ * Standard serial driver dev_close() helper.
+ *
+ * This function can be used to implement the dev_close() driver API
+ * callback in drivers that use a serial port.
+ *
+ * After closing the port, the status field of the given sdi is set
+ * to SR_ST_INACTIVE.
+ *
+ * @retval SR_OK Success.
+ */
+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;
+}
+
 /*
  * Standard sr_session_stop() API helper.
  *
@@ -262,15 +286,3 @@ 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 && sdi->status == SR_ST_ACTIVE) {
-		serial_close(serial);
-		sdi->status = SR_ST_INACTIVE;
-	}
-
-	return SR_OK;
-}