]> sigrok.org Git - libsigrok.git/blobdiff - src/hardware/conrad-digi-35-cpu/protocol.c
Put driver pointers into special section
[libsigrok.git] / src / hardware / conrad-digi-35-cpu / protocol.c
index caf1e85db17962d376a1777f9e012cbd6157eb81..732bec62c7805169daaa74a840950c2dab01b626 100644 (file)
@@ -23,6 +23,7 @@
  * @internal
  */
 
+#include <config.h>
 #include "protocol.h"
 
 /**
@@ -48,7 +49,8 @@ SR_PRIV int send_msg1(const struct sr_dev_inst *sdi, char cmd, int param)
 
        sr_spew("send_msg1(): %c%c%c%c\\r", buf[0], buf[1], buf[2], buf[3]);
 
-       if (serial_write_blocking(serial, buf, sizeof(buf), 0) < (int)sizeof(buf)) {
+       if (serial_write_blocking(serial, buf, sizeof(buf),
+                       serial_timeout(serial, sizeof(buf))) < (int)sizeof(buf)) {
                sr_err("Write error for cmd=%c", cmd);
                return SR_ERR;
        }
@@ -57,7 +59,7 @@ SR_PRIV int send_msg1(const struct sr_dev_inst *sdi, char cmd, int param)
         * Wait 50ms to ensure that the device does not swallow any of the
         * following commands.
         */
-       g_usleep(50000);
+       g_usleep(50 * 1000);
 
        return SR_OK;
 }