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

std: Factor out send_df_without_payload() helper.

This commit is contained in:
Uwe Hermann 2020-04-08 23:11:15 +02:00
parent 10cf811385
commit 447c4216fc
1 changed files with 30 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
src/std.c
View File

@ -195,6 +195,30 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi)
return SR_OK; return SR_OK;
} }
static int send_df_without_payload(const struct sr_dev_inst *sdi, uint16_t packet_type)
{
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 = packet_type;
packet.payload = NULL;
if ((ret = sr_session_send(sdi, &packet)) < 0) {
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. * Standard API helper for sending an SR_DF_END packet.
* *
@ -209,26 +233,7 @@ 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_end(const struct sr_dev_inst *sdi)
{ {
const char *prefix; return send_df_without_payload(sdi, SR_DF_END);
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_END;
packet.payload = NULL;
if ((ret = sr_session_send(sdi, &packet)) < 0) {
sr_err("%s: Failed to send SR_DF_END packet: %d.", prefix, ret);
return ret;
}
return SR_OK;
} }
/** /**
@ -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) SR_PRIV int std_session_send_df_trigger(const struct sr_dev_inst *sdi)
{ {
const char *prefix; return send_df_without_payload(sdi, SR_DF_TRIGGER);
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;
} }
/** /**
* Standard API helper for sending an SR_DF_FRAME_BEGIN packet. * Standard API helper for sending an SR_DF_FRAME_BEGIN packet.
* *
* This function can be used to simplify most drivers' * This function can be used to simplify most drivers' frame handling.
* frame handling.
* *
* @param[in] sdi The device instance to use. Must not be NULL. * @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) SR_PRIV int std_session_send_frame_begin(const struct sr_dev_inst *sdi)
{ {
const char *prefix; return send_df_without_payload(sdi, SR_DF_FRAME_BEGIN);
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;
} }
/** /**
* Standard API helper for sending an SR_DF_FRAME_END packet. * Standard API helper for sending an SR_DF_FRAME_END packet.
* *
* This function can be used to simplify most drivers' * This function can be used to simplify most drivers' frame handling.
* frame handling.
* *
* @param[in] sdi The device instance to use. Must not be NULL. * @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) SR_PRIV int std_session_send_frame_end(const struct sr_dev_inst *sdi)
{ {
const char *prefix; return send_df_without_payload(sdi, SR_DF_FRAME_END);
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;
} }
#ifdef HAVE_SERIAL_COMM #ifdef HAVE_SERIAL_COMM