drivers: Use serial_write_blocking() everywhere.

[libsigrok.git] / src / modbus / modbus_serial_rtu.c

diff --git a/src/modbus/modbus_serial_rtu.c b/src/modbus/modbus_serial_rtu.c
index 437d187a7b8745fcd9b27fbfb7270961c59ddecd..ae76e7cf769edf2e14c7dd3d8489ab44467c521a 100644 (file)
--- a/src/modbus/modbus_serial_rtu.c
+++ b/src/modbus/modbus_serial_rtu.c
@@ -17,12 +17,12 @@
  * 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"
 
 #define LOG_PREFIX "modbus_serial"
 
@@ -39,7 +39,7 @@ static int modbus_serial_rtu_dev_inst_new(void *priv, const char *resource,
 {
        struct modbus_serial_rtu *modbus = priv;
 
-       (void) params;
+       (void)params;
 
        modbus->serial = sr_serial_dev_inst_new(resource, serialcomm);
        modbus->slave_addr = modbusaddr;
@@ -96,6 +96,7 @@ static uint16_t modbus_serial_rtu_crc(uint16_t crc,
                                crc ^= 0xA001;
                }
        }
+
        return crc;
 }
 
@@ -108,18 +109,18 @@ static int modbus_serial_rtu_send(void *priv,
        uint8_t slave_addr = modbus->slave_addr;
        uint16_t crc;
 
-       result = serial_write_nonblocking(serial, &slave_addr, sizeof(slave_addr));
+       result = serial_write_blocking(serial, &slave_addr, sizeof(slave_addr), 0);
        if (result < 0)
                return result;
 
-       result = serial_write_nonblocking(serial, buffer, buffer_size);
+       result = serial_write_blocking(serial, buffer, buffer_size, 0);
        if (result < 0)
                return result;
 
        crc = modbus_serial_rtu_crc(0xFFFF, &slave_addr, sizeof(slave_addr));
        crc = modbus_serial_rtu_crc(crc, buffer, buffer_size);
 
-       result = serial_write_nonblocking(serial, &crc, sizeof(crc));
+       result = serial_write_blocking(serial, &crc, sizeof(crc), 0);
        if (result < 0)
                return result;
 
@@ -151,11 +152,11 @@ static int modbus_serial_rtu_read_data(void *priv, uint8_t *buf, int maxlen)
        struct modbus_serial_rtu *modbus = priv;
        int ret;
 
-       ret = serial_read_nonblocking(modbus->serial, buf, maxlen); 
+       ret = serial_read_nonblocking(modbus->serial, buf, maxlen);
        if (ret < 0)
                return ret;
-       modbus->crc = modbus_serial_rtu_crc(modbus->crc, buf, ret); 
-       return ret; 
+       modbus->crc = modbus_serial_rtu_crc(modbus->crc, buf, ret);
+       return ret;
 }
 
 static int modbus_serial_rtu_read_end(void *priv)