Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hedger/toochain_29' of https://github.com/flipperdevices/flipperzero-firmware into xfw-dev

Browse Source
This commit is contained in:
Willy-JL
2024-02-21 03:00:41 +00:00
parent f3bdcadf8e bc98c788fe
commit 92fb61f585
22 changed files with 76 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
targets/f7/furi_hal/furi_hal_ibutton.c
View File

@@ -25,7 +25,8 @@ typedef struct {
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)) {
LL_TIM_ClearFlag_UPDATE(FURI_HAL_IBUTTON_TIMER);
furi_hal_ibutton->callback(furi_hal_ibutton->context);

10
targets/f7/furi_hal/furi_hal_infrared.c
View File

@@ -99,7 +99,9 @@ bool furi_hal_infrared_get_debug_out_status(void) {
return infrared_external_output;
}
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;
/* Timeout */
@@ -264,7 +266,8 @@ static uint8_t furi_hal_infrared_get_current_dma_tx_buffer(void) {
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(LL_DMA_IsActiveFlag_TE1(INFRARED_DMA)) {
LL_DMA_ClearFlag_TE1(INFRARED_DMA);
@@ -286,7 +289,8 @@ static void furi_hal_infrared_tx_dma_polarity_isr() {
#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(LL_DMA_IsActiveFlag_TE2(INFRARED_DMA)) {
LL_DMA_ClearFlag_TE2(INFRARED_DMA);

3
targets/f7/furi_hal/furi_hal_nfc_irq.c
View File

@@ -3,7 +3,8 @@
#include <lib/drivers/st25r3916.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);
}

3
targets/f7/furi_hal/furi_hal_rfid.c
View File

@@ -315,7 +315,8 @@ void furi_hal_rfid_tim_read_capture_stop() {
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(LL_DMA_IsActiveFlag_HT1(RFID_DMA)) {
LL_DMA_ClearFlag_HT1(RFID_DMA);

3
targets/f7/furi_hal/furi_hal_spi.c
View File

@@ -169,7 +169,8 @@ bool furi_hal_spi_bus_trx(
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(LL_DMA_IsActiveFlag_TC6(SPI_DMA) && LL_DMA_IsEnabledIT_TC(SPI_DMA_RX_DEF)) {
LL_DMA_ClearFlag_TC6(SPI_DMA);

6
targets/f7/furi_hal/furi_hal_subghz.c
View File

@@ -466,7 +466,8 @@ volatile uint32_t furi_hal_subghz_capture_delta_duration = 0;
volatile FuriHalSubGhzCaptureCallback furi_hal_subghz_capture_callback = 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
if(LL_TIM_IsActiveFlag_CC1(TIM2)) {
LL_TIM_ClearFlag_CC1(TIM2);
@@ -701,7 +702,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);
#if SUBGHZ_DMA_CH1_CHANNEL == LL_DMA_CHANNEL_1