]> sigrok.org Git - libsigrok.git/commitdiff
g_get_monotonic_time() takes a signed int64
authorBert Vermeulen <redacted>
Wed, 7 Nov 2012 00:23:24 +0000 (01:23 +0100)
committerBert Vermeulen <redacted>
Wed, 7 Nov 2012 00:23:24 +0000 (01:23 +0100)
hardware/common/serial.c
libsigrok-internal.h

index 5a1d21af90c4cbebc9a593847f7b0fe1634c51e2..bc837a3841f29e575eefa9ab5490cfe4ecf0475b 100644 (file)
@@ -603,9 +603,9 @@ SR_PRIV int serial_set_paramstr(int fd, const char *paramstr)
 }
 
 SR_PRIV int serial_readline(int fd, char **buf, int *buflen,
-                           uint64_t timeout_ms)
+                           gint64 timeout_ms)
 {
-       uint64_t start;
+       gint64 start;
        int maxlen, len;
 
        timeout_ms *= 1000;
index 4e46805af5ac35d4931737bdfd50b007ff1c2d42..c63dcd46b858e2a52e11ccb1bab4ffb322422854 100644 (file)
@@ -136,7 +136,7 @@ SR_PRIV int serial_set_params(int fd, int baudrate, int bits, int parity,
                              int stopbits, int flowcontrol);
 SR_PRIV int serial_set_paramstr(int fd, const char *paramstr);
 SR_PRIV int serial_readline(int fd, char **buf, int *buflen,
-                           uint64_t timeout_ms);
+                           gint64 timeout_ms);
 
 /*--- hardware/common/ezusb.c -----------------------------------------------*/