Remove workaround for radio interrupt - patch FreeRTOS port.

Former-commit-id: 52fbe72

Author: h2zero

cores/nRF5/freertos/port_nrf52.c

@@ -360,4 +360,24 @@ UBaseType_t uxGetCriticalNestingDepth(void)
     return uxCriticalNesting;
 }
 
+uint32_t ulSetInterruptMaskFromISR( void )
+{
+  __asm volatile (
+  " mrs r0, PRIMASK	\n"
+  " cpsid i			\n"
+  " bx lr             "
+  ::: "memory"
+  );
+}
+/*-----------------------------------------------------------*/
+
+void vClearInterruptMaskFromISR( __attribute__( ( unused ) ) uint32_t ulMask )
+{
+  __asm volatile (
+  " msr PRIMASK, r0	\n"
+  " bx lr             "
+  ::: "memory"
+  );
+}
+
 #endif /* NRF52_SERIES */

cores/nRF5/freertos/port_nrf52_systick.c

@@ -242,6 +242,14 @@ void vPortSuppressTicksAndSleep( TickType_t xExpectedIdleTime )
             else
 #endif
             {
+                // Fix ERRATA 87 (https://infocenter.nordicsemi.com/index.jsp?topic=%252Fcom.nordic.infocenter.sdk5.v11.0.0%252Findex.html&cp=4_0_0)
+                // Clear FPU interrupt before going to sleep. This prevent unexpected wake-up.
+                #define FPU_EXCEPTION_MASK 0x0000009F
+                /* Clear exceptions and PendingIRQ from the FPU unit */
+                __set_FPSCR(__get_FPSCR()  & ~(FPU_EXCEPTION_MASK));
+                (void) __get_FPSCR();
+                NVIC_ClearPendingIRQ(FPU_IRQn);
+
                 /* No SD -  we would just block interrupts globally.
                 * BASEPRI cannot be used for that because it would prevent WFE from wake up.
                 */

cores/nRF5/freertos/portmacro_nrf52.h

@@ -106,10 +106,12 @@ typedef unsigned long UBaseType_t;
 extern void vPortEnterCritical( void );
 extern void vPortExitCritical( void );
 extern UBaseType_t uxGetCriticalNestingDepth(void);
-#define portSET_INTERRUPT_MASK_FROM_ISR()       ulPortRaiseBASEPRI()
-#define portCLEAR_INTERRUPT_MASK_FROM_ISR(x)    vPortSetBASEPRI(x)
-#define portDISABLE_INTERRUPTS()                vPortRaiseBASEPRI()
-#define portENABLE_INTERRUPTS()                 vPortSetBASEPRI(0)
+extern uint32_t ulSetInterruptMaskFromISR( void ) __attribute__( ( naked ) );
+extern void vClearInterruptMaskFromISR( uint32_t ulMask )  __attribute__( ( naked ) );
+#define portSET_INTERRUPT_MASK_FROM_ISR()       ulSetInterruptMaskFromISR()
+#define portCLEAR_INTERRUPT_MASK_FROM_ISR(x)    vClearInterruptMaskFromISR( x )
+#define portDISABLE_INTERRUPTS()                __asm volatile 	( " cpsid i " ::: "memory" )
+#define portENABLE_INTERRUPTS()                 __asm volatile 	( " cpsie i " ::: "memory" )
 #define portENTER_CRITICAL()                    vPortEnterCritical()
 #define portEXIT_CRITICAL()                     vPortExitCritical()
 

platform.txt

@@ -60,7 +60,7 @@ nordic.path={build.core.path}/nordic
 compiler.nrf.flags=-DNRF5 -DARDUINO_ARCH_NRF5 "-I{build.core.path}/nimble_config" "-I{nordic.path}/nrfx" "-I{nordic.path}/nrfx/hal" "-I{nordic.path}/nrfx/mdk" "-I{nordic.path}/nrfx/soc" "-I{nordic.path}/nrfx/drivers/include" "-I{nordic.path}/nrfx/drivers/src" "-I{build.core.path}/CMSIS/Include" "-I{build.core.path}/FC_Store" "-I{build.core.path}/BLEBond_nvs" "-I{build.core.path}/TinyUSB" "-I{build.core.path}/TinyUSB/Adafruit_TinyUSB_ArduinoCore" "-I{build.core.path}/TinyUSB/Adafruit_TinyUSB_ArduinoCore/tinyusb/src"
 
 # These can be overridden in platform.local.txt
-compiler.c.extra_flags=-DRIOT_VERSION=1
+compiler.c.extra_flags=
 compiler.c.elf.extra_flags=
 compiler.cpp.extra_flags=
 compiler.S.extra_flags=