build: Portability fixes.

[libsigrok.git] / hardware / cem-dt-885x / protocol.c

diff --git a/hardware/cem-dt-885x/protocol.c b/hardware/cem-dt-885x/protocol.c
index e0e9f8b717cc4035ac7ff1fbd0025abe8cbd9c22..19e083062c69331230589be10ab7e6ec34bab4e2 100644 (file)
--- a/hardware/cem-dt-885x/protocol.c
+++ b/hardware/cem-dt-885x/protocol.c
@@ -134,7 +134,7 @@ static void process_mset(const struct sr_dev_inst *sdi)
                analog.mq = SR_MQ_SOUND_PRESSURE_LEVEL;
                analog.mqflags = devc->cur_mqflags;
                analog.unit = SR_UNIT_DECIBEL_SPL;
-               analog.probes = sdi->probes;
+               analog.channels = sdi->channels;
                analog.num_samples = 1;
                analog.data = &devc->last_spl;
                packet.type = SR_DF_ANALOG;
@@ -193,7 +193,7 @@ static void send_data(const struct sr_dev_inst *sdi, unsigned char *data,
        analog.mq = SR_MQ_SOUND_PRESSURE_LEVEL;
        analog.mqflags = devc->cur_mqflags;
        analog.unit = SR_UNIT_DECIBEL_SPL;
-       analog.probes = sdi->probes;
+       analog.channels = sdi->channels;
        analog.num_samples = num_samples;
        analog.data = fbuf;
        packet.type = SR_DF_ANALOG;
@@ -440,7 +440,7 @@ static int wait_for_token(const struct sr_dev_inst *sdi, int8_t *tokens, int tim
 
 /* cmd is the command to send, tokens are the tokens that denote the state
  * which the command affects. The first token is the desired state. */
-SR_PRIV int cem_dt_885x_toggle(const struct sr_dev_inst *sdi, uint8_t cmd,
+static int cem_dt_885x_toggle(const struct sr_dev_inst *sdi, uint8_t cmd,
                int8_t *tokens, int timeout)
 {
        struct dev_context *devc;