X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fbeaglelogic%2Fprotocol.c;h=8f3ce26593175b50aff04570dc481a633684071b;hb=1aba65727015e298f213c851dbc8d2d57d27d37b;hp=a0a784e874502d6ca5ef93498674ac241c331468;hpb=e743a47d6d23050c72aa1276c5df4a45a6bc5357;p=libsigrok.git
diff --git a/src/hardware/beaglelogic/protocol.c b/src/hardware/beaglelogic/protocol.c
index a0a784e8..8f3ce265 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 */
@@ -64,7 +64,7 @@ SR_PRIV int beaglelogic_receive_data(int fd, int revents, void *cb_data)
if (devc->trigger_fired) {
/* Send the incoming transfer to the session bus. */
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
} else {
/* Check for trigger */
trigger_offset = soft_trigger_logic_check(devc->stl,
@@ -76,7 +76,7 @@ SR_PRIV int beaglelogic_receive_data(int fd, int revents, void *cb_data)
bytes_remaining);
logic.data += trigger_offset;
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
devc->trigger_fired = TRUE;
}
@@ -101,10 +101,7 @@ SR_PRIV int beaglelogic_receive_data(int fd, int revents, void *cb_data)
if (devc->bytes_read >= devc->limit_samples * logic.unitsize ||
packetsize == 0) {
/* Send EOA Packet, stop polling */
- packet.type = SR_DF_END;
- packet.payload = NULL;
- sr_session_send(devc->cb_data, &packet);
-
+ std_session_send_df_end(sdi);
sr_session_source_remove_pollfd(sdi->session, &devc->pollfd);
}