diff options
| author | bnewbold <bnewbold@robocracy.org> | 2010-08-31 22:05:39 -0400 |
|---|---|---|
| committer | bnewbold <bnewbold@robocracy.org> | 2010-08-31 22:05:39 -0400 |
| commit | 0ccec95446d4c7f3ea47a46d267c791fb22bb8d4 (patch) | |
| tree | 0ea524020fc464c33b8f988e3f182e908105e1fc /libmaple/util.c | |
| parent | 02d7b08f0497096f21e41922e0efb54c4ef33bab (diff) | |
| download | librambutan-0ccec95446d4c7f3ea47a46d267c791fb22bb8d4.tar.gz librambutan-0ccec95446d4c7f3ea47a46d267c791fb22bb8d4.zip | |
Portability fixes
Still not working but fixed a lot of merge errors
Diffstat (limited to 'libmaple/util.c')
| -rw-r--r-- | libmaple/util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmaple/util.c b/libmaple/util.c index 61beab8..a747948 100644 --- a/libmaple/util.c +++ b/libmaple/util.c @@ -44,7 +44,7 @@ void _fail(const char* file, int line, const char* exp) { uint32 i = 0; /* Turn off interrupts */ - nvic_disable_interrupts(); + nvic_irq_disable_all(); /* Turn off timers */ timer_disable_all(); @@ -73,8 +73,8 @@ void _fail(const char* file, int line, const char* exp) { gpio_set_mode(ERROR_LED_PORT, ERROR_LED_PIN, GPIO_MODE_OUTPUT_PP); /* Turn the USB interrupt back on so the bootloader keeps on functioning */ - nvic_enable_interrupt(NVIC_INT_USBHP); - nvic_enable_interrupt(NVIC_INT_USBLP); + nvic_irq_enable(NVIC_INT_USBHP); + nvic_irq_enable(NVIC_INT_USBLP); /* Error fade */ while (1) { |