Peter M. Groen / libmodbus

Commit 0b22e719c4f899feb42b15856935adc382548d5c

Authored by Stéphane Raimbault
1 parent b09ff2fb

Rename EXPORT by MODBUS_API

Inline Side-by-side
Showing 3 changed files with 55 additions and 55 deletions
src/modbus-rtu.h
  View file @0b22e71
@@ -28,21 +28,21 @@ MODBUS_BEGIN_DECLS @@ -28,21 +28,21 @@ MODBUS_BEGIN_DECLS
28 */ 28 */
29 #define MODBUS_RTU_MAX_ADU_LENGTH 256 29 #define MODBUS_RTU_MAX_ADU_LENGTH 256
30 30
31 -EXPORT modbus_t* modbus_new_rtu(const char *device, int baud, char parity, 31 +MODBUS_API modbus_t* modbus_new_rtu(const char *device, int baud, char parity,
32 int data_bit, int stop_bit); 32 int data_bit, int stop_bit);
33 33
34 #define MODBUS_RTU_RS232 0 34 #define MODBUS_RTU_RS232 0
35 #define MODBUS_RTU_RS485 1 35 #define MODBUS_RTU_RS485 1
36 36
37 -EXPORT int modbus_rtu_set_serial_mode(modbus_t *ctx, int mode);  
38 -EXPORT int modbus_rtu_get_serial_mode(modbus_t *ctx); 37 +MODBUS_API int modbus_rtu_set_serial_mode(modbus_t *ctx, int mode);
  38 +MODBUS_API int modbus_rtu_get_serial_mode(modbus_t *ctx);
39 39
40 #define MODBUS_RTU_RTS_NONE 0 40 #define MODBUS_RTU_RTS_NONE 0
41 #define MODBUS_RTU_RTS_UP 1 41 #define MODBUS_RTU_RTS_UP 1
42 #define MODBUS_RTU_RTS_DOWN 2 42 #define MODBUS_RTU_RTS_DOWN 2
43 43
44 -EXPORT int modbus_rtu_set_rts(modbus_t *ctx, int mode);  
45 -EXPORT int modbus_rtu_get_rts(modbus_t *ctx); 44 +MODBUS_API int modbus_rtu_set_rts(modbus_t *ctx, int mode);
  45 +MODBUS_API int modbus_rtu_get_rts(modbus_t *ctx);
46 46
47 MODBUS_END_DECLS 47 MODBUS_END_DECLS
48 48
src/modbus-tcp.h
  View file @0b22e71
@@ -51,13 +51,13 @@ MODBUS_BEGIN_DECLS @@ -51,13 +51,13 @@ MODBUS_BEGIN_DECLS
51 */ 51 */
52 #define MODBUS_TCP_MAX_ADU_LENGTH 260 52 #define MODBUS_TCP_MAX_ADU_LENGTH 260
53 53
54 -EXPORT modbus_t* modbus_new_tcp(const char *ip_address, int port);  
55 -EXPORT int modbus_tcp_listen(modbus_t *ctx, int nb_connection);  
56 -EXPORT int modbus_tcp_accept(modbus_t *ctx, int *s); 54 +MODBUS_API modbus_t* modbus_new_tcp(const char *ip_address, int port);
  55 +MODBUS_API int modbus_tcp_listen(modbus_t *ctx, int nb_connection);
  56 +MODBUS_API int modbus_tcp_accept(modbus_t *ctx, int *s);
57 57
58 -EXPORT modbus_t* modbus_new_tcp_pi(const char *node, const char *service);  
59 -EXPORT int modbus_tcp_pi_listen(modbus_t *ctx, int nb_connection);  
60 -EXPORT int modbus_tcp_pi_accept(modbus_t *ctx, int *s); 58 +MODBUS_API modbus_t* modbus_new_tcp_pi(const char *node, const char *service);
  59 +MODBUS_API int modbus_tcp_pi_listen(modbus_t *ctx, int nb_connection);
  60 +MODBUS_API int modbus_tcp_pi_accept(modbus_t *ctx, int *s);
61 61
62 MODBUS_END_DECLS 62 MODBUS_END_DECLS
63 63
src/modbus.h
  View file @0b22e71
