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

rigol-ds: Fix partial read handling in header parser.

This commit is contained in:
Martin Ling 2014-01-22 08:13:27 +00:00 committed by Bert Vermeulen
parent 8943049cd4
commit aff00e4088
2 changed files with 60 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
hardware/rigol-ds/protocol.c
View File

@ -401,49 +401,71 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi)
return SR_ERR; return SR_ERR;
if (rigol_ds_config_set(sdi, ":WAV:BEG") != SR_OK) if (rigol_ds_config_set(sdi, ":WAV:BEG") != SR_OK)
return SR_ERR; return SR_ERR;
rigol_ds_set_wait_event(devc, WAIT_BLOCK); }
} else
rigol_ds_set_wait_event(devc, WAIT_NONE);
} }
rigol_ds_set_wait_event(devc, WAIT_BLOCK);
devc->num_channel_bytes = 0; devc->num_channel_bytes = 0;
devc->num_header_bytes = 0;
devc->num_block_bytes = 0; devc->num_block_bytes = 0;
return SR_OK; return SR_OK;
} }
/* Read the header of a data block */ /* Read the header of a data block */
static int rigol_ds_read_header(struct sr_scpi_dev_inst *scpi) static int rigol_ds_read_header(struct sr_dev_inst *sdi)
{ {
char start[3], length[10]; struct sr_scpi_dev_inst *scpi = sdi->conn;
int len, tmp; struct dev_context *devc = sdi->priv;
char *buf = (char *) devc->buffer;
int len;
int tmp;
/* Read the hashsign and length digit. */ /* Try to read the hashsign and length digit. */
tmp = sr_scpi_read_data(scpi, start, 2); if (devc->num_header_bytes < 2) {
start[2] = '\0'; tmp = sr_scpi_read_data(scpi, buf + devc->num_header_bytes,
if (tmp != 2) { 2 - devc->num_header_bytes);
sr_err("Failed to read first two bytes of data block header."); if (tmp < 0) {
return -1; sr_err("Read error while reading data header.");
return SR_ERR;
}
devc->num_header_bytes += tmp;
} }
if (start[0] != '#' || !isdigit(start[1]) || start[1] == '0') {
sr_err("Received invalid data block header start '%s'.", start); if (devc->num_header_bytes < 2)
return -1; return 0;
if (buf[0] != '#' || !isdigit(buf[1]) || buf[1] == '0') {
sr_err("Received invalid data block header '%c%c'.", buf[0], buf[1]);
return SR_ERR;
} }
len = atoi(start + 1);
len = buf[1] - '0';
/* Try to read the length. */
if (devc->num_header_bytes < 2 + len) {
tmp = sr_scpi_read_data(scpi, buf + devc->num_header_bytes,
2 + len - devc->num_header_bytes);
if (tmp < 0) {
sr_err("Read error while reading data header.");
return SR_ERR;
}
devc->num_header_bytes += tmp;
}
if (devc->num_header_bytes < 2 + len)
return 0;
/* Read the data length. */ /* Read the data length. */
tmp = sr_scpi_read_data(scpi, length, len); buf[2 + len] = '\0';
length[len] = '\0';
if (tmp != len) { if (parse_int(buf + 2, &len) != SR_OK) {
sr_err("Failed to read %d bytes of data block length.", len); sr_err("Received invalid data block length '%s'.", buf + 2);
return -1;
}
if (parse_int(length, &len) != SR_OK) {
sr_err("Received invalid data block length '%s'.", length);
return -1; return -1;
} }
sr_dbg("Received data block header: %s%s -> block length %d", start, length, len); sr_dbg("Received data block header: '%s' -> block length %d", buf, len);
return len; return len;
} }
@ -512,9 +534,17 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
if (devc->format == FORMAT_IEEE488_2) { if (devc->format == FORMAT_IEEE488_2) {
sr_dbg("New block header expected"); sr_dbg("New block header expected");
len = rigol_ds_read_header(scpi); len = rigol_ds_read_header(sdi);
if (len == -1) if (len == 0)
/* Still reading the header. */
return TRUE; return TRUE;
if (len == -1) {
sr_err("Read error, aborting capture.");
packet.type = SR_DF_FRAME_END;
sr_session_send(cb_data, &packet);
sdi->driver->dev_acquisition_stop(sdi, cb_data);
return TRUE;
}
/* At slow timebases in live capture the DS2072 /* At slow timebases in live capture the DS2072
* sometimes returns "short" data blocks, with * sometimes returns "short" data blocks, with
* apparently no way to get the rest of the data. * apparently no way to get the rest of the data.
@ -590,6 +620,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
} }
if (devc->format == FORMAT_IEEE488_2) { if (devc->format == FORMAT_IEEE488_2) {
/* Prepare for possible next block */ /* Prepare for possible next block */
devc->num_header_bytes = 0;
devc->num_block_bytes = 0; devc->num_block_bytes = 0;
if (devc->data_source != DATA_SOURCE_LIVE) if (devc->data_source != DATA_SOURCE_LIVE)
rigol_ds_set_wait_event(devc, WAIT_BLOCK); rigol_ds_set_wait_event(devc, WAIT_BLOCK);

2
hardware/rigol-ds/protocol.h
View File

@ -131,6 +131,8 @@ struct dev_context {
GSList *channel_entry; GSList *channel_entry;
/* Number of bytes received for current channel. */ /* Number of bytes received for current channel. */
uint64_t num_channel_bytes; uint64_t num_channel_bytes;
/* Number of bytes of block header read */
uint64_t num_header_bytes;
/* Number of bytes in current data block, if 0 block header expected */ /* Number of bytes in current data block, if 0 block header expected */
uint64_t num_block_bytes; uint64_t num_block_bytes;
/* Number of data block bytes already read */ /* Number of data block bytes already read */