Jelajahi Sumber

Declare some args with const

Stéphane Raimbault 17 tahun lalu
induk
melakukan
58426bc8aa
2 mengubah file dengan 13 tambahan dan 12 penghapusan
  1. 7 6
      modbus/modbus.c
  2. 6 6
      modbus/modbus.h

+ 7 - 6
modbus/modbus.c

@@ -733,7 +733,7 @@ static int response_exception(modbus_param_t *mb_param, sft_t *sft,
    If an error occurs, this function construct the response
    accordingly.
 */
-void modbus_manage_query(modbus_param_t *mb_param, uint8_t *query,
+void modbus_manage_query(modbus_param_t *mb_param, const uint8_t *query,
                          int query_length, modbus_mapping_t *mb_mapping)
 {                   
         int offset = mb_param->header_length;
@@ -1171,7 +1171,7 @@ int preset_single_register(modbus_param_t *mb_param, int slave,
 /* Sets/resets the coils in the slave from an array in argument */
 int force_multiple_coils(modbus_param_t *mb_param, int slave,
                          int start_addr, int nb,
-                         uint8_t *data_src)
+                         const uint8_t *data_src)
 {
         int i;
         int byte_count;
@@ -1223,7 +1223,8 @@ int force_multiple_coils(modbus_param_t *mb_param, int slave,
 
 /* Copies the values in the slave from the array given in argument */
 int preset_multiple_registers(modbus_param_t *mb_param, int slave,
-                              int start_addr, int nb, uint16_t *data_src)
+                              int start_addr, int nb,
+                              const uint16_t *data_src)
 {
         int i;
         int query_length;
@@ -1305,8 +1306,8 @@ int report_slave_id(modbus_param_t *mb_param, int slave,
    - data_bits: 5, 6, 7, 8 
    - stop_bits: 1, 2
 */
-void modbus_init_rtu(modbus_param_t *mb_param, char *device,
-                     int baud, char *parity, int data_bit,
+void modbus_init_rtu(modbus_param_t *mb_param, const char *device,
+                     int baud, const char *parity, int data_bit,
                      int stop_bit)
 {
         memset(mb_param, 0, sizeof(modbus_param_t));
@@ -1330,7 +1331,7 @@ void modbus_init_rtu(modbus_param_t *mb_param, char *device,
    to 1024 because it's not necessary to be root to use this port
    number.
 */
-void modbus_init_tcp(modbus_param_t *mb_param, char *ip, int port)
+void modbus_init_tcp(modbus_param_t *mb_param, const char *ip, int port)
 {
         memset(mb_param, 0, sizeof(modbus_param_t));
         strncpy(mb_param->ip, ip, sizeof(char)*16);

+ 6 - 6
modbus/modbus.h

@@ -197,11 +197,11 @@ int preset_single_register(modbus_param_t *mb_param, int slave,
 
 /* Sets/resets the coils in the slave from an array in argument */
 int force_multiple_coils(modbus_param_t *mb_param, int slave,
-                         int start_addr, int nb, uint8_t *data);
+                         int start_addr, int nb, const uint8_t *data);
 
 /* Copies the values in the slave from the array given in argument */
 int preset_multiple_registers(modbus_param_t *mb_param, int slave,
-                              int start_addr, int nb, uint16_t *data);
+                              int start_addr, int nb, const uint16_t *data);
 
 /* Returns the slave id! */
 int report_slave_id(modbus_param_t *mb_param, int slave, uint8_t *dest);
@@ -213,8 +213,8 @@ int report_slave_id(modbus_param_t *mb_param, int slave, uint8_t *dest);
    - data_bits: 5, 6, 7, 8 
    - stop_bits: 1, 2
 */
-void modbus_init_rtu(modbus_param_t *mb_param, char *device,
-                     int baud, char *parity, int data_bit,
+void modbus_init_rtu(modbus_param_t *mb_param, const char *device,
+                     int baud, const char *parity, int data_bit,
                      int stop_bit);
                      
 /* Initializes the modbus_param_t structure for TCP.
@@ -226,7 +226,7 @@ void modbus_init_rtu(modbus_param_t *mb_param, char *device,
    to 1024 because it's not necessary to be root to use this port
    number.
 */
-void modbus_init_tcp(modbus_param_t *mb_param, char *ip_address, int port);
+void modbus_init_tcp(modbus_param_t *mb_param, const char *ip_address, int port);
 
 /* By default, the error handling mode used is RECONNECT_ON_ERROR.
 
@@ -280,7 +280,7 @@ int modbus_listen(modbus_param_t *mb_param, uint8_t *query, int *query_length);
    If an error occurs, this function construct the response
    accordingly.
 */
-void modbus_manage_query(modbus_param_t *mb_param, uint8_t *query,
+void modbus_manage_query(modbus_param_t *mb_param, const uint8_t *query,
                          int query_length, modbus_mapping_t *mb_mapping);