X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=std.c;h=7dc020b999f736bd36d60628862dbd11f9065475;hb=23dc6661667b05a91b01ab6a6fa425aa57af6daf;hp=d1ff84e037c29cdb70044ac68d36c33be1ee7328;hpb=ae67644fe5340d9c6e450fb0443178af356e0647;p=libsigrok.git

diff --git a/std.c b/std.c
index d1ff84e0..7dc020b9 100644
--- a/std.c
+++ b/std.c
@@ -103,6 +103,32 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi,
 
 #ifdef HAVE_LIBSERIALPORT
 
+/*
+ * Standard serial driver dev_open() helper.
+ *
+ * This function can be used to implement the dev_open() driver API
+ * callback in drivers that use a serial port. The port is opened
+ * with the SERIAL_RDWR and SERIAL_NONBLOCK flags.
+ *
+ * If the open succeeded, the status field of the given sdi is set
+ * to SR_ST_ACTIVE.
+ *
+ * @retval SR_OK Success.
+ * @retval SR_ERR Serial port open failed.
+ */
+SR_PRIV int std_serial_dev_open(struct sr_dev_inst *sdi)
+{
+	struct sr_serial_dev_inst *serial;
+
+	serial = sdi->conn;
+	if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+		return SR_ERR;
+
+	sdi->status = SR_ST_ACTIVE;
+
+	return SR_OK;
+}
+
 /*
  * Standard sr_session_stop() API helper.
  *
@@ -124,7 +150,7 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi,
  * @retval SR_ERR_DEV_CLOSED Device is closed.
  * @retval SR_ERR Other errors.
  */
-SR_PRIV int std_dev_acquisition_stop_serial(struct sr_dev_inst *sdi,
+SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
 			void *cb_data, dev_close_t dev_close_fn,
 			struct sr_serial_dev_inst *serial, const char *prefix)
 {
@@ -143,7 +169,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 +241,8 @@ 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);
 		}
 		if (clear_private)
 			clear_private(sdi->priv);
@@ -230,3 +256,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 && sdi->status == SR_ST_ACTIVE) {
+		serial_close(serial);
+		sdi->status = SR_ST_INACTIVE;
+	}
+
+	return SR_OK;
+}