X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fcolead-slm%2Fapi.c;h=9ea441781520244c00e52ffaf5a4d5215044fc7d;hb=aed4ad0beaf64062752039a13f9a95326aa1df87;hp=8e48552da7a9f7239cbf8ed40045b1351ceda0a3;hpb=584560f142e1b17b9f4ef9069bd3724f2f77e750;p=libsigrok.git diff --git a/src/hardware/colead-slm/api.c b/src/hardware/colead-slm/api.c index 8e48552d..9ea44178 100644 --- a/src/hardware/colead-slm/api.c +++ b/src/hardware/colead-slm/api.c @@ -30,16 +30,16 @@ /* The Colead SL-5868P uses this. */ #define SERIALCOMM "2400/8n1" -static const uint32_t hwopts[] = { +static const uint32_t scanopts[] = { SR_CONF_CONN, SR_CONF_SERIALCOMM, }; -static const uint32_t hwcaps[] = { +static const uint32_t devopts[] = { SR_CONF_SOUNDLEVELMETER, - SR_CONF_LIMIT_SAMPLES, - SR_CONF_LIMIT_MSEC, SR_CONF_CONTINUOUS, + SR_CONF_LIMIT_SAMPLES | SR_CONF_SET, + SR_CONF_LIMIT_MSEC | SR_CONF_SET, }; SR_PRIV struct sr_dev_driver colead_slm_driver_info; @@ -82,7 +82,7 @@ static GSList *scan(GSList *options) if (!serialcomm) serialcomm = SERIALCOMM; - if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Colead", + if (!(sdi = sr_dev_inst_new(SR_ST_INACTIVE, "Colead", "SL-5868P", NULL))) return NULL; @@ -176,11 +176,11 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * switch (key) { case SR_CONF_SCAN_OPTIONS: *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t)); + scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); break; case SR_CONF_DEVICE_OPTIONS: *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - hwcaps, ARRAY_SIZE(hwcaps), sizeof(uint32_t)); + devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); break; default: return SR_ERR_NA;