mirror of
https://github.com/flipperdevices/flipperzero-firmware.git
synced 2025-12-12 04:41:26 +04:00
[FL-3867] Code formatting update (#3765)
* clang-format: AllowShortEnumsOnASingleLine: false * clang-format: InsertNewlineAtEOF: true * clang-format: Standard: c++20 * clang-format: AlignConsecutiveBitFields * clang-format: AlignConsecutiveMacros * clang-format: RemoveParentheses: ReturnStatement * clang-format: RemoveSemicolon: true * Restored RemoveParentheses: Leave, retained general changes for it * formatting: fixed logging TAGs * Formatting update for dev Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
@@ -22,7 +22,7 @@ extern "C" {
|
||||
|
||||
// Flags instead of pointers will save ~4 bytes on furi_assert and furi_check calls.
|
||||
#define __FURI_ASSERT_MESSAGE_FLAG (0x01)
|
||||
#define __FURI_CHECK_MESSAGE_FLAG (0x02)
|
||||
#define __FURI_CHECK_MESSAGE_FLAG (0x02)
|
||||
|
||||
/** Crash system */
|
||||
FURI_NORETURN void __furi_crash_implementation(void);
|
||||
|
||||
@@ -79,7 +79,7 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
#ifndef CONCATENATE
|
||||
#define CONCATENATE(a, b) CONCATENATE_(a, b)
|
||||
#define CONCATENATE(a, b) CONCATENATE_(a, b)
|
||||
#define CONCATENATE_(a, b) a##b
|
||||
#endif
|
||||
|
||||
|
||||
@@ -29,4 +29,4 @@ void __furi_critical_exit(__FuriCriticalInfo info) {
|
||||
} else {
|
||||
__enable_irq();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include <event_groups.h>
|
||||
|
||||
#define FURI_EVENT_FLAG_MAX_BITS_EVENT_GROUPS 24U
|
||||
#define FURI_EVENT_FLAG_INVALID_BITS (~((1UL << FURI_EVENT_FLAG_MAX_BITS_EVENT_GROUPS) - 1U))
|
||||
#define FURI_EVENT_FLAG_INVALID_BITS (~((1UL << FURI_EVENT_FLAG_MAX_BITS_EVENT_GROUPS) - 1U))
|
||||
|
||||
struct FuriEventFlag {
|
||||
StaticEventGroup_t container;
|
||||
|
||||
@@ -29,7 +29,7 @@ bool furi_kernel_is_irq_or_masked(void) {
|
||||
}
|
||||
|
||||
/* Return context, 0: thread context, 1: IRQ context */
|
||||
return (irq);
|
||||
return irq;
|
||||
}
|
||||
|
||||
bool furi_kernel_is_running(void) {
|
||||
@@ -58,7 +58,7 @@ int32_t furi_kernel_lock(void) {
|
||||
}
|
||||
|
||||
/* Return previous lock state */
|
||||
return (lock);
|
||||
return lock;
|
||||
}
|
||||
|
||||
int32_t furi_kernel_unlock(void) {
|
||||
@@ -88,7 +88,7 @@ int32_t furi_kernel_unlock(void) {
|
||||
}
|
||||
|
||||
/* Return previous lock state */
|
||||
return (lock);
|
||||
return lock;
|
||||
}
|
||||
|
||||
int32_t furi_kernel_restore_lock(int32_t lock) {
|
||||
@@ -119,12 +119,12 @@ int32_t furi_kernel_restore_lock(int32_t lock) {
|
||||
}
|
||||
|
||||
/* Return new lock state */
|
||||
return (lock);
|
||||
return lock;
|
||||
}
|
||||
|
||||
uint32_t furi_kernel_get_tick_frequency(void) {
|
||||
/* Return frequency in hertz */
|
||||
return (configTICK_RATE_HZ_RAW);
|
||||
return configTICK_RATE_HZ_RAW;
|
||||
}
|
||||
|
||||
void furi_delay_tick(uint32_t ticks) {
|
||||
@@ -160,7 +160,7 @@ FuriStatus furi_delay_until_tick(uint32_t tick) {
|
||||
}
|
||||
|
||||
/* Return execution status */
|
||||
return (stat);
|
||||
return stat;
|
||||
}
|
||||
|
||||
uint32_t furi_get_tick(void) {
|
||||
|
||||
@@ -23,14 +23,14 @@ typedef enum {
|
||||
FuriLogLevelTrace = 6,
|
||||
} FuriLogLevel;
|
||||
|
||||
#define _FURI_LOG_CLR(clr) "\033[0;" clr "m"
|
||||
#define _FURI_LOG_CLR(clr) "\033[0;" clr "m"
|
||||
#define _FURI_LOG_CLR_RESET "\033[0m"
|
||||
|
||||
#define _FURI_LOG_CLR_BLACK "30"
|
||||
#define _FURI_LOG_CLR_RED "31"
|
||||
#define _FURI_LOG_CLR_GREEN "32"
|
||||
#define _FURI_LOG_CLR_BROWN "33"
|
||||
#define _FURI_LOG_CLR_BLUE "34"
|
||||
#define _FURI_LOG_CLR_BLACK "30"
|
||||
#define _FURI_LOG_CLR_RED "31"
|
||||
#define _FURI_LOG_CLR_GREEN "32"
|
||||
#define _FURI_LOG_CLR_BROWN "33"
|
||||
#define _FURI_LOG_CLR_BLUE "34"
|
||||
#define _FURI_LOG_CLR_PURPLE "35"
|
||||
|
||||
#define _FURI_LOG_CLR_E _FURI_LOG_CLR(_FURI_LOG_CLR_RED)
|
||||
|
||||
@@ -107,4 +107,4 @@ void* aligned_malloc(size_t size, size_t alignment) {
|
||||
|
||||
void aligned_free(void* p) {
|
||||
free(((void**)p)[-1]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -528,7 +528,7 @@ void vPortFree(void* pv) {
|
||||
xFreeBytesRemaining += pxLink->xBlockSize;
|
||||
traceFREE(pv, pxLink->xBlockSize);
|
||||
memset(pv, 0, pxLink->xBlockSize - xHeapStructSize);
|
||||
prvInsertBlockIntoFreeList(((BlockLink_t*)pxLink));
|
||||
prvInsertBlockIntoFreeList((BlockLink_t*)pxLink);
|
||||
}
|
||||
(void)xTaskResumeAll();
|
||||
} else {
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
|
||||
// Internal FreeRTOS member names
|
||||
#define uxMessagesWaiting uxDummy4[0]
|
||||
#define uxLength uxDummy4[1]
|
||||
#define uxItemSize uxDummy4[2]
|
||||
#define uxLength uxDummy4[1]
|
||||
#define uxItemSize uxDummy4[2]
|
||||
|
||||
struct FuriMessageQueue {
|
||||
StaticQueue_t container;
|
||||
|
||||
@@ -29,20 +29,20 @@ FuriStreamBuffer* furi_stream_buffer_alloc(size_t size, size_t trigger_level) {
|
||||
furi_check(hStreamBuffer == (StreamBufferHandle_t)stream_buffer);
|
||||
|
||||
return stream_buffer;
|
||||
};
|
||||
}
|
||||
|
||||
void furi_stream_buffer_free(FuriStreamBuffer* stream_buffer) {
|
||||
furi_check(stream_buffer);
|
||||
|
||||
vStreamBufferDelete((StreamBufferHandle_t)stream_buffer);
|
||||
free(stream_buffer);
|
||||
};
|
||||
}
|
||||
|
||||
bool furi_stream_set_trigger_level(FuriStreamBuffer* stream_buffer, size_t trigger_level) {
|
||||
furi_check(stream_buffer);
|
||||
return xStreamBufferSetTriggerLevel((StreamBufferHandle_t)stream_buffer, trigger_level) ==
|
||||
pdTRUE;
|
||||
};
|
||||
}
|
||||
|
||||
size_t furi_stream_buffer_send(
|
||||
FuriStreamBuffer* stream_buffer,
|
||||
@@ -62,7 +62,7 @@ size_t furi_stream_buffer_send(
|
||||
}
|
||||
|
||||
return ret;
|
||||
};
|
||||
}
|
||||
|
||||
size_t furi_stream_buffer_receive(
|
||||
FuriStreamBuffer* stream_buffer,
|
||||
@@ -89,25 +89,25 @@ size_t furi_stream_buffer_bytes_available(FuriStreamBuffer* stream_buffer) {
|
||||
furi_check(stream_buffer);
|
||||
|
||||
return xStreamBufferBytesAvailable((StreamBufferHandle_t)stream_buffer);
|
||||
};
|
||||
}
|
||||
|
||||
size_t furi_stream_buffer_spaces_available(FuriStreamBuffer* stream_buffer) {
|
||||
furi_check(stream_buffer);
|
||||
|
||||
return xStreamBufferSpacesAvailable((StreamBufferHandle_t)stream_buffer);
|
||||
};
|
||||
}
|
||||
|
||||
bool furi_stream_buffer_is_full(FuriStreamBuffer* stream_buffer) {
|
||||
furi_check(stream_buffer);
|
||||
|
||||
return xStreamBufferIsFull((StreamBufferHandle_t)stream_buffer) == pdTRUE;
|
||||
};
|
||||
}
|
||||
|
||||
bool furi_stream_buffer_is_empty(FuriStreamBuffer* stream_buffer) {
|
||||
furi_check(stream_buffer);
|
||||
|
||||
return (xStreamBufferIsEmpty((StreamBufferHandle_t)stream_buffer) == pdTRUE);
|
||||
};
|
||||
return xStreamBufferIsEmpty((StreamBufferHandle_t)stream_buffer) == pdTRUE;
|
||||
}
|
||||
|
||||
FuriStatus furi_stream_buffer_reset(FuriStreamBuffer* stream_buffer) {
|
||||
furi_check(stream_buffer);
|
||||
|
||||
@@ -426,11 +426,11 @@ void furi_thread_yield(void) {
|
||||
}
|
||||
|
||||
/* Limits */
|
||||
#define MAX_BITS_TASK_NOTIFY 31U
|
||||
#define MAX_BITS_TASK_NOTIFY 31U
|
||||
#define MAX_BITS_EVENT_GROUPS 24U
|
||||
|
||||
#define THREAD_FLAGS_INVALID_BITS (~((1UL << MAX_BITS_TASK_NOTIFY) - 1U))
|
||||
#define EVENT_FLAGS_INVALID_BITS (~((1UL << MAX_BITS_EVENT_GROUPS) - 1U))
|
||||
#define EVENT_FLAGS_INVALID_BITS (~((1UL << MAX_BITS_EVENT_GROUPS) - 1U))
|
||||
|
||||
uint32_t furi_thread_flags_set(FuriThreadId thread_id, uint32_t flags) {
|
||||
TaskHandle_t hTask = (TaskHandle_t)thread_id;
|
||||
|
||||
@@ -121,4 +121,4 @@ float furi_thread_list_get_isr_time(FuriThreadList* instance) {
|
||||
const uint32_t isr_counter = instance->isr_current - instance->isr_previous;
|
||||
|
||||
return (float)isr_counter / (float)runtime_counter;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user