@@ -37,12 +37,12 @@ @@ -37,12 +37,12 @@
37 #if defined(_MSC_VER) 37 #if defined(_MSC_VER)
38 # if defined(DLLBUILD) 38 # if defined(DLLBUILD)
39 /* define DLLBUILD when building the DLL */ 39 /* define DLLBUILD when building the DLL */
40 -# define EXPORT __declspec(dllexport) 40 +# define MODBUS_API __declspec(dllexport)
41 # else 41 # else
42 -# define EXPORT __declspec(dllimport) 42 +# define MODBUS_API __declspec(dllimport)
43 # endif 43 # endif
44 #else 44 #else
45 -# define EXPORT 45 +# define MODBUS_API
46 #endif 46 #endif
47 47
48 #ifdef __cplusplus 48 #ifdef __cplusplus
@@ -154,57 +154,57 @@ typedef enum @@ -154,57 +154,57 @@ typedef enum
154 MODBUS_ERROR_RECOVERY_PROTOCOL = (1<<2), 154 MODBUS_ERROR_RECOVERY_PROTOCOL = (1<<2),
155 } modbus_error_recovery_mode; 155 } modbus_error_recovery_mode;
156 156
157 -EXPORT int modbus_set_slave(modbus_t* ctx, int slave);  
158 -EXPORT int modbus_set_error_recovery(modbus_t *ctx, modbus_error_recovery_mode error_recovery);  
159 -EXPORT int modbus_set_socket(modbus_t *ctx, int s);  
160 -EXPORT int modbus_get_socket(modbus_t *ctx); 157 +MODBUS_API int modbus_set_slave(modbus_t* ctx, int slave);
  158 +MODBUS_API int modbus_set_error_recovery(modbus_t *ctx, modbus_error_recovery_mode error_recovery);
  159 +MODBUS_API int modbus_set_socket(modbus_t *ctx, int s);
  160 +MODBUS_API int modbus_get_socket(modbus_t *ctx);
161 161
162 -EXPORT int modbus_get_response_timeout(modbus_t *ctx, struct timeval *timeout);  
163 -EXPORT int modbus_set_response_timeout(modbus_t *ctx, const struct timeval *timeout); 162 +MODBUS_API int modbus_get_response_timeout(modbus_t *ctx, struct timeval *timeout);
  163 +MODBUS_API int modbus_set_response_timeout(modbus_t *ctx, const struct timeval *timeout);
164 164
165 -EXPORT int modbus_get_byte_timeout(modbus_t *ctx, struct timeval *timeout);  
166 -EXPORT int modbus_set_byte_timeout(modbus_t *ctx, const struct timeval *timeout); 165 +MODBUS_API int modbus_get_byte_timeout(modbus_t *ctx, struct timeval *timeout);
  166 +MODBUS_API int modbus_set_byte_timeout(modbus_t *ctx, const struct timeval *timeout);
167 167
168 -EXPORT int modbus_get_header_length(modbus_t *ctx); 168 +MODBUS_API int modbus_get_header_length(modbus_t *ctx);
169 169
170 -EXPORT int modbus_connect(modbus_t *ctx);  
171 -EXPORT void modbus_close(modbus_t *ctx); 170 +MODBUS_API int modbus_connect(modbus_t *ctx);
  171 +MODBUS_API void modbus_close(modbus_t *ctx);
172 172
173 -EXPORT void modbus_free(modbus_t *ctx); 173 +MODBUS_API void modbus_free(modbus_t *ctx);
174 174
175 -EXPORT int modbus_flush(modbus_t *ctx);  
176 -EXPORT int modbus_set_debug(modbus_t *ctx, int flag); 175 +MODBUS_API int modbus_flush(modbus_t *ctx);
  176 +MODBUS_API int modbus_set_debug(modbus_t *ctx, int flag);
177 177
178 -EXPORT const char *modbus_strerror(int errnum); 178 +MODBUS_API const char *modbus_strerror(int errnum);
179 179
180 -EXPORT int modbus_read_bits(modbus_t *ctx, int addr, int nb, uint8_t *dest);  
181 -EXPORT int modbus_read_input_bits(modbus_t *ctx, int addr, int nb, uint8_t *dest);  
182 -EXPORT int modbus_read_registers(modbus_t *ctx, int addr, int nb, uint16_t *dest);  
183 -EXPORT int modbus_read_input_registers(modbus_t *ctx, int addr, int nb, uint16_t *dest);  
184 -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);  
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);  
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, 180 +MODBUS_API int modbus_read_bits(modbus_t *ctx, int addr, int nb, uint8_t *dest);
  181 +MODBUS_API int modbus_read_input_bits(modbus_t *ctx, int addr, int nb, uint8_t *dest);
  182 +MODBUS_API int modbus_read_registers(modbus_t *ctx, int addr, int nb, uint16_t *dest);
  183 +MODBUS_API int modbus_read_input_registers(modbus_t *ctx, int addr, int nb, uint16_t *dest);
  184 +MODBUS_API int modbus_write_bit(modbus_t *ctx, int coil_addr, int status);
  185 +MODBUS_API int modbus_write_register(modbus_t *ctx, int reg_addr, int value);
  186 +MODBUS_API int modbus_write_bits(modbus_t *ctx, int addr, int nb, const uint8_t *data);
  187 +MODBUS_API int modbus_write_registers(modbus_t *ctx, int addr, int nb, const uint16_t *data);
  188 +MODBUS_API int modbus_mask_write_register(modbus_t *ctx, int addr, uint16_t and_mask, uint16_t or_mask);
  189 +MODBUS_API 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);
