serial.c: Sanitize serial_stream_detect
Print the timeout in miliseconds, not microseconds. Only calculate elapsed time once oer loop. Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
This commit is contained in:
parent
8be8746951
commit
551c3d8ce3
|
@ -660,8 +660,6 @@ SR_PRIV int serial_stream_detect(struct sr_serial_dev_inst *serial,
|
||||||
return SR_ERR;
|
return SR_ERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
timeout_ms *= 1000;
|
|
||||||
|
|
||||||
/* Assume 8n1 transmission. That is 10 bits for every byte. */
|
/* Assume 8n1 transmission. That is 10 bits for every byte. */
|
||||||
byte_delay_us = 10 * (1000000 / baudrate);
|
byte_delay_us = 10 * (1000000 / baudrate);
|
||||||
start = g_get_monotonic_time();
|
start = g_get_monotonic_time();
|
||||||
|
@ -676,11 +674,13 @@ SR_PRIV int serial_stream_detect(struct sr_serial_dev_inst *serial,
|
||||||
} else {
|
} else {
|
||||||
/* Error reading byte, but continuing anyway. */
|
/* Error reading byte, but continuing anyway. */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
time = g_get_monotonic_time() - start;
|
||||||
|
time /= 1000;
|
||||||
|
|
||||||
if ((ibuf - i) >= packet_size) {
|
if ((ibuf - i) >= packet_size) {
|
||||||
/* We have at least a packet's worth of data. */
|
/* We have at least a packet's worth of data. */
|
||||||
if (is_valid(&buf[i])) {
|
if (is_valid(&buf[i])) {
|
||||||
time = g_get_monotonic_time() - start;
|
|
||||||
time /= 1000;
|
|
||||||
sr_spew("Found valid %d-byte packet after "
|
sr_spew("Found valid %d-byte packet after "
|
||||||
"%" PRIu64 "ms.", (ibuf - i), time);
|
"%" PRIu64 "ms.", (ibuf - i), time);
|
||||||
*buflen = ibuf;
|
*buflen = ibuf;
|
||||||
|
@ -692,9 +692,9 @@ SR_PRIV int serial_stream_detect(struct sr_serial_dev_inst *serial,
|
||||||
/* Not a valid packet. Continue searching. */
|
/* Not a valid packet. Continue searching. */
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
if (g_get_monotonic_time() - start > timeout_ms) {
|
if (time >= timeout_ms) {
|
||||||
/* Timeout */
|
/* Timeout */
|
||||||
sr_dbg("Detection timed out after %dms.", timeout_ms);
|
sr_dbg("Detection timed out after %dms.", time);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
g_usleep(byte_delay_us);
|
g_usleep(byte_delay_us);
|
||||||
|
|
Loading…
Reference in New Issue