Add sr_dev_acquisition_stop(), factor out SR_ERR_DEV_CLOSED check.

[libsigrok.git] / src / hardware / ftdi-la / api.c

diff --git a/src/hardware/ftdi-la/api.c b/src/hardware/ftdi-la/api.c
index 78dc23f779f74f4e3bcf9ee06a9557131db1e42b..240aa7ad2597eed0a81145c24bf901b7e5ee6f4f 100644 (file)
--- a/src/hardware/ftdi-la/api.c
+++ b/src/hardware/ftdi-la/api.c
@@ -120,7 +120,7 @@ static void scan_device(struct ftdi_context *ftdic,
        model = g_malloc(32);
        serial_num = g_malloc(32);
        rv = ftdi_usb_get_strings(ftdic, dev, vendor, 32,
-                            model, 32, serial_num, 32);
+                       model, 32, serial_num, 32);
        switch (rv) {
        case 0:
                break;
@@ -451,7 +451,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        devc->samples_sent = 0;
        devc->bytes_received = 0;
 
-       std_session_send_df_header(sdi, LOG_PREFIX);
+       std_session_send_df_header(sdi);
 
        /* Hook up a dummy handler to receive data from the device. */
        sr_session_source_add(sdi->session, -1, G_IO_IN, 0,
@@ -462,13 +462,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
-       sr_dbg("Stopping acquisition.");
        sr_session_source_remove(sdi->session, -1);
 
-       std_session_send_df_end(sdi, LOG_PREFIX);
+       std_session_send_df_end(sdi);
 
        return SR_OK;
 }