192 -EXPORT int modbus_report_slave_id(modbus_t *ctx, uint8_t *dest); 192 +MODBUS_API int modbus_report_slave_id(modbus_t *ctx, uint8_t *dest);
193 193
194 -EXPORT modbus_mapping_t* modbus_mapping_new(int nb_bits, int nb_input_bits, 194 +MODBUS_API modbus_mapping_t* modbus_mapping_new(int nb_bits, int nb_input_bits,
195 int nb_registers, int nb_input_registers); 195 int nb_registers, int nb_input_registers);
196 -EXPORT void modbus_mapping_free(modbus_mapping_t *mb_mapping); 196 +MODBUS_API void modbus_mapping_free(modbus_mapping_t *mb_mapping);
197 197
198 -EXPORT int modbus_send_raw_request(modbus_t *ctx, uint8_t *raw_req, int raw_req_length); 198 +MODBUS_API int modbus_send_raw_request(modbus_t *ctx, uint8_t *raw_req, int raw_req_length);
199 199
200 -EXPORT int modbus_receive(modbus_t *ctx, uint8_t *req);  
201 -EXPORT int modbus_receive_from(modbus_t *ctx, int sockfd, uint8_t *req); 200 +MODBUS_API int modbus_receive(modbus_t *ctx, uint8_t *req);
  201 +MODBUS_API int modbus_receive_from(modbus_t *ctx, int sockfd, uint8_t *req);
202 202
203 -EXPORT int modbus_receive_confirmation(modbus_t *ctx, uint8_t *rsp); 203 +MODBUS_API int modbus_receive_confirmation(modbus_t *ctx, uint8_t *rsp);
204 204
205 -EXPORT int modbus_reply(modbus_t *ctx, const uint8_t *req, 205 +MODBUS_API int modbus_reply(modbus_t *ctx, const uint8_t *req,
206 int req_length, modbus_mapping_t *mb_mapping); 206 int req_length, modbus_mapping_t *mb_mapping);
207 -EXPORT int modbus_reply_exception(modbus_t *ctx, const uint8_t *req, 207 +MODBUS_API int modbus_reply_exception(modbus_t *ctx, const uint8_t *req,
208 unsigned int exception_code); 208 unsigned int exception_code);
209 209
210 /** 210 /**
@@ -221,14 +221,14 @@ EXPORT int modbus_reply_exception(modbus_t *ctx, const uint8_t *req, @@ -221,14 +221,14 @@ EXPORT int modbus_reply_exception(modbus_t *ctx, const uint8_t *req,
221 tab_int8[(index) + 1] = (value) & 0xFF; \ 221 tab_int8[(index) + 1] = (value) & 0xFF; \
222 } while (0) 222 } while (0)
223 223
224 -EXPORT void modbus_set_bits_from_byte(uint8_t *dest, int index, const uint8_t value);  
225 -EXPORT void modbus_set_bits_from_bytes(uint8_t *dest, int index, unsigned int nb_bits, 224 +MODBUS_API void modbus_set_bits_from_byte(uint8_t *dest, int index, const uint8_t value);
  225 +MODBUS_API void modbus_set_bits_from_bytes(uint8_t *dest, int index, unsigned int nb_bits,
226 const uint8_t *tab_byte); 226 const uint8_t *tab_byte);
227 -EXPORT uint8_t modbus_get_byte_from_bits(const uint8_t *src, int index, unsigned int nb_bits);  
228 -EXPORT float modbus_get_float(const uint16_t *src);  
229 -EXPORT float modbus_get_float_dcba(const uint16_t *src);  
230 -EXPORT void modbus_set_float(float f, uint16_t *dest);  
231 -EXPORT void modbus_set_float_dcba(float f, uint16_t *dest); 227 +MODBUS_API uint8_t modbus_get_byte_from_bits(const uint8_t *src, int index, unsigned int nb_bits);
  228 +MODBUS_API float modbus_get_float(const uint16_t *src);
  229 +MODBUS_API float modbus_get_float_dcba(const uint16_t *src);
  230 +MODBUS_API void modbus_set_float(float f, uint16_t *dest);
  231 +MODBUS_API void modbus_set_float_dcba(float f, uint16_t *dest);
232 232
233 #include "modbus-tcp.h" 233 #include "modbus-tcp.h"
234 #include "modbus-rtu.h" 234 #include "modbus-rtu.h"