Skip to content

Ols improvements 2024 part1 #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Ols improvements 2024 part1 #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
34416b8
ols: Adjust pre-trigger delay
v1ne Feb 23, 2021
30be2e8
ols: Flip samples after reading everything
v1ne Feb 23, 2021
9c5325c
ols: Use a dynamic sample buffer
v1ne Feb 23, 2021
28a1173
ols: Be more robust against short reads
v1ne Feb 23, 2021
a16adc7
ols: Make resetting more robust, reset at the end
v1ne Feb 23, 2021
a19dd41
ols: Clean up: Rename variables, remove misleading counter
v1ne Feb 23, 2021
c9d78a0
ols: Clean up: Always keep sample_buf_size up to date
v1ne Feb 23, 2021
d62827b
ols: Communicate internally that the number of samples is a multiple …
v1ne Feb 23, 2021
edb566a
ols: Immediately process data after expected sample count
v1ne Feb 23, 2021
bc8ea79
ols: Receive many bytes in a row
v1ne Feb 23, 2021
62fc690
ols: Capture multiple bytes at once
v1ne Feb 23, 2021
d62c909
ols: Determine the right trigger point when using RLE
v1ne Feb 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/hardware/openbench-logic-sniffer/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
devc = g_malloc0(sizeof(*devc));
sdi->priv = devc;
devc->trigger_at_smpl = OLS_NO_TRIGGER;
devc->trigger_rle_at_smpl_from_end = OLS_NO_TRIGGER;
devc->channel_names = sr_parse_probe_names(probe_names,
ols_channel_names, ARRAY_SIZE(ols_channel_names),
ARRAY_SIZE(ols_channel_names), &ch_max);
Expand Down Expand Up @@ -457,17 +458,19 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
return SR_ERR;

/* Reset all operational states. */
devc->rle_count = devc->num_transfers = 0;
devc->num_samples = devc->num_bytes = 0;
devc->cnt_bytes = devc->cnt_samples = devc->cnt_samples_rle = 0;
memset(devc->sample, 0, 4);
devc->rle_count = 0;
devc->trigger_rle_at_smpl_from_end = OLS_NO_TRIGGER;
devc->cnt_samples = devc->raw_sample_size = 0;
devc->cnt_rx_bytes = devc->cnt_rx_raw_samples = 0;
memset(devc->raw_sample, 0, 4);

std_session_send_df_header(sdi);

/* If the device stops sending for longer than it takes to send a byte,
* that means it's finished. But wait at least 100 ms to be safe.
* that means it's finished. Since the device can be used over a slow
* network link, give it 10 seconds to reply.
*/
return serial_source_add(sdi->session, serial, G_IO_IN, 100,
return serial_source_add(sdi->session, serial, G_IO_IN, 10 * 1000,
ols_receive_data, (struct sr_dev_inst *)sdi);
}

Expand Down
Loading