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

[libsigrok.git] / src / hardware / atten-pps3xxx / api.c

diff --git a/src/hardware/atten-pps3xxx/api.c b/src/hardware/atten-pps3xxx/api.c
index d901649a20c1434f61eeb5c9033d1b7344db92e4..75a1fbbd3e3355ce75096fed5b93fc303995c934 100644 (file)
--- a/src/hardware/atten-pps3xxx/api.c
+++ b/src/hardware/atten-pps3xxx/api.c
@@ -122,7 +122,7 @@ static GSList *scan(GSList *options, int modelid)
        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;
        serial_flush(serial);
 
@@ -130,7 +130,7 @@ static GSList *scan(GSList *options, int modelid)
        memset(packet, 0, PACKET_SIZE);
        packet[0] = 0xaa;
        packet[1] = 0xaa;
-       if (serial_write(serial, packet, PACKET_SIZE) == -1) {
+       if (serial_write_blocking(serial, packet, PACKET_SIZE) == -1) {
                sr_err("Unable to write while probing for hardware: %s",
                                strerror(errno));
                return NULL;
@@ -161,7 +161,7 @@ static GSList *scan(GSList *options, int modelid)
                return NULL;
        }
 
-       sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Atten", model->name, NULL);
+       sdi = sr_dev_inst_new(SR_ST_INACTIVE, "Atten", model->name, NULL);
        sdi->driver = di;
        sdi->inst_type = SR_INST_SERIAL;
        sdi->conn = serial;