Build: Include <config.h> first in all source files

[libsigrok.git] / src / scpi / scpi_serial.c

diff --git a/src/scpi/scpi_serial.c b/src/scpi/scpi_serial.c
index feb3317651eb18f2d858b576bd242e4556c1e1d0..257ff88380c55096688c50422addd1ac5220a41d 100644 (file)
--- a/src/scpi/scpi_serial.c
+++ b/src/scpi/scpi_serial.c
@@ -18,12 +18,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-
+#include <config.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
+#include <libsigrok/libsigrok.h>
+#include "libsigrok-internal.h"
+#include "scpi.h"
 
 #define LOG_PREFIX "scpi_serial"
 
@@ -36,7 +37,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 +55,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 +80,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 +90,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 +130,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 +163,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->count,
                                BUFFER_SIZE - sscpi->count);
 
                if (ret < 0)