From 5729bafbbd0dae547d5876f904e2a8230a6c2273 Mon Sep 17 00:00:00 2001 From: Valerio De Benedetto Date: Fri, 20 Sep 2024 14:12:36 +0200 Subject: [PATCH] Formatting after merge --- nanomodbus.c | 19 +++++++------------ nanomodbus.h | 6 ++---- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/nanomodbus.c b/nanomodbus.c index 787c86d..1b794a2 100644 --- a/nanomodbus.c +++ b/nanomodbus.c @@ -59,8 +59,7 @@ static void discard_1(nmbs_t* nmbs) { #ifndef NMBS_SERVER_DISABLED -#if !defined(NMBS_SERVER_READ_FILE_RECORD_DISABLED) || \ - !defined(NMBS_SERVER_WRITE_FILE_RECORD_DISABLED) +#if !defined(NMBS_SERVER_READ_FILE_RECORD_DISABLED) || !defined(NMBS_SERVER_WRITE_FILE_RECORD_DISABLED) static void discard_n(nmbs_t* nmbs, uint16_t n) { nmbs->msg.buf_idx += n; } @@ -516,11 +515,9 @@ static void put_req_header(nmbs_t* nmbs, uint16_t data_length) { #endif -#if !defined(NMBS_CLIENT_DISABLED) || \ - (!defined(NMBS_SERVER_DISABLED) && ( \ - !defined(NMBS_SERVER_READ_COILS_DISABLED) || \ - !defined(NMBS_SERVER_READ_DISCRETE_INPUTS_DISABLED) \ - )) +#if !defined(NMBS_CLIENT_DISABLED) || \ + (!defined(NMBS_SERVER_DISABLED) && \ + (!defined(NMBS_SERVER_READ_COILS_DISABLED) || !defined(NMBS_SERVER_READ_DISCRETE_INPUTS_DISABLED))) static nmbs_error recv_read_discrete_res(nmbs_t* nmbs, nmbs_bitfield values) { nmbs_error err = recv_res_header(nmbs); if (err != NMBS_ERROR_NONE) @@ -558,11 +555,9 @@ static nmbs_error recv_read_discrete_res(nmbs_t* nmbs, nmbs_bitfield values) { #endif -#if !defined(NMBS_CLIENT_DISABLED) || \ - (!defined(NMBS_SERVER_DISABLED) && ( \ - !defined(NMBS_SERVER_READ_HOLDING_REGISTERS_DISABLED) || \ - !defined(NMBS_SERVER_READ_INPUT_REGISTERS_DISABLED) \ - )) +#if !defined(NMBS_CLIENT_DISABLED) || \ + (!defined(NMBS_SERVER_DISABLED) && (!defined(NMBS_SERVER_READ_HOLDING_REGISTERS_DISABLED) || \ + !defined(NMBS_SERVER_READ_INPUT_REGISTERS_DISABLED))) static nmbs_error recv_read_registers_res(nmbs_t* nmbs, uint16_t quantity, uint16_t* registers) { nmbs_error err = recv_res_header(nmbs); if (err != NMBS_ERROR_NONE) diff --git a/nanomodbus.h b/nanomodbus.h index 7f2ccb1..fe7052e 100644 --- a/nanomodbus.h +++ b/nanomodbus.h @@ -176,8 +176,7 @@ typedef struct nmbs_callbacks { void* arg); #endif -#if !defined(NMBS_SERVER_READ_HOLDING_REGISTERS_DISABLED) || \ - !defined(NMBS_SERVER_READ_WRITE_REGISTERS_DISABLED) +#if !defined(NMBS_SERVER_READ_HOLDING_REGISTERS_DISABLED) || !defined(NMBS_SERVER_READ_WRITE_REGISTERS_DISABLED) nmbs_error (*read_holding_registers)(uint16_t address, uint16_t quantity, uint16_t* registers_out, uint8_t unit_id, void* arg); #endif @@ -200,8 +199,7 @@ typedef struct nmbs_callbacks { void* arg); #endif -#if !defined(NMBS_SERVER_WRITE_MULTIPLE_REGISTERS_DISABLED) || \ - !defined(NMBS_SERVER_READ_WRITE_REGISTERS_DISABLED) +#if !defined(NMBS_SERVER_WRITE_MULTIPLE_REGISTERS_DISABLED) || !defined(NMBS_SERVER_READ_WRITE_REGISTERS_DISABLED) nmbs_error (*write_multiple_registers)(uint16_t address, uint16_t quantity, const uint16_t* registers, uint8_t unit_id, void* arg); #endif