Peter M. Groen / libmodbus

Commit 5ccb51d5bbe64e9ca999a7c3b20669b3e0029487

Authored by Stéphane Raimbault
1 parent 34ec939a

Rename reserved C++ keywords of modbus_mask_write_register 

Thanks Tobias Doerffel.
Inline Side-by-side
Showing 2 changed files with 6 additions and 6 deletions
src/modbus.c
  View file @5ccb51d
@@ -1290,7 +1290,7 @@ int modbus_write_registers(modbus_t *ctx, int addr, int nb, const uint16_t *src) @@ -1290,7 +1290,7 @@ int modbus_write_registers(modbus_t *ctx, int addr, int nb, const uint16_t *src)
1290 return rc; 1290 return rc;
1291 } 1291 }
1292 1292
1293 -int modbus_mask_write_register(modbus_t *ctx, int addr, uint16_t and, uint16_t or) 1293 +int modbus_mask_write_register(modbus_t *ctx, int addr, uint16_t and_mask, uint16_t or_mask)
1294 { 1294 {
1295 int rc; 1295 int rc;
1296 int req_length; 1296 int req_length;
@@ -1301,10 +1301,10 @@ int modbus_mask_write_register(modbus_t *ctx, int addr, uint16_t and, uint16_t o @@ -1301,10 +1301,10 @@ int modbus_mask_write_register(modbus_t *ctx, int addr, uint16_t and, uint16_t o
1301 /* HACKISH, count is not used */ 1301 /* HACKISH, count is not used */
1302 req_length -=2; 1302 req_length -=2;
1303 1303
1304 - req[req_length++] = and >> 8;  
1305 - req[req_length++] = and & 0x00ff;  
1306 - req[req_length++] = or >> 8;  
1307 - req[req_length++] = or & 0x00ff; 1304 + req[req_length++] = and_mask >> 8;
  1305 + req[req_length++] = and_mask & 0x00ff;
  1306 + req[req_length++] = or_mask >> 8;
  1307 + req[req_length++] = or_mask & 0x00ff;
1308 1308
1309 rc = send_msg(ctx, req, req_length); 1309 rc = send_msg(ctx, req, req_length);
1310 if (rc > 0) { 1310 if (rc > 0) {
src/modbus.h
  View file @5ccb51d
@@ -185,7 +185,7 @@ EXPORT int modbus_write_bit(modbus_t *ctx, int coil_addr, int status); @@ -185,7 +185,7 @@ EXPORT int modbus_write_bit(modbus_t *ctx, int coil_addr, int status);
185 EXPORT int modbus_write_register(modbus_t *ctx, int reg_addr, int value); 185 EXPORT int modbus_write_register(modbus_t *ctx, int reg_addr, int value);
186 EXPORT int modbus_write_bits(modbus_t *ctx, int addr, int nb, const uint8_t *data); 186 EXPORT int modbus_write_bits(modbus_t *ctx, int addr, int nb, const uint8_t *data);
187 EXPORT int modbus_write_registers(modbus_t *ctx, int addr, int nb, const uint16_t *data); 187 EXPORT int modbus_write_registers(modbus_t *ctx, int addr, int nb, const uint16_t *data);
188 -EXPORT int modbus_mask_write_register(modbus_t *ctx, int addr, uint16_t and, uint16_t or); 188 +EXPORT int modbus_mask_write_register(modbus_t *ctx, int addr, uint16_t and_mask, uint16_t or_mask);
189 EXPORT int modbus_write_and_read_registers(modbus_t *ctx, int write_addr, int write_nb, 189 EXPORT int modbus_write_and_read_registers(modbus_t *ctx, int write_addr, int write_nb,
190 const uint16_t *src, int read_addr, int read_nb, 190 const uint16_t *src, int read_addr, int read_nb,
191 uint16_t *dest); 191 uint16_t *dest);