X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Frigol-ds%2Fprotocol.c;h=eefed0745b8f3e9276c71c7c93ac56458f70cddf;hb=a53278de01008e1ea04f06d6ae3a32de37d1797c;hp=fc938e9d93763ff95dfc9ff00c4198a145201fed;hpb=036d378a628213f71afd24e9de475eacd592ca32;p=libsigrok.git diff --git a/hardware/rigol-ds/protocol.c b/hardware/rigol-ds/protocol.c index fc938e9d..eefed074 100644 --- a/hardware/rigol-ds/protocol.c +++ b/hardware/rigol-ds/protocol.c @@ -457,13 +457,17 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data) probe = devc->channel_entry->data; + if (devc->num_block_bytes == 0 && + devc->model->protocol == PROTOCOL_IEEE488_2) { + if (sr_scpi_send(sdi->conn, ":WAV:DATA?") != SR_OK) + return TRUE; + } + if (devc->num_block_bytes == 0) { if (sr_scpi_read_begin(scpi) != SR_OK) return TRUE; if (devc->model->protocol == PROTOCOL_IEEE488_2) { sr_dbg("New block header expected"); - if (sr_scpi_send(sdi->conn, ":WAV:DATA?") != SR_OK) - return TRUE; len = rigol_ds_read_header(scpi); if (len == -1) return TRUE;