Typos and consistency fixes.

diff --git a/src/hardware/asix-sigma/asix-sigma.c b/src/hardware/asix-sigma/asix-sigma.c
index d0f06603a2009ec02b5a86b9db0e93cab4fcacd9..8965f685de961992c83d18d5cf2bdbac55647d7b 100644 (file)
--- a/src/hardware/asix-sigma/asix-sigma.c
+++ b/src/hardware/asix-sigma/asix-sigma.c
@@ -908,7 +908,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                *data = g_variant_builder_end(&gvb);
                break;
        case SR_CONF_TRIGGER_MATCH:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
                                trigger_matches, ARRAY_SIZE(trigger_matches),
                                sizeof(int32_t));
                break;

diff --git a/src/hardware/beaglelogic/api.c b/src/hardware/beaglelogic/api.c
index 9732311de386cc655257d94f40add7d07ae3b0ac..8af44d1e6ffa140109162e42426311e4c6f84051 100644 (file)
--- a/src/hardware/beaglelogic/api.c
+++ b/src/hardware/beaglelogic/api.c
@@ -321,7 +321,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                *data = g_variant_builder_end(&gvb);
                break;
        case SR_CONF_TRIGGER_MATCH:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
                                soft_trigger_matches, ARRAY_SIZE(soft_trigger_matches),
                                sizeof(int32_t));
                break;

diff --git a/src/hardware/chronovu-la/api.c b/src/hardware/chronovu-la/api.c
index 4edeedfc93cc6592a77b2c68a91ea48bd204eb64..0a22922d4699c9e8d7d675b2751ed1655a2b0200 100644 (file)
--- a/src/hardware/chronovu-la/api.c
+++ b/src/hardware/chronovu-la/api.c
@@ -379,7 +379,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        case SR_CONF_TRIGGER_MATCH:
                if (!sdi || !sdi->priv || !(devc = sdi->priv) || !devc->prof)
                        return SR_ERR_BUG;
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
                                trigger_matches, devc->prof->num_trigger_matches,
                                sizeof(int32_t));
                break;

diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c
index cd33eb1a27311ab30b29a3c71529433eb99e7912..3cf5a2be41e3d14e6d24ccd11261bc05b5171a1e 100644 (file)
--- a/src/hardware/yokogawa-dlm/api.c
+++ b/src/hardware/yokogawa-dlm/api.c
@@ -483,7 +483,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                                model->devopts, model->num_devopts, sizeof(uint32_t));
                } else if (cg_type == CG_ANALOG) {
                        *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                               model->analog_devopts, model->num_analog_devopts,       sizeof(uint32_t));
+                               model->analog_devopts, model->num_analog_devopts, sizeof(uint32_t));
                } else {
                        *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
                                NULL, 0, sizeof(uint32_t));

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index 1fc049e46e007cde6a505e01f875fd03ea58b26d..b0df768c82b57297f74d0226c78aedb560e69821 100644 (file)
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -79,7 +79,7 @@
  * @return the corresponding signed integer
  */
 #define RL16S(x)  ((int16_t) \
-                         (((unsigned)((const uint8_t*)(x))[1] <<  8) | \
+                  (((unsigned)((const uint8_t*)(x))[1] <<  8) | \
                     (unsigned)((const uint8_t*)(x))[0]))
 
 /**