Peter M. Groen / libmodbus

Commit 202231daa21cee544ce522c99894a3e3b03235ba

Authored by Stéphane Raimbault
1 parent d11d30a5

Rename manage_query() to modbus_manage_query() and comment cleanups.

Inline Side-by-side
Showing 5 changed files with 10 additions and 12 deletions
modbus/modbus.c
  View file @202231d
... ... @@ -733,8 +733,8 @@ static int response_exception(modbus_param_t *mb_param, sft_t *sft,
733 733 If an error occurs, this function construct the response
734 734 accordingly.
735 735 */
736   -void manage_query(modbus_param_t *mb_param, uint8_t *query,
737   - int query_length, modbus_mapping_t *mb_mapping)
  736 +void modbus_manage_query(modbus_param_t *mb_param, uint8_t *query,
  737 + int query_length, modbus_mapping_t *mb_mapping)
738 738 {
739 739 int offset = mb_param->header_length;
740 740 int slave = query[offset];
... ...
modbus/modbus.h
  View file @202231d
... ... @@ -267,10 +267,11 @@ int modbus_mapping_new(modbus_mapping_t *mb_mapping,
267 267 /* Frees the 4 arrays */
268 268 void modbus_mapping_free(modbus_mapping_t *mb_mapping);
269 269  
270   -/* Listens for any query from a modbus master in TCP */
  270 +/* Initializes the modbus_param_t structure for a TCP slave (server) */
271 271 int modbus_init_listen_tcp(modbus_param_t *mb_param);
272 272  
273   -/* FIXME */
  273 +/* Listens for any query from a modbus master in TCP
  274 + Not tested in RTU communication. */
274 275 int modbus_listen(modbus_param_t *mb_param, uint8_t *query, int *query_length);
275 276  
276 277 /* Manages the received query.
... ... @@ -279,12 +280,9 @@ int modbus_listen(modbus_param_t *mb_param, uint8_t *query, int *query_length);
279 280 If an error occurs, this function construct the response
280 281 accordingly.
281 282 */
282   -void manage_query(modbus_param_t *mb_param, uint8_t *query,
283   - int query_length, modbus_mapping_t *mb_mapping);
  283 +void modbus_manage_query(modbus_param_t *mb_param, uint8_t *query,
  284 + int query_length, modbus_mapping_t *mb_mapping);
284 285  
285   -/* Not implemented :
286   - - read_exception_status()
287   -*/
288 286  
289 287 /**
290 288 * UTILS FUNCTIONS
... ...
tests/bench-bandwidth-slave.c
  View file @202231d
... ... @@ -45,7 +45,7 @@ int main(void)
45 45  
46 46 ret = modbus_listen(&mb_param, query, &query_size);
47 47 if (ret == 0) {
48   - manage_query(&mb_param, query, query_size, &mb_mapping);
  48 + modbus_manage_query(&mb_param, query, query_size, &mb_mapping);
49 49 } else if (ret == CONNECTION_CLOSED) {
50 50 /* Connection closed by the client, end of server */
51 51 break;
... ...
tests/random-test-slave.c
  View file @202231d
... ... @@ -45,7 +45,7 @@ int main(void)
45 45  
46 46 ret = modbus_listen(&mb_param, query, &query_size);
47 47 if (ret == 0) {
48   - manage_query(&mb_param, query, query_size, &mb_mapping);
  48 + modbus_manage_query(&mb_param, query, query_size, &mb_mapping);
49 49 } else if (ret == CONNECTION_CLOSED) {
50 50 /* Connection closed by the client, end of server */
51 51 break;
... ...
tests/unit-test-slave.c
  View file @202231d
... ... @@ -67,7 +67,7 @@ int main(void)
67 67  
68 68 ret = modbus_listen(&mb_param, query, &query_size);
69 69 if (ret == 0) {
70   - manage_query(&mb_param, query, query_size, &mb_mapping);
  70 + modbus_manage_query(&mb_param, query, query_size, &mb_mapping);
71 71 } else if (ret == CONNECTION_CLOSED) {
72 72 /* Connection closed by the client, end of server */
73 73 break;
... ...