DRY on modbus_serial_set_slave

Author: stephane

src/modbus-ascii.c

@@ -21,21 +21,6 @@
 
 #include "modbus-serial-private.h"
 
-/* Define the slave ID of the remote device to talk in master mode or set the
- * internal slave ID in slave mode */
-static int _modbus_set_slave(modbus_t *ctx, int slave)
-{
-    /* Broadcast address is 0 (MODBUS_BROADCAST_ADDRESS) */
-    if (slave >= 0 && slave <= 247) {
-        ctx->slave = slave;
-    } else {
-        errno = EINVAL;
-        return -1;
-    }
-
-    return 0;
-}
-
 static char nibble_to_hex_ascii(uint8_t nibble)
 {
     char c;
@@ -254,7 +239,7 @@ const modbus_backend_t _modbus_ascii_backend = {
     _MODBUS_ASCII_HEADER_LENGTH,
     _MODBUS_ASCII_CHECKSUM_LENGTH,
     MODBUS_ASCII_MAX_ADU_LENGTH,
-    _modbus_set_slave,
+    _modbus_serial_set_slave,
     _modbus_ascii_build_request_basis,
     _modbus_ascii_build_response_basis,
     _modbus_ascii_prepare_response_tid,

src/modbus-rtu.c

@@ -81,21 +81,6 @@ static const uint8_t table_crc_lo[] = {
     0x43, 0x83, 0x41, 0x81, 0x80, 0x40
 };
 
-/* Define the slave ID of the remote device to talk in master mode or set the
- * internal slave ID in slave mode */
-static int _modbus_set_slave(modbus_t *ctx, int slave)
-{
-    /* Broadcast address is 0 (MODBUS_BROADCAST_ADDRESS) */
-    if (slave >= 0 && slave <= 247) {
-        ctx->slave = slave;
-    } else {
-        errno = EINVAL;
-        return -1;
-    }
-
-    return 0;
-}
-
 /* Builds a RTU request header */
 static int _modbus_rtu_build_request_basis(modbus_t *ctx, int function,
                                            int addr, int nb,
@@ -206,7 +191,7 @@ const modbus_backend_t _modbus_rtu_backend = {
     _MODBUS_RTU_HEADER_LENGTH,
     _MODBUS_RTU_CHECKSUM_LENGTH,
     MODBUS_RTU_MAX_ADU_LENGTH,
-    _modbus_set_slave,
+    _modbus_serial_set_slave,
     _modbus_rtu_build_request_basis,
     _modbus_rtu_build_response_basis,
     _modbus_rtu_prepare_response_tid,

src/modbus-serial-private.h

@@ -79,6 +79,7 @@ void _modbus_serial_close(modbus_t *ctx);
 int _modbus_serial_flush(modbus_t *ctx);
 int _modbus_serial_select(modbus_t *ctx, fd_set *rset, struct timeval *tv, int length_to_read);
 
+int _modbus_serial_set_slave(modbus_t *ctx, int slave);
 void _modbus_serial_free(modbus_serial_t *serial_ctx);
 modbus_t* _modbus_serial_new(const modbus_backend_t *modbus_backend,
                              const char *device, int baud, char parity, int data_bit, int stop_bit);

src/modbus-serial.c

@@ -985,6 +985,21 @@ int _modbus_serial_select(modbus_t *ctx, fd_set *rset,
     return s_rc;
 }
 
+/* Define the slave ID of the remote device to talk in master mode or set the
+ * internal slave ID in slave mode */
+int _modbus_serial_set_slave(modbus_t *ctx, int slave)
+{
+    /* Broadcast address is 0 (MODBUS_BROADCAST_ADDRESS) */
+    if (slave >= 0 && slave <= 247) {
+        ctx->slave = slave;
+    } else {
+        errno = EINVAL;
+        return -1;
+    }
+
+    return 0;
+}
+
 void _modbus_serial_free(modbus_serial_t *ctx_serial)
 {
     if (ctx_serial) {
@@ -1076,4 +1091,3 @@ modbus_t* _modbus_serial_new(const modbus_backend_t *modbus_backend, const char
 
     return ctx;
 }
-