]> sigrok.org Git - libsigrok.git/commitdiff
std: Don't build serial helpers without libserialport present.
authorBert Vermeulen <redacted>
Tue, 10 Dec 2013 23:33:11 +0000 (00:33 +0100)
committerBert Vermeulen <redacted>
Tue, 10 Dec 2013 23:33:11 +0000 (00:33 +0100)
std.c

diff --git a/std.c b/std.c
index 9fac390d77cd42c68fd18cb3f094fdfa09888b94..ca9c25e1833e749f4405ade5cd430939f14171e1 100644 (file)
--- 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;
-}