std: Factor out send_df_without_payload() helper.

diff --git a/src/std.c b/src/std.c
index ff09f46fc5eac5e11d9b54abe22f318c37c29e34..9766875cc2ac058db9365f7479c2331ffee06c30 100644 (file)
--- a/src/std.c
+++ b/src/std.c
@@ -195,19 +195,7 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-/**
- * Standard API helper for sending an SR_DF_END packet.
- *
- * This function can be used to simplify most drivers'
- * dev_acquisition_stop() API callback.
- *
- * @param[in] sdi The device instance to use. Must not be NULL.
- *
- * @retval SR_OK Success.
- * @retval SR_ERR_ARG Invalid argument.
- * @retval other Other error.
- */
-SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi)
+static int send_df_without_payload(const struct sr_dev_inst *sdi, uint16_t packet_type)
 {
        const char *prefix;
        int ret;
@@ -220,17 +208,34 @@ SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi)
 
        prefix = (sdi->driver) ? sdi->driver->name : "unknown";
 
-       packet.type = SR_DF_END;
+       packet.type = packet_type;
        packet.payload = NULL;
 
        if ((ret = sr_session_send(sdi, &packet)) < 0) {
-               sr_err("%s: Failed to send SR_DF_END packet: %d.", prefix, ret);
+               sr_err("%s: Failed to send packet of type %d: %d.", prefix, packet_type, ret);
                return ret;
        }
 
        return SR_OK;
 }
 
+/**
+ * Standard API helper for sending an SR_DF_END packet.
+ *
+ * This function can be used to simplify most drivers'
+ * dev_acquisition_stop() API callback.
+ *
+ * @param[in] sdi The device instance to use. Must not be NULL.
+ *
+ * @retval SR_OK Success.
+ * @retval SR_ERR_ARG Invalid argument.
+ * @retval other Other error.
+ */
+SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi)
+{
+       return send_df_without_payload(sdi, SR_DF_END);
+}
+
 /**
  * Standard API helper for sending an SR_DF_TRIGGER packet.
  *
@@ -244,33 +249,13 @@ 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)
 {
-       const char *prefix;
-       int ret;
-       struct sr_datafeed_packet packet;
-
-       if (!sdi) {
-               sr_err("%s: Invalid argument.", __func__);
-               return SR_ERR_ARG;
-       }
-
-       prefix = (sdi->driver) ? sdi->driver->name : "unknown";
-
-       packet.type = SR_DF_TRIGGER;
-       packet.payload = NULL;
-
-       if ((ret = sr_session_send(sdi, &packet)) < 0) {
-               sr_err("%s: Failed to send SR_DF_TRIGGER packet: %d.", prefix, ret);
-               return ret;
-       }
-
-       return SR_OK;
+       return send_df_without_payload(sdi, SR_DF_TRIGGER);
 }
 
 /**
  * Standard API helper for sending an SR_DF_FRAME_BEGIN packet.
  *
- * This function can be used to simplify most drivers'
- * frame handling.
+ * This function can be used to simplify most drivers' frame handling.
  *
  * @param[in] sdi The device instance to use. Must not be NULL.
  *
@@ -280,33 +265,13 @@ 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)
 {
-       const char *prefix;
-       int ret;
-       struct sr_datafeed_packet packet;
-
-       if (!sdi) {
-               sr_err("%s: Invalid argument.", __func__);
-               return SR_ERR_ARG;
-       }
-
-       prefix = (sdi->driver) ? sdi->driver->name : "unknown";
-
-       packet.type = SR_DF_FRAME_BEGIN;
-       packet.payload = NULL;
-
-       if ((ret = sr_session_send(sdi, &packet)) < 0) {
-               sr_err("%s: Failed to send SR_DF_FRAME_BEGIN packet: %d.", prefix, ret);
-               return ret;
-       }
-
-       return SR_OK;
+       return send_df_without_payload(sdi, SR_DF_FRAME_BEGIN);
 }
 
 /**
  * Standard API helper for sending an SR_DF_FRAME_END packet.
  *
- * This function can be used to simplify most drivers'
- * frame handling.
+ * This function can be used to simplify most drivers' frame handling.
  *
  * @param[in] sdi The device instance to use. Must not be NULL.
  *
@@ -316,26 +281,7 @@ 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)
 {
-       const char *prefix;
-       int ret;
-       struct sr_datafeed_packet packet;
-
-       if (!sdi) {
-               sr_err("%s: Invalid argument.", __func__);
-               return SR_ERR_ARG;
-       }
-
-       prefix = (sdi->driver) ? sdi->driver->name : "unknown";
-
-       packet.type = SR_DF_FRAME_END;
-       packet.payload = NULL;
-
-       if ((ret = sr_session_send(sdi, &packet)) < 0) {
-               sr_err("%s: Failed to send SR_DF_FRAME_END packet: %d.", prefix, ret);
-               return ret;
-       }
-
-       return SR_OK;
+       return send_df_without_payload(sdi, SR_DF_FRAME_END);
 }
 
 #ifdef HAVE_SERIAL_COMM