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

LA8: Improve trigger support and debug output.

This commit is contained in:
Uwe Hermann 2011-05-09 00:52:55 +02:00
parent 06dd80d424
commit f36cbf60cb
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hardware/chronovu-la8/chronovu-la8.c
View File

@ -891,6 +891,14 @@ static void send_block_to_session_bus(struct la8 *la8, int block)
if (la8->trigger_found) if (la8->trigger_found)
break; break;
/*
* Also, don't continue if triggers are "don't care", i.e. if
* no trigger conditions were specified by the user. In that
* case we don't want to send an SR_DF_TRIGGER packet at all.
*/
if (la8->trigger_mask == 0x00)
break;
sample = *(la8->final_buf + (block * BS) + i); sample = *(la8->final_buf + (block * BS) + i);
if ((sample & la8->trigger_mask) == expected_sample) { if ((sample & la8->trigger_mask) == expected_sample) {
@ -903,7 +911,8 @@ static void send_block_to_session_bus(struct la8 *la8, int block)
/* If no trigger was found, send one SR_DF_LOGIC packet. */ /* If no trigger was found, send one SR_DF_LOGIC packet. */
if (trigger_point == -1) { if (trigger_point == -1) {
/* Send an SR_DF_LOGIC packet to the session bus. */ /* Send an SR_DF_LOGIC packet to the session bus. */
// sr_dbg("la8: %s: sending SR_DF_LOGIC packet", __func__); // sr_dbg("la8: sending SR_DF_LOGIC packet (%d bytes) for "
// "block %d", BS, block);
packet.type = SR_DF_LOGIC; packet.type = SR_DF_LOGIC;
packet.length = BS; packet.length = BS;
packet.unitsize = 1; packet.unitsize = 1;
@ -924,9 +933,8 @@ static void send_block_to_session_bus(struct la8 *la8, int block)
/* If at least one sample is located before the trigger... */ /* If at least one sample is located before the trigger... */
if (trigger_point > 0) { if (trigger_point > 0) {
/* Send pre-trigger SR_DF_LOGIC packet to the session bus. */ /* Send pre-trigger SR_DF_LOGIC packet to the session bus. */
sr_dbg("la8: %s: sending pre-trigger SR_DF_LOGIC packet, ", sr_dbg("la8: sending pre-trigger SR_DF_LOGIC packet, "
"start = %" PRIu64 ", length = %d", __func__, "start = %d, length = %d", block * BS, trigger_point);
block * BS, trigger_point);
packet.type = SR_DF_LOGIC; packet.type = SR_DF_LOGIC;
packet.length = trigger_point; packet.length = trigger_point;
packet.unitsize = 1; packet.unitsize = 1;
@ -935,8 +943,8 @@ static void send_block_to_session_bus(struct la8 *la8, int block)
} }
/* Send the SR_DF_TRIGGER packet to the session bus. */ /* Send the SR_DF_TRIGGER packet to the session bus. */
sr_dbg("la8: %s: sending SR_DF_TRIGGER packet, sample = %" PRIu64, sr_dbg("la8: sending SR_DF_TRIGGER packet, sample = %d",
__func__, (block * BS) + trigger_point); (block * BS) + trigger_point);
packet.type = SR_DF_TRIGGER; packet.type = SR_DF_TRIGGER;
packet.length = 0; packet.length = 0;
packet.unitsize = 0; packet.unitsize = 0;
@ -946,11 +954,11 @@ static void send_block_to_session_bus(struct la8 *la8, int block)
/* If at least one sample is located after the trigger... */ /* If at least one sample is located after the trigger... */
if (trigger_point < (BS - 1)) { if (trigger_point < (BS - 1)) {
/* Send post-trigger SR_DF_LOGIC packet to the session bus. */ /* Send post-trigger SR_DF_LOGIC packet to the session bus. */
sr_dbg("la8: %s: sending post-trigger SR_DF_LOGIC packet, ", sr_dbg("la8: sending post-trigger SR_DF_LOGIC packet, "
"start = %" PRIu64 ", length = %d", __func__, "start = %d, length = %d",
(block * BS) + trigger_point, (BS - 1) - trigger_point); (block * BS) + trigger_point, BS - trigger_point);
packet.type = SR_DF_LOGIC; packet.type = SR_DF_LOGIC;
packet.length = (BS - 1) - trigger_point; packet.length = BS - trigger_point;
packet.unitsize = 1; packet.unitsize = 1;
packet.payload = la8->final_buf + (block * BS) + trigger_point; packet.payload = la8->final_buf + (block * BS) + trigger_point;
sr_session_bus(la8->session_id, &packet); sr_session_bus(la8->session_id, &packet);