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

ols: Fix serial port timeout.

This commit is contained in:
Bert Vermeulen 2014-10-08 03:00:47 +02:00
parent 9e6d9bee2a
commit f4d3a4fb9a
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hardware/openbench-logic-sniffer/api.c
View File

@ -161,7 +161,7 @@ static GSList *scan(GSList *options)
if (probefd.revents != G_IO_IN)
return NULL;
if (serial_read_blocking(serial, buf, 4, 0) != 4)
if (serial_read_blocking(serial, buf, 4, serial_timeout(serial, 4)) != 4)
return NULL;
if (strncmp(buf, "1SLO", 4) && strncmp(buf, "1ALS", 4))
return NULL;

17
src/hardware/openbench-logic-sniffer/protocol.c
View File

@ -30,7 +30,7 @@ SR_PRIV int send_shortcommand(struct sr_serial_dev_inst *serial,
sr_dbg("Sending cmd 0x%.2x.", command);
buf[0] = command;
if (serial_write_blocking(serial, buf, 1, 0) != 1)
if (serial_write_blocking(serial, buf, 1, serial_timeout(serial, 1)) != 1)
return SR_ERR;
return SR_OK;
@ -48,7 +48,7 @@ SR_PRIV int send_longcommand(struct sr_serial_dev_inst *serial,
buf[2] = data[1];
buf[3] = data[2];
buf[4] = data[3];
if (serial_write_blocking(serial, buf, 5, 0) != 5)
if (serial_write_blocking(serial, buf, 5, serial_timeout(serial, 1)) != 5)
return SR_ERR;
return SR_OK;
@ -142,6 +142,7 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
struct sr_channel *ch;
uint32_t tmp_int, ui;
uint8_t key, type, token;
int delay_ms;
GString *tmp_str, *devname, *version;
guchar tmp_c;
@ -155,7 +156,8 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
key = 0xff;
while (key) {
if (serial_read_blocking(serial, &key, 1, 0) != 1)
delay_ms = serial_timeout(serial, 1);
if (serial_read_blocking(serial, &key, 1, delay_ms) != 1)
break;
if (key == 0x00) {
sr_dbg("Got metadata key 0x00, metadata ends.");
@ -167,7 +169,8 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
case 0:
/* NULL-terminated string */
tmp_str = g_string_new("");
while (serial_read_blocking(serial, &tmp_c, 1, 0) == 1 && tmp_c != '\0')
delay_ms = serial_timeout(serial, 1);
while (serial_read_blocking(serial, &tmp_c, 1, delay_ms) == 1 && tmp_c != '\0')
g_string_append_c(tmp_str, tmp_c);
sr_dbg("Got metadata key 0x%.2x value '%s'.",
key, tmp_str->str);
@ -199,7 +202,8 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
break;
case 1:
/* 32-bit unsigned integer */
if (serial_read_blocking(serial, &tmp_int, 4, 0) != 4)
delay_ms = serial_timeout(serial, 4);
if (serial_read_blocking(serial, &tmp_int, 4, delay_ms) != 4)
break;
tmp_int = RB32(&tmp_int);
sr_dbg("Got metadata key 0x%.2x value 0x%.8x.",
@ -238,7 +242,8 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
break;
case 2:
/* 8-bit unsigned integer */
if (serial_read_blocking(serial, &tmp_c, 1, 0) != 1)
delay_ms = serial_timeout(serial, 1);
if (serial_read_blocking(serial, &tmp_c, 1, delay_ms) != 1)
break;
sr_dbg("Got metadata key 0x%.2x value 0x%.2x.",
key, tmp_c);