From: Uwe Hermann Date: Tue, 18 Nov 2014 22:19:21 +0000 (+0100) Subject: mic-985xx: Publish driver options. X-Git-Tag: libsigrok-0.4.0~740 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=d6e1e6c4e15b57ac3b209c2fb9b151161e815c0b;p=libsigrok.git mic-985xx: Publish driver options. --- diff --git a/src/hardware/mic-985xx/api.c b/src/hardware/mic-985xx/api.c index 5969b103..a03dffa9 100644 --- a/src/hardware/mic-985xx/api.c +++ b/src/hardware/mic-985xx/api.c @@ -25,10 +25,13 @@ static const uint32_t scanopts[] = { SR_CONF_SERIALCOMM, }; -static const uint32_t devopts[] = { +static const uint32_t drvopts[] = { SR_CONF_THERMOMETER, SR_CONF_HYGROMETER, - SR_CONF_CONTINUOUS, +}; + +static const uint32_t devopts[] = { + SR_CONF_CONTINUOUS | SR_CONF_SET, SR_CONF_LIMIT_SAMPLES | SR_CONF_SET, SR_CONF_LIMIT_MSEC | SR_CONF_SET, }; @@ -194,7 +197,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - (void)sdi; (void)cg; switch (key) { @@ -203,7 +205,11 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); break; case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + if (!sdi) + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t)); + else + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); break; default: