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

dslogic: Removed trigger_fired option

This commit is contained in:
Joel Holdsworth 2017-06-15 14:52:28 -06:00 committed by Uwe Hermann
parent 658caaf0d1
commit 5e7e327ac8
2 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hardware/dslogic/protocol.c
View File

@ -800,7 +800,7 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
} else { } else {
devc->empty_transfer_count = 0; devc->empty_transfer_count = 0;
} }
if (devc->trigger_fired) {
if (!devc->limit_samples || devc->sent_samples < devc->limit_samples) { if (!devc->limit_samples || devc->sent_samples < devc->limit_samples) {
/* Send the incoming transfer to the session bus. */ /* Send the incoming transfer to the session bus. */
if (devc->limit_samples && devc->sent_samples + cur_sample_count > devc->limit_samples) if (devc->limit_samples && devc->sent_samples + cur_sample_count > devc->limit_samples)
@ -832,7 +832,6 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
devc->sent_samples += num_samples; devc->sent_samples += num_samples;
} }
} }
}
if (devc->limit_samples && devc->sent_samples >= devc->limit_samples) { if (devc->limit_samples && devc->sent_samples >= devc->limit_samples) {
abort_acquisition(devc); abort_acquisition(devc);
@ -912,7 +911,6 @@ static int start_transfers(const struct sr_dev_inst *sdi)
devc->sent_samples = 0; devc->sent_samples = 0;
devc->acq_aborted = FALSE; devc->acq_aborted = FALSE;
devc->empty_transfer_count = 0; devc->empty_transfer_count = 0;
devc->trigger_fired = TRUE;
num_transfers = get_number_of_transfers(devc); num_transfers = get_number_of_transfers(devc);

1
src/hardware/dslogic/protocol.h
View File

@ -122,7 +122,6 @@ struct dev_context {
uint64_t capture_ratio; uint64_t capture_ratio;
/* Operational settings */ /* Operational settings */
gboolean trigger_fired;
gboolean acq_aborted; gboolean acq_aborted;
unsigned int sent_samples; unsigned int sent_samples;