Attachment 509 Details for Bug 1364 – patch for hardcoding the datasource

[patch] patch for hardcoding the datasource

hardcode_source.patch (text/plain), 1.34 KB, created by Mariusz Białończyk on 2019-03-11 10:53:12 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Mariusz Białończyk

Created: 2019-03-11 10:53:12 CET

Size: 1.34 KB

patch

obsolete

>diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
>index 6334cd74..8bf35b6b 100644
>--- a/src/hardware/rigol-ds/api.c
>+++ b/src/hardware/rigol-ds/api.c
>@@ -415,7 +415,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
>        devc->buffer = g_malloc(ACQ_BUFFER_SIZE);
>        devc->data = g_malloc(ACQ_BUFFER_SIZE * sizeof(float));
> 
>-       devc->data_source = DATA_SOURCE_LIVE;
>+       devc->data_source = DATA_SOURCE_MEMORY;
> 
>        sdi->priv = devc;
> 
>@@ -552,12 +552,12 @@ static int config_get(uint32_t key, GVariant **data,
>                        *data = g_variant_new_string("Segmented");
>                break;
>        case SR_CONF_SAMPLERATE:
>-               if (devc->data_source == DATA_SOURCE_LIVE) {
>+               if (devc->data_source == DATA_SOURCE_LIVE || devc->data_source == DATA_SOURCE_MEMORY) {
>                        samplerate = analog_frame_size(sdi) /
>                                (devc->timebase * devc->model->series->num_horizontal_divs);
>                        *data = g_variant_new_uint64(samplerate);
>                } else {
>-                       sr_dbg("Unknown data source: %d.", devc->data_source);
>+                       sr_dbg("Unknown sample rate for data source: %d.", devc->data_source);
>                        return SR_ERR_NA;
>                }
>                break;

Actions: View

Attachments on bug 1364: 507 | 508 | 509 | 510 | 511 | 591