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

std: Rename std_session_send_frame_begin/_end().

This commit is contained in:
Uwe Hermann 2020-04-08 23:35:44 +02:00
parent 0fa71943e3
commit 7f7702b81b
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hardware/demo/api.c
View File

@ -573,7 +573,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
std_session_send_df_header(sdi);
if (devc->limit_frames > 0)
std_session_send_frame_begin(sdi);
std_session_send_df_frame_begin(sdi);
/* We use this timestamp to decide how many more samples to send. */
devc->start_us = g_get_monotonic_time();
@ -591,7 +591,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
devc = sdi->priv;
if (devc->limit_frames > 0)
std_session_send_frame_end(sdi);
std_session_send_df_frame_end(sdi);
std_session_send_df_end(sdi);

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

@ -714,7 +714,7 @@ SR_PRIV int demo_prepare_data(int fd, int revents, void *cb_data)
devc->spent_us += todo_us;
if (devc->limit_frames && devc->sent_frame_samples >= SAMPLES_PER_FRAME) {
std_session_send_frame_end(sdi);
std_session_send_df_frame_end(sdi);
devc->sent_frame_samples = 0;
devc->limit_frames--;
if (!devc->limit_frames) {
@ -742,7 +742,7 @@ SR_PRIV int demo_prepare_data(int fd, int revents, void *cb_data)
sr_dev_acquisition_stop(sdi);
} else if (devc->limit_frames) {
if (devc->sent_frame_samples == 0)
std_session_send_frame_begin(sdi);
std_session_send_df_frame_begin(sdi);
}
return G_SOURCE_CONTINUE;

2
src/hardware/serial-lcr/protocol.c
View File

@ -98,7 +98,7 @@ static int handle_packet(struct sr_dev_inst *sdi, const uint8_t *pkt)
g_slist_free(analog.meaning->channels);
}
if (frame) {
std_session_send_frame_end(sdi);
std_session_send_df_frame_end(sdi);
sr_sw_limits_update_frames_read(&devc->limits, 1);
}

4
src/libsigrok-internal.h
View File

@ -1031,8 +1031,8 @@ SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi);
SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi);
SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi);
SR_PRIV int std_session_send_df_trigger(const struct sr_dev_inst *sdi);
SR_PRIV int std_session_send_frame_begin(const struct sr_dev_inst *sdi);
SR_PRIV int std_session_send_frame_end(const struct sr_dev_inst *sdi);
SR_PRIV int std_session_send_df_frame_begin(const struct sr_dev_inst *sdi);
SR_PRIV int std_session_send_df_frame_end(const struct sr_dev_inst *sdi);
SR_PRIV int std_dev_clear_with_callback(const struct sr_dev_driver *driver,
std_dev_clear_callback clear_private);
SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver);

4
src/std.c
View File

@ -263,7 +263,7 @@ SR_PRIV int std_session_send_df_trigger(const struct sr_dev_inst *sdi)
* @retval SR_ERR_ARG Invalid argument.
* @retval other Other error.
*/
SR_PRIV int std_session_send_frame_begin(const struct sr_dev_inst *sdi)
SR_PRIV int std_session_send_df_frame_begin(const struct sr_dev_inst *sdi)
{
return send_df_without_payload(sdi, SR_DF_FRAME_BEGIN);
}
@ -279,7 +279,7 @@ SR_PRIV int std_session_send_frame_begin(const struct sr_dev_inst *sdi)
* @retval SR_ERR_ARG Invalid argument.
* @retval other Other error.
*/
SR_PRIV int std_session_send_frame_end(const struct sr_dev_inst *sdi)
SR_PRIV int std_session_send_df_frame_end(const struct sr_dev_inst *sdi)
{
return send_df_without_payload(sdi, SR_DF_FRAME_END);
}