X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fstd.c;h=581e2e467440f7776dc508e5a7d702691062ab92;hb=82b9f3d116ce0c982291a2dfdd15cd8a1c4cc16e;hp=48f83b53b5856c1ae3c8740bc16d2d60bbaf02f1;hpb=b7602846fd2d8388e3462237e2c60927efcff744;p=libsigrok.git diff --git a/src/std.c b/src/std.c index 48f83b53..581e2e46 100644 --- a/src/std.c +++ b/src/std.c @@ -21,13 +21,15 @@ * @file * * Standard API helper functions. - * - * @internal */ +/* Needed for gettimeofday(), at least on FreeBSD. */ +#define _XOPEN_SOURCE 700 + #include #include #include +#include #include #include #include "libsigrok-internal.h" @@ -35,6 +37,8 @@ #define LOG_PREFIX "std" +SR_PRIV const uint32_t NO_OPTS[1] = {}; + /** * Standard driver init() callback API helper. * @@ -178,7 +182,6 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi) prefix = (sdi->driver) ? sdi->driver->name : "unknown"; /* Send header packet to the session bus. */ - sr_dbg("%s: Sending SR_DF_HEADER packet.", prefix); packet.type = SR_DF_HEADER; packet.payload = (uint8_t *)&header; header.feed_version = 1; @@ -217,8 +220,6 @@ SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi) prefix = (sdi->driver) ? sdi->driver->name : "unknown"; - sr_dbg("%s: Sending SR_DF_END packet.", prefix); - packet.type = SR_DF_END; packet.payload = NULL; @@ -255,8 +256,6 @@ SR_PRIV int std_session_send_frame_begin(const struct sr_dev_inst *sdi) prefix = (sdi->driver) ? sdi->driver->name : "unknown"; - sr_dbg("%s: Sending SR_DF_FRAME_BEGIN packet.", prefix); - packet.type = SR_DF_FRAME_BEGIN; packet.payload = NULL; @@ -293,8 +292,6 @@ SR_PRIV int std_session_send_frame_end(const struct sr_dev_inst *sdi) prefix = (sdi->driver) ? sdi->driver->name : "unknown"; - sr_dbg("%s: Sending SR_DF_FRAME_END packet.", prefix); - packet.type = SR_DF_FRAME_END; packet.payload = NULL; @@ -306,7 +303,7 @@ SR_PRIV int std_session_send_frame_end(const struct sr_dev_inst *sdi) return SR_OK; } -#ifdef HAVE_LIBSERIALPORT +#ifdef HAVE_SERIAL_COMM /** * Standard serial driver dev_open() callback API helper. @@ -393,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); } @@ -455,7 +447,7 @@ SR_PRIV int std_dev_clear_with_callback(const struct sr_dev_driver *driver, 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 @@ -584,7 +576,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)); @@ -592,13 +584,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)); @@ -625,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]); @@ -644,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); @@ -708,15 +700,21 @@ SR_PRIV GVariant *std_gvar_min_max_step_array(const double a[3]) SR_PRIV GVariant *std_gvar_min_max_step_thresholds(const double min, const double max, const double step) { - double d; + double d, v; GVariant *gvar, *range[2]; GVariantBuilder gvb; g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); for (d = min; d <= max; d += step) { - range[0] = g_variant_new_double(d); - range[1] = g_variant_new_double(d); + /* + * 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; + + range[0] = g_variant_new_double(v); + range[1] = g_variant_new_double(v); gvar = g_variant_new_tuple(range, 2); g_variant_builder_add_value(&gvb, gvar); @@ -745,24 +743,41 @@ SR_PRIV GVariant *std_gvar_tuple_double(double low, double high) return g_variant_new_tuple(range, 2); } -SR_PRIV GVariant *std_gvar_array_i32(const int32_t *a, unsigned int n) +SR_PRIV GVariant *std_gvar_array_i32(const int32_t a[], unsigned int n) { return g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, a, n, sizeof(int32_t)); } -SR_PRIV GVariant *std_gvar_array_u32(const uint32_t *a, unsigned int n) +SR_PRIV GVariant *std_gvar_array_u32(const uint32_t a[], unsigned int n) { return g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, a, n, sizeof(uint32_t)); } -SR_PRIV GVariant *std_gvar_array_u64(const uint64_t *a, unsigned int n) +SR_PRIV GVariant *std_gvar_array_u64(const uint64_t a[], unsigned int n) { return g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64, a, n, sizeof(uint64_t)); } +SR_PRIV GVariant *std_gvar_array_str(const char *a[], unsigned int n) +{ + GVariant *gvar; + GVariantBuilder *builder; + unsigned int i; + + builder = g_variant_builder_new(G_VARIANT_TYPE ("as")); + + for (i = 0; i < n; i++) + g_variant_builder_add(builder, "s", a[i]); + + gvar = g_variant_new("as", builder); + g_variant_builder_unref(builder); + + return gvar; +} + SR_PRIV GVariant *std_gvar_thresholds(const double a[][2], unsigned int n) { unsigned int i; @@ -915,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; +} +