Rename 'struct sr_probe' to 'struct sr_channel' everywhere.

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

diff --git a/hardware/rigol-ds/protocol.c b/hardware/rigol-ds/protocol.c
index 3e6a5bef694c94c6b8d8247c4ee53e95072b1011..d609b06079dd14bc9a29c0a7535e4467fc4eb471 100644 (file)
--- a/hardware/rigol-ds/protocol.c
+++ b/hardware/rigol-ds/protocol.c
@@ -207,7 +207,7 @@ static int rigol_ds_stop_wait(const struct sr_dev_inst *sdi)
 static int rigol_ds_check_stop(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
-       struct sr_probe *probe;
+       struct sr_channel *probe;
        int tmp;
 
        if (!(devc = sdi->priv))
@@ -376,7 +376,7 @@ SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi)
 SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
-       struct sr_probe *probe;
+       struct sr_channel *probe;
 
        if (!(devc = sdi->priv))
                return SR_ERR;
@@ -483,7 +483,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
        struct sr_datafeed_logic logic;
        double vdiv, offset;
        int len, i, vref;
-       struct sr_probe *probe;
+       struct sr_channel *probe;
        gsize expected_data_bytes;
 
        (void)fd;
@@ -505,7 +505,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
                                return TRUE;
                        if (rigol_ds_channel_start(sdi) != SR_OK)
                                return TRUE;
-                       break;
+                       return TRUE;
                case WAIT_BLOCK:
                        if (rigol_ds_block_wait(sdi) != SR_OK)
                                return TRUE;