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

Use std_session_send_df_trigger() where possible.

This commit is contained in:
Uwe Hermann 2020-04-08 23:21:39 +02:00
parent 447c4216fc
commit 0fa71943e3
13 changed files with 18 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hardware/asix-sigma/protocol.c
View File

@ -907,10 +907,8 @@ static void sigma_decode_dram_cluster(struct sigma_dram_cluster *dram_cluster,
}
/* Only send trigger if explicitly enabled. */
if (devc->use_triggers) {
packet.type = SR_DF_TRIGGER;
sr_session_send(sdi, &packet);
}
if (devc->use_triggers)
std_session_send_df_trigger(sdi);
}
/*

4
src/hardware/chronovu-la/protocol.c
View File

@ -494,9 +494,7 @@ SR_PRIV void cv_send_block_to_session_bus(const struct sr_dev_inst *sdi, int blo
/* Send the SR_DF_TRIGGER packet to the session bus. */
sr_spew("Sending SR_DF_TRIGGER packet, sample = %d.",
(block * BS) + trigger_point);
packet.type = SR_DF_TRIGGER;
packet.payload = NULL;
sr_session_send(sdi, &packet);
std_session_send_df_trigger(sdi);
/* If at least one sample is located after the trigger... */
if (trigger_point < (BS - 1)) {

5
src/hardware/dreamsourcelab-dslogic/protocol.c
View File

@ -776,7 +776,6 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
(DSLOGIC_ATOMIC_BYTES * channel_count);
gboolean packet_has_error = FALSE;
struct sr_datafeed_packet packet;
unsigned int num_samples;
int trigger_offset;
@ -856,9 +855,7 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
devc->sent_samples += trigger_offset;
/* Trigger position. */
devc->trigger_pos = 0;
packet.type = SR_DF_TRIGGER;
packet.payload = NULL;
sr_session_send(sdi, &packet);
std_session_send_df_trigger(sdi);
/* Post trigger samples. */
num_samples -= trigger_offset;
send_data(sdi, devc->deinterleave_buffer

6
src/hardware/hantek-4032l/protocol.c
View File

@ -114,10 +114,6 @@ static void send_data(struct sr_dev_inst *sdi,
.type = SR_DF_LOGIC,
.payload = &logic
};
const struct sr_datafeed_packet trig = {
.type = SR_DF_TRIGGER,
.payload = NULL
};
size_t trigger_offset;
if (devc->trigger_pos >= devc->sent_samples &&
@ -129,7 +125,7 @@ static void send_data(struct sr_dev_inst *sdi,
sr_session_send(sdi, &packet);
/* Send trigger position. */
sr_session_send(sdi, &trig);
std_session_send_df_trigger(sdi);
/* Send rest of data. */
logic.length = (sample_count - trigger_offset) * sizeof(uint32_t);

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

@ -396,12 +396,8 @@ static int read_subframe(const struct sr_dev_inst *sdi, uint8_t *buf)
if (interleave)
num *= 2;
if (!devc->step) {
struct sr_datafeed_packet packet = {
.type = SR_DF_TRIGGER
};
push_samples(sdi, buf, 6);
sr_session_send(sdi, &packet);
std_session_send_df_trigger(sdi);
buf += 6;
num -= 6;
}

9
src/hardware/ikalogic-scanalogic2/protocol.c
View File

@ -122,10 +122,8 @@ static void process_sample_data(const struct sr_dev_inst *sdi)
* through the capture ratio.
*/
if (devc->trigger_type != TRIGGER_TYPE_NONE &&
devc->pre_trigger_samples == 0) {
packet.type = SR_DF_TRIGGER;
sr_session_send(sdi, &packet);
}
devc->pre_trigger_samples == 0)
std_session_send_df_trigger(sdi);
}
for (; k >= 0; k--) {
@ -164,8 +162,7 @@ static void process_sample_data(const struct sr_dev_inst *sdi)
logic.data = buffer;
sr_session_send(sdi, &packet);
packet.type = SR_DF_TRIGGER;
sr_session_send(sdi, &packet);
std_session_send_df_trigger(sdi);
n = 0;
}

3
src/hardware/ipdbg-la/protocol.c
View File

@ -338,8 +338,7 @@ SR_PRIV int ipdbg_la_receive_data(int fd, int revents, void *cb_data)
}
/* Send the trigger. */
packet.type = SR_DF_TRIGGER;
sr_session_send(cb_data, &packet);
std_session_send_df_trigger(cb_data);
/* Send post-trigger samples. */
packet.type = SR_DF_LOGIC;

6
src/hardware/lecroy-logicstudio/protocol.c
View File

@ -1003,7 +1003,6 @@ static void LIBUSB_CALL recv_bulk_transfer(struct libusb_transfer *xfer)
const struct sr_dev_inst *sdi;
struct dev_context *devc;
struct drv_context *drvc;
struct sr_datafeed_packet packet;
uint32_t bytes_left, length;
uint16_t read_offset, trigger_offset;
@ -1069,10 +1068,7 @@ static void LIBUSB_CALL recv_bulk_transfer(struct libusb_transfer *xfer)
}
/* Here comes the trigger. */
packet.type = SR_DF_TRIGGER;
packet.payload = NULL;
sr_session_send(sdi, &packet);
std_session_send_df_trigger(sdi);
/* Send post-trigger samples. */
while (bytes_left > 0) {

3
src/hardware/openbench-logic-sniffer/protocol.c
View File

@ -515,8 +515,7 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
}
/* Send the trigger. */
packet.type = SR_DF_TRIGGER;
sr_session_send(sdi, &packet);
std_session_send_df_trigger(sdi);
/* Send post-trigger samples. */
packet.type = SR_DF_LOGIC;

