rigol-ds1xx2: properly send frame begin/end packets

[libsigrok.git] / hardware / rigol-ds1xx2 / api.c

diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index 572df782d0ba2fd54029ca92c7da11de5c95cba2..0bc2a23ca670e2bddc2081f8ab9fd6d025df6d80 100644 (file)
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -26,6 +26,9 @@
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
+#define NUM_TIMEBASE  12
+#define NUM_VDIV      8
+
 static const int32_t hwcaps[] = {
        SR_CONF_OSCILLOSCOPE,
        SR_CONF_LIMIT_SAMPLES,
@@ -35,6 +38,8 @@ static const int32_t hwcaps[] = {
        SR_CONF_HORIZ_TRIGGERPOS,
        SR_CONF_VDIV,
        SR_CONF_COUPLING,
+       SR_CONF_NUM_TIMEBASE,
+       SR_CONF_NUM_VDIV,
 };
 
 static const uint64_t timebases[][2] = {
@@ -304,6 +309,25 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
+static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
+{
+
+       (void)sdi;
+
+       switch (id) {
+       case SR_CONF_NUM_TIMEBASE:
+               *data = g_variant_new_int32(NUM_TIMEBASE);
+               break;
+       case SR_CONF_NUM_VDIV:
+               *data = g_variant_new_int32(NUM_VDIV);
+               break;
+       default:
+               return SR_ERR_ARG;
+       }
+
+       return SR_OK;
+}
+
 static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
@@ -405,6 +429,9 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
 
 static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
 {
+       GVariant *tuple, *rational[2];
+       GVariantBuilder gvb;
+       unsigned int i;
 
        (void)sdi;
 
@@ -417,12 +444,24 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
                *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling));
                break;
        case SR_CONF_VDIV:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
-                               vdivs, ARRAY_SIZE(vdivs) * 2, sizeof(uint64_t));
+               g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+               for (i = 0; i < ARRAY_SIZE(vdivs); i++) {
+                       rational[0] = g_variant_new_uint64(vdivs[i][0]);
+                       rational[1] = g_variant_new_uint64(vdivs[i][1]);
+                       tuple = g_variant_new_tuple(rational, 2);
+                       g_variant_builder_add_value(&gvb, tuple);
+               }
+               *data = g_variant_builder_end(&gvb);
                break;
        case SR_CONF_TIMEBASE:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
-                               timebases, ARRAY_SIZE(timebases) * 2, sizeof(uint64_t));
+               g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+               for (i = 0; i < ARRAY_SIZE(timebases); i++) {
+                       rational[0] = g_variant_new_uint64(timebases[i][0]);
+                       rational[1] = g_variant_new_uint64(timebases[i][1]);
+                       tuple = g_variant_new_tuple(rational, 2);
+                       g_variant_builder_add_value(&gvb, tuple);
+               }
+               *data = g_variant_builder_end(&gvb);
                break;
        case SR_CONF_TRIGGER_SOURCE:
                *data = g_variant_new_strv(trigger_sources,
@@ -446,7 +485,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 
        devc = sdi->priv;
 
-       devc->num_frames = 0;
+       devc->num_frames = devc->num_frame_samples = 0;
 
        sr_source_add(devc->fd, G_IO_IN, 50, rigol_ds1xx2_receive_data, (void *)sdi);
 
@@ -497,7 +536,7 @@ SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info = {
        .scan = hw_scan,
        .dev_list = hw_dev_list,
        .dev_clear = clear_instances,
-       .config_get = NULL,
+       .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
        .dev_open = hw_dev_open,