X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fstd.c;h=81f269fa92dc26ee73b9ca90081dc27039d010d9;hp=9199611a1723118cf39de5d857679f17388d2f4c;hb=deb7615262ac4f9cc0750a08351afa7cbf9c34d5;hpb=f696d27e05da5221e915b44b7db5e0ebdc1dee30

diff --git a/src/std.c b/src/std.c
index 9199611a..81f269fa 100644
--- a/src/std.c
+++ b/src/std.c
@@ -21,8 +21,6 @@
  * @file
  *
  * Standard API helper functions.
- *
- * @internal
  */
 
 /* Needed for gettimeofday(), at least on FreeBSD. */
@@ -39,6 +37,8 @@
 
 #define LOG_PREFIX "std"
 
+SR_PRIV const uint32_t NO_OPTS[1] = {};
+
 /**
  * Standard driver init() callback API helper.
  *
@@ -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,11 +208,11 @@ 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;
 	}
 
@@ -232,10 +220,10 @@ SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi)
 }
 
 /**
- * Standard API helper for sending an SR_DF_FRAME_BEGIN packet.
+ * Standard API helper for sending an SR_DF_END packet.
  *
  * This function can be used to simplify most drivers'
- * frame handling.
+ * dev_acquisition_stop() API callback.
  *
  * @param[in] sdi The device instance to use. Must not be NULL.
  *
@@ -243,35 +231,47 @@ SR_PRIV int std_session_send_df_end(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_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_BEGIN;
-	packet.payload = NULL;
+	return send_df_without_payload(sdi, SR_DF_END);
+}
 
-	if ((ret = sr_session_send(sdi, &packet)) < 0) {
-		sr_err("%s: Failed to send SR_DF_FRAME_BEGIN packet: %d.", prefix, ret);
-		return ret;
-	}
+/**
+ * Standard API helper for sending an SR_DF_TRIGGER packet.
+ *
+ * This function can be used to simplify most drivers' trigger handling.
+ *
+ * @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_trigger(const struct sr_dev_inst *sdi)
+{
+	return send_df_without_payload(sdi, SR_DF_TRIGGER);
+}
 
-	return SR_OK;
+/**
+ * Standard API helper for sending an SR_DF_FRAME_BEGIN packet.
+ *
+ * This function can be used to simplify most drivers' frame handling.
+ *
+ * @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_frame_begin(const struct sr_dev_inst *sdi)
+{
+	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.
  *
@@ -279,31 +279,12 @@ 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_LIBSERIALPORT
+#ifdef HAVE_SERIAL_COMM
 
 /**
  * Standard serial driver dev_open() callback API helper.
@@ -390,11 +371,6 @@ SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi)
 		return ret;
 	}
 
-	if ((ret = sr_dev_close(sdi)) < 0) {
-		sr_err("%s: Failed to close device: %d.", prefix, ret);
-		return ret;
-	}
-
 	return std_session_send_df_end(sdi);
 }
 
@@ -448,11 +424,11 @@ 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) {
-#ifdef HAVE_LIBSERIALPORT
+#ifdef HAVE_SERIAL_COMM
 			if (sdi->inst_type == SR_INST_SERIAL)
 				sr_serial_dev_inst_free(sdi->conn);
 #endif
@@ -581,7 +557,7 @@ SR_PRIV int std_opts_config_list(uint32_t key, GVariant **data,
 	switch (key) {
 	case SR_CONF_SCAN_OPTIONS:
 		/* Always return scanopts, regardless of sdi or cg. */
-		if (!scanopts)
+		if (!scanopts || scanopts == NO_OPTS)
 			return SR_ERR_ARG;
 		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
 			scanopts, scansize, sizeof(uint32_t));
@@ -589,13 +565,13 @@ SR_PRIV int std_opts_config_list(uint32_t key, GVariant **data,
 	case SR_CONF_DEVICE_OPTIONS:
 		if (!sdi) {
 			/* sdi == NULL: return drvopts. */
-			if (!drvopts)
+			if (!drvopts || drvopts == NO_OPTS)
 				return SR_ERR_ARG;
 			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
 				drvopts, drvsize, sizeof(uint32_t));
 		} else if (sdi && !cg) {
 			/* sdi != NULL, cg == NULL: return devopts. */
-			if (!devopts)
+			if (!devopts || devopts == NO_OPTS)
 				return SR_ERR_ARG;
 			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
 				devopts, devsize, sizeof(uint32_t));
@@ -622,7 +598,7 @@ SR_PRIV GVariant *std_gvar_tuple_array(const uint64_t a[][2], unsigned int n)
 	GVariant *rational[2];
 	GVariantBuilder gvb;
 
-	g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+	g_variant_builder_init(&gvb, G_VARIANT_TYPE_TUPLE);
 
 	for (i = 0; i < n; i++) {
 		rational[0] = g_variant_new_uint64(a[i][0]);
@@ -641,7 +617,7 @@ SR_PRIV GVariant *std_gvar_tuple_rational(const struct sr_rational *r, unsigned
 	GVariant *rational[2];
 	GVariantBuilder gvb;
 
-	g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+	g_variant_builder_init(&gvb, G_VARIANT_TYPE_TUPLE);
 
 	for (i = 0; i < n; i++) {
 		rational[0] = g_variant_new_uint64(r[i].p);
@@ -935,3 +911,29 @@ SR_PRIV int std_cg_idx(const struct sr_channel_group *cg, struct sr_channel_grou
 
 	return -1;
 }
+
+SR_PRIV int std_dummy_set_params(struct sr_serial_dev_inst *serial,
+	int baudrate, int bits, int parity, int stopbits,
+	int flowcontrol, int rts, int dtr)
+{
+	(void)serial;
+	(void)baudrate;
+	(void)bits;
+	(void)parity;
+	(void)stopbits;
+	(void)flowcontrol;
+	(void)rts;
+	(void)dtr;
+
+	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;
+}