Backport recent changes from mainline.

[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 29aacbdab0642b33b32df487f343df5b4cf9aa53..8721ec2b0c4761e4abf675de1e0a722821575057 100644 (file)
--- a/src/hardware/link-mso19/protocol.c
+++ b/src/hardware/link-mso19/protocol.c
@@ -48,8 +48,8 @@ SR_PRIV int mso_send_control_message(struct sr_serial_dev_inst *serial,
        p += sizeof(mso_head);
 
        for (i = 0; i < n; i++) {
-               *(uint16_t *) p = g_htons(payload[i]);
-               p += 2;
+               WB16(p, payload[i]);
+               p += sizeof(uint16_t);
        }
        memcpy(p, mso_foot, sizeof(mso_foot));
 
@@ -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;