X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ftesto%2Fapi.c;h=062849bfd5e320c80bc36500565fdabaee3f1b2f;hb=53279f13e4694fcf2aba314baade418941b0bc3e;hp=d04cce6f3ca8b87a8b6289d664e1466ece80d600;hpb=d2f7c417fdd96a13d8fd86350d2fc13db16f626c;p=libsigrok.git diff --git a/src/hardware/testo/api.c b/src/hardware/testo/api.c index d04cce6f..062849bf 100644 --- a/src/hardware/testo/api.c +++ b/src/hardware/testo/api.c @@ -162,7 +162,6 @@ static int dev_open(struct sr_dev_inst *sdi) sr_err("Failed to claim interface: %s.", libusb_error_name(ret)); return SR_ERR; } - sdi->status = SR_ST_ACTIVE; return SR_OK; } @@ -172,14 +171,13 @@ static int dev_close(struct sr_dev_inst *sdi) struct sr_usb_dev_inst *usb; usb = sdi->conn; + if (!usb->devhdl) - /* Nothing to do. */ - return SR_OK; + 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; } @@ -218,9 +216,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; - return sr_sw_limits_config_set(&devc->sw_limits, key, data); } @@ -372,10 +367,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) unsigned char *buf; drvc = di->context; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - - devc = sdi->priv; usb = sdi->conn; devc->reply_size = 0; @@ -424,6 +415,7 @@ static struct sr_dev_driver testo_driver_info = { .cleanup = std_cleanup, .scan = scan, .dev_list = std_dev_list, + .dev_clear = std_dev_clear, .config_get = config_get, .config_set = config_set, .config_list = config_list,