[EFM32] Swap out INT_* functions with mbed critical sections

Author: stevew817

hal/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/dma_api.c

@@ -25,7 +25,6 @@
 #include "dma_api_HAL.h"
 #include "em_device.h"
 #include "em_cmu.h"
-#include "em_int.h"
 
 #ifdef DMA_PRESENT
 #include "em_dma.h"
@@ -198,7 +197,6 @@ bool LDMAx_ChannelEnabled( int ch )
     EFM_ASSERT(ch < DMA_CHAN_COUNT);
     uint32_t chMask = 1 << ch;
     return (bool)(LDMA->CHEN & chMask);
-    INT_Disable();
 }
 
 #endif /* LDMA_PRESENT */

hal/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/lp_ticker.c

@@ -28,7 +28,7 @@
 #include "rtc_api_HAL.h"
 #include "lp_ticker_api.h"
 
-#include "em_int.h"
+#include "critical.h"
 #if (defined RTCC_COUNT) && (RTCC_COUNT > 0)
 #include "em_rtcc.h"
 #endif
@@ -38,21 +38,21 @@ static int rtc_reserved = 0;
 void lp_ticker_init()
 {
     if(!rtc_reserved) {
-        INT_Disable();
+        core_util_critical_section_enter();
         rtc_init_real(RTC_INIT_LPTIMER);
         rtc_set_comp0_handler((uint32_t)lp_ticker_irq_handler);
         rtc_reserved = 1;
-        INT_Enable();
+        core_util_critical_section_exit();
     }
 }
 
 void lp_ticker_free()
 {
     if(rtc_reserved) {
-        INT_Disable();
+        core_util_critical_section_enter();
         rtc_free_real(RTC_INIT_LPTIMER);
         rtc_reserved = 0;
-        INT_Enable();
+        core_util_critical_section_exit();
     }
 }
 

hal/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/sleep.c

@@ -28,7 +28,7 @@
 #include "sleepmodes.h"
 #include "cmsis.h"
 #include "em_emu.h"
-#include "em_int.h"
+#include "critical.h"
 
 uint32_t sleep_block_counter[NUM_SLEEP_MODES] = {0};
 
@@ -80,9 +80,9 @@ void deepsleep(void)
  */
 void blockSleepMode(sleepstate_enum minimumMode)
 {
-    INT_Disable();
+    core_util_critical_section_enter();
     sleep_block_counter[minimumMode]++;
-    INT_Enable();
+    core_util_critical_section_exit();
 }
 
 /** Unblock the microcontroller from sleeping below a certain mode
@@ -94,11 +94,11 @@ void blockSleepMode(sleepstate_enum minimumMode)
  */
 void unblockSleepMode(sleepstate_enum minimumMode)
 {
-    INT_Disable();
+    core_util_critical_section_enter();
     if(sleep_block_counter[minimumMode] > 0) {
         sleep_block_counter[minimumMode]--;
     }
-    INT_Enable();
+    core_util_critical_section_exit();
 }
 
 #endif