Add sr_dev_acquisition_stop(), factor out SR_ERR_DEV_CLOSED check.

[libsigrok.git] / src / hardware / link-mso19 / protocol.c

diff --git a/src/hardware/link-mso19/protocol.c b/src/hardware/link-mso19/protocol.c
index 5c263adb89317f3f2fee066c4df3c89ccdef779b..b0cb2d8a7ecb120d00260a2ebadd46dcbfb97644 100644 (file)
--- a/src/hardware/link-mso19/protocol.c
+++ b/src/hardware/link-mso19/protocol.c
@@ -100,7 +100,7 @@ SR_PRIV int mso_configure_trigger(const struct sr_dev_inst *sdi)
                trigger_config |= 0x20; //DSO level trigger & width < trigger_width
                break;
        case 2:
-               trigger_config |= 0x40; //DSO level trigger & width >= trigger_width 
+               trigger_config |= 0x40; //DSO level trigger & width >= trigger_width
                break;
        case 3:
                trigger_config |= 0x60; //LA combination trigger
@@ -289,7 +289,7 @@ SR_PRIV void stop_acquisition(const struct sr_dev_inst *sdi)
        devc = sdi->priv;
        serial_source_remove(sdi->session, devc->serial);
 
-       std_session_send_df_end(sdi, LOG_PREFIX);
+       std_session_send_df_end(sdi);
 }
 
 SR_PRIV int mso_clkrate_out(struct sr_serial_dev_inst *serial, uint16_t val)
@@ -405,7 +405,7 @@ SR_PRIV int mso_receive_data(int fd, int revents, void *cb_data)
 
        if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
                sr_info("Requested number of samples reached.");
-               sdi->driver->dev_acquisition_stop(sdi);
+               sr_dev_acquisition_stop(sdi);
        }
 
        return TRUE;