Add protocol decoder for Cyrustek ES51919 LCR meter chip.

[libsigrok.git] / src / device.c

diff --git a/src/device.c b/src/device.c
index 054c7347f91308f22bb4422cf41e66f6e0910112..9ed6080294096fabc7751903a096f7d1ae1457b3 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -191,7 +191,7 @@ SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key)
        ret = FALSE;
        devopts = g_variant_get_fixed_array(gvar, &num_opts, sizeof(int32_t));
        for (i = 0; i < num_opts; i++) {
-               if (devopts[i] == key) {
+               if ((devopts[i] & SR_CONF_MASK) == key) {
                        ret = TRUE;
                        break;
                }
@@ -213,7 +213,7 @@ SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key)
  *  @retval struct sr_dev_inst *. Dynamically allocated, free using
  *              sr_dev_inst_free().
  */
-SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status,
+SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int status,
                const char *vendor, const char *model, const char *version)
 {
        struct sr_dev_inst *sdi;
@@ -224,7 +224,6 @@ SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status,
        }
 
        sdi->driver = NULL;
-       sdi->index = index;
        sdi->status = status;
        sdi->inst_type = -1;
        sdi->vendor = vendor ? g_strdup(vendor) : NULL;