Skip to content

Commit

Permalink
mimxrt/machine_pin: Fix bug when Pin.irq is called without a handler.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
robert-hh authored and dpgeorge committed Aug 15, 2023
1 parent 91674c4 commit a9821c0
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions ports/mimxrt/machine_pin.c
Expand Up @@ -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]);

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.
if (irq == NULL) {
irq = m_new_obj(machine_pin_irq_obj_t);
Expand Down Expand Up @@ -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);
// Enable the specific Pin interrupt
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);
Expand Down

0 comments on commit a9821c0

Please sign in to comment.