Consistently don't check sdi->priv in dev_acquisition_start().

[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 3910100a97899543e3e1cae0370fa2fd86ae63e9..4b92446e93ea37ef0ecc03e09f8303e0905cf331 100644 (file)
--- a/src/hardware/maynuo-m97/api.c
+++ b/src/hardware/maynuo-m97/api.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "protocol.h"
 
 static const uint32_t scanopts[] = {
@@ -128,13 +129,13 @@ static struct sr_dev_inst *probe_device(struct sr_modbus_dev_inst *modbus)
        int ret = maynuo_m97_get_model_version(modbus, &id, &version);
        if (ret != SR_OK)
                return NULL;
-       for (i=0; i<ARRAY_SIZE(supported_models); i++)
+       for (i = 0; i < ARRAY_SIZE(supported_models); i++)
                if (id == supported_models[i].id) {
                        model = &supported_models[i];
                        break;
                }
        if (model == NULL) {
-               sr_err("Unkown model: %d.", id);
+               sr_err("Unknown model: %d.", id);
                return NULL;
        }
 
@@ -452,8 +453,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        return ret;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi,
-               void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 {
        struct dev_context *devc;
        struct sr_modbus_dev_inst *modbus;
@@ -471,7 +471,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
                        maynuo_m97_receive_data, (void *)sdi)) != SR_OK)
                return ret;
 
-       /* Send header packet to the session bus. */
        std_session_send_df_header(sdi, LOG_PREFIX);
 
        devc->num_samples = 0;
@@ -483,16 +482,13 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
        struct sr_modbus_dev_inst *modbus;
-       struct sr_datafeed_packet packet;
 
        (void)cb_data;
 
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       /* End of last frame. */
-       packet.type = SR_DF_END;
-       sr_session_send(sdi, &packet);
+       std_session_send_df_end(sdi, LOG_PREFIX);
 
        modbus = sdi->conn;
        sr_modbus_source_remove(sdi->session, modbus);