liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Guard RCC registers access with critical section (#854)

Browse Source 
* Core: critical section macros. FuriHal: guard rcc registers access with critical section, fix condition race.
* FuriHal: update documentation.

Co-authored-by: SG <who.just.the.doctor@gmail.com>
This commit is contained in:
あく
2021-12-01 01:07:17 +03:00
committed by GitHub
parent 6f7d93fe72
commit 418c0939a0
14 changed files with 148 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
firmware/targets/f7/furi-hal/furi-hal-console.c
View File

@@ -25,42 +25,40 @@ void furi_hal_console_init() {
void furi_hal_console_enable() {
furi_hal_uart_set_irq_cb(FuriHalUartIdUSART1, NULL, NULL);
while(!LL_USART_IsActiveFlag_TC(USART1))
;
while (!LL_USART_IsActiveFlag_TC(USART1));
furi_hal_uart_set_br(FuriHalUartIdUSART1, CONSOLE_BAUDRATE);
furi_hal_console_alive = true;
}
void furi_hal_console_disable() {
while(!LL_USART_IsActiveFlag_TC(USART1))
;
while (!LL_USART_IsActiveFlag_TC(USART1));
furi_hal_console_alive = false;
}
void furi_hal_console_tx(const uint8_t* buffer, size_t buffer_size) {
if(!furi_hal_console_alive) return;
if (!furi_hal_console_alive)
return;
UTILS_ENTER_CRITICAL_SECTION();
FURI_CRITICAL_ENTER();
// Transmit data
furi_hal_uart_tx(FuriHalUartIdUSART1, (uint8_t*)buffer, buffer_size);
// Wait for TC flag to be raised for last char
while(!LL_USART_IsActiveFlag_TC(USART1))
;
UTILS_EXIT_CRITICAL_SECTION();
while (!LL_USART_IsActiveFlag_TC(USART1));
FURI_CRITICAL_EXIT();
}
void furi_hal_console_tx_with_new_line(const uint8_t* buffer, size_t buffer_size) {
if(!furi_hal_console_alive) return;
if (!furi_hal_console_alive)
return;
UTILS_ENTER_CRITICAL_SECTION();
FURI_CRITICAL_ENTER();
// Transmit data
furi_hal_uart_tx(FuriHalUartIdUSART1, (uint8_t*)buffer, buffer_size);
// Transmit new line symbols
furi_hal_uart_tx(FuriHalUartIdUSART1, (uint8_t*)"\r\n", 2);
// Wait for TC flag to be raised for last char
while(!LL_USART_IsActiveFlag_TC(USART1))
;
UTILS_EXIT_CRITICAL_SECTION();
while (!LL_USART_IsActiveFlag_TC(USART1));
FURI_CRITICAL_EXIT();
}
void furi_hal_console_printf(const char format[], ...) {
@@ -73,6 +71,6 @@ void furi_hal_console_printf(const char format[], ...) {
string_clear(string);
}
void furi_hal_console_puts(const char* data) {
void furi_hal_console_puts(const char *data) {
furi_hal_console_tx((const uint8_t*)data, strlen(data));
}