]> sigrok.org Git - libsigrok.git/blobdiff - src/hardware/teleinfo/api.c
Removal of sdi->index, step 4: fix trivial sr_dev_inst_new() calls
[libsigrok.git] / src / hardware / teleinfo / api.c
index 4060b03ebf67866baaf1871c8c6e8f5d6a258a6a..63432f58d922632c6de71096be4ab76ed0b2f288 100644 (file)
@@ -76,7 +76,7 @@ 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;
 
        sr_info("Probing serial port %s.", conn);
@@ -92,7 +92,7 @@ static GSList *scan(GSList *options)
 
        sr_info("Found device on port %s.", conn);
 
-       if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "EDF", "Teleinfo", NULL)))
+       if (!(sdi = sr_dev_inst_new(SR_ST_INACTIVE, "EDF", "Teleinfo", NULL)))
                goto scan_cleanup;
 
        if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {