Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-14 22:08:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ofw-dev' into dev

Browse Source
This commit is contained in:
MX
2023-07-05 19:39:49 +03:00
parent f6d0b1d399 f3ae09cc16
commit ad33162d81
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/targets/f7/furi_hal/furi_hal_interrupt.c
View File

@@ -128,14 +128,13 @@ void furi_hal_interrupt_set_isr_ex(
FuriHalInterruptISR isr, FuriHalInterruptISR isr,
void* context) { void* context) {
furi_check(index < FuriHalInterruptIdMax); furi_check(index < FuriHalInterruptIdMax);
furi_check(priority < 15); furi_check(priority <= 15);
if(isr) { if(isr) {
// Pre ISR set // Pre ISR set
furi_check(furi_hal_interrupt_isr[index].isr == NULL); furi_check(furi_hal_interrupt_isr[index].isr == NULL);
} else { } else {
// Pre ISR clear // Pre ISR clear
furi_check(furi_hal_interrupt_isr[index].isr != NULL);
furi_hal_interrupt_disable(index); furi_hal_interrupt_disable(index);
furi_hal_interrupt_clear_pending(index); furi_hal_interrupt_clear_pending(index);
} }

2
furi/core/check.c
View File

@@ -36,7 +36,7 @@ PLACE_IN_SECTION("MB_MEM2") uint32_t __furi_check_registers[13] = {0};
* *
*/ */
#define RESTORE_REGISTERS_AND_HALT_MCU(debug) \ #define RESTORE_REGISTERS_AND_HALT_MCU(debug) \
register const bool r0 asm("r0") = debug; \ register bool r0 asm("r0") = debug; \
asm volatile("cbnz r0, with_debugger%= \n" \ asm volatile("cbnz r0, with_debugger%= \n" \
"ldr r12, =__furi_check_registers\n" \ "ldr r12, =__furi_check_registers\n" \
"ldm r12, {r0-r11} \n" \ "ldm r12, {r0-r11} \n" \