Factor out std_session_send_df_end() helper.

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

diff --git a/src/hardware/fx2lafw/protocol.c b/src/hardware/fx2lafw/protocol.c
index 8a11514ed824d6b0227f61f0879cd0fccccf4712..513fd0e2821f8fe039b45b4e58a33423ea152ac0 100644 (file)
--- a/src/hardware/fx2lafw/protocol.c
+++ b/src/hardware/fx2lafw/protocol.c
@@ -125,6 +125,8 @@ SR_PRIV int fx2lafw_command_start_acquisition(const struct sr_dev_inst *sdi)
        /* Select the sampling width. */
        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;
 
        /* Send the control message. */
        ret = libusb_control_transfer(usb->devhdl, LIBUSB_REQUEST_TYPE_VENDOR |
@@ -324,14 +326,11 @@ SR_PRIV void fx2lafw_abort_acquisition(struct dev_context *devc)
 
 static void finish_acquisition(struct sr_dev_inst *sdi)
 {
-       struct sr_datafeed_packet packet;
        struct dev_context *devc;
 
        devc = sdi->priv;
 
-       /* Terminate session. */
-       packet.type = SR_DF_END;
-       sr_session_send(sdi, &packet);
+       std_session_send_df_end(sdi, LOG_PREFIX);
 
        /* Remove fds from polling. */
        usb_source_remove(sdi->session, devc->ctx);
@@ -339,6 +338,10 @@ 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);
+
        if (devc->stl) {
                soft_trigger_logic_free(devc->stl);
                devc->stl = NULL;
@@ -382,7 +385,50 @@ static void resubmit_transfer(struct libusb_transfer *transfer)
 
 }
 
-SR_PRIV void la_send_data_proc(void *cb_data,
+SR_PRIV void mso_send_data_proc(struct dev_context *devc,
+       uint8_t *data, size_t length, size_t sample_width)
+{
+       size_t i;
+       sample_width = sample_width;
+       length /= 2;
+
+       /* Send the logic */
+       for(i = 0; i < length; i++) {
+               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;
+       };
+
+       const struct sr_datafeed_logic logic = {
+               .length = length,
+               .unitsize = 1,
+               .data = devc->logic_buffer
+       };
+
+       const struct sr_datafeed_packet logic_packet = {
+               .type = SR_DF_LOGIC,
+               .payload = &logic
+       };
+       sr_session_send(devc->cb_data, &logic_packet);
+
+       const struct sr_datafeed_analog_old analog = {
+               .channels = devc->enabled_analog_channels,
+               .num_samples = length,
+               .mq = SR_MQ_VOLTAGE,
+               .unit = SR_UNIT_VOLT,
+               .mqflags = 0 /*SR_MQFLAG_DC*/,
+               .data = devc->analog_buffer
+       };
+
+       const struct sr_datafeed_packet analog_packet = {
+               .type = SR_DF_ANALOG_OLD,
+               .payload = &analog
+       };
+       sr_session_send(devc->cb_data, &analog_packet);
+
+}
+
+SR_PRIV void la_send_data_proc(struct dev_context *devc,
        uint8_t *data, size_t length, size_t sample_width)
 {
        const struct sr_datafeed_logic logic = {
@@ -396,7 +442,7 @@ SR_PRIV void la_send_data_proc(void *cb_data,
                .payload = &logic
        };
 
-       sr_session_send(cb_data, &packet);
+       sr_session_send(devc->cb_data, &packet);
 }
 
 SR_PRIV void LIBUSB_CALL fx2lafw_receive_transfer(struct libusb_transfer *transfer)
@@ -466,7 +512,7 @@ SR_PRIV void LIBUSB_CALL fx2lafw_receive_transfer(struct libusb_transfer *transf
                        else
                                num_samples = cur_sample_count;
 
-                       devc->send_data_proc(devc->cb_data,
+                       devc->send_data_proc(devc,
                                                (uint8_t*)transfer->buffer,
                                                num_samples * unitsize,
                                                unitsize);
@@ -482,7 +528,7 @@ SR_PRIV void LIBUSB_CALL fx2lafw_receive_transfer(struct libusb_transfer *transf
                                        num_samples > devc->limit_samples - devc->sent_samples)
                                num_samples = devc->limit_samples - devc->sent_samples;
 
-                       devc->send_data_proc(devc->cb_data,
+                       devc->send_data_proc(devc,
                                                (uint8_t*)transfer->buffer + trigger_offset * unitsize,
                                                num_samples * unitsize,
                                                unitsize);