Merge branch 'ofw-dev' into dev

This commit is contained in:
MX 2023-07-05 19:39:49 +03:00
commit ad33162d81
No known key found for this signature in database
GPG key ID: 7CCC66B7DBDD1C83
2 changed files with 2 additions and 3 deletions

View file

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

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) \
register const bool r0 asm("r0") = debug; \
register bool r0 asm("r0") = debug; \
asm volatile("cbnz r0, with_debugger%= \n" \
"ldr r12, =__furi_check_registers\n" \
"ldm r12, {r0-r11} \n" \