Replace 'probe' with 'channel' in most places.

[libsigrok.git] / hardware / colead-slm / protocol.c

diff --git a/hardware/colead-slm/protocol.c b/hardware/colead-slm/protocol.c
index d14a382bae8cbcec3f9db76691ae3be8a9a915b0..4abcdd5e43dc336814fa4f70862713aa6744a59f 100644 (file)
--- a/hardware/colead-slm/protocol.c
+++ b/hardware/colead-slm/protocol.c
@@ -25,7 +25,6 @@
 #include <errno.h>
 #include <string.h>
 
-
 static void process_packet(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
@@ -75,7 +74,7 @@ static void process_packet(const struct sr_dev_inst *sdi)
        memset(&analog, 0, sizeof(struct sr_datafeed_analog));
        analog.mq = SR_MQ_SOUND_PRESSURE_LEVEL;
        analog.unit = SR_UNIT_DECIBEL_SPL;
-       analog.probes = sdi->probes;
+       analog.channels = sdi->channels;
        analog.num_samples = 1;
        analog.data = &fvalue;
 
@@ -181,6 +180,7 @@ SR_PRIV int colead_slm_receive_data(int fd, int revents, void *cb_data)
 {
        const struct sr_dev_inst *sdi;
        struct dev_context *devc;
+       struct sr_serial_dev_inst *serial;
        int len;
        char buf[128];
 
@@ -196,21 +196,22 @@ SR_PRIV int colead_slm_receive_data(int fd, int revents, void *cb_data)
                /* Timeout event. */
                return TRUE;
 
+       serial = sdi->conn;
        if (devc->state == IDLE) {
-               if (serial_read(devc->serial, buf, 128) != 1 || buf[0] != 0x10)
+               if (serial_read(serial, buf, 128) != 1 || buf[0] != 0x10)
                        /* Nothing there, or caught the tail end of a previous packet,
                         * or some garbage. Unless it's a single "data ready" byte,
                         * we don't want it. */
                        return TRUE;
                /* Got 0x10, "measurement ready". */
-               if (serial_write(devc->serial, "\x20", 1) == -1)
+               if (serial_write(serial, "\x20", 1) == -1)
                        sr_err("unable to send command: %s", strerror(errno));
                else {
                        devc->state = COMMAND_SENT;
                        devc->buflen = 0;
                }
        } else {
-               len = serial_read(devc->serial, devc->buf + devc->buflen,
+               len = serial_read(serial, devc->buf + devc->buflen,
                                10 - devc->buflen);
                if (len < 1)
                        return TRUE;
@@ -230,4 +231,3 @@ SR_PRIV int colead_slm_receive_data(int fd, int revents, void *cb_data)
 
        return TRUE;
 }
-