X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fstd.c;h=581e2e467440f7776dc508e5a7d702691062ab92;hb=82b9f3d116ce0c982291a2dfdd15cd8a1c4cc16e;hp=b6a0fc9c768e4071f7505743cdccf27fb9813159;hpb=1df81f4b062fcfe8c6de4d2e5edf9743030ae0fc;p=libsigrok.git

diff --git a/src/std.c b/src/std.c
index b6a0fc9c..581e2e46 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. */
@@ -392,11 +390,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);
 }
 
@@ -624,7 +617,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]);
@@ -643,7 +636,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);
@@ -937,3 +930,20 @@ 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;
+}
+