X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fbrymen-bm86x%2Fapi.c;h=44424241d945f66174b931861f176df08b4e74d0;hb=7e463623382e1f574fde150b3fc88a65eaebb578;hp=fb9f2807efd87496a18e346a8597d7a319c61cbe;hpb=bee2b0168c087676c1b365861d8c2d4714afa9b9;p=libsigrok.git diff --git a/src/hardware/brymen-bm86x/api.c b/src/hardware/brymen-bm86x/api.c index fb9f2807..44424241 100644 --- a/src/hardware/brymen-bm86x/api.c +++ b/src/hardware/brymen-bm86x/api.c @@ -95,9 +95,7 @@ static int dev_open(struct sr_dev_inst *sdi) usb = sdi->conn; devc = sdi->priv; - if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb)) == SR_OK) - sdi->status = SR_ST_ACTIVE; - else + if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb)) < 0) return SR_ERR; /* Detach kernel drivers which grabbed this device (if any). */ @@ -122,7 +120,7 @@ static int dev_open(struct sr_dev_inst *sdi) } sr_dbg("Successfully claimed interface 0."); - return ret; + return SR_OK; } static int dev_close(struct sr_dev_inst *sdi) @@ -131,9 +129,6 @@ 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; @@ -176,9 +171,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd (void)cg; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - devc = sdi->priv; return sr_sw_limits_config_set(&devc->sw_limits, key, data); @@ -210,9 +202,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) { struct dev_context *devc; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - devc = sdi->priv; sr_sw_limits_acquisition_start(&devc->sw_limits); @@ -227,9 +216,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) static int dev_acquisition_stop(struct sr_dev_inst *sdi) { - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - std_session_send_df_end(sdi); sr_session_source_remove(sdi->session, -1);