X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi_serial.c;h=9522c29702305948e2d90c0cbba0c2101253108c;hb=55c9f09dbc7edd24b0da8dda8837aff6a932e3c5;hp=feb3317651eb18f2d858b576bd242e4556c1e1d0;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git
diff --git a/src/scpi/scpi_serial.c b/src/scpi/scpi_serial.c
index feb33176..9522c297 100644
--- a/src/scpi/scpi_serial.c
+++ b/src/scpi/scpi_serial.c
@@ -18,12 +18,12 @@
* along with this program. If not, see .
*/
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-
#include
#include
#include
+#include
+#include "libsigrok-internal.h"
+#include "scpi.h"
#define LOG_PREFIX "scpi_serial"
@@ -36,7 +36,7 @@ struct scpi_serial {
size_t read;
};
-static struct {
+static const struct {
uint16_t vendor_id;
uint16_t product_id;
const char *serialcomm;
@@ -54,8 +54,8 @@ static GSList *scpi_serial_scan(struct drv_context *drvc)
(void)drvc;
for (i = 0; i < ARRAY_SIZE(scpi_serial_usb_ids); i++) {
- if ((l = sr_serial_find_usb(scpi_serial_usb_ids[i].vendor_id,
- scpi_serial_usb_ids[i].product_id)) == NULL)
+ if (!(l = sr_serial_find_usb(scpi_serial_usb_ids[i].vendor_id,
+ scpi_serial_usb_ids[i].product_id)))
continue;
for (r = l; r; r = r->next) {
if (scpi_serial_usb_ids[i].serialcomm)
@@ -79,8 +79,7 @@ static int scpi_serial_dev_inst_new(void *priv, struct drv_context *drvc,
(void)drvc;
(void)params;
- if (!(sscpi->serial = sr_serial_dev_inst_new(resource, serialcomm)))
- return SR_ERR;
+ sscpi->serial = sr_serial_dev_inst_new(resource, serialcomm);
return SR_OK;
}
@@ -90,7 +89,7 @@ static int scpi_serial_open(void *priv)
struct scpi_serial *sscpi = priv;
struct sr_serial_dev_inst *serial = sscpi->serial;
- if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+ if (serial_open(serial, SERIAL_RDWR) != SR_OK)
return SR_ERR;
if (serial_flush(serial) != SR_OK)
@@ -130,7 +129,8 @@ static int scpi_serial_send(void *priv, const char *command)
len = strlen(terminated_command);
written = 0;
while (written < len) {
- result = serial_write(serial, terminated_command + written, len - written);
+ result = serial_write_nonblocking(serial,
+ terminated_command + written, len - written);
if (result < 0) {
sr_err("Error while sending SCPI command: '%s'.", command);
g_free(terminated_command);
@@ -162,7 +162,7 @@ static int scpi_serial_read_data(void *priv, char *buf, int maxlen)
/* Try to read new data into the buffer if there is space. */
if (len > 0) {
- ret = serial_read(sscpi->serial, sscpi->buffer + sscpi->read,
+ ret = serial_read_nonblocking(sscpi->serial, sscpi->buffer + sscpi->read,
BUFFER_SIZE - sscpi->count);
if (ret < 0)