X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fstd.c;h=9755ff0aad19c5fccc17451f22e20b2d2f242cc1;hb=HEAD;hp=d3a3d36dd175b6886882f42b1d6e7ab8764bcf96;hpb=7f7702b81bd9051a87fde54983561675329d5dc8;p=libsigrok.git

diff --git a/src/std.c b/src/std.c
index d3a3d36d..959d0005 100644
--- a/src/std.c
+++ b/src/std.c
@@ -424,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) {
@@ -605,7 +605,8 @@ SR_PRIV GVariant *std_gvar_tuple_array(const uint64_t a[][2], unsigned int n)
 		rational[1] = g_variant_new_uint64(a[i][1]);
 
 		/* FIXME: Valgrind reports a memory leak here. */
-		g_variant_builder_add_value(&gvb, g_variant_new_tuple(rational, 2));
+		g_variant_builder_add_value(&gvb, g_variant_new_tuple(rational,
+			ARRAY_SIZE(rational)));
 	}
 
 	return g_variant_builder_end(&gvb);
@@ -624,7 +625,8 @@ SR_PRIV GVariant *std_gvar_tuple_rational(const struct sr_rational *r, unsigned
 		rational[1] = g_variant_new_uint64(r[i].q);
 
 		/* FIXME: Valgrind reports a memory leak here. */
-		g_variant_builder_add_value(&gvb, g_variant_new_tuple(rational, 2));
+		g_variant_builder_add_value(&gvb, g_variant_new_tuple(rational,
+			ARRAY_SIZE(rational)));
 	}
 
 	return g_variant_builder_end(&gvb);
@@ -687,17 +689,17 @@ SR_PRIV GVariant *std_gvar_min_max_step_thresholds(const double min, const doubl
 
 	g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
 
-	for (d = min; d <= max; d += step) {
+	for (d = min; d <= max + step / 2.0; d += step) {
 		/*
 		 * We will never see exactly 0.0 because of the error we're
 		 * accumulating, so catch the "zero" value and force it to be 0.
 		 */
-		v = ((d > (-step / 2)) && (d < (step / 2))) ? 0 : d;
+		v = ((d > (-step / 2.0)) && (d < (step / 2.0))) ? 0 : d;
 
 		range[0] = g_variant_new_double(v);
 		range[1] = g_variant_new_double(v);
 
-		gvar = g_variant_new_tuple(range, 2);
+		gvar = g_variant_new_tuple(range, ARRAY_SIZE(range));
 		g_variant_builder_add_value(&gvb, gvar);
 	}
 
@@ -711,7 +713,7 @@ SR_PRIV GVariant *std_gvar_tuple_u64(uint64_t low, uint64_t high)
 	range[0] = g_variant_new_uint64(low);
 	range[1] = g_variant_new_uint64(high);
 
-	return g_variant_new_tuple(range, 2);
+	return g_variant_new_tuple(range, ARRAY_SIZE(range));
 }
 
 SR_PRIV GVariant *std_gvar_tuple_double(double low, double high)
@@ -721,7 +723,7 @@ SR_PRIV GVariant *std_gvar_tuple_double(double low, double high)
 	range[0] = g_variant_new_double(low);
 	range[1] = g_variant_new_double(high);
 
-	return g_variant_new_tuple(range, 2);
+	return g_variant_new_tuple(range, ARRAY_SIZE(range));
 }
 
 SR_PRIV GVariant *std_gvar_array_i32(const int32_t a[], unsigned int n)
@@ -770,7 +772,7 @@ SR_PRIV GVariant *std_gvar_thresholds(const double a[][2], unsigned int n)
 	for (i = 0; i < n; i++) {
 		range[0] = g_variant_new_double(a[i][0]);
 		range[1] = g_variant_new_double(a[i][1]);
-		gvar = g_variant_new_tuple(range, 2);
+		gvar = g_variant_new_tuple(range, ARRAY_SIZE(range));
 		g_variant_builder_add_value(&gvb, gvar);
 	}
 
@@ -928,3 +930,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;
+}