X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fgwinstek-gds-800%2Fapi.c;h=2ab06957e2ed39e98a2e2a74d7888a7f30bb8b59;hb=093e1cba6b7bf14cfb77fa36f59b0c16e6fca7cc;hp=2889a814d2996c0e46eaffaff53d79d22f944f2b;hpb=bee2b0168c087676c1b365861d8c2d4714afa9b9;p=libsigrok.git diff --git a/src/hardware/gwinstek-gds-800/api.c b/src/hardware/gwinstek-gds-800/api.c index 2889a814..2ab06957 100644 --- a/src/hardware/gwinstek-gds-800/api.c +++ b/src/hardware/gwinstek-gds-800/api.c @@ -66,8 +66,8 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) devc = g_malloc0(sizeof(struct dev_context)); devc->frame_limit = 1; - devc->sample_rate = 0.; - devc->df_started = FALSE; + devc->sample_rate = 0.0; + devc->df_started = FALSE; sdi->priv = devc; sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "CH1"); @@ -107,9 +107,6 @@ static int dev_close(struct sr_dev_inst *sdi) { struct sr_scpi_dev_inst *scpi; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - scpi = sdi->conn; if (scpi) { if (sr_scpi_close(scpi) < 0) @@ -153,9 +150,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd if (!sdi) return SR_ERR_ARG; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - devc = sdi->priv; switch (key) { @@ -199,9 +193,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) scpi = sdi->conn; devc = sdi->priv; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - devc->state = START_ACQUISITION; devc->cur_acq_frame = 0; @@ -220,11 +211,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) scpi = sdi->conn; devc = sdi->priv; - if (sdi->status != SR_ST_ACTIVE) { - sr_err("Device inactive, can't stop acquisition."); - return SR_ERR; - } - if (devc->df_started) { packet.type = SR_DF_FRAME_END; sr_session_send(sdi, &packet);