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

Use std_session_send_df_frame_begin()/_end() where possible.

This commit is contained in:
Uwe Hermann 2020-04-08 23:49:38 +02:00
parent 7f7702b81b
commit 4c5f70063a
17 changed files with 47 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hardware/arachnid-labs-re-load-pro/protocol.c
View File

@ -338,9 +338,7 @@ static void handle_packet(const struct sr_dev_inst *sdi)
g_strfreev(tokens);
/* Begin frame. */
packet.type = SR_DF_FRAME_BEGIN;
packet.payload = NULL;
sr_session_send(sdi, &packet);
std_session_send_df_frame_begin(sdi);
sr_analog_init(&analog, &encoding, &meaning, &spec, 4);
@ -373,9 +371,7 @@ static void handle_packet(const struct sr_dev_inst *sdi)
g_slist_free(l);
/* End frame. */
packet.type = SR_DF_FRAME_END;
packet.payload = NULL;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
sr_sw_limits_update_samples_read(&devc->limits, 1);
}

8
src/hardware/baylibre-acme/protocol.c
View File

@ -703,7 +703,7 @@ SR_PRIV void bl_acme_close_channel(struct sr_channel *ch)
SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
{
uint64_t nrexpiration;
struct sr_datafeed_packet packet, framep;
struct sr_datafeed_packet packet;
struct sr_datafeed_analog analog;
struct sr_analog_encoding encoding;
struct sr_analog_meaning meaning;
@ -759,8 +759,7 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
* accuracy.
*/
for (i = 0; i < nrexpiration; i++) {
framep.type = SR_DF_FRAME_BEGIN;
sr_session_send(sdi, &framep);
std_session_send_df_frame_begin(sdi);
/*
* Due to different units used in each channel we're sending
@ -788,8 +787,7 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
sr_session_send(sdi, &packet);
}
framep.type = SR_DF_FRAME_END;
sr_session_send(sdi, &framep);
std_session_send_df_frame_end(sdi);
}
sr_sw_limits_update_samples_read(&devc->limits, 1);

6
src/hardware/gwinstek-gds-800/api.c
View File

@ -189,17 +189,13 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
struct sr_scpi_dev_inst *scpi;
struct dev_context *devc;
struct sr_datafeed_packet packet;
scpi = sdi->conn;
devc = sdi->priv;
if (devc->df_started) {
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
std_session_send_df_end(sdi);
devc->df_started = FALSE;
}

19
src/hardware/gwinstek-gds-800/protocol.c
View File

@ -141,11 +141,8 @@ SR_PRIV int gwinstek_gds_800_receive_data(int fd, int revents, void *cb_data)
} else {
/* Start acquiring next frame. */
if (devc->df_started) {
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
packet.type = SR_DF_FRAME_BEGIN;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
std_session_send_df_frame_begin(sdi);
}
devc->cur_acq_frame++;
@ -202,10 +199,7 @@ SR_PRIV int gwinstek_gds_800_receive_data(int fd, int revents, void *cb_data)
if (!devc->df_started) {
std_session_send_df_header(sdi);
packet.type = SR_DF_FRAME_BEGIN;
sr_session_send(sdi, &packet);
std_session_send_df_frame_begin(sdi);
devc->df_started = TRUE;
}
break;
@ -271,11 +265,8 @@ SR_PRIV int gwinstek_gds_800_receive_data(int fd, int revents, void *cb_data)
} else {
/* Start acquiring next frame. */
if (devc->df_started) {
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
packet.type = SR_DF_FRAME_BEGIN;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
std_session_send_df_frame_begin(sdi);
}
devc->cur_acq_frame++;
devc->state = START_ACQUISITION;

9
src/hardware/hameg-hmo/protocol.c
View File

@ -1402,10 +1402,8 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
* Send "frame begin" packet upon reception of data for the
* first enabled channel.
*/
if (devc->current_channel == devc->enabled_channels) {
packet.type = SR_DF_FRAME_BEGIN;
sr_session_send(sdi, &packet);
}
if (devc->current_channel == devc->enabled_channels)
std_session_send_df_frame_begin(sdi);
/*
* Pass on the received data of the channel(s).
@ -1526,8 +1524,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
*/
hmo_cleanup_logic_data(devc);
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
/*
* End of frame was reached. Stop acquisition after the specified

8
src/hardware/hantek-dso/api.c
View File

@ -704,7 +704,6 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
*/
static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
{
struct sr_datafeed_packet packet;
struct sr_dev_inst *sdi;
struct dev_context *devc;
int num_samples, pre;
@ -782,8 +781,7 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
devc->framebuf = NULL;
/* Mark the end of this frame. */
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
if (devc->limit_frames && ++devc->num_frames >= devc->limit_frames) {
/* Terminate session */
@ -797,7 +795,6 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
static int handle_event(int fd, int revents, void *cb_data)
{
const struct sr_dev_inst *sdi;
struct sr_datafeed_packet packet;
struct timeval tv;
struct sr_dev_driver *di;
struct dev_context *devc;
@ -889,8 +886,7 @@ static int handle_event(int fd, int revents, void *cb_data)
devc->dev_state = FETCH_DATA;
/* Tell the frontend a new frame is on the way. */
packet.type = SR_DF_FRAME_BEGIN;
sr_session_send(sdi, &packet);
std_session_send_df_frame_begin(sdi);
break;
case CAPTURE_READY_9BIT:
/* TODO */

6
src/hardware/hung-chang-dso-2100/protocol.c
View File

@ -415,7 +415,6 @@ static int read_subframe(const struct sr_dev_inst *sdi, uint8_t *buf)
SR_PRIV int hung_chang_dso_2100_poll(int fd, int revents, void *cb_data)
{
struct sr_datafeed_packet packet = { .type = SR_DF_FRAME_BEGIN };
struct sr_dev_inst *sdi;
struct dev_context *devc;
uint8_t state, buf[1000];
@ -443,7 +442,7 @@ SR_PRIV int hung_chang_dso_2100_poll(int fd, int revents, void *cb_data)
return FALSE;
}
sr_session_send(sdi, &packet);
std_session_send_df_frame_begin(sdi);
if (devc->channel) {
while (read_subframe(sdi, buf)) {
@ -456,8 +455,7 @@ SR_PRIV int hung_chang_dso_2100_poll(int fd, int revents, void *cb_data)
}
}
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
if (++devc->frame >= devc->frame_limit)
sr_dev_acquisition_stop(sdi);

9
src/hardware/lecroy-xstream/protocol.c
View File

@ -679,10 +679,8 @@ SR_PRIV int lecroy_xstream_receive_data(int fd, int revents, void *cb_data)
* Send "frame begin" packet upon reception of data for the
* first enabled channel.
*/
if (devc->current_channel == devc->enabled_channels) {
packet.type = SR_DF_FRAME_BEGIN;
sr_session_send(sdi, &packet);
}
if (devc->current_channel == devc->enabled_channels)
std_session_send_df_frame_begin(sdi);
meaning.channels = g_slist_append(NULL, ch);
packet.payload = &analog;
@ -706,8 +704,7 @@ SR_PRIV int lecroy_xstream_receive_data(int fd, int revents, void *cb_data)
return TRUE;
}
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
/*
* End of frame was reached. Stop acquisition after the specified

7
src/hardware/maynuo-m97/protocol.c
View File

@ -166,7 +166,6 @@ SR_PRIV int maynuo_m97_receive_data(int fd, int revents, void *cb_data)
struct sr_dev_inst *sdi;
struct dev_context *devc;
struct sr_modbus_dev_inst *modbus;
struct sr_datafeed_packet packet;
uint16_t registers[4];
(void)fd;
@ -180,8 +179,7 @@ SR_PRIV int maynuo_m97_receive_data(int fd, int revents, void *cb_data)
devc->expecting_registers = 0;
if (sr_modbus_read_holding_registers(modbus, -1, 4, registers) == SR_OK) {
packet.type = SR_DF_FRAME_BEGIN;
sr_session_send(sdi, &packet);
std_session_send_df_frame_begin(sdi);
maynuo_m97_session_send_value(sdi, sdi->channels->data,
RBFL(registers + 0),
@ -190,8 +188,7 @@ SR_PRIV int maynuo_m97_receive_data(int fd, int revents, void *cb_data)
RBFL(registers + 2),
SR_MQ_CURRENT, SR_UNIT_AMPERE, 4);
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
sr_sw_limits_update_samples_read(&devc->limits, 1);
}

7
src/hardware/rdtech-dps/protocol.c
View File

@ -120,7 +120,6 @@ SR_PRIV int rdtech_dps_receive_data(int fd, int revents, void *cb_data)
struct sr_dev_inst *sdi;
struct dev_context *devc;
struct sr_modbus_dev_inst *modbus;
struct sr_datafeed_packet packet;
uint16_t registers[8];
int ret;
@ -143,8 +142,7 @@ SR_PRIV int rdtech_dps_receive_data(int fd, int revents, void *cb_data)
if (ret == SR_OK) {
/* Send channel values */
packet.type = SR_DF_FRAME_BEGIN;
sr_session_send(sdi, &packet);
std_session_send_df_frame_begin(sdi);
send_value(sdi, sdi->channels->data,
RB16(registers + 0) / devc->voltage_multiplier,
@ -158,8 +156,7 @@ SR_PRIV int rdtech_dps_receive_data(int fd, int revents, void *cb_data)
RB16(registers + 2) / 100.0f,
SR_MQ_POWER, 0, SR_UNIT_WATT, 2);
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
/* Check for state changes */
if (devc->actual_ovp_state != (RB16(registers + 5) == STATE_OVP)) {

4
src/hardware/rigol-ds/api.c
View File

@ -878,7 +878,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
struct sr_scpi_dev_inst *scpi;
struct dev_context *devc;
struct sr_channel *ch;
struct sr_datafeed_packet packet;
gboolean some_digital;
GSList *l;
char *cmd;
@ -994,8 +993,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
return SR_ERR;
/* Start of first frame. */
packet.type = SR_DF_FRAME_BEGIN;
sr_session_send(sdi, &packet);
std_session_send_df_frame_begin(sdi);
return SR_OK;
}

15
src/hardware/rigol-ds/protocol.c
View File

@ -666,8 +666,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
return TRUE;
if (len == -1) {
sr_err("Error while reading block header, aborting capture.");
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
sr_dev_acquisition_stop(sdi);
return TRUE;
}
@ -699,8 +698,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
if (len == -1) {
sr_err("Error while reading block data, aborting capture.");
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
sr_dev_acquisition_stop(sdi);
return TRUE;
}
@ -761,8 +759,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
/* End acquisition when data for all channels is acquired. */
if (!sr_scpi_read_complete(scpi) && !devc->channel_entry->next) {
sr_err("Read should have been completed");
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
sr_dev_acquisition_stop(sdi);
return TRUE;
}
@ -796,8 +793,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
rigol_ds_channel_start(sdi);
} else {
/* Done with this frame. */
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
if (++devc->num_frames == devc->limit_frames) {
/* Last frame, stop capture. */
@ -809,8 +805,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
rigol_ds_capture_start(sdi);
/* Start of next frame. */
packet.type = SR_DF_FRAME_BEGIN;
sr_session_send(sdi, &packet);
std_session_send_df_frame_begin(sdi);
}
}

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

@ -31,7 +31,6 @@ static void send_frame_start(struct sr_dev_inst *sdi)
struct lcr_parse_info *info;
uint64_t freq;
const char *model;
struct sr_datafeed_packet packet;
devc = sdi->priv;
info = &devc->parse_info;
@ -51,8 +50,7 @@ static void send_frame_start(struct sr_dev_inst *sdi)
}
/* Data is about to get sent. Start a new frame. */
packet.type = SR_DF_FRAME_BEGIN;
sr_session_send(sdi, &packet);
std_session_send_df_frame_begin(sdi);
}
static int handle_packet(struct sr_dev_inst *sdi, const uint8_t *pkt)

4
src/hardware/siglent-sds/api.c
View File

@ -799,7 +799,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
struct sr_scpi_dev_inst *scpi;
struct dev_context *devc;
struct sr_channel *ch;
struct sr_datafeed_packet packet;
gboolean some_digital;
GSList *l, *d;
@ -900,8 +899,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
return SR_ERR;
/* Start of first frame. */
packet.type = SR_DF_FRAME_BEGIN;
sr_session_send(sdi, &packet);
std_session_send_df_frame_begin(sdi);
return SR_OK;
}

