diff --git a/.clang-format b/.clang-format index 5375535..a9a3bc4 100644 --- a/.clang-format +++ b/.clang-format @@ -1,10 +1,11 @@ -# 2024-07-30 +# 2025-02-12 Language: Cpp BasedOnStyle: LLVM AlignAfterOpenBracket: BlockIndent AlignArrayOfStructures: Left AlignConsecutiveAssignments: true AlignConsecutiveMacros: AcrossComments +AlignEscapedNewlinesLeft: true AlignTrailingComments: true AllowAllArgumentsOnNextLine: false AllowAllParametersOfDeclarationOnNextLine: false @@ -24,7 +25,6 @@ IndentWidth: 4 LambdaBodyIndentation: Signature MaxEmptyLinesToKeep: 1 PenaltyReturnTypeOnItsOwnLine: 1000 -# PointerAlignment: Left # TODO enable this and reformat project QualifierAlignment: Left ReflowComments: true SeparateDefinitionBlocks: Always diff --git a/cores/beken-72xx/arduino/libraries/WiFi/WiFiPrivate.h b/cores/beken-72xx/arduino/libraries/WiFi/WiFiPrivate.h index 38ec80c..24850f7 100644 --- a/cores/beken-72xx/arduino/libraries/WiFi/WiFiPrivate.h +++ b/cores/beken-72xx/arduino/libraries/WiFi/WiFiPrivate.h @@ -79,34 +79,34 @@ typedef struct { #define IP_STATUS (DATA->statusIp) #define LINK_STATUS (DATA->statusLink) -#define STA_GET_LINK_STATUS_RETURN(ret) \ - { \ - if (!sta_ip_is_start()) \ - return ret; \ - memset(&LINK_STATUS, 0x00, sizeof(LinkStatusTypeDef)); \ - bk_wlan_get_link_status(&LINK_STATUS); \ +#define STA_GET_LINK_STATUS_RETURN(ret) \ + { \ + if (!sta_ip_is_start()) \ + return ret; \ + memset(&LINK_STATUS, 0x00, sizeof(LinkStatusTypeDef)); \ + bk_wlan_get_link_status(&LINK_STATUS); \ } -#define STA_GET_IP_STATUS_RETURN(ret) \ - { \ - if (!sta_ip_is_start()) \ - return ret; \ - memset(&IP_STATUS, 0x00, sizeof(IPStatusTypedef)); \ - bk_wlan_get_ip_status(&IP_STATUS, BK_STATION); \ +#define STA_GET_IP_STATUS_RETURN(ret) \ + { \ + if (!sta_ip_is_start()) \ + return ret; \ + memset(&IP_STATUS, 0x00, sizeof(IPStatusTypedef)); \ + bk_wlan_get_ip_status(&IP_STATUS, BK_STATION); \ } -#define AP_GET_LINK_STATUS_RETURN(ret) \ - { \ - if (!uap_ip_is_start()) \ - return ret; \ +#define AP_GET_LINK_STATUS_RETURN(ret) \ + { \ + if (!uap_ip_is_start()) \ + return ret; \ } -#define AP_GET_IP_STATUS_RETURN(ret) \ - { \ - if (!uap_ip_is_start()) \ - return ret; \ - memset(&IP_STATUS, 0x00, sizeof(IPStatusTypedef)); \ - bk_wlan_get_ip_status(&IP_STATUS, BK_SOFT_AP); \ +#define AP_GET_IP_STATUS_RETURN(ret) \ + { \ + if (!uap_ip_is_start()) \ + return ret; \ + memset(&IP_STATUS, 0x00, sizeof(IPStatusTypedef)); \ + bk_wlan_get_ip_status(&IP_STATUS, BK_SOFT_AP); \ } } // extern "C" diff --git a/cores/common/arduino/libraries/ext/WebServer/HTTP_Method.h b/cores/common/arduino/libraries/ext/WebServer/HTTP_Method.h index b739a2f..e35491c 100644 --- a/cores/common/arduino/libraries/ext/WebServer/HTTP_Method.h +++ b/cores/common/arduino/libraries/ext/WebServer/HTTP_Method.h @@ -1,48 +1,48 @@ #pragma once /* Request Methods */ -#define HTTP_METHOD_MAP(XX) \ - XX(0, DELETE, DELETE) \ - XX(1, GET, GET) \ - XX(2, HEAD, HEAD) \ - XX(3, POST, POST) \ - XX(4, PUT, PUT) \ - /* pathological */ \ - XX(5, CONNECT, CONNECT) \ - XX(6, OPTIONS, OPTIONS) \ - XX(7, TRACE, TRACE) \ - /* WebDAV */ \ - XX(8, COPY, COPY) \ - XX(9, LOCK, LOCK) \ - XX(10, MKCOL, MKCOL) \ - XX(11, MOVE, MOVE) \ - XX(12, PROPFIND, PROPFIND) \ - XX(13, PROPPATCH, PROPPATCH) \ - XX(14, SEARCH, SEARCH) \ - XX(15, UNLOCK, UNLOCK) \ - XX(16, BIND, BIND) \ - XX(17, REBIND, REBIND) \ - XX(18, UNBIND, UNBIND) \ - XX(19, ACL, ACL) \ - /* subversion */ \ - XX(20, REPORT, REPORT) \ - XX(21, MKACTIVITY, MKACTIVITY) \ - XX(22, CHECKOUT, CHECKOUT) \ - XX(23, MERGE, MERGE) \ - /* upnp */ \ - XX(24, MSEARCH, M - SEARCH) \ - XX(25, NOTIFY, NOTIFY) \ - XX(26, SUBSCRIBE, SUBSCRIBE) \ - XX(27, UNSUBSCRIBE, UNSUBSCRIBE) \ - /* RFC-5789 */ \ - XX(28, PATCH, PATCH) \ - XX(29, PURGE, PURGE) \ - /* CalDAV */ \ - XX(30, MKCALENDAR, MKCALENDAR) \ - /* RFC-2068, section 19.6.1.2 */ \ - XX(31, LINK, LINK) \ - XX(32, UNLINK, UNLINK) \ - /* icecast */ \ +#define HTTP_METHOD_MAP(XX) \ + XX(0, DELETE, DELETE) \ + XX(1, GET, GET) \ + XX(2, HEAD, HEAD) \ + XX(3, POST, POST) \ + XX(4, PUT, PUT) \ + /* pathological */ \ + XX(5, CONNECT, CONNECT) \ + XX(6, OPTIONS, OPTIONS) \ + XX(7, TRACE, TRACE) \ + /* WebDAV */ \ + XX(8, COPY, COPY) \ + XX(9, LOCK, LOCK) \ + XX(10, MKCOL, MKCOL) \ + XX(11, MOVE, MOVE) \ + XX(12, PROPFIND, PROPFIND) \ + XX(13, PROPPATCH, PROPPATCH) \ + XX(14, SEARCH, SEARCH) \ + XX(15, UNLOCK, UNLOCK) \ + XX(16, BIND, BIND) \ + XX(17, REBIND, REBIND) \ + XX(18, UNBIND, UNBIND) \ + XX(19, ACL, ACL) \ + /* subversion */ \ + XX(20, REPORT, REPORT) \ + XX(21, MKACTIVITY, MKACTIVITY) \ + XX(22, CHECKOUT, CHECKOUT) \ + XX(23, MERGE, MERGE) \ + /* upnp */ \ + XX(24, MSEARCH, M - SEARCH) \ + XX(25, NOTIFY, NOTIFY) \ + XX(26, SUBSCRIBE, SUBSCRIBE) \ + XX(27, UNSUBSCRIBE, UNSUBSCRIBE) \ + /* RFC-5789 */ \ + XX(28, PATCH, PATCH) \ + XX(29, PURGE, PURGE) \ + /* CalDAV */ \ + XX(30, MKCALENDAR, MKCALENDAR) \ + /* RFC-2068, section 19.6.1.2 */ \ + XX(31, LINK, LINK) \ + XX(32, UNLINK, UNLINK) \ + /* icecast */ \ XX(33, SOURCE, SOURCE) enum http_method { diff --git a/cores/common/arduino/src/wiring/wiring_compat.h b/cores/common/arduino/src/wiring/wiring_compat.h index de67aa2..00ffb03 100644 --- a/cores/common/arduino/src/wiring/wiring_compat.h +++ b/cores/common/arduino/src/wiring/wiring_compat.h @@ -26,7 +26,7 @@ extern "C" { #define digitalPinToInterrupt(pin) (pin) // FreeRTOS utilities -#define xTaskCreateUniversal(pxTaskCode, pcName, usStackDepth, pvParameters, uxPriority, pxCreatedTask, xCoreID) \ +#define xTaskCreateUniversal(pxTaskCode, pcName, usStackDepth, pvParameters, uxPriority, pxCreatedTask, xCoreID) \ xTaskCreate(pxTaskCode, pcName, usStackDepth, pvParameters, uxPriority, pxCreatedTask) #define xTaskCreatePinnedToCore xTaskCreateUniversal diff --git a/cores/common/arduino/src/wiring/wiring_private.h b/cores/common/arduino/src/wiring/wiring_private.h index 5d0b9c3..4331b1e 100644 --- a/cores/common/arduino/src/wiring/wiring_private.h +++ b/cores/common/arduino/src/wiring/wiring_private.h @@ -27,36 +27,36 @@ inline void pinDisable(PinInfo *pin, uint32_t mask) { pin->enabled &= ~mask; } -#define pinCheckGetInfo(pinNumber, mask, ret) \ - PinInfo *pin = pinInfo(pinNumber); \ - if (!pin) \ - return ret; \ - if (!pinSupported(pin, mask)) \ +#define pinCheckGetInfo(pinNumber, mask, ret) \ + PinInfo *pin = pinInfo(pinNumber); \ + if (!pin) \ + return ret; \ + if (!pinSupported(pin, mask)) \ return ret; -#define pinCheckGetData(pinNumber, mask, ret) \ - PinInfo *pin = pinInfo(pinNumber); \ - if (!pin) \ - return ret; \ - if (!pinSupported(pin, mask)) \ - return ret; \ +#define pinCheckGetData(pinNumber, mask, ret) \ + PinInfo *pin = pinInfo(pinNumber); \ + if (!pin) \ + return ret; \ + if (!pinSupported(pin, mask)) \ + return ret; \ PinData *data = pinData(pin); #define pinIsOutput(pin, data) (pinEnabled(pin, PIN_GPIO) && (data->gpioMode ^ 0b101) < 5) #define pinIsInput(pin, data) (pinEnabled(pin, PIN_GPIO) && (data->gpioMode ^ 0b101) > 4) -#define pinSetOutputPull(pin, data, pinNumber, status) \ - do { \ - if (!pinIsOutput(pin, data)) { \ - pinMode(pinNumber, INPUT_PULLDOWN ^ !!status); \ - return; \ - } \ +#define pinSetOutputPull(pin, data, pinNumber, status) \ + do { \ + if (!pinIsOutput(pin, data)) { \ + pinMode(pinNumber, INPUT_PULLDOWN ^ !!status); \ + return; \ + } \ } while (0); -#define pinSetInputMode(pin, data, pinNumber) \ - do { \ - if (!pinIsInput(pin, data)) \ - pinMode(pinNumber, INPUT); \ +#define pinSetInputMode(pin, data, pinNumber) \ + do { \ + if (!pinIsInput(pin, data)) \ + pinMode(pinNumber, INPUT); \ } while (0); #ifdef __cplusplus diff --git a/cores/common/base/api/lt_utils.h b/cores/common/base/api/lt_utils.h index ab942bb..c79b2bd 100644 --- a/cores/common/base/api/lt_utils.h +++ b/cores/common/base/api/lt_utils.h @@ -5,17 +5,17 @@ #include // https://stackoverflow.com/a/3437484 -#define MAX(a, b) \ - ({ \ - __typeof__(a) _a = (a); \ - __typeof__(b) _b = (b); \ - _a > _b ? _a : _b; \ +#define MAX(a, b) \ + ({ \ + __typeof__(a) _a = (a); \ + __typeof__(b) _b = (b); \ + _a > _b ? _a : _b; \ }) -#define MIN(a, b) \ - ({ \ - __typeof__(a) _a = (a); \ - __typeof__(b) _b = (b); \ - _a < _b ? _a : _b; \ +#define MIN(a, b) \ + ({ \ + __typeof__(a) _a = (a); \ + __typeof__(b) _b = (b); \ + _a < _b ? _a : _b; \ }) /** diff --git a/cores/common/base/config/fal_cfg.h b/cores/common/base/config/fal_cfg.h index 903302b..1428ae8 100644 --- a/cores/common/base/config/fal_cfg.h +++ b/cores/common/base/config/fal_cfg.h @@ -20,9 +20,9 @@ extern const struct fal_flash_dev flash0; #define FAL_FLASH_DEV_NAME "flash0" -#define FAL_FLASH_DEV_TABLE \ - { \ - &flash0, \ +#define FAL_FLASH_DEV_TABLE \ + { \ + &flash0, \ } #define FAL_DEV_NAME_MAX 16 // no need for 24 chars (default) @@ -30,13 +30,13 @@ extern const struct fal_flash_dev flash0; // Partition table #define FAL_PART_HAS_TABLE_CFG -#define FAL_PART_TABLE_ITEM(part_lower, part_upper) \ - { \ - .magic_word = FAL_PART_MAGIC_WORD, /* magic word */ \ - .name = #part_lower, /* lowercase name as string */ \ - .flash_name = FAL_FLASH_DEV_NAME, /* flash device name */ \ - .offset = FLASH_##part_upper##_OFFSET, /* partition offset macro as uppercase string */ \ - .len = FLASH_##part_upper##_LENGTH, /* partition length macro as uppercase string */ \ +#define FAL_PART_TABLE_ITEM(part_lower, part_upper) \ + { \ + .magic_word = FAL_PART_MAGIC_WORD, /* magic word */ \ + .name = #part_lower, /* lowercase name as string */ \ + .flash_name = FAL_FLASH_DEV_NAME, /* flash device name */ \ + .offset = FLASH_##part_upper##_OFFSET, /* partition offset macro as uppercase string */ \ + .len = FLASH_##part_upper##_LENGTH, /* partition length macro as uppercase string */ \ }, // for fal_partition_t diff --git a/cores/common/base/config/lwipopts.h b/cores/common/base/config/lwipopts.h index 5ce2650..073a49a 100644 --- a/cores/common/base/config/lwipopts.h +++ b/cores/common/base/config/lwipopts.h @@ -87,16 +87,16 @@ */ #define SNTP_SERVER_DNS 1 -#define SNTP_SET_SYSTEM_TIME_US(sec, us) \ - do { \ - struct timeval tv = {.tv_sec = sec, .tv_usec = us}; \ - settimeofday(&tv, NULL); \ +#define SNTP_SET_SYSTEM_TIME_US(sec, us) \ + do { \ + struct timeval tv = {.tv_sec = sec, .tv_usec = us}; \ + settimeofday(&tv, NULL); \ } while (0); -#define SNTP_GET_SYSTEM_TIME(sec, us) \ - do { \ - struct timeval tv = {.tv_sec = 0, .tv_usec = 0}; \ - gettimeofday(&tv, NULL); \ - (sec) = tv.tv_sec; \ - (us) = tv.tv_usec; \ +#define SNTP_GET_SYSTEM_TIME(sec, us) \ + do { \ + struct timeval tv = {.tv_sec = 0, .tv_usec = 0}; \ + gettimeofday(&tv, NULL); \ + (sec) = tv.tv_sec; \ + (us) = tv.tv_usec; \ } while (0); diff --git a/cores/common/base/config/printf_config.h b/cores/common/base/config/printf_config.h index 2588c06..a5768d9 100644 --- a/cores/common/base/config/printf_config.h +++ b/cores/common/base/config/printf_config.h @@ -21,133 +21,133 @@ extern "C" { // declare putchar() method with custom output port void putchar_p(char c, unsigned long port); -#define WRAP_DISABLE_DEF(name) \ - extern void __wrap_##name##_disable(); \ - extern void __wrap_##name##_enable(); \ - extern void __wrap_##name##_set(unsigned char disabled); \ +#define WRAP_DISABLE_DEF(name) \ + extern void __wrap_##name##_disable(); \ + extern void __wrap_##name##_enable(); \ + extern void __wrap_##name##_set(unsigned char disabled); \ extern unsigned char __wrap_##name##_get(); #if !LT_UART_SILENT_ENABLED || LT_UART_SILENT_ALL -#define WRAP_DISABLE_DECL(name) \ - void __wrap_##name##_disable() {} \ - void __wrap_##name##_enable() {} \ - void __wrap_##name##_set(unsigned char disabled) {} \ - unsigned char __wrap_##name##_get() { \ - return LT_UART_SILENT_ALL; \ +#define WRAP_DISABLE_DECL(name) \ + void __wrap_##name##_disable() {} \ + void __wrap_##name##_enable() {} \ + void __wrap_##name##_set(unsigned char disabled) {} \ + unsigned char __wrap_##name##_get() { \ + return LT_UART_SILENT_ALL; \ } -#define WRAP_DISABLE_CHECK(name) \ - { \ - if (LT_UART_SILENT_ALL) \ - return 0; \ +#define WRAP_DISABLE_CHECK(name) \ + { \ + if (LT_UART_SILENT_ALL) \ + return 0; \ } #else // LT_UART_SILENT_ENABLED && !LT_UART_SILENT_ALL -#define WRAP_DISABLE_DECL(name) \ - static unsigned char __wrap_##name##_disabled = 0; \ - void __wrap_##name##_disable() { \ - __wrap_##name##_disabled = 1; \ - } \ - void __wrap_##name##_enable() { \ - __wrap_##name##_disabled = 0; \ - } \ - void __wrap_##name##_set(unsigned char disabled) { \ - __wrap_##name##_disabled = disabled; \ - } \ - unsigned char __wrap_##name##_get() { \ - return __wrap_##name##_disabled; \ +#define WRAP_DISABLE_DECL(name) \ + static unsigned char __wrap_##name##_disabled = 0; \ + void __wrap_##name##_disable() { \ + __wrap_##name##_disabled = 1; \ + } \ + void __wrap_##name##_enable() { \ + __wrap_##name##_disabled = 0; \ + } \ + void __wrap_##name##_set(unsigned char disabled) { \ + __wrap_##name##_disabled = disabled; \ + } \ + unsigned char __wrap_##name##_get() { \ + return __wrap_##name##_disabled; \ } -#define WRAP_DISABLE_CHECK(name) \ - { \ - if (__wrap_##name##_disabled) \ - return 0; \ +#define WRAP_DISABLE_CHECK(name) \ + { \ + if (__wrap_##name##_disabled) \ + return 0; \ } #endif // LT_UART_SILENT_ENABLED && !LT_UART_SILENT_ALL #if !LT_UART_SILENT_ENABLED -#define WRAP_PRINTF(name) \ - WRAP_DISABLE_DECL(name) \ - int __wrap_##name(const char *format, ...) { \ - va_list va; \ - va_start(va, format); \ - const int ret = vprintf(format, va); \ - va_end(va); \ - return ret; \ +#define WRAP_PRINTF(name) \ + WRAP_DISABLE_DECL(name) \ + int __wrap_##name(const char *format, ...) { \ + va_list va; \ + va_start(va, format); \ + const int ret = vprintf(format, va); \ + va_end(va); \ + return ret; \ } -#define WRAP_VPRINTF(name) \ - WRAP_DISABLE_DECL(name) \ - int __wrap_##name(const char *format, va_list arg) { \ - return vprintf(format, arg); \ +#define WRAP_VPRINTF(name) \ + WRAP_DISABLE_DECL(name) \ + int __wrap_##name(const char *format, va_list arg) { \ + return vprintf(format, arg); \ } #elif LT_UART_SILENT_ALL -#define WRAP_PRINTF(name) \ - WRAP_DISABLE_DECL(name) \ - int __wrap_##name(const char *format, ...) { \ - return 0; \ +#define WRAP_PRINTF(name) \ + WRAP_DISABLE_DECL(name) \ + int __wrap_##name(const char *format, ...) { \ + return 0; \ } -#define WRAP_VPRINTF(name) \ - WRAP_DISABLE_DECL(name) \ - int __wrap_##name(const char *format, va_list arg) { \ - return 0; \ +#define WRAP_VPRINTF(name) \ + WRAP_DISABLE_DECL(name) \ + int __wrap_##name(const char *format, va_list arg) { \ + return 0; \ } #else // !LT_UART_SILENT_ENABLED || !LT_UART_SILENT_ALL -#define WRAP_PRINTF(name) \ - WRAP_DISABLE_DECL(name) \ - int __wrap_##name(const char *format, ...) { \ - WRAP_DISABLE_CHECK(name); \ - va_list va; \ - va_start(va, format); \ - const int ret = vprintf(format, va); \ - va_end(va); \ - return ret; \ +#define WRAP_PRINTF(name) \ + WRAP_DISABLE_DECL(name) \ + int __wrap_##name(const char *format, ...) { \ + WRAP_DISABLE_CHECK(name); \ + va_list va; \ + va_start(va, format); \ + const int ret = vprintf(format, va); \ + va_end(va); \ + return ret; \ } -#define WRAP_VPRINTF(name) \ - WRAP_DISABLE_DECL(name) \ - int __wrap_##name(const char *format, va_list arg) { \ - WRAP_DISABLE_CHECK(name); \ - return vprintf(format, arg); \ +#define WRAP_VPRINTF(name) \ + WRAP_DISABLE_DECL(name) \ + int __wrap_##name(const char *format, va_list arg) { \ + WRAP_DISABLE_CHECK(name); \ + return vprintf(format, arg); \ } #endif // !LT_UART_SILENT_ENABLED || !LT_UART_SILENT_ALL -#define WRAP_SPRINTF(name) \ - int __wrap_##name(char *s, const char *format, ...) { \ - va_list va; \ - va_start(va, format); \ - const int ret = vsprintf(s, format, va); \ - va_end(va); \ - return ret; \ +#define WRAP_SPRINTF(name) \ + int __wrap_##name(char *s, const char *format, ...) { \ + va_list va; \ + va_start(va, format); \ + const int ret = vsprintf(s, format, va); \ + va_end(va); \ + return ret; \ } -#define WRAP_SNPRINTF(name) \ - int __wrap_##name(char *s, size_t count, const char *format, ...) { \ - va_list va; \ - va_start(va, format); \ - const int ret = vsnprintf(s, count, format, va); \ - va_end(va); \ - return ret; \ +#define WRAP_SNPRINTF(name) \ + int __wrap_##name(char *s, size_t count, const char *format, ...) { \ + va_list va; \ + va_start(va, format); \ + const int ret = vsnprintf(s, count, format, va); \ + va_end(va); \ + return ret; \ } -#define WRAP_VSPRINTF(name) \ - int __wrap_##name(char *s, const char *format, va_list arg) { \ - return vsprintf(s, format, arg); \ +#define WRAP_VSPRINTF(name) \ + int __wrap_##name(char *s, const char *format, va_list arg) { \ + return vsprintf(s, format, arg); \ } -#define WRAP_VSNPRINTF(name) \ - int __wrap_##name(char *s, size_t count, const char *format, va_list arg) { \ - return vsnprintf(s, count, format, arg); \ +#define WRAP_VSNPRINTF(name) \ + int __wrap_##name(char *s, size_t count, const char *format, va_list arg) { \ + return vsnprintf(s, count, format, arg); \ } #ifdef __cplusplus diff --git a/cores/common/base/libretiny.h b/cores/common/base/libretiny.h index 1d394e9..bb3c5fe 100644 --- a/cores/common/base/libretiny.h +++ b/cores/common/base/libretiny.h @@ -25,10 +25,10 @@ #define STRINGIFY_MACRO(x) STRINGIFY(x) #define LT_VERSION_STR STRINGIFY_MACRO(LT_VERSION) #define LT_BOARD_STR STRINGIFY_MACRO(LT_BOARD) -#define GCC_VERSION_STR \ +#define GCC_VERSION_STR \ STRINGIFY_MACRO(__GNUC__) "." STRINGIFY_MACRO(__GNUC_MINOR__) "." STRINGIFY_MACRO(__GNUC_PATCHLEVEL__) -#define LT_BANNER_STR \ - "LibreTiny v" LT_VERSION_STR " on " LT_BOARD_STR ", compiled at " __DATE__ " " __TIME__ ", GCC " GCC_VERSION_STR \ +#define LT_BANNER_STR \ + "LibreTiny v" LT_VERSION_STR " on " LT_BOARD_STR ", compiled at " __DATE__ " " __TIME__ ", GCC " GCC_VERSION_STR \ " (-O" STRINGIFY_MACRO(__OPTIMIZE_LEVEL__) ")" // Functional macros diff --git a/cores/common/base/lt_logger.h b/cores/common/base/lt_logger.h index df8754c..9b28d2e 100644 --- a/cores/common/base/lt_logger.h +++ b/cores/common/base/lt_logger.h @@ -10,21 +10,21 @@ extern "C" { #if LT_LOGGER_CALLER #define LT_LOG(level, caller, line, ...) lt_log(level, caller, line, __VA_ARGS__) -#define LT_LOGM(level, module, caller, line, ...) \ - do { \ - if (LT_DEBUG_##module) { \ - lt_log(level, caller, line, #module ": " __VA_ARGS__); \ - } \ +#define LT_LOGM(level, module, caller, line, ...) \ + do { \ + if (LT_DEBUG_##module) { \ + lt_log(level, caller, line, #module ": " __VA_ARGS__); \ + } \ } while (0) void lt_log(const uint8_t level, const char *caller, const unsigned short line, const char *format, ...) __attribute__((format(printf, 4, 5))); #else #define LT_LOG(level, caller, line, ...) lt_log(level, __VA_ARGS__) -#define LT_LOGM(level, module, caller, line, ...) \ - do { \ - if (LT_DEBUG_##module) { \ - lt_log(level, #module ": " __VA_ARGS__); \ - } \ +#define LT_LOGM(level, module, caller, line, ...) \ + do { \ + if (LT_DEBUG_##module) { \ + lt_log(level, #module ": " __VA_ARGS__); \ + } \ } while (0) void lt_log(const uint8_t level, const char *format, ...) __attribute__((format(printf, 2, 3))); #endif @@ -126,47 +126,47 @@ void lt_log_disable(); #define ets_printf(...) LT_I(__VA_ARGS__) #define ETS_PRINTF(...) LT_I(__VA_ARGS__) -#define LT_RET(ret) \ - LT_E("ret=%d", ret); \ +#define LT_RET(ret) \ + LT_E("ret=%d", ret); \ return ret; -#define LT_RET_NZ(ret) \ - if (ret) { \ - LT_E("ret=%d", ret); \ - return ret; \ +#define LT_RET_NZ(ret) \ + if (ret) { \ + LT_E("ret=%d", ret); \ + return ret; \ } -#define LT_RET_LZ(ret) \ - if (ret < 0) { \ - LT_E("ret=%d", ret); \ - return ret; \ +#define LT_RET_LZ(ret) \ + if (ret < 0) { \ + LT_E("ret=%d", ret); \ + return ret; \ } -#define LT_RET_LEZ(ret) \ - if (ret <= 0) { \ - LT_E("ret=%d", ret); \ - return ret; \ +#define LT_RET_LEZ(ret) \ + if (ret <= 0) { \ + LT_E("ret=%d", ret); \ + return ret; \ } -#define LT_ERRNO_NZ(ret) \ - if (ret) { \ - LT_E("errno=%d, ret=%d", errno, ret); \ - return ret; \ +#define LT_ERRNO_NZ(ret) \ + if (ret) { \ + LT_E("errno=%d, ret=%d", errno, ret); \ + return ret; \ } -#define LT_ERRNO_LZ(ret) \ - if (ret < 0) { \ - LT_E("errno=%d, ret=%d", errno, ret); \ - return ret; \ +#define LT_ERRNO_LZ(ret) \ + if (ret < 0) { \ + LT_E("errno=%d, ret=%d", errno, ret); \ + return ret; \ } -#define LT_ERRNO_LEZ(ret) \ - if (ret <= 0) { \ - LT_E("errno=%d, ret=%d", errno, ret); \ - return ret; \ +#define LT_ERRNO_LEZ(ret) \ + if (ret <= 0) { \ + LT_E("errno=%d, ret=%d", errno, ret); \ + return ret; \ } #if LT_LOG_ERRNO -#define LT_ERRNO() \ - if (errno) { \ - LT_E("errno=%d", errno); \ - errno = 0; \ +#define LT_ERRNO() \ + if (errno) { \ + LT_E("errno=%d", errno); \ + errno = 0; \ } #else #define LT_ERRNO() diff --git a/cores/realtek-amb/arduino/libraries/WiFi/WiFiPrivate.h b/cores/realtek-amb/arduino/libraries/WiFi/WiFiPrivate.h index 99745a2..02c9811 100644 --- a/cores/realtek-amb/arduino/libraries/WiFi/WiFiPrivate.h +++ b/cores/realtek-amb/arduino/libraries/WiFi/WiFiPrivate.h @@ -69,27 +69,27 @@ typedef struct { #define cDATA ((WiFiData *)cls->data) #if LT_RTL8710B // Realtek AmebaZ -#define DIAG_PRINTF_ENABLE() \ - do { \ - __wrap_rtl_printf_enable(); \ - __wrap_DiagPrintf_enable(); \ +#define DIAG_PRINTF_ENABLE() \ + do { \ + __wrap_rtl_printf_enable(); \ + __wrap_DiagPrintf_enable(); \ } while (0); -#define DIAG_PRINTF_DISABLE() \ - do { \ - __wrap_rtl_printf_disable(); \ - __wrap_DiagPrintf_disable(); \ +#define DIAG_PRINTF_DISABLE() \ + do { \ + __wrap_rtl_printf_disable(); \ + __wrap_DiagPrintf_disable(); \ } while (0); #elif LT_RTL8720C // Realtek AmebaZ2 -#define DIAG_PRINTF_ENABLE() \ - do { \ - __wrap_rt_printf_enable(); \ - __wrap_rt_log_printf_enable(); \ +#define DIAG_PRINTF_ENABLE() \ + do { \ + __wrap_rt_printf_enable(); \ + __wrap_rt_log_printf_enable(); \ } while (0); -#define DIAG_PRINTF_DISABLE() \ - do { \ - __wrap_rt_printf_disable(); \ - __wrap_rt_log_printf_disable(); \ +#define DIAG_PRINTF_DISABLE() \ + do { \ + __wrap_rt_printf_disable(); \ + __wrap_rt_log_printf_disable(); \ } while (0); #else