BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

g_get_monotonic_time() takes a signed int64

This commit is contained in:
Bert Vermeulen 2012-11-07 01:23:24 +01:00
parent 74ac7d7f73
commit b87f8504dc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hardware/common/serial.c
View 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, 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; int maxlen, len;
timeout_ms *= 1000; timeout_ms *= 1000;

2
libsigrok-internal.h
View File

@ -136,7 +136,7 @@ SR_PRIV int serial_set_params(int fd, int baudrate, int bits, int parity,
int stopbits, int flowcontrol); int stopbits, int flowcontrol);
SR_PRIV int serial_set_paramstr(int fd, const char *paramstr); SR_PRIV int serial_set_paramstr(int fd, const char *paramstr);
SR_PRIV int serial_readline(int fd, char **buf, int *buflen, SR_PRIV int serial_readline(int fd, char **buf, int *buflen,
uint64_t timeout_ms); gint64 timeout_ms);
/*--- hardware/common/ezusb.c -----------------------------------------------*/ /*--- hardware/common/ezusb.c -----------------------------------------------*/