X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fmodbus%2Fmodbus_serial_rtu.c;h=f7fee0abafec655ef221a2df335705f7f619dfa3;hb=10cfb0482645dbf351b54f89ead883f4a4fd3902;hp=4b15d241fcdf14c1b35a761b60d4814b0b429008;hpb=d4e070177109148b9b6ab512611ad88f100506e2;p=libsigrok.git

diff --git a/src/modbus/modbus_serial_rtu.c b/src/modbus/modbus_serial_rtu.c
index 4b15d241..f7fee0ab 100644
--- a/src/modbus/modbus_serial_rtu.c
+++ b/src/modbus/modbus_serial_rtu.c
@@ -26,6 +26,8 @@
 
 #define LOG_PREFIX "modbus_serial"
 
+#ifdef HAVE_SERIAL_COMM
+
 #define BUFFER_SIZE 1024
 
 struct modbus_serial_rtu {
@@ -111,18 +113,18 @@ static int modbus_serial_rtu_send(void *priv,
 
 	result = serial_write_blocking(serial, &slave_addr, sizeof(slave_addr), 0);
 	if (result < 0)
-		return result;
+		return SR_ERR;
 
 	result = serial_write_blocking(serial, buffer, buffer_size, 0);
 	if (result < 0)
-		return result;
+		return SR_ERR;
 
 	crc = modbus_serial_rtu_crc(0xFFFF, &slave_addr, sizeof(slave_addr));
 	crc = modbus_serial_rtu_crc(crc, buffer, buffer_size);
 
 	result = serial_write_blocking(serial, &crc, sizeof(crc), 0);
 	if (result < 0)
-		return result;
+		return SR_ERR;
 
 	return SR_OK;
 }
@@ -135,11 +137,11 @@ static int modbus_serial_rtu_read_begin(void *priv, uint8_t *function_code)
 
 	ret = serial_read_blocking(modbus->serial, &slave_addr, 1, 500);
 	if (ret != 1 || slave_addr != modbus->slave_addr)
-		return ret;
+		return SR_ERR;
 
 	ret = serial_read_blocking(modbus->serial, function_code, 1, 100);
 	if (ret != 1)
-		return ret;
+		return SR_ERR;
 
 	modbus->crc = modbus_serial_rtu_crc(0xFFFF, &slave_addr, sizeof(slave_addr));
 	modbus->crc = modbus_serial_rtu_crc(modbus->crc, function_code, 1);
@@ -167,7 +169,7 @@ static int modbus_serial_rtu_read_end(void *priv)
 
 	ret = serial_read_blocking(modbus->serial, &crc, sizeof(crc), 100);
 	if (ret != 2)
-		return ret;
+		return SR_ERR;
 
 	if (crc != modbus->crc) {
 		sr_err("CRC error (0x%04X vs 0x%04X).", crc, modbus->crc);
@@ -207,3 +209,5 @@ SR_PRIV const struct sr_modbus_dev_inst modbus_serial_rtu_dev = {
 	.close         = modbus_serial_rtu_close,
 	.free          = modbus_serial_rtu_free,
 };
+
+#endif