X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbrymen-bm86x%2Fapi.c;h=71de86d1e6750b2824dd5b8d585f1b60a67edb6d;hb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;hp=834f11bb80cc140f4802771e7d8f156352875c23;hpb=41812aca436805b0614f2a8f31cf2f8ce494aea0;p=libsigrok.git
diff --git a/src/hardware/brymen-bm86x/api.c b/src/hardware/brymen-bm86x/api.c
index 834f11bb..71de86d1 100644
--- a/src/hardware/brymen-bm86x/api.c
+++ b/src/hardware/brymen-bm86x/api.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include "protocol.h"
#define BRYMEN_BC86X "0820.0001"
@@ -109,6 +110,8 @@ static int dev_open(struct sr_dev_inst *sdi)
if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb)) == SR_OK)
sdi->status = SR_ST_ACTIVE;
+ else
+ return SR_ERR;
/* Detach kernel drivers which grabbed this device (if any). */
if (libusb_kernel_driver_active(usb->devhdl, 0) == 1) {
@@ -141,6 +144,9 @@ static int dev_close(struct sr_dev_inst *sdi)
struct dev_context *devc;
int ret;
+ if (sdi->status != SR_ST_ACTIVE)
+ return SR_ERR_DEV_CLOSED;
+
usb = sdi->conn;
devc = sdi->priv;
@@ -256,10 +262,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
devc = sdi->priv;
devc->start_time = g_get_monotonic_time();
- /* Send header packet to the session bus. */
std_session_send_df_header(sdi, LOG_PREFIX);
- sr_session_source_add(sdi->session, 0, 0, 10,
+ sr_session_source_add(sdi->session, -1, 0, 10,
brymen_bm86x_receive_data, (void *)sdi);
return SR_OK;
@@ -267,18 +272,14 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
- struct sr_datafeed_packet packet;
-
(void)cb_data;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- /* Send end packet to the session bus. */
- packet.type = SR_DF_END;
- sr_session_send(sdi, &packet);
+ std_session_send_df_end(sdi, LOG_PREFIX);
- sr_session_source_remove(sdi->session, 0);
+ sr_session_source_remove(sdi->session, -1);
return SR_OK;
}