mirror of
https://github.com/DarkFlippers/unleashed-firmware
synced 2024-11-26 14:30:25 +00:00
fbt: bumped c&cpp standard versions
This commit is contained in:
parent
02a827da38
commit
71e763d9b3
13 changed files with 36 additions and 24 deletions
|
@ -495,7 +495,8 @@ static bool subghz_device_cc1101_ext_stop_debug() {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void subghz_device_cc1101_ext_capture_ISR() {
|
static void subghz_device_cc1101_ext_capture_ISR(void* context) {
|
||||||
|
UNUSED(context);
|
||||||
if(!furi_hal_gpio_read(subghz_device_cc1101_ext->g0_pin)) {
|
if(!furi_hal_gpio_read(subghz_device_cc1101_ext->g0_pin)) {
|
||||||
if(subghz_device_cc1101_ext->async_rx.capture_callback) {
|
if(subghz_device_cc1101_ext->async_rx.capture_callback) {
|
||||||
if(subghz_device_cc1101_ext->async_mirror_pin != NULL)
|
if(subghz_device_cc1101_ext->async_mirror_pin != NULL)
|
||||||
|
@ -674,7 +675,8 @@ static void subghz_device_cc1101_ext_async_tx_refill(uint32_t* buffer, size_t sa
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void subghz_device_cc1101_ext_async_tx_dma_isr() {
|
static void subghz_device_cc1101_ext_async_tx_dma_isr(void* context) {
|
||||||
|
UNUSED(context);
|
||||||
furi_assert(subghz_device_cc1101_ext->state == SubGhzDeviceCC1101ExtStateAsyncTx);
|
furi_assert(subghz_device_cc1101_ext->state == SubGhzDeviceCC1101ExtStateAsyncTx);
|
||||||
|
|
||||||
#if SUBGHZ_DEVICE_CC1101_EXT_DMA_CH3_CHANNEL == LL_DMA_CHANNEL_3
|
#if SUBGHZ_DEVICE_CC1101_EXT_DMA_CH3_CHANNEL == LL_DMA_CHANNEL_3
|
||||||
|
|
|
@ -18,8 +18,8 @@ constexpr HashtableApiInterface applicaton_hashtable_api_interface{
|
||||||
.resolver_callback = &elf_resolve_from_hashtable,
|
.resolver_callback = &elf_resolve_from_hashtable,
|
||||||
},
|
},
|
||||||
/* pointers to application's API table boundaries */
|
/* pointers to application's API table boundaries */
|
||||||
.table_cbegin = app_api_table.cbegin(),
|
app_api_table.cbegin(),
|
||||||
.table_cend = app_api_table.cend(),
|
app_api_table.cend(),
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Casting to generic resolver to use in Composite API resolver */
|
/* Casting to generic resolver to use in Composite API resolver */
|
||||||
|
|
|
@ -18,8 +18,8 @@ constexpr HashtableApiInterface nfc_application_hashtable_api_interface{
|
||||||
.resolver_callback = &elf_resolve_from_hashtable,
|
.resolver_callback = &elf_resolve_from_hashtable,
|
||||||
},
|
},
|
||||||
/* pointers to application's API table boundaries */
|
/* pointers to application's API table boundaries */
|
||||||
.table_cbegin = nfc_app_api_table.cbegin(),
|
nfc_app_api_table.cbegin(),
|
||||||
.table_cend = nfc_app_api_table.cend(),
|
nfc_app_api_table.cend(),
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Casting to generic resolver to use in Composite API resolver */
|
/* Casting to generic resolver to use in Composite API resolver */
|
||||||
|
|
|
@ -17,8 +17,8 @@ constexpr HashtableApiInterface mock_elf_api_interface{
|
||||||
.api_version_minor = 0,
|
.api_version_minor = 0,
|
||||||
.resolver_callback = &elf_resolve_from_hashtable,
|
.resolver_callback = &elf_resolve_from_hashtable,
|
||||||
},
|
},
|
||||||
.table_cbegin = nullptr,
|
nullptr,
|
||||||
.table_cend = nullptr,
|
nullptr,
|
||||||
};
|
};
|
||||||
|
|
||||||
const ElfApiInterface* const firmware_api_interface = &mock_elf_api_interface;
|
const ElfApiInterface* const firmware_api_interface = &mock_elf_api_interface;
|
||||||
|
@ -29,8 +29,8 @@ constexpr HashtableApiInterface elf_api_interface{
|
||||||
.api_version_minor = (elf_api_version & 0xFFFF),
|
.api_version_minor = (elf_api_version & 0xFFFF),
|
||||||
.resolver_callback = &elf_resolve_from_hashtable,
|
.resolver_callback = &elf_resolve_from_hashtable,
|
||||||
},
|
},
|
||||||
.table_cbegin = elf_api_table.cbegin(),
|
elf_api_table.cbegin(),
|
||||||
.table_cend = elf_api_table.cend(),
|
elf_api_table.cend(),
|
||||||
};
|
};
|
||||||
const ElfApiInterface* const firmware_api_interface = &elf_api_interface;
|
const ElfApiInterface* const firmware_api_interface = &elf_api_interface;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -18,8 +18,8 @@ constexpr HashtableApiInterface applicaton_hashtable_api_interface{
|
||||||
.resolver_callback = &elf_resolve_from_hashtable,
|
.resolver_callback = &elf_resolve_from_hashtable,
|
||||||
},
|
},
|
||||||
/* pointers to application's API table boundaries */
|
/* pointers to application's API table boundaries */
|
||||||
.table_cbegin = app_api_table.cbegin(),
|
app_api_table.cbegin(),
|
||||||
.table_cend = app_api_table.cend(),
|
app_api_table.cend(),
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Casting to generic resolver to use in Composite API resolver */
|
/* Casting to generic resolver to use in Composite API resolver */
|
||||||
|
|
|
@ -3,10 +3,10 @@ Import("ENV")
|
||||||
|
|
||||||
ENV.AppendUnique(
|
ENV.AppendUnique(
|
||||||
CFLAGS=[
|
CFLAGS=[
|
||||||
"-std=gnu17",
|
"-std=gnu2x",
|
||||||
],
|
],
|
||||||
CXXFLAGS=[
|
CXXFLAGS=[
|
||||||
"-std=c++17",
|
"-std=c++20",
|
||||||
"-fno-rtti",
|
"-fno-rtti",
|
||||||
"-fno-use-cxa-atexit",
|
"-fno-use-cxa-atexit",
|
||||||
"-fno-exceptions",
|
"-fno-exceptions",
|
||||||
|
|
|
@ -25,7 +25,8 @@ typedef struct {
|
||||||
|
|
||||||
FuriHalIbutton* furi_hal_ibutton = NULL;
|
FuriHalIbutton* furi_hal_ibutton = NULL;
|
||||||
|
|
||||||
static void furi_hal_ibutton_emulate_isr() {
|
static void furi_hal_ibutton_emulate_isr(void* context) {
|
||||||
|
UNUSED(context);
|
||||||
if(LL_TIM_IsActiveFlag_UPDATE(FURI_HAL_IBUTTON_TIMER)) {
|
if(LL_TIM_IsActiveFlag_UPDATE(FURI_HAL_IBUTTON_TIMER)) {
|
||||||
LL_TIM_ClearFlag_UPDATE(FURI_HAL_IBUTTON_TIMER);
|
LL_TIM_ClearFlag_UPDATE(FURI_HAL_IBUTTON_TIMER);
|
||||||
furi_hal_ibutton->callback(furi_hal_ibutton->context);
|
furi_hal_ibutton->callback(furi_hal_ibutton->context);
|
||||||
|
|
|
@ -94,7 +94,9 @@ static uint8_t furi_hal_infrared_get_current_dma_tx_buffer(void);
|
||||||
static void furi_hal_infrared_tx_dma_polarity_isr();
|
static void furi_hal_infrared_tx_dma_polarity_isr();
|
||||||
static void furi_hal_infrared_tx_dma_isr();
|
static void furi_hal_infrared_tx_dma_isr();
|
||||||
|
|
||||||
static void furi_hal_infrared_tim_rx_isr() {
|
static void furi_hal_infrared_tim_rx_isr(void* context) {
|
||||||
|
UNUSED(context);
|
||||||
|
|
||||||
static uint32_t previous_captured_ch2 = 0;
|
static uint32_t previous_captured_ch2 = 0;
|
||||||
|
|
||||||
/* Timeout */
|
/* Timeout */
|
||||||
|
@ -259,7 +261,8 @@ static uint8_t furi_hal_infrared_get_current_dma_tx_buffer(void) {
|
||||||
return buf_num;
|
return buf_num;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void furi_hal_infrared_tx_dma_polarity_isr() {
|
static void furi_hal_infrared_tx_dma_polarity_isr(void* context) {
|
||||||
|
UNUSED(context);
|
||||||
#if INFRARED_DMA_CH1_CHANNEL == LL_DMA_CHANNEL_1
|
#if INFRARED_DMA_CH1_CHANNEL == LL_DMA_CHANNEL_1
|
||||||
if(LL_DMA_IsActiveFlag_TE1(INFRARED_DMA)) {
|
if(LL_DMA_IsActiveFlag_TE1(INFRARED_DMA)) {
|
||||||
LL_DMA_ClearFlag_TE1(INFRARED_DMA);
|
LL_DMA_ClearFlag_TE1(INFRARED_DMA);
|
||||||
|
@ -281,7 +284,8 @@ static void furi_hal_infrared_tx_dma_polarity_isr() {
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static void furi_hal_infrared_tx_dma_isr() {
|
static void furi_hal_infrared_tx_dma_isr(void* context) {
|
||||||
|
UNUSED(context);
|
||||||
#if INFRARED_DMA_CH2_CHANNEL == LL_DMA_CHANNEL_2
|
#if INFRARED_DMA_CH2_CHANNEL == LL_DMA_CHANNEL_2
|
||||||
if(LL_DMA_IsActiveFlag_TE2(INFRARED_DMA)) {
|
if(LL_DMA_IsActiveFlag_TE2(INFRARED_DMA)) {
|
||||||
LL_DMA_ClearFlag_TE2(INFRARED_DMA);
|
LL_DMA_ClearFlag_TE2(INFRARED_DMA);
|
||||||
|
|
|
@ -3,7 +3,8 @@
|
||||||
#include <lib/drivers/st25r3916.h>
|
#include <lib/drivers/st25r3916.h>
|
||||||
#include <furi_hal_resources.h>
|
#include <furi_hal_resources.h>
|
||||||
|
|
||||||
static void furi_hal_nfc_int_callback() {
|
static void furi_hal_nfc_int_callback(void* context) {
|
||||||
|
UNUSED(context);
|
||||||
furi_hal_nfc_event_set(FuriHalNfcEventInternalTypeIrq);
|
furi_hal_nfc_event_set(FuriHalNfcEventInternalTypeIrq);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -315,7 +315,8 @@ void furi_hal_rfid_tim_read_capture_stop() {
|
||||||
furi_hal_bus_disable(RFID_CAPTURE_TIM_BUS);
|
furi_hal_bus_disable(RFID_CAPTURE_TIM_BUS);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void furi_hal_rfid_dma_isr() {
|
static void furi_hal_rfid_dma_isr(void* context) {
|
||||||
|
UNUSED(context);
|
||||||
#if RFID_DMA_CH1_CHANNEL == LL_DMA_CHANNEL_1
|
#if RFID_DMA_CH1_CHANNEL == LL_DMA_CHANNEL_1
|
||||||
if(LL_DMA_IsActiveFlag_HT1(RFID_DMA)) {
|
if(LL_DMA_IsActiveFlag_HT1(RFID_DMA)) {
|
||||||
LL_DMA_ClearFlag_HT1(RFID_DMA);
|
LL_DMA_ClearFlag_HT1(RFID_DMA);
|
||||||
|
|
|
@ -169,7 +169,8 @@ bool furi_hal_spi_bus_trx(
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void spi_dma_isr() {
|
static void spi_dma_isr(void* context) {
|
||||||
|
UNUSED(context);
|
||||||
#if SPI_DMA_RX_CHANNEL == LL_DMA_CHANNEL_6
|
#if SPI_DMA_RX_CHANNEL == LL_DMA_CHANNEL_6
|
||||||
if(LL_DMA_IsActiveFlag_TC6(SPI_DMA) && LL_DMA_IsEnabledIT_TC(SPI_DMA_RX_DEF)) {
|
if(LL_DMA_IsActiveFlag_TC6(SPI_DMA) && LL_DMA_IsEnabledIT_TC(SPI_DMA_RX_DEF)) {
|
||||||
LL_DMA_ClearFlag_TC6(SPI_DMA);
|
LL_DMA_ClearFlag_TC6(SPI_DMA);
|
||||||
|
|
|
@ -413,7 +413,8 @@ volatile uint32_t furi_hal_subghz_capture_delta_duration = 0;
|
||||||
volatile FuriHalSubGhzCaptureCallback furi_hal_subghz_capture_callback = NULL;
|
volatile FuriHalSubGhzCaptureCallback furi_hal_subghz_capture_callback = NULL;
|
||||||
volatile void* furi_hal_subghz_capture_callback_context = NULL;
|
volatile void* furi_hal_subghz_capture_callback_context = NULL;
|
||||||
|
|
||||||
static void furi_hal_subghz_capture_ISR() {
|
static void furi_hal_subghz_capture_ISR(void* context) {
|
||||||
|
UNUSED(context);
|
||||||
// Channel 1
|
// Channel 1
|
||||||
if(LL_TIM_IsActiveFlag_CC1(TIM2)) {
|
if(LL_TIM_IsActiveFlag_CC1(TIM2)) {
|
||||||
LL_TIM_ClearFlag_CC1(TIM2);
|
LL_TIM_ClearFlag_CC1(TIM2);
|
||||||
|
@ -647,7 +648,8 @@ static void furi_hal_subghz_async_tx_refill(uint32_t* buffer, size_t samples) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void furi_hal_subghz_async_tx_dma_isr() {
|
static void furi_hal_subghz_async_tx_dma_isr(void* context) {
|
||||||
|
UNUSED(context);
|
||||||
furi_assert(furi_hal_subghz.state == SubGhzStateAsyncTx);
|
furi_assert(furi_hal_subghz.state == SubGhzStateAsyncTx);
|
||||||
|
|
||||||
#if SUBGHZ_DMA_CH1_CHANNEL == LL_DMA_CHANNEL_1
|
#if SUBGHZ_DMA_CH1_CHANNEL == LL_DMA_CHANNEL_1
|
||||||
|
|
|
@ -18,7 +18,7 @@ static FATFS* pfs = NULL;
|
||||||
#define CHECK_FRESULT(result) \
|
#define CHECK_FRESULT(result) \
|
||||||
{ \
|
{ \
|
||||||
if((result) != FR_OK) { \
|
if((result) != FR_OK) { \
|
||||||
return false; \
|
return 0; \
|
||||||
} \
|
} \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue