X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbeaglelogic%2Fprotocol.c;h=55e2b647deefd5f11dcbb86da9483a08e1beaeac;hb=9cfc695ffe5f04622f61acb98ea4ac91c3f4ffc3;hp=1c01b64f758405955e5715d3b9a4a67998b51c9d;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git
diff --git a/src/hardware/beaglelogic/protocol.c b/src/hardware/beaglelogic/protocol.c
index 1c01b64f..55e2b647 100644
--- a/src/hardware/beaglelogic/protocol.c
+++ b/src/hardware/beaglelogic/protocol.c
@@ -17,11 +17,11 @@
* along with this program. If not, see .
*/
-#include "protocol.h"
-#include
+#include
#include
#include
#include
+#include "protocol.h"
/* Define data packet size independent of packet (bufunitsize bytes) size
* from the BeagleLogic kernel module */
@@ -40,6 +40,7 @@ SR_PRIV int beaglelogic_receive_data(int fd, int revents, void *cb_data)
struct sr_datafeed_logic logic;
int trigger_offset;
+ int pre_trigger_samples;
uint32_t packetsize;
uint64_t bytes_remaining;
@@ -67,10 +68,9 @@ SR_PRIV int beaglelogic_receive_data(int fd, int revents, void *cb_data)
} else {
/* Check for trigger */
trigger_offset = soft_trigger_logic_check(devc->stl,
- logic.data,
- packetsize);
-
+ logic.data, packetsize, &pre_trigger_samples);
if (trigger_offset > -1) {
+ devc->bytes_read += pre_trigger_samples * logic.unitsize;
trigger_offset *= logic.unitsize;
logic.length = MIN(packetsize - trigger_offset,
bytes_remaining);