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

ols: Refactor, deduplicate logic packet code 

Reviewed-By: Wolfram Sang <wsa@kernel.org>
This commit is contained in:
v1ne 2020-03-31 19:02:29 +02:00 committed by Gerhard Sittig
parent dcdc2848b7
commit 2755ab36f3
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/hardware/openbench-logic-sniffer/protocol.c
View File

@ -509,25 +509,19 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
/* Send the trigger. */
std_session_send_df_trigger(sdi);
/* Send post-trigger samples. */
packet.type = SR_DF_LOGIC;
packet.payload = &logic;
logic.length = (devc->num_samples * 4) - (devc->trigger_at_smpl * 4);
logic.unitsize = 4;
logic.data = devc->raw_sample_buf + devc->trigger_at_smpl * 4 +
(devc->limit_samples - devc->num_samples) * 4;
sr_session_send(sdi, &packet);
} else {
/* no trigger was used */
packet.type = SR_DF_LOGIC;
packet.payload = &logic;
logic.length = devc->num_samples * 4;
logic.unitsize = 4;
logic.data = devc->raw_sample_buf +
(devc->limit_samples - devc->num_samples) * 4;
sr_session_send(sdi, &packet);
}
/* Send post-trigger / all captured samples. */
int num_pre_trigger_samples = devc->trigger_at_smpl == OLS_NO_TRIGGER
? 0 : devc->trigger_at_smpl;
packet.type = SR_DF_LOGIC;
packet.payload = &logic;
logic.length = (devc->num_samples - num_pre_trigger_samples) * 4;
logic.unitsize = 4;
logic.data = devc->raw_sample_buf + (num_pre_trigger_samples +
devc->limit_samples - devc->num_samples) * 4;
sr_session_send(sdi, &packet);
g_free(devc->raw_sample_buf);
serial_flush(serial);