rigol-ds: On DS1000 with firmware < 0.2.4, use legacy protocol.

[libsigrok.git] / hardware / rigol-ds / protocol.c

diff --git a/hardware/rigol-ds/protocol.c b/hardware/rigol-ds/protocol.c
index 4f4ff412b015d7240b37c08ccb5fb30ffe346b02..446534b9966d7bcf948cbc54e7c6a1e3ebc4c443 100644 (file)
--- a/hardware/rigol-ds/protocol.c
+++ b/hardware/rigol-ds/protocol.c
@@ -460,7 +460,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
                        if (sr_scpi_read_begin(scpi) != SR_OK)
                                return TRUE;
 
-                       if (devc->model->protocol == PROTOCOL_IEEE488_2) {
+                       if (devc->protocol == PROTOCOL_IEEE488_2) {
                                sr_dbg("New block header expected");
                                len = rigol_ds_read_header(scpi);
                                if (len == -1)
@@ -529,7 +529,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
                                /* Discard the terminating linefeed */
                                sr_scpi_read_data(scpi, (char *)devc->buffer, 1);
                        }
-                       if (devc->model->protocol == PROTOCOL_IEEE488_2) {
+                       if (devc->protocol == PROTOCOL_IEEE488_2) {
                                /* Prepare for possible next block */
                                devc->num_block_bytes = 0;
                                if (devc->data_source != DATA_SOURCE_LIVE)