27
src/hardware/siglent-sds/protocol.c
View File

@ -539,8 +539,7 @@ SR_PRIV int siglent_sds_receive(int fd, int revents, void *cb_data)
return TRUE;
if (len == -1) {
sr_err("Read error, aborting capture.");
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}
@ -549,8 +548,7 @@ SR_PRIV int siglent_sds_receive(int fd, int revents, void *cb_data)
if (len == -1) {
sr_err("Read error, aborting capture.");
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}
@ -567,8 +565,7 @@ SR_PRIV int siglent_sds_receive(int fd, int revents, void *cb_data)
len = sr_scpi_read_data(scpi, (char *)devc->buffer, devc->num_samples-devc->num_block_bytes);
if (len == -1) {
sr_err("Read error, aborting capture.");
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}
@ -615,8 +612,7 @@ SR_PRIV int siglent_sds_receive(int fd, int revents, void *cb_data)
read_complete = TRUE;
if (!sr_scpi_read_complete(scpi)) {
sr_err("Read should have been completed.");
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}
@ -633,8 +629,7 @@ SR_PRIV int siglent_sds_receive(int fd, int revents, void *cb_data)
siglent_sds_channel_start(sdi);
} else {
/* Done with this frame. */
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
if (++devc->num_frames == devc->limit_frames) {
/* Last frame, stop capture. */
sdi->driver->dev_acquisition_stop(sdi);
@ -644,8 +639,7 @@ SR_PRIV int siglent_sds_receive(int fd, int revents, void *cb_data)
siglent_sds_capture_start(sdi);
/* Start of next frame. */
packet.type = SR_DF_FRAME_BEGIN;
sr_session_send(sdi, &packet);
std_session_send_df_frame_begin(sdi);
}
}
}
@ -658,8 +652,7 @@ SR_PRIV int siglent_sds_receive(int fd, int revents, void *cb_data)
packet.type = SR_DF_LOGIC;
packet.payload = &logic;
sr_session_send(sdi, &packet);
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
sdi->driver->dev_acquisition_stop(sdi);
if (++devc->num_frames == devc->limit_frames) {
@ -671,14 +664,12 @@ SR_PRIV int siglent_sds_receive(int fd, int revents, void *cb_data)
siglent_sds_capture_start(sdi);
/* Start of next frame. */
packet.type = SR_DF_FRAME_BEGIN;
sr_session_send(sdi, &packet);
std_session_send_df_frame_begin(sdi);
}
}
// sr_session_send(sdi, &packet);
// packet.type = SR_DF_FRAME_END;
// sr_session_send(sdi, &packet);
// std_session_send_df_frame_end(sdi);
// sdi->driver->dev_acquisition_stop(sdi);
return TRUE;

