Change sr_dev_inst_new() to take no parameters.

[libsigrok.git] / src / hardware / openbench-logic-sniffer / protocol.c

diff --git a/src/hardware/openbench-logic-sniffer/protocol.c b/src/hardware/openbench-logic-sniffer/protocol.c
index 00068ebdcb4e37145ce7f9363c6cf446b3c826c0..c2b66615e5156781163d9ca02de723d11a018598 100644 (file)
--- a/src/hardware/openbench-logic-sniffer/protocol.c
+++ b/src/hardware/openbench-logic-sniffer/protocol.c
@@ -33,6 +33,9 @@ SR_PRIV int send_shortcommand(struct sr_serial_dev_inst *serial,
        if (serial_write_blocking(serial, buf, 1, serial_timeout(serial, 1)) != 1)
                return SR_ERR;
 
+       if (serial_drain(serial) != 0)
+               return SR_ERR;
+
        return SR_OK;
 }
 
@@ -51,6 +54,9 @@ SR_PRIV int send_longcommand(struct sr_serial_dev_inst *serial,
        if (serial_write_blocking(serial, buf, 5, serial_timeout(serial, 1)) != 5)
                return SR_ERR;
 
+       if (serial_drain(serial) != 0)
+               return SR_ERR;
+
        return SR_OK;
 }
 
@@ -146,7 +152,8 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
        GString *tmp_str, *devname, *version;
        guchar tmp_c;
 
-       sdi = sr_dev_inst_new(SR_ST_INACTIVE, NULL, NULL, NULL);
+       sdi = sr_dev_inst_new();
+       sdi->status = SR_ST_INACTIVE;
        sdi->driver = di;
        devc = ols_dev_new();
        sdi->priv = devc;