Peter M. Groen / libmodbus

Commit 88b2eaf3be49d7c54eb941722cb033130b891a7b

Authored by Torello Querci
Committed by Stéphane Raimbault
1 parent fa86846c

Some stilistic changes

Inline Side-by-side
Showing 3 changed files with 18 additions and 18 deletions
src/modbus-rtu-private.h
  View file @88b2eaf
... ... @@ -80,11 +80,11 @@ typedef struct _modbus_rtu {
80 80 #endif
81 81 #if HAVE_DECL_TIOCSRS485
82 82 int serial_mode;
83   - int usage_rts;
  83 + int use_rts;
84 84 #endif
85 85 } modbus_rtu_t;
86 86  
87   -/* Time waited beetween the RTS switch before transmit data o after transmit data before to read */
  87 +/* Time waited beetween the RTS switch before transmit data or after transmit data before to read */
88 88 #define TIME_BETWEEN_RTS_SWITCH 10000
89 89 void _modbus_rtu_setrts(int fd, int on);
90 90  
... ...
src/modbus-rtu.c
  View file @88b2eaf
... ... @@ -265,19 +265,19 @@ ssize_t _modbus_rtu_send(modbus_t *ctx, const uint8_t *req, int req_length)
265 265 return (WriteFile(ctx_rtu->w_ser.fd, req, req_length, &n_bytes, NULL)) ? n_bytes : -1;
266 266 #else
267 267 modbus_rtu_t *ctx_rtu = ctx->backend_data;
268   - if (ctx_rtu->usage_rts != MODBUS_NO_USE_RTS) {
  268 + if (ctx_rtu->use_rts != MODBUS_RTS_NONE) {
269 269 if (ctx->debug) {
270 270 fprintf(stderr, "sending request using RTS signal\n");
271 271 }
272 272  
273 273 ssize_t size;
274 274  
275   - _modbus_rtu_setrts(ctx->s, (ctx_rtu->usage_rts == MODBUS_USE_RTS_UP ? 1 : 0));
  275 + _modbus_rtu_setrts(ctx->s, (ctx_rtu->use_rts == MODBUS_RTS_UP ? 1 : 0));
276 276 usleep(TIME_BETWEEN_RTS_SWITCH);
277 277  
278 278 size = write(ctx->s, req, req_length);
279 279 usleep(TIME_BETWEEN_RTS_SWITCH);
280   - _modbus_rtu_setrts(ctx->s, (ctx_rtu->usage_rts == MODBUS_USE_RTS_UP ? 0 : 1));
  280 + _modbus_rtu_setrts(ctx->s, (ctx_rtu->use_rts == MODBUS_RTS_UP ? 0 : 1));
281 281  
282 282 return size;
283 283 } else {
... ... @@ -725,8 +725,8 @@ static int _modbus_rtu_connect(modbus_t *ctx)
725 725 /* The RS232 mode has been set by default */
726 726 ctx_rtu->serial_mode = MODBUS_RTU_RS232;
727 727  
728   - /* The RTS usage has been set by default */
729   - ctx_rtu->usage_rts = MODBUS_NO_USE_RTS;
  728 + /* The RTS use has been set by default */
  729 + ctx_rtu->use_rts = MODBUS_RTS_NONE;
730 730  
731 731 #endif
732 732  
... ... @@ -789,16 +789,16 @@ int modbus_rtu_get_serial_mode(modbus_t *ctx) {
789 789 }
790 790 }
791 791  
792   -int modbus_rtu_set_usage_rts(modbus_t *ctx, int mode)
  792 +int modbus_rtu_set_use_rts(modbus_t *ctx, int mode)
793 793 {
794 794 if (ctx->backend->backend_type == _MODBUS_BACKEND_TYPE_RTU) {
795 795 modbus_rtu_t *ctx_rtu = ctx->backend_data;
796 796  
797   - if (mode == MODBUS_NO_USE_RTS || mode == MODBUS_USE_RTS_UP || mode == MODBUS_USE_RTS_DOWN) {
798   - ctx_rtu->usage_rts = mode;
  797 + if (mode == MODBUS_RTS_NONE || mode == MODBUS_RTS_UP || mode == MODBUS_RTS_DOWN) {
  798 + ctx_rtu->use_rts = mode;
799 799  
800 800 // Set the RTS bit in order to not reserve the RS485 bus
801   - _modbus_rtu_setrts(ctx->s, (ctx_rtu->usage_rts == MODBUS_USE_RTS_UP ? 0 : 1));
  801 + _modbus_rtu_setrts(ctx->s, (ctx_rtu->use_rts == MODBUS_RTS_UP ? 0 : 1));
802 802 return 0;
803 803 }
804 804  
... ... @@ -814,10 +814,10 @@ int modbus_rtu_set_usage_rts(modbus_t *ctx, int mode)
814 814 return -1;
815 815 }
816 816  
817   -int modbus_rtu_get_usage_rts(modbus_t *ctx) {
  817 +int modbus_rtu_get_use_rts(modbus_t *ctx) {
818 818 if (ctx->backend->backend_type == _MODBUS_BACKEND_TYPE_RTU) {
819 819 modbus_rtu_t *ctx_rtu = ctx->backend_data;
820   - return ctx_rtu->usage_rts;
  820 + return ctx_rtu->use_rts;
821 821 } else {
822 822 errno = EINVAL;
823 823 return -1;
... ...
src/modbus-rtu.h
  View file @88b2eaf
... ... @@ -32,14 +32,14 @@ modbus_t* modbus_new_rtu(const char *device, int baud, char parity,
32 32 #define MODBUS_RTU_RS232 0
33 33 #define MODBUS_RTU_RS485 1
34 34  
35   -#define MODBUS_NO_USE_RTS 0
36   -#define MODBUS_USE_RTS_UP 1
37   -#define MODBUS_USE_RTS_DOWN 2
  35 +#define MODBUS_RTS_NONE 0
  36 +#define MODBUS_RTS_UP 1
  37 +#define MODBUS_RTS_DOWN 2
38 38  
39 39 int modbus_rtu_set_serial_mode(modbus_t *ctx, int mode);
40 40 int modbus_rtu_get_serial_mode(modbus_t *ctx);
41 41  
42   -int modbus_rtu_set_usage_rts(modbus_t *ctx, int mode);
43   -int modbus_rtu_get_usage_rts(modbus_t *ctx);
  42 +int modbus_rtu_set_use_rts(modbus_t *ctx, int mode);
  43 +int modbus_rtu_get_use_rts(modbus_t *ctx);
44 44  
45 45 #endif /* _MODBUS_RTU_H_ */
... ...