drivers: Provide proper drvopts.

[libsigrok.git] / src / lcr / es51919.c

diff --git a/src/lcr/es51919.c b/src/lcr/es51919.c
index cd901366841b3dfe1a53495dac64786bf2a2cfa0..eeb724ec20cef49de7992374d84c0860cafa33f6 100644 (file)
--- a/src/lcr/es51919.c
+++ b/src/lcr/es51919.c
@@ -251,32 +251,6 @@ static int serial_stream_check(struct sr_serial_dev_inst *serial,
                                       is_valid, timeout_ms, baudrate);
 }
 
-struct std_opt_desc {
-       const uint32_t *scanopts;
-       const int num_scanopts;
-       const uint32_t *devopts;
-       const int num_devopts;
-};
-
-static int std_config_list(uint32_t key, GVariant **data,
-                          const struct std_opt_desc *d)
-{
-       switch (key) {
-       case SR_CONF_SCAN_OPTIONS:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                       d->scanopts, d->num_scanopts, sizeof(uint32_t));
-               break;
-       case SR_CONF_DEVICE_OPTIONS:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                       d->devopts, d->num_devopts, sizeof(uint32_t));
-               break;
-       default:
-               return SR_ERR_NA;
-       }
-
-       return SR_OK;
-}
-
 static int send_config_update(struct sr_dev_inst *sdi, struct sr_config *cfg)
 {
        struct sr_datafeed_packet packet;
@@ -490,21 +464,21 @@ static void parse_measurement(const uint8_t *pkt, float *floatval,
                int unit;
                int exponent;
        } units[] = {
-               { SR_UNIT_UNITLESS,   0 },      /* no unit */
-               { SR_UNIT_OHM,        0 },      /* Ohm     */
-               { SR_UNIT_OHM,        3 },      /* kOhm    */
-               { SR_UNIT_OHM,        6 },      /* MOhm    */
-               { -1,                 0 },      /* ???     */
-               { SR_UNIT_HENRY,     -6 },      /* uH      */
-               { SR_UNIT_HENRY,     -3 },      /* mH      */
-               { SR_UNIT_HENRY,      0 },      /* H       */
-               { SR_UNIT_HENRY,      3 },      /* kH      */
-               { SR_UNIT_FARAD,    -12 },      /* pF      */
-               { SR_UNIT_FARAD,     -9 },      /* nF      */
-               { SR_UNIT_FARAD,     -6 },      /* uF      */
-               { SR_UNIT_FARAD,     -3 },      /* mF      */
-               { SR_UNIT_PERCENTAGE, 0 },      /* %       */
-               { SR_UNIT_DEGREE,     0 },      /* degree  */
+               { SR_UNIT_UNITLESS,   0 }, /* no unit */
+               { SR_UNIT_OHM,        0 }, /* Ohm */
+               { SR_UNIT_OHM,        3 }, /* kOhm */
+               { SR_UNIT_OHM,        6 }, /* MOhm */
+               { -1,                 0 }, /* ??? */
+               { SR_UNIT_HENRY,     -6 }, /* uH */
+               { SR_UNIT_HENRY,     -3 }, /* mH */
+               { SR_UNIT_HENRY,      0 }, /* H */
+               { SR_UNIT_HENRY,      3 }, /* kH */
+               { SR_UNIT_FARAD,    -12 }, /* pF */
+               { SR_UNIT_FARAD,     -9 }, /* nF */
+               { SR_UNIT_FARAD,     -6 }, /* uF */
+               { SR_UNIT_FARAD,     -3 }, /* mF */
+               { SR_UNIT_PERCENTAGE, 0 }, /* % */
+               { SR_UNIT_DEGREE,     0 }, /* degree */
        };
        const uint8_t *buf;
        int digits, exponent;
@@ -535,7 +509,7 @@ static void parse_measurement(const uint8_t *pkt, float *floatval,
                        analog->meaning->mqflags |= SR_MQFLAG_RELATIVE;
        }
 
-       if ((analog->meaning->mq = parse_mq(pkt, is_secondary, pkt[2] & 0x80)) < 0)
+       if ((analog->meaning->mq = parse_mq(pkt, is_secondary, pkt[2] & 0x80)) == 0)
                return;
 
        if ((buf[3] >> 3) >= ARRAY_SIZE(units)) {
@@ -731,7 +705,7 @@ static int receive_data(int fd, int revents, void *cb_data)
 
        if (dev_limit_counter_limit_reached(&devc->frame_count) ||
            dev_time_limit_reached(&devc->time_count))
-               sdi->driver->dev_acquisition_stop(sdi);
+               sr_dev_acquisition_stop(sdi);
 
        return TRUE;
 }
@@ -741,14 +715,11 @@ static const char *const channel_names[] = { "P1", "P2" };
 static int setup_channels(struct sr_dev_inst *sdi)
 {
        unsigned int i;
-       int ret;
-
-       ret = SR_ERR_BUG;
 
        for (i = 0; i < ARRAY_SIZE(channel_names); i++)
                sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channel_names[i]);
 
-       return ret;
+       return SR_OK;
 }
 
 SR_PRIV void es51919_serial_clean(void *priv)
@@ -802,10 +773,8 @@ SR_PRIV struct sr_dev_inst *es51919_serial_scan(GSList *options,
 
 scan_cleanup:
        es51919_serial_clean(devc);
-       if (sdi)
-               sr_dev_inst_free(sdi);
-       if (serial)
-               sr_serial_dev_inst_free(serial);
+       sr_dev_inst_free(sdi);
+       sr_serial_dev_inst_free(serial);
 
        return NULL;
 }
@@ -870,8 +839,11 @@ static const uint32_t scanopts[] = {
        SR_CONF_SERIALCOMM,
 };
 
-static const uint32_t devopts[] = {
+static const uint32_t drvopts[] = {
        SR_CONF_LCRMETER,
+};
+
+static const uint32_t devopts[] = {
        SR_CONF_CONTINUOUS,
        SR_CONF_LIMIT_FRAMES | SR_CONF_SET,
        SR_CONF_LIMIT_MSEC | SR_CONF_SET,
@@ -879,22 +851,14 @@ static const uint32_t devopts[] = {
        SR_CONF_EQUIV_CIRCUIT_MODEL | SR_CONF_GET | SR_CONF_LIST,
 };
 
-static const struct std_opt_desc opts = {
-       scanopts, ARRAY_SIZE(scanopts),
-       devopts, ARRAY_SIZE(devopts),
-};
-
 SR_PRIV int es51919_serial_config_list(uint32_t key, GVariant **data,
                                       const struct sr_dev_inst *sdi,
                                       const struct sr_channel_group *cg)
 {
-       (void)sdi;
-       (void)cg;
-
-       if (std_config_list(key, data, &opts) == SR_OK)
-               return SR_OK;
-
        switch (key) {
+       case SR_CONF_SCAN_OPTIONS:
+       case SR_CONF_DEVICE_OPTIONS:
+               return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
        case SR_CONF_OUTPUT_FREQUENCY:
                *data = g_variant_new_fixed_array(G_VARIANT_TYPE_DOUBLE,
                        frequencies, ARRAY_SIZE(frequencies), sizeof(double));
@@ -914,9 +878,6 @@ SR_PRIV int es51919_serial_acquisition_start(const struct sr_dev_inst *sdi)
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        if (!(devc = sdi->priv))
                return SR_ERR_BUG;