Removal of sdi->index, step 4: fix trivial sr_dev_inst_new() calls

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

diff --git a/src/hardware/cem-dt-885x/api.c b/src/hardware/cem-dt-885x/api.c
index b4bfe861f58f2f97d5832358e92bbf8e4562db42..70a28e58153de63ed5f4833edb5299ae065f2ebe 100644 (file)
--- a/src/hardware/cem-dt-885x/api.c
+++ b/src/hardware/cem-dt-885x/api.c
@@ -30,16 +30,16 @@ static const uint32_t scanopts[] = {
 
 static const uint32_t devopts[] = {
        SR_CONF_SOUNDLEVELMETER,
-       SR_CONF_LIMIT_SAMPLES,
        SR_CONF_CONTINUOUS,
-       SR_CONF_SPL_WEIGHT_FREQ,
-       SR_CONF_SPL_WEIGHT_TIME,
-       SR_CONF_SPL_MEASUREMENT_RANGE,
-       SR_CONF_DATALOG,
-       SR_CONF_HOLD_MAX,
-       SR_CONF_HOLD_MIN,
-       SR_CONF_POWER_OFF,
-       SR_CONF_DATA_SOURCE,
+       SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_SPL_WEIGHT_FREQ | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_SPL_WEIGHT_TIME | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_SPL_MEASUREMENT_RANGE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_DATALOG | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_HOLD_MAX | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_HOLD_MIN | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_POWER_OFF | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_DATA_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
 static const char *weight_freq[] = {
@@ -97,16 +97,16 @@ static GSList *scan(GSList *options)
        if (!(serial = sr_serial_dev_inst_new(conn, SERIALCOMM)))
                return NULL;
 
-       if (serial_open(serial, SERIAL_RDONLY | SERIAL_NONBLOCK) != SR_OK)
+       if (serial_open(serial, SERIAL_RDONLY) != SR_OK)
                return NULL;
 
        devices = NULL;
        drvc = di->priv;
        start = g_get_monotonic_time();
        while (g_get_monotonic_time() - start < MAX_SCAN_TIME) {
-               if (serial_read(serial, &c, 1) == 1 && c == 0xa5) {
+               if (serial_read_nonblocking(serial, &c, 1) == 1 && c == 0xa5) {
                        /* Found one. */
-                       if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "CEM",
+                       if (!(sdi = sr_dev_inst_new(SR_ST_INACTIVE, "CEM",
                                        "DT-885x", NULL)))
                                return NULL;