zeroplus-logic-cube: Add LAP-16032U

[libsigrok.git] / src / hardware / zeroplus-logic-cube / api.c

diff --git a/src/hardware/zeroplus-logic-cube/api.c b/src/hardware/zeroplus-logic-cube/api.c
index c3ee8017fa554251d4759203bffe80a7c7acfd51..da3899dd404d217de644efb0ad671e35b66d6aee 100644 (file)
--- a/src/hardware/zeroplus-logic-cube/api.c
+++ b/src/hardware/zeroplus-logic-cube/api.c
@@ -42,6 +42,7 @@ struct zp_model {
  */
 static const struct zp_model zeroplus_models[] = {
        {0x0c12, 0x7002, "LAP-16128U",    16, 128,  200},
+       {0x0c12, 0x7007, "LAP-16032U",    16, 32,   200},
        {0x0c12, 0x7009, "LAP-C(16064)",  16, 64,   100},
        {0x0c12, 0x700a, "LAP-C(16128)",  16, 128,  200},
        {0x0c12, 0x700b, "LAP-C(32128)",  32, 128,  200},
@@ -49,7 +50,9 @@ static const struct zp_model zeroplus_models[] = {
        {0x0c12, 0x700d, "LAP-C(322000)", 32, 2048, 200},
        {0x0c12, 0x700e, "LAP-C(16032)",  16, 32,   100},
        {0x0c12, 0x7016, "LAP-C(162000)", 16, 2048, 200},
-       {0x0c12, 0x7100, "AKIP-9101", 16, 256, 200},
+       {0x0c12, 0x7025, "LAP-C(16128+)", 16, 128,  200},
+       {0x0c12, 0x7064, "Logian-16L",    16, 128,  200},
+       {0x0c12, 0x7100, "AKIP-9101",     16, 256,  200},
        ALL_ZERO
 };
 
@@ -327,11 +330,10 @@ static int dev_close(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_get(uint32_t key, GVariant **data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
-       GVariant *range[2];
 
        (void)cg;
 
@@ -348,9 +350,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
                *data = g_variant_new_uint64(devc->capture_ratio);
                break;
        case SR_CONF_VOLTAGE_THRESHOLD:
-               range[0] = g_variant_new_double(devc->cur_threshold);
-               range[1] = g_variant_new_double(devc->cur_threshold);
-               *data = g_variant_new_tuple(range, 2);
+               *data = std_gvar_tuple_double(devc->cur_threshold, devc->cur_threshold);
                break;
        default:
                return SR_ERR_NA;
@@ -359,8 +359,8 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
        return SR_OK;
 }
 
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
        gdouble low, high;
@@ -375,7 +375,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        case SR_CONF_LIMIT_SAMPLES:
                return set_limit_samples(devc, g_variant_get_uint64(data));
        case SR_CONF_CAPTURE_RATIO:
-               return set_capture_ratio(devc, g_variant_get_uint64(data));
+               devc->capture_ratio = g_variant_get_uint64(data);
+               break;
        case SR_CONF_VOLTAGE_THRESHOLD:
                g_variant_get(data, "(dd)", &low, &high);
                return set_voltage_threshold(devc, (low + high) / 2.0);
@@ -386,11 +387,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        return SR_OK;
 }
 
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
-       GVariant *grange[2];
 
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:
@@ -417,9 +417,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                if (!sdi)
                        return SR_ERR_ARG;
                devc = sdi->priv;
-               grange[0] = g_variant_new_uint64(0);
-               grange[1] = g_variant_new_uint64(devc->max_sample_depth);
-               *data = g_variant_new_tuple(grange, 2);
+               *data = std_gvar_tuple_u64(0, devc->max_sample_depth);
                break;
        default:
                return SR_ERR_NA;