X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffx2lafw%2Fprotocol.c;h=f028d132711221301857b94eae5f1a85353e823d;hb=4237fbcaac84160a04333244ba0a309b952d3a8f;hp=5d0eba596d726451baefc3edfc01dd8b4c9f6483;hpb=7e5ccff2ec6cf9f8723f3e76394ab78946b278f8;p=libsigrok.git diff --git a/src/hardware/fx2lafw/protocol.c b/src/hardware/fx2lafw/protocol.c index 5d0eba59..f028d132 100644 --- 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 | @@ -304,7 +306,6 @@ SR_PRIV struct dev_context *fx2lafw_dev_new(void) devc->limit_samples = 0; devc->capture_ratio = 0; devc->sample_wide = FALSE; - devc->trigger_en = FALSE; devc->stl = NULL; return devc; @@ -324,16 +325,12 @@ 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); devc->num_transfers = 0; @@ -386,19 +383,23 @@ static void resubmit_transfer(struct libusb_transfer *transfer) } -SR_PRIV void mso_send_data_proc(struct dev_context *devc, +SR_PRIV void mso_send_data_proc(struct sr_dev_inst *sdi, uint8_t *data, size_t length, size_t sample_width) { size_t i; - sample_width = sample_width; - length /= 2; + struct dev_context *devc; + + (void)sample_width; + + devc = sdi->priv; - sr_dbg("mso_send_data_proc length = %d", length); + length /= 2; /* Send the logic */ - for(i = 0; i < length; i++) { + for (i = 0; i < length; i++) { devc->logic_buffer[i] = data[i * 2]; - devc->analog_buffer[i] = data[i * 2 + 1] - 128.0f; + /* 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 = { @@ -411,13 +412,15 @@ SR_PRIV void mso_send_data_proc(struct dev_context *devc, .type = SR_DF_LOGIC, .payload = &logic }; - sr_session_send(devc->cb_data, &logic_packet); + + sr_session_send(sdi, &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 = SR_MQFLAG_DC, + .mqflags = 0 /*SR_MQFLAG_DC*/, .data = devc->analog_buffer }; @@ -426,12 +429,10 @@ SR_PRIV void mso_send_data_proc(struct dev_context *devc, .payload = &analog }; - sr_dbg("mso_send_data_proc length = %d", length); - sr_session_send(devc->cb_data, &analog_packet); - + sr_session_send(sdi, &analog_packet); } -SR_PRIV void la_send_data_proc(struct dev_context *devc, +SR_PRIV void la_send_data_proc(struct sr_dev_inst *sdi, uint8_t *data, size_t length, size_t sample_width) { const struct sr_datafeed_logic logic = { @@ -445,7 +446,7 @@ SR_PRIV void la_send_data_proc(struct dev_context *devc, .payload = &logic }; - sr_session_send(devc->cb_data, &packet); + sr_session_send(sdi, &packet); } SR_PRIV void LIBUSB_CALL fx2lafw_receive_transfer(struct libusb_transfer *transfer) @@ -453,6 +454,7 @@ SR_PRIV void LIBUSB_CALL fx2lafw_receive_transfer(struct libusb_transfer *transf struct sr_dev_inst *sdi; struct dev_context *devc; gboolean packet_has_error = FALSE; + struct sr_datafeed_packet packet; unsigned int num_samples; int trigger_offset, cur_sample_count, unitsize; int pre_trigger_samples; @@ -505,8 +507,6 @@ SR_PRIV void LIBUSB_CALL fx2lafw_receive_transfer(struct libusb_transfer *transf } else { devc->empty_transfer_count = 0; } - if (devc->trigger_en) - devc->trigger_fired = TRUE; if (devc->trigger_fired) { if (!devc->limit_samples || devc->sent_samples < devc->limit_samples) { /* Send the incoming transfer to the session bus. */ @@ -515,11 +515,29 @@ SR_PRIV void LIBUSB_CALL fx2lafw_receive_transfer(struct libusb_transfer *transf else num_samples = cur_sample_count; - devc->send_data_proc(devc, - (uint8_t*)transfer->buffer, - num_samples * unitsize, - unitsize); - devc->sent_samples += num_samples; + if(devc->dslogic && devc->trigger_pos > devc->sent_samples + && devc->trigger_pos <= devc->sent_samples + num_samples){ + /* dslogic trigger in this block. Send trigger position */ + trigger_offset = devc->trigger_pos - devc->sent_samples; + /* pre-trigger samples */ + devc->send_data_proc(sdi, (uint8_t *)transfer->buffer, + trigger_offset * unitsize, unitsize); + devc->sent_samples += trigger_offset; + /* trigger position */ + devc->trigger_pos = 0; + packet.type = SR_DF_TRIGGER; + packet.payload = NULL; + sr_session_send(sdi, &packet); + /* post trigger samples */ + num_samples -= trigger_offset; + devc->send_data_proc(sdi, (uint8_t *)transfer->buffer + + trigger_offset * unitsize, num_samples * unitsize, unitsize); + devc->sent_samples += num_samples; + }else{ + devc->send_data_proc(sdi, (uint8_t *)transfer->buffer, + num_samples * unitsize, unitsize); + devc->sent_samples += num_samples; + } } } else { trigger_offset = soft_trigger_logic_check(devc->stl, @@ -531,10 +549,9 @@ 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, - (uint8_t*)transfer->buffer + trigger_offset * unitsize, - num_samples * unitsize, - unitsize); + devc->send_data_proc(sdi, (uint8_t *)transfer->buffer + + trigger_offset * unitsize, + num_samples * unitsize, unitsize); devc->sent_samples += num_samples; devc->trigger_fired = TRUE;