BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fx2lafw: Don't send more samples than requested. 

It's the new law.
This commit is contained in:
Bert Vermeulen 2014-04-24 21:04:23 +02:00
parent b0ccd64d02
commit 06b5d7f70d
1 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
hardware/fx2lafw/protocol.c
View File

@ -431,8 +431,8 @@ SR_PRIV void fx2lafw_receive_transfer(struct libusb_transfer *transfer)
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic; struct sr_datafeed_logic logic;
struct dev_context *devc; struct dev_context *devc;
int cur_sample_count, num_samples, trigger_offset, sample_width; unsigned int trigger_offset, num_samples;
int i; int cur_sample_count, sample_width, i;
uint8_t *cur_buf; uint8_t *cur_buf;
uint16_t cur_sample; uint16_t cur_sample;
@ -501,7 +501,7 @@ SR_PRIV void fx2lafw_receive_transfer(struct libusb_transfer *transfer)
if (devc->trigger_stage == NUM_TRIGGER_STAGES || if (devc->trigger_stage == NUM_TRIGGER_STAGES ||
devc->trigger_mask[devc->trigger_stage] == 0) { devc->trigger_mask[devc->trigger_stage] == 0) {
/* Match on all trigger stages, we're done. */ /* Match on all trigger stages, we're done. */
trigger_offset = i + 1; trigger_offset = i;
/* /*
* TODO: Send pre-trigger buffer to session bus. * TODO: Send pre-trigger buffer to session bus.
@ -517,13 +517,13 @@ SR_PRIV void fx2lafw_receive_transfer(struct libusb_transfer *transfer)
*/ */
packet.type = SR_DF_LOGIC; packet.type = SR_DF_LOGIC;
packet.payload = &logic; packet.payload = &logic;
logic.unitsize = sample_width; num_samples = cur_sample_count - trigger_offset;
if (devc->trigger_stage > devc->limit_samples) if (devc->limit_samples &&
num_samples = devc->trigger_stage; num_samples > devc->limit_samples - devc->sent_samples)
else num_samples = devc->limit_samples - devc->sent_samples;
num_samples = devc->limit_samples;
logic.length = num_samples * sample_width; logic.length = num_samples * sample_width;
logic.data = devc->trigger_buffer; logic.unitsize = sample_width;
logic.data = cur_buf + trigger_offset * sample_width;
sr_session_send(devc->cb_data, &packet); sr_session_send(devc->cb_data, &packet);
devc->sent_samples += num_samples; devc->sent_samples += num_samples;
@ -545,9 +545,7 @@ SR_PRIV void fx2lafw_receive_transfer(struct libusb_transfer *transfer)
devc->trigger_stage = 0; devc->trigger_stage = 0;
} }
} }
} } else if (devc->sent_samples < devc->limit_samples) {
if (devc->trigger_fired) {
/* Send the incoming transfer to the session bus. */ /* Send the incoming transfer to the session bus. */
packet.type = SR_DF_LOGIC; packet.type = SR_DF_LOGIC;
packet.payload = &logic; packet.payload = &logic;
@ -557,21 +555,15 @@ SR_PRIV void fx2lafw_receive_transfer(struct libusb_transfer *transfer)
num_samples = cur_sample_count; num_samples = cur_sample_count;
logic.length = num_samples * sample_width; logic.length = num_samples * sample_width;
logic.unitsize = sample_width; logic.unitsize = sample_width;
logic.data = cur_buf + trigger_offset * sample_width; logic.data = cur_buf;
sr_session_send(devc->cb_data, &packet); sr_session_send(devc->cb_data, &packet);
devc->sent_samples += cur_sample_count; devc->sent_samples += cur_sample_count;
if (devc->limit_samples && }
(unsigned int)devc->sent_samples > devc->limit_samples) {
fx2lafw_abort_acquisition(devc); if (devc->limit_samples && devc->sent_samples >= devc->limit_samples) {
free_transfer(transfer); fx2lafw_abort_acquisition(devc);
return; free_transfer(transfer);
} return;
} else {
/*
* TODO: Buffer pre-trigger data in capture
* ratio-sized buffer.
*/
} }
resubmit_transfer(transfer); resubmit_transfer(transfer);