drivers: Factor out std_*_idx*().

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

diff --git a/src/hardware/cem-dt-885x/protocol.c b/src/hardware/cem-dt-885x/protocol.c
index 65642775558c8c27a5fa69ba44e78e61ac5d559a..092d16542aa2aa1e0f3ff75c7049dac726228cc8 100644 (file)
--- a/src/hardware/cem-dt-885x/protocol.c
+++ b/src/hardware/cem-dt-885x/protocol.c
@@ -134,7 +134,7 @@ static void process_mset(const struct sr_dev_inst *sdi)
                                break;
                        }
                }
-               sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+               sr_analog_init(&analog, &encoding, &meaning, &spec, 1);
                analog.meaning->mq = SR_MQ_SOUND_PRESSURE_LEVEL;
                analog.meaning->mqflags = devc->cur_mqflags;
                analog.meaning->unit = SR_UNIT_DECIBEL_SPL;
@@ -147,7 +147,7 @@ static void process_mset(const struct sr_dev_inst *sdi)
 
                devc->num_samples++;
                if (devc->limit_samples && devc->num_samples >= devc->limit_samples)
-                       sdi->driver->dev_acquisition_stop((struct sr_dev_inst *)sdi);
+                       sr_dev_acquisition_stop((struct sr_dev_inst *)sdi);
                break;
        case TOKEN_RECORDING_ON:
                devc->recording = TRUE;
@@ -195,7 +195,7 @@ static void send_data(const struct sr_dev_inst *sdi, unsigned char *data,
                fbuf[i] += ((data[i * 2 + 1] & 0xf0) >> 4);
                fbuf[i] += (data[i * 2 + 1] & 0x0f) / 10.0;
        }
-       sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+       sr_analog_init(&analog, &encoding, &meaning, &spec, 1);
        analog.meaning->mq = SR_MQ_SOUND_PRESSURE_LEVEL;
        analog.meaning->mqflags = devc->cur_mqflags;
        analog.meaning->unit = SR_UNIT_DECIBEL_SPL;
@@ -208,7 +208,7 @@ static void send_data(const struct sr_dev_inst *sdi, unsigned char *data,
 
        devc->num_samples += analog.num_samples;
        if (devc->limit_samples && devc->num_samples >= devc->limit_samples)
-               sdi->driver->dev_acquisition_stop((struct sr_dev_inst *)sdi);
+               sr_dev_acquisition_stop((struct sr_dev_inst *)sdi);
 
        return;
 }
@@ -321,7 +321,7 @@ static void process_byte(const struct sr_dev_inst *sdi, const unsigned char c,
                         * records. Otherwise the frontend would have no
                         * way to tell where stored data ends and live
                         * measurements begin. */
-                       sdi->driver->dev_acquisition_stop((struct sr_dev_inst *)sdi);
+                       sr_dev_acquisition_stop((struct sr_dev_inst *)sdi);
                } else if (c == RECORD_DATA) {
                        devc->buf_len = 0;
                        devc->state = ST_GET_LOG_RECORD_DATA;
@@ -770,11 +770,11 @@ SR_PRIV int cem_dt_885x_meas_range_set(const struct sr_dev_inst *sdi,
        devc = sdi->priv;
        if (low == 30 && high == 130)
                token = TOKEN_MEAS_RANGE_30_130;
-       else if (low == 30 &&  high == 80)
+       else if (low == 30 && high == 80)
                token = TOKEN_MEAS_RANGE_30_80;
-       else if (low == 50 &&  high == 100)
+       else if (low == 50 && high == 100)
                token = TOKEN_MEAS_RANGE_50_100;
-       else if (low == 80 &&  high == 130)
+       else if (low == 80 && high == 130)
                token = TOKEN_MEAS_RANGE_80_130;
        else
                return SR_ERR;