diff options
| author | Daniel Campora <daniel@wipy.io> | 2015-09-22 23:20:29 +0200 |
|---|---|---|
| committer | Daniel Campora <daniel@wipy.io> | 2015-09-27 01:48:20 +0200 |
| commit | dbdcb58d6413a907e5f4aed25eee85073ff7e575 (patch) | |
| tree | 0ecc90d3a3a947639549afde2b94c3d35b13fc2a /cc3200/mptask.c | |
| parent | 81d64ab939ff45e74b0154e4ce2d9c5d2cfe6328 (diff) | |
| download | micropython-dbdcb58d6413a907e5f4aed25eee85073ff7e575.tar.gz micropython-dbdcb58d6413a907e5f4aed25eee85073ff7e575.zip | |
cc3200: New irq API, affects all classes that provide the irq method.
Diffstat (limited to 'cc3200/mptask.c')
| -rw-r--r-- | cc3200/mptask.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cc3200/mptask.c b/cc3200/mptask.c index ec342e2d09..4f01a66eb6 100644 --- a/cc3200/mptask.c +++ b/cc3200/mptask.c @@ -64,8 +64,8 @@ #include "pins.h" #include "pybsleep.h" #include "pybtimer.h" -#include "mpcallback.h" #include "cryptohash.h" +#include "mpirq.h" #include "updater.h" #include "moduos.h" @@ -126,7 +126,7 @@ soft_reset: // execute all basic initializations mpexception_init0(); - mpcallback_init0(); + mp_irq_init0(); pybsleep_init0(); pin_init0(); mperror_init0(); @@ -234,7 +234,10 @@ soft_reset_exit: // disable all callbacks to avoid undefined behaviour // when coming out of a soft reset - mpcallback_disable_all(); + mp_irq_disable_all(); + + // cancel the RTC alarm which might be running independent of the irq state + pyb_rtc_disable_alarm(); // flush the serial flash buffer sflash_disk_flush(); |