Merge maple-native changes into portable

This compiles for both maple and maple_native but is untested.

1 files changed, 10 insertions, 24 deletions

diff --git a/libmaple/nvic.c b/libmaple/nvic.c
index d8745a4..7aef26d 100644
--- a/libmaple/nvic.c
+++ b/libmaple/nvic.c
@@ -32,16 +32,6 @@
 #include "nvic.h"
 #include "systick.h"
 
-void nvic_disable_interrupts(void) {
-    /* Turn off all interrupts  */
-    REG_SET(NVIC_ICER0, 0xFFFFFFFF);
-    REG_SET(NVIC_ICER1, 0xFFFFFFFF);
-
-    /* Turn off systick exception  */
-    REG_CLEAR_BIT(SYSTICK_CSR, 0);
-}
-
-
 void nvic_set_vector_table(uint32 addr, uint32 offset) {
    __write(SCB_VTOR, (uint32)addr | (offset & 0x1FFFFF80));
 }
@@ -49,33 +39,29 @@ void nvic_set_vector_table(uint32 addr, uint32 offset) {
 
 /**
  *  @brief turn on interrupt number n
- *  @param[in] n interrupt number
+ *  @param n interrupt number
  */
-void nvic_enable_interrupt(uint32 n) {
-    if (n >= NVIC_NR_INTERRUPTS) {
-        return;
-    }
-
+void nvic_irq_enable(uint32 n) {
     if (n < 32) {
         REG_SET_BIT(NVIC_ISER0, n);
-    } else {
+    } else if(n < 64) {
         REG_SET_BIT(NVIC_ISER1, n - 32);
+    } else {
+        REG_SET_BIT(NVIC_ISER2, n - 64);
     }
 }
 
 /**
  *  @brief turn off interrupt number n
- *  @param[in] n interrupt number
+ *  @param n interrupt number
  */
-void nvic_disable_interrupt(uint32 n) {
-    if (n >= NVIC_NR_INTERRUPTS) {
-        return;
-    }
-
+void nvic_irq_disable(uint32 n) {
     if (n < 32) {
         REG_SET_BIT(NVIC_ICER0, n);
-    } else {
+    } else if(n < 64) {
         REG_SET_BIT(NVIC_ICER1, n - 32);
+    } else {
+        REG_SET_BIT(NVIC_ICER2, n - 64);
     }
 }