sr_dev_close(): Set status to SR_ST_INACTIVE.

[libsigrok.git] / src / hardware / maynuo-m97 / api.c

diff --git a/src/hardware/maynuo-m97/api.c b/src/hardware/maynuo-m97/api.c
index 3ded72e9f49acabacc825dcff98bbb024dc2c9d3..23b0e68bc14b63788c1cb581e261849717a373a0 100644 (file)
--- a/src/hardware/maynuo-m97/api.c
+++ b/src/hardware/maynuo-m97/api.c
@@ -203,8 +203,6 @@ static int dev_open(struct sr_dev_inst *sdi)
        if (sr_modbus_open(modbus) < 0)
                return SR_ERR;
 
-       sdi->status = SR_ST_ACTIVE;
-
        maynuo_m97_set_bit(modbus, PC1, 1);
 
        return SR_OK;
@@ -215,28 +213,23 @@ static int dev_close(struct sr_dev_inst *sdi)
        struct dev_context *devc;
        struct sr_modbus_dev_inst *modbus;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        modbus = sdi->conn;
 
-       if (modbus) {
-               devc = sdi->priv;
-               if (devc->expecting_registers) {
-                       /* Wait for the last data that was requested from the device. */
-                       uint16_t registers[devc->expecting_registers];
-                       sr_modbus_read_holding_registers(modbus, -1,
-                               devc->expecting_registers, registers);
-               }
+       if (!modbus)
+               return SR_ERR_BUG;
 
-               maynuo_m97_set_bit(modbus, PC1, 0);
+       devc = sdi->priv;
 
-               if (sr_modbus_close(modbus) < 0)
-                       return SR_ERR;
-               sdi->status = SR_ST_INACTIVE;
+       if (devc->expecting_registers) {
+               /* Wait for the last data that was requested from the device. */
+               uint16_t registers[devc->expecting_registers];
+               sr_modbus_read_holding_registers(modbus, -1,
+                       devc->expecting_registers, registers);
        }
 
-       return SR_OK;
+       maynuo_m97_set_bit(modbus, PC1, 0);
+
+       return sr_modbus_close(modbus);
 }
 
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
@@ -332,9 +325,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;
-
        modbus = sdi->conn;
        devc = sdi->priv;
 
@@ -435,9 +425,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        struct sr_modbus_dev_inst *modbus;
        int ret;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        modbus = sdi->conn;
        devc = sdi->priv;
 
@@ -455,9 +442,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
        struct sr_modbus_dev_inst *modbus;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        std_session_send_df_end(sdi);
 
        modbus = sdi->conn;