X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fikalogic-scanaplus%2Fapi.c;h=79585f060dfc86f9d71209cd27f2567611bd7f82;hb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;hp=2105bce130ed937ef4a9da75070a0c2c7f3b750f;hpb=f670835f1fbc03525e995d6970a5495976ab7c1a;p=libsigrok.git diff --git a/src/hardware/ikalogic-scanaplus/api.c b/src/hardware/ikalogic-scanaplus/api.c index 2105bce1..79585f06 100644 --- a/src/hardware/ikalogic-scanaplus/api.c +++ b/src/hardware/ikalogic-scanaplus/api.c @@ -207,33 +207,21 @@ static int dev_open(struct sr_dev_inst *sdi) sr_dbg("Received ScanaPLUS device ID successfully: %02x %02x %02x.", devc->devid[0], devc->devid[1], devc->devid[2]); - sdi->status = SR_ST_ACTIVE; - return SR_OK; err_dev_open_close_ftdic: scanaplus_close(devc); + return SR_ERR; } static int dev_close(struct sr_dev_inst *sdi) { - int ret; struct dev_context *devc; - ret = SR_OK; devc = sdi->priv; - if (sdi->status == SR_ST_ACTIVE) { - sr_dbg("Status ACTIVE, closing device."); - ret = scanaplus_close(devc); - } else { - sr_spew("Status not ACTIVE, nothing to do."); - } - - sdi->status = SR_ST_INACTIVE; - - return ret; + return scanaplus_close(devc); } static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, @@ -261,9 +249,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; switch (key) {