X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fmodbus%2Fmodbus_serial_rtu.c;h=21205d941163d6544602e66b44a9d90d5f73fabc;hb=c3cd66a00cdb4afbd43108563d979eebfbafaf69;hp=437d187a7b8745fcd9b27fbfb7270961c59ddecd;hpb=4c938fc27f1679d5239133d2a821ab7f39a256de;p=libsigrok.git
diff --git a/src/modbus/modbus_serial_rtu.c b/src/modbus/modbus_serial_rtu.c
index 437d187a..21205d94 100644
--- 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 .
*/
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-
+#include
#include
#include
#include
+#include
+#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;
}
@@ -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)