From 3803f89e6e8aac951a24fd2b3f0df455494ef63b Mon Sep 17 00:00:00 2001 From: Stéphane Raimbault Date: Sun, 17 Jul 2011 23:13:43 +0200 Subject: [PATCH] Extract serial_mode attribute from platform tests --- src/modbus-rtu-private.h | 2 ++ src/modbus-rtu.c | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/modbus-rtu-private.h b/src/modbus-rtu-private.h index 93dfb03..2948f17 100644 --- a/src/modbus-rtu-private.h +++ b/src/modbus-rtu-private.h @@ -77,6 +77,8 @@ typedef struct _modbus_rtu { #else /* Save old termios settings */ struct termios old_tios; +#endif +#if HAVE_DECL_TIOCSRS485 int serial_mode; #endif } modbus_rtu_t; diff --git a/src/modbus-rtu.c b/src/modbus-rtu.c index 1c6e33e..bc2118e 100644 --- a/src/modbus-rtu.c +++ b/src/modbus-rtu.c @@ -698,10 +698,13 @@ static int _modbus_rtu_connect(modbus_t *ctx) if (tcsetattr(ctx->s, TCSANOW, &tios) < 0) { return -1; } +#endif +#if HAVE_DECL_TIOCSRS485 /* The RS232 mode has been set by default */ ctx_rtu->serial_mode = MODBUS_RTU_RS232; #endif + return 0; } -- libgit2 0.21.4