fengqi/lv_micropython
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

mimxrt/machine_pin: Fix bug when Pin.irq is called without a handler.

Browse Source 
When called without a handler, the IRQ data was not cleared.  That caused a
crash at the second soft reset in a row.

Signed-off-by: robert-hh <robert@hammelrath.com>
This commit is contained in:
robert-hh 2023-07-28 22:29:32 +02:00 committed by Damien George
parent 91674c41b8
commit a9821c0185
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ports/mimxrt/machine_pin.c
View File

@ -337,6 +337,13 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
} }
machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[index]); machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[index]);
if (args[ARG_handler].u_obj == mp_const_none) {
// remove the IRQ from the table, leave it to gc to free it.
GPIO_PortDisableInterrupts(self->gpio, 1U << self->pin);
MP_STATE_PORT(machine_pin_irq_objects[index]) = NULL;
return mp_const_none;
}
// Allocate the IRQ object if it doesn't already exist. // Allocate the IRQ object if it doesn't already exist.
if (irq == NULL) { if (irq == NULL) {
irq = m_new_obj(machine_pin_irq_obj_t); irq = m_new_obj(machine_pin_irq_obj_t);
@ -371,9 +378,9 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
GPIO_PinSetInterruptConfig(self->gpio, self->pin, irq->trigger); GPIO_PinSetInterruptConfig(self->gpio, self->pin, irq->trigger);
// Enable the specific Pin interrupt // Enable the specific Pin interrupt
GPIO_PortEnableInterrupts(self->gpio, 1U << self->pin); GPIO_PortEnableInterrupts(self->gpio, 1U << self->pin);
// Enable LEVEL1 interrupt again
EnableIRQ(irq_num);
} }
// Enable LEVEL1 interrupt again
EnableIRQ(irq_num);
} }
return MP_OBJ_FROM_PTR(irq); return MP_OBJ_FROM_PTR(irq);