Add sr_dev_acquisition_stop(), factor out SR_ERR_DEV_CLOSED check.

[libsigrok.git] / src / hardware / hp-3457a / protocol.c

diff --git a/src/hardware/hp-3457a/protocol.c b/src/hardware/hp-3457a/protocol.c
index d9aa83383ac6ac3a492b8ad4d68ebcd995bc902a..aa8ab5284bc3664feaa8cffee781221eb633d683 100644 (file)
--- a/src/hardware/hp-3457a/protocol.c
+++ b/src/hardware/hp-3457a/protocol.c
@@ -67,7 +67,7 @@ static const struct rear_card_info rear_card_parameters[] = {
 };
 
 static int send_mq_ac_dc(struct sr_scpi_dev_inst *scpi, const char *mode,
-                          enum sr_mqflag flags)
+                        enum sr_mqflag flags)
 {
        const char *ac_flag, *dc_flag;
 
@@ -388,7 +388,7 @@ SR_PRIV int hp_3457a_receive_data(int fd, int revents, void *cb_data)
        struct sr_scpi_dev_inst *scpi;
        struct dev_context *devc;
        struct channel_context *chanc;
-       struct sr_dev_inst *sdi = cb_data;
+       struct sr_dev_inst *sdi;
 
        (void)fd;
        (void)revents;
@@ -435,7 +435,7 @@ SR_PRIV int hp_3457a_receive_data(int fd, int revents, void *cb_data)
                ret = sr_scpi_get_double(scpi, NULL, &devc->last_channel_sync);
                if (ret != SR_OK) {
                        sr_err("Cannot check channel synchronization.");
-                       sdi->driver->dev_acquisition_stop(sdi, cb_data);
+                       sr_dev_acquisition_stop(sdi);
                        return FALSE;
                }
                devc->acq_state = ACQ_GOT_CHANNEL_SYNC;
@@ -456,7 +456,7 @@ SR_PRIV int hp_3457a_receive_data(int fd, int revents, void *cb_data)
                        sr_err("Expected channel %u, but device says %u",
                               chanc->index,
                               (unsigned int)devc->last_channel_sync);
-                       sdi->driver->dev_acquisition_stop(sdi, cb_data);
+                       sr_dev_acquisition_stop(sdi);
                        return FALSE;
                }
                /* All is good. Back to business. */
@@ -464,7 +464,7 @@ SR_PRIV int hp_3457a_receive_data(int fd, int revents, void *cb_data)
        }
 
        if (devc->limit_samples && (devc->num_samples >= devc->limit_samples)) {
-               sdi->driver->dev_acquisition_stop(sdi, cb_data);
+               sr_dev_acquisition_stop(sdi);
                return FALSE;
        }