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

scpi-pps: Don't block waiting for a value on capture stop. 

The comment says "A requested value is certainly on the way", but the code no
longer works this way. The receive handler requests a value and blocks until
it is received. There is no value pending between receive handler calls, so
this code now only leads to a timeout.
This commit is contained in:
Martin Ling 2018-09-10 16:10:31 +01:00
parent cda70c2c19
commit 49f7cb2425
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hardware/scpi-pps/api.c
View File

@ -647,18 +647,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
static int dev_acquisition_stop(struct sr_dev_inst *sdi) static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{ {
struct sr_scpi_dev_inst *scpi; struct sr_scpi_dev_inst *scpi;
double d;
scpi = sdi->conn; scpi = sdi->conn;
/*
* A requested value is certainly on the way. Retrieve it now,
* to avoid leaving the device in a state where it's not expecting
* commands.
*
* TODO: Doesn't work for (at least) the HP 66XXB models.
*/
sr_scpi_get_double(scpi, NULL, &d);
sr_scpi_source_remove(sdi->session, scpi); sr_scpi_source_remove(sdi->session, scpi);
std_session_send_df_end(sdi); std_session_send_df_end(sdi);