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

kingst-la2016: Use common code to send trigger and frame boundary packets 

[ gsi: adjust more locations, reword commit message ]
This commit is contained in:
Helge Kruse 2021-01-30 15:16:49 +01:00 committed by Gerhard Sittig
parent 8f87c5284b
commit d9a74e97f4
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/hardware/kingst-la2016/api.c
View File

@ -534,14 +534,8 @@ static void send_chunk(struct sr_dev_inst *sdi, transfer_packet_t *packets, unsi
do_signal_trigger = 0; do_signal_trigger = 0;
if (devc->had_triggers_configured && devc->reading_behind_trigger == 0 && devc->info.n_rep_packets_before_trigger == 0) { if (devc->had_triggers_configured && devc->reading_behind_trigger == 0 && devc->info.n_rep_packets_before_trigger == 0) {
sr_packet.type = SR_DF_TRIGGER; std_session_send_df_trigger(sdi);
sr_packet.payload = NULL;
sr_session_send(sdi, &sr_packet);
devc->reading_behind_trigger = 1; devc->reading_behind_trigger = 1;
do_signal_trigger = 0;
sr_packet.type = SR_DF_LOGIC;
sr_packet.payload = &logic;
} }
for (i = 0; i < num_tfers; i++) { for (i = 0; i < num_tfers; i++) {
@ -556,13 +550,8 @@ static void send_chunk(struct sr_dev_inst *sdi, transfer_packet_t *packets, unsi
n_samples = 0; n_samples = 0;
wp = (uint16_t*)devc->convbuffer; wp = (uint16_t*)devc->convbuffer;
if (do_signal_trigger) { if (do_signal_trigger) {
sr_packet.type = SR_DF_TRIGGER; std_session_send_df_trigger(sdi);
sr_packet.payload = NULL;
sr_session_send(sdi, &sr_packet);
do_signal_trigger = 0; do_signal_trigger = 0;
sr_packet.type = SR_DF_LOGIC;
sr_packet.payload = &logic;
} }
} }
p = packet->packet + k; p = packet->packet + k;
@ -588,9 +577,7 @@ static void send_chunk(struct sr_dev_inst *sdi, transfer_packet_t *packets, unsi
logic.length = n_samples * 2; logic.length = n_samples * 2;
sr_session_send(sdi, &sr_packet); sr_session_send(sdi, &sr_packet);
if (do_signal_trigger) { if (do_signal_trigger) {
sr_packet.type = SR_DF_TRIGGER; std_session_send_df_trigger(sdi);
sr_packet.payload = NULL;
sr_session_send(sdi, &sr_packet);
} }
} }
sr_dbg("send_chunk done after %d samples", total_samples); sr_dbg("send_chunk done after %d samples", total_samples);
@ -641,7 +628,6 @@ static int handle_event(int fd, int revents, void *cb_data)
const struct sr_dev_inst *sdi; const struct sr_dev_inst *sdi;
struct dev_context *devc; struct dev_context *devc;
struct drv_context *drvc; struct drv_context *drvc;
struct sr_datafeed_packet packet;
struct timeval tv; struct timeval tv;
(void)fd; (void)fd;
@ -666,8 +652,7 @@ static int handle_event(int fd, int revents, void *cb_data)
return FALSE; return FALSE;
} }
sr_dbg("retrieval is started..."); sr_dbg("retrieval is started...");
packet.type = SR_DF_FRAME_BEGIN; std_session_send_df_frame_begin(sdi);
sr_session_send(sdi, &packet);
return TRUE; return TRUE;
} }
@ -677,8 +662,7 @@ static int handle_event(int fd, int revents, void *cb_data)
if (devc->transfer_finished) { if (devc->transfer_finished) {
sr_dbg("transfer is finished!"); sr_dbg("transfer is finished!");
packet.type = SR_DF_FRAME_END; std_session_send_df_frame_end(sdi);
sr_session_send(sdi, &packet);
usb_source_remove(sdi->session, drvc->sr_ctx); usb_source_remove(sdi->session, drvc->sr_ctx);
std_session_send_df_end(sdi); std_session_send_df_end(sdi);