3
src/hardware/pipistrello-ols/protocol.c
View File

@ -636,8 +636,7 @@ SR_PRIV int p_ols_receive_data(int fd, int revents, void *cb_data)
}
/* Send the trigger. */
packet.type = SR_DF_TRIGGER;
sr_session_send(sdi, &packet);
std_session_send_df_trigger(sdi);
/* Send post-trigger samples. */
packet.type = SR_DF_LOGIC;

8
src/hardware/zeroplus-logic-cube/api.c
View File

@ -583,12 +583,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
buf_offset += logic.length;
}
if (samples_read == trigger_offset) {
/* Send out trigger */
packet.type = SR_DF_TRIGGER;
packet.payload = NULL;
sr_session_send(sdi, &packet);
}
if (samples_read == trigger_offset)
std_session_send_df_trigger(sdi);
/* Send out data (or data after trigger) */
packet.type = SR_DF_LOGIC;

12
src/input/trace32_ad.c
View File

@ -447,7 +447,6 @@ static void flush_output_buffer(struct sr_input *in)
static void process_record_pi(struct sr_input *in, gsize start)
{
struct sr_datafeed_packet packet;
struct context *inc;
uint64_t timestamp, next_timestamp;
uint32_t pod_data;
@ -580,10 +579,7 @@ static void process_record_pi(struct sr_input *in, gsize start)
if (timestamp == inc->trigger_timestamp && !inc->trigger_sent) {
sr_dbg("Trigger @%lf s, record #%d.",
timestamp * TIMESTAMP_RESOLUTION, inc->cur_record);
packet.type = SR_DF_TRIGGER;
packet.payload = NULL;
sr_session_send(in->sdi, &packet);
std_session_send_df_trigger(in->sdi);
inc->trigger_sent = TRUE;
}
@ -610,7 +606,6 @@ static void process_record_pi(struct sr_input *in, gsize start)
static void process_record_iprobe(struct sr_input *in, gsize start)
{
struct sr_datafeed_packet packet;
struct context *inc;
uint64_t timestamp, next_timestamp;
char single_payload[3];
@ -633,10 +628,7 @@ static void process_record_iprobe(struct sr_input *in, gsize start)
if (timestamp == inc->trigger_timestamp && !inc->trigger_sent) {
sr_dbg("Trigger @%lf s, record #%d.",
timestamp * TIMESTAMP_RESOLUTION, inc->cur_record);
packet.type = SR_DF_TRIGGER;
packet.payload = NULL;
sr_session_send(in->sdi, &packet);
std_session_send_df_trigger(in->sdi);
inc->trigger_sent = TRUE;
}

5
src/soft-trigger.c
View File

@ -175,7 +175,6 @@ static gboolean logic_check_match(struct soft_trigger_logic *stl,
SR_PRIV int soft_trigger_logic_check(struct soft_trigger_logic *stl,
uint8_t *buf, int len, int *pre_trigger_samples)
{
struct sr_datafeed_packet packet;
struct sr_trigger_stage *stage;
struct sr_trigger_match *match;
GSList *l, *l_stage;
@ -216,9 +215,7 @@ SR_PRIV int soft_trigger_logic_check(struct soft_trigger_logic *stl,
/* Fire trigger. */
offset = i / stl->unitsize;
packet.type = SR_DF_TRIGGER;
packet.payload = NULL;
sr_session_send(stl->sdi, &packet);
std_session_send_df_trigger(stl->sdi);
break;
}
} else if (stl->cur_stage > 0) {