fx2lafw/dslogic: Updated dslogic_fpga_config structure to reflect v0.97 firmware

[libsigrok.git] / src / hardware / fx2lafw / protocol.c

diff --git a/src/hardware/fx2lafw/protocol.c b/src/hardware/fx2lafw/protocol.c
index 29bb0df51f2a1d8467e225a490fbfdfd2debfa78..7e2df5ad9e0ed9b11ee9c0f586b7a19b9b1bd8fe 100644 (file)
--- a/src/hardware/fx2lafw/protocol.c
+++ b/src/hardware/fx2lafw/protocol.c
@@ -126,7 +126,7 @@ SR_PRIV int fx2lafw_command_start_acquisition(const struct sr_dev_inst *sdi)
        cmd.flags |= devc->sample_wide ? CMD_START_FLAGS_SAMPLE_16BIT :
                CMD_START_FLAGS_SAMPLE_8BIT;
        /* Enable CTL2 clock. */
-       cmd.flags |= (devc->profile->dev_caps & DEV_CAPS_AX_ANALOG) ? CMD_START_FLAGS_CLK_CTL2 : 0;
+       cmd.flags |= (g_slist_length(devc->enabled_analog_channels) > 0) ? CMD_START_FLAGS_CLK_CTL2 : 0;
 
        /* Send the control message. */
        ret = libusb_control_transfer(usb->devhdl, LIBUSB_REQUEST_TYPE_VENDOR |
@@ -338,9 +338,11 @@ static void finish_acquisition(struct sr_dev_inst *sdi)
        devc->num_transfers = 0;
        g_free(devc->transfers);
 
-       /* Free the deinterlace buffers if we had them */
-       g_free(devc->logic_buffer);
-       g_free(devc->analog_buffer);
+       /* Free the deinterlace buffers if we had them. */
+       if (g_slist_length(devc->enabled_analog_channels) > 0) {
+               g_free(devc->logic_buffer);
+               g_free(devc->analog_buffer);
+       }
 
        if (devc->stl) {
                soft_trigger_logic_free(devc->stl);
@@ -403,9 +405,9 @@ SR_PRIV void mso_send_data_proc(struct sr_dev_inst *sdi,
 
        /* Send the logic */
        for (i = 0; i < length; i++) {
-               devc->logic_buffer[i]  = data[i * 2];
+               devc->logic_buffer[i] = data[i * 2];
                /* Rescale to -10V - +10V from 0-255. */
-               devc->analog_buffer[i] = data[i * 2 + 1] - 128.0f / 12.8f;
+               devc->analog_buffer[i] = (data[i * 2 + 1] - 128.0f) / 12.8f;
        };
 
        const struct sr_datafeed_logic logic = {
@@ -421,7 +423,7 @@ SR_PRIV void mso_send_data_proc(struct sr_dev_inst *sdi,
 
        sr_session_send(sdi, &logic_packet);
 
-       sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+       sr_analog_init(&analog, &encoding, &meaning, &spec, 2);
        analog.meaning->channels = devc->enabled_analog_channels;
        analog.meaning->mq = SR_MQ_VOLTAGE;
        analog.meaning->unit = SR_UNIT_VOLT;
@@ -591,6 +593,9 @@ SR_PRIV unsigned int fx2lafw_get_number_of_transfers(struct dev_context *devc)
 {
        unsigned int n;
 
+       if (devc->dslogic)
+               return dslogic_get_number_of_transfers(devc);
+
        /* Total buffer size should be able to hold about 500ms of data. */
        n = (500 * to_bytes_per_ms(devc->cur_samplerate) /
                fx2lafw_get_buffer_size(devc));