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

[libsigrok.git] / src / hardware / mic-985xx / api.c

diff --git a/src/hardware/mic-985xx/api.c b/src/hardware/mic-985xx/api.c
index 10f114e4ec821dd2a86030f297022024adc26e87..eb5d25d4f2cbec74735604c239c79f3d834490af 100644 (file)
--- a/src/hardware/mic-985xx/api.c
+++ b/src/hardware/mic-985xx/api.c
@@ -28,9 +28,9 @@ static const uint32_t scanopts[] = {
 static const uint32_t devopts[] = {
        SR_CONF_THERMOMETER,
        SR_CONF_HYGROMETER,
-       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 mic_98581_driver_info;
@@ -71,7 +71,7 @@ static GSList *mic_scan(const char *conn, const char *serialcomm, int idx)
        if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
                return NULL;
 
-       if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+       if (serial_open(serial, SERIAL_RDWR) != SR_OK)
                return NULL;
 
        drvc = mic_devs[idx].di->priv;
@@ -84,7 +84,7 @@ static GSList *mic_scan(const char *conn, const char *serialcomm, int idx)
        sr_info("Found device on port %s.", conn);
 
        /* TODO: Fill in version from protocol response. */
-       if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, mic_devs[idx].vendor,
+       if (!(sdi = sr_dev_inst_new(SR_ST_INACTIVE, mic_devs[idx].vendor,
                                    mic_devs[idx].device, NULL)))
                goto scan_cleanup;