X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flecroy-logicstudio%2Fapi.c;h=c3007e4210da344695493dd71a17408bb4819663;hb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;hp=db423e4b749c29f01b2e7639bb3bf2308d4f571f;hpb=bee2b0168c087676c1b365861d8c2d4714afa9b9;p=libsigrok.git diff --git a/src/hardware/lecroy-logicstudio/api.c b/src/hardware/lecroy-logicstudio/api.c index db423e4b..c3007e42 100644 --- a/src/hardware/lecroy-logicstudio/api.c +++ b/src/hardware/lecroy-logicstudio/api.c @@ -191,9 +191,6 @@ static int open_device(struct sr_dev_inst *sdi) size_t i; int r; - if (sdi->status == SR_ST_ACTIVE) - return SR_ERR; - drvc = sdi->driver->context; usb = sdi->conn; @@ -340,15 +337,13 @@ static int dev_close(struct sr_dev_inst *sdi) } if (!usb->devhdl) - return SR_ERR; + return SR_ERR_BUG; libusb_release_interface(usb->devhdl, 0); libusb_close(usb->devhdl); usb->devhdl = NULL; - sdi->status = SR_ST_INACTIVE; - return SR_OK; } @@ -390,9 +385,6 @@ static int config_set(uint32_t key, GVariant *data, devc = sdi->priv; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - switch (key) { case SR_CONF_SAMPLERATE: return lls_set_samplerate(sdi, g_variant_get_uint64(data)); @@ -472,9 +464,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) struct drv_context *drvc; int ret; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - drvc = sdi->driver->context; if ((ret = lls_start_acquisition(sdi)) < 0) @@ -488,9 +477,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; - return lls_stop_acquisition(sdi); }