X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fstd.c;h=81f269fa92dc26ee73b9ca90081dc27039d010d9;hb=2622b4297fd4cc4bed5c06bb6ae0aaa8b40e0ece;hp=ff09f46fc5eac5e11d9b54abe22f318c37c29e34;hpb=10cf8113858f017687ce792f7c370db38023914e;p=libsigrok.git

diff --git a/src/std.c b/src/std.c
index ff09f46f..81f269fa 100644
--- a/src/std.c
+++ b/src/std.c
@@ -195,19 +195,7 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-/**
- * Standard API helper for sending an SR_DF_END packet.
- *
- * This function can be used to simplify most drivers'
- * dev_acquisition_stop() API callback.
- *
- * @param[in] sdi The device instance to use. Must not be NULL.
- *
- * @retval SR_OK Success.
- * @retval SR_ERR_ARG Invalid argument.
- * @retval other Other error.
- */
-SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi)
+static int send_df_without_payload(const struct sr_dev_inst *sdi, uint16_t packet_type)
 {
 	const char *prefix;
 	int ret;
@@ -220,17 +208,34 @@ SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi)
 
 	prefix = (sdi->driver) ? sdi->driver->name : "unknown";
 
-	packet.type = SR_DF_END;
+	packet.type = packet_type;
 	packet.payload = NULL;
 
 	if ((ret = sr_session_send(sdi, &packet)) < 0) {
-		sr_err("%s: Failed to send SR_DF_END packet: %d.", prefix, ret);
+		sr_err("%s: Failed to send packet of type %d: %d.", prefix, packet_type, ret);
 		return ret;
 	}
 
 	return SR_OK;
 }
 
+/**
+ * Standard API helper for sending an SR_DF_END packet.
+ *
+ * This function can be used to simplify most drivers'
+ * dev_acquisition_stop() API callback.
+ *
+ * @param[in] sdi The device instance to use. Must not be NULL.
+ *
+ * @retval SR_OK Success.
+ * @retval SR_ERR_ARG Invalid argument.
+ * @retval other Other error.
+ */
+SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi)
+{
+	return send_df_without_payload(sdi, SR_DF_END);
+}
+
 /**
  * Standard API helper for sending an SR_DF_TRIGGER packet.
  *
@@ -244,33 +249,13 @@ SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi)
  */
 SR_PRIV int std_session_send_df_trigger(const struct sr_dev_inst *sdi)
 {
-	const char *prefix;
-	int ret;
-	struct sr_datafeed_packet packet;
-
-	if (!sdi) {
-		sr_err("%s: Invalid argument.", __func__);
-		return SR_ERR_ARG;
-	}
-
-	prefix = (sdi->driver) ? sdi->driver->name : "unknown";
-
-	packet.type = SR_DF_TRIGGER;
-	packet.payload = NULL;
-
-	if ((ret = sr_session_send(sdi, &packet)) < 0) {
-		sr_err("%s: Failed to send SR_DF_TRIGGER packet: %d.", prefix, ret);
-		return ret;
-	}
-
-	return SR_OK;
+	return send_df_without_payload(sdi, SR_DF_TRIGGER);
 }
 
 /**
  * Standard API helper for sending an SR_DF_FRAME_BEGIN packet.
  *
- * This function can be used to simplify most drivers'
- * frame handling.
+ * This function can be used to simplify most drivers' frame handling.
  *
  * @param[in] sdi The device instance to use. Must not be NULL.
  *
@@ -278,35 +263,15 @@ SR_PRIV int std_session_send_df_trigger(const struct sr_dev_inst *sdi)
  * @retval SR_ERR_ARG Invalid argument.
  * @retval other Other error.
  */
-SR_PRIV int std_session_send_frame_begin(const struct sr_dev_inst *sdi)
+SR_PRIV int std_session_send_df_frame_begin(const struct sr_dev_inst *sdi)
 {
-	const char *prefix;
-	int ret;
-	struct sr_datafeed_packet packet;
-
-	if (!sdi) {
-		sr_err("%s: Invalid argument.", __func__);
-		return SR_ERR_ARG;
-	}
-
-	prefix = (sdi->driver) ? sdi->driver->name : "unknown";
-
-	packet.type = SR_DF_FRAME_BEGIN;
-	packet.payload = NULL;
-
-	if ((ret = sr_session_send(sdi, &packet)) < 0) {
-		sr_err("%s: Failed to send SR_DF_FRAME_BEGIN packet: %d.", prefix, ret);
-		return ret;
-	}
-
-	return SR_OK;
+	return send_df_without_payload(sdi, SR_DF_FRAME_BEGIN);
 }
 
 /**
  * Standard API helper for sending an SR_DF_FRAME_END packet.
  *
- * This function can be used to simplify most drivers'
- * frame handling.
+ * This function can be used to simplify most drivers' frame handling.
  *
  * @param[in] sdi The device instance to use. Must not be NULL.
  *
@@ -314,28 +279,9 @@ SR_PRIV int std_session_send_frame_begin(const struct sr_dev_inst *sdi)
  * @retval SR_ERR_ARG Invalid argument.
  * @retval other Other error.
  */
-SR_PRIV int std_session_send_frame_end(const struct sr_dev_inst *sdi)
+SR_PRIV int std_session_send_df_frame_end(const struct sr_dev_inst *sdi)
 {
-	const char *prefix;
-	int ret;
-	struct sr_datafeed_packet packet;
-
-	if (!sdi) {
-		sr_err("%s: Invalid argument.", __func__);
-		return SR_ERR_ARG;
-	}
-
-	prefix = (sdi->driver) ? sdi->driver->name : "unknown";
-
-	packet.type = SR_DF_FRAME_END;
-	packet.payload = NULL;
-
-	if ((ret = sr_session_send(sdi, &packet)) < 0) {
-		sr_err("%s: Failed to send SR_DF_FRAME_END packet: %d.", prefix, ret);
-		return ret;
-	}
-
-	return SR_OK;
+	return send_df_without_payload(sdi, SR_DF_FRAME_END);
 }
 
 #ifdef HAVE_SERIAL_COMM
@@ -478,7 +424,7 @@ SR_PRIV int std_dev_clear_with_callback(const struct sr_dev_driver *driver,
 			ret = SR_ERR_BUG;
 			continue;
 		}
-		if (driver->dev_close)
+		if (driver->dev_close && sdi->status == SR_ST_ACTIVE)
 			driver->dev_close(sdi);
 
 		if (sdi->conn) {
@@ -982,3 +928,12 @@ SR_PRIV int std_dummy_set_params(struct sr_serial_dev_inst *serial,
 	return SR_OK;
 }
 
+SR_PRIV int std_dummy_set_handshake(struct sr_serial_dev_inst *serial,
+	int rts, int dtr)
+{
+	(void)serial;
+	(void)rts;
+	(void)dtr;
+
+	return SR_OK;
+}