X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frohde-schwarz-sme-0x%2Fapi.c;h=3ca5441ad2fb2ad6d91e2f500a47220033f23171;hb=7e463623382e1f574fde150b3fc88a65eaebb578;hp=68c57ea9077c88e77d9c0526c1c6aca67ade97a0;hpb=f670835f1fbc03525e995d6970a5495976ab7c1a;p=libsigrok.git diff --git a/src/hardware/rohde-schwarz-sme-0x/api.c b/src/hardware/rohde-schwarz-sme-0x/api.c index 68c57ea9..3ca5441a 100644 --- a/src/hardware/rohde-schwarz-sme-0x/api.c +++ b/src/hardware/rohde-schwarz-sme-0x/api.c @@ -162,19 +162,11 @@ static int dev_clear(const struct sr_dev_driver *di) static int dev_open(struct sr_dev_inst *sdi) { - if ((sdi->status != SR_ST_ACTIVE) && (sr_scpi_open(sdi->conn) != SR_OK)) - return SR_ERR; - - sdi->status = SR_ST_ACTIVE; - - return SR_OK; + return sr_scpi_open(sdi->conn); } static int dev_close(struct sr_dev_inst *sdi) { - if (sdi->status == SR_ST_INACTIVE) - return SR_OK; - sr_scpi_close(sdi->conn); sdi->status = SR_ST_INACTIVE; @@ -215,9 +207,6 @@ static int config_set(uint32_t key, GVariant *data, if (!sdi) return SR_ERR_ARG; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - switch (key) { case SR_CONF_OUTPUT_FREQUENCY: value_f = g_variant_get_double(data);