std: Rename std_session_send_frame_begin/_end().

diff --git a/src/hardware/demo/api.c b/src/hardware/demo/api.c
index 3b77d40cdd36bf3f127c6bd90ef132f56204b050..ba317fbe4a1b8fa389a8de39966c833956820659 100644 (file)
--- a/src/hardware/demo/api.c
+++ b/src/hardware/demo/api.c
@@ -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);
 

diff --git a/src/hardware/demo/protocol.c b/src/hardware/demo/protocol.c
index a969d02995cb661c35ff54bf2891fbc018a1f28d..eea3c9b8e7e622a72941ca23be952aa2e54c30e4 100644 (file)
--- a/src/hardware/demo/protocol.c
+++ b/src/hardware/demo/protocol.c
@@ -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;

diff --git a/src/hardware/serial-lcr/protocol.c b/src/hardware/serial-lcr/protocol.c
index e7b2612f56661ed0976f6d4cacc4a2374e740d78..e5b89dc5dde1f4a3d084dfecc89c6bcde3ec33cd 100644 (file)
--- a/src/hardware/serial-lcr/protocol.c
+++ b/src/hardware/serial-lcr/protocol.c
@@ -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);
        }
 

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index 94ac3d1a77d1d3d059a7a88fb76dab54cfe72142..4caceef6ba4a97ef0a0fe873fb2e7ee0d72528d7 100644 (file)
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -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);

diff --git a/src/std.c b/src/std.c
index 9766875cc2ac058db9365f7479c2331ffee06c30..d3a3d36dd175b6886882f42b1d6e7ab8764bcf96 100644 (file)
--- a/src/std.c
+++ b/src/std.c
@@ -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);
 }