10
src/hardware/yokogawa-dlm/protocol.c
View File

@ -1018,7 +1018,6 @@ SR_PRIV int dlm_data_receive(int fd, int revents, void *cb_data)
struct scope_state *model_state;
struct dev_context *devc;
struct sr_channel *ch;
struct sr_datafeed_packet packet;
int chunk_len, num_bytes;
static GArray *data = NULL;
@ -1065,10 +1064,8 @@ SR_PRIV int dlm_data_receive(int fd, int revents, void *cb_data)
devc->data_pending = FALSE;
/* Signal the beginning of a new frame if this is the first channel. */
if (devc->current_channel == devc->enabled_channels) {
packet.type = SR_DF_FRAME_BEGIN;
sr_session_send(sdi, &packet);
}
if (devc->current_channel == devc->enabled_channels)
std_session_send_df_frame_begin(sdi);
if (dlm_block_data_header_process(data, &num_bytes) != SR_OK) {
sr_err("Encountered malformed block data header.");
@ -1111,8 +1108,7 @@ SR_PRIV int dlm_data_receive(int fd, int revents, void *cb_data)
* and set the next enabled channel. Then, request its data.
*/
if (!devc->current_channel->next) {
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
devc->current_channel = devc->enabled_channels;
/*

8
src/hardware/zketech-ebd-usb/protocol.c
View File

@ -224,9 +224,7 @@ SR_PRIV int ebd_receive_data(int fd, int revents, void *cb_data)
sr_dbg("Current limit %f", current_limit);
/* Begin frame. */
packet.type = SR_DF_FRAME_BEGIN;
packet.payload = NULL;
sr_session_send(sdi, &packet);
std_session_send_df_frame_begin(sdi);
sr_analog_init(&analog, &encoding, &meaning, &spec, 4);
@ -257,9 +255,7 @@ SR_PRIV int ebd_receive_data(int fd, int revents, void *cb_data)
g_slist_free(l);
/* End frame. */
packet.type = SR_DF_FRAME_END;
packet.payload = NULL;
sr_session_send(sdi, &packet);
std_session_send_df_frame_end(sdi);
sr_sw_limits_update_samples_read(&devc->limits, 1);
if (sr_sw_limits_check(&devc->limits))