TEAMUSB / mbed-rtos

mbed-rtos // fixed error.h

Dependents:   USBHost

Fork of mbed-rtos by mbed official

Files at this revision

API Documentation at this revision

Revision 32:e98f5e27f346, committed 2014-06-12

Comitter:
mbed_official
Date:
Thu Jun 12 15:00:16 2014 +0100
Parent:
31:015df9e602b6
Child:
33:ac8d036315ed
Commit message:
Synchronized with git revision af13906dd5a88c5486f81fa7e6b079d5da671e46

Full URL: https://github.com/mbedmicro/mbed/commit/af13906dd5a88c5486f81fa7e6b079d5da671e46/

Changed in this revision

rtx/RTX_CM_lib.h Show annotated file Show diff for this revision Revisions of this file
rtx/RTX_Conf_CM.c Show annotated file Show diff for this revision Revisions of this file 
--- a/rtx/RTX_CM_lib.h	Tue Jun 03 11:30:14 2014 +0100
+++ b/rtx/RTX_CM_lib.h	Thu Jun 12 15:00:16 2014 +0100
@@ -247,6 +247,9 @@
 #elif defined(TARGET_LPC11U68)
 #define INITIAL_SP            (0x10004000UL)
 
+#elif defined(TARGET_NRF51822)
+#define INITIAL_SP            (0x20004000UL)
+
 #else
 #error "no target defined"
 

--- a/rtx/RTX_Conf_CM.c	Tue Jun 03 11:30:14 2014 +0100
+++ b/rtx/RTX_Conf_CM.c	Thu Jun 12 15:00:16 2014 +0100
@@ -50,7 +50,7 @@
 //   <i> Default: 6
 #ifndef OS_TASKCNT
 #  if   defined(TARGET_LPC1768) || defined(TARGET_LPC2368)   || defined(TARGET_LPC4088) || defined(TARGET_LPC1347) || defined(TARGET_K64F) \
-	 || defined(TARGET_KL46Z)   || defined(TARGET_STM32F407) || defined(TARGET_F407VG)  || defined(TARGET_STM32F303VC) || defined(TARGET_LPC1549) || defined(TARGET_LPC11U68)
+	 || defined(TARGET_KL46Z)   || defined(TARGET_STM32F407) || defined(TARGET_F407VG)  || defined(TARGET_STM32F303VC) || defined(TARGET_LPC1549) || defined(TARGET_LPC11U68) || defined(TARGET_NRF51822)
 #    define OS_TASKCNT         14
 #  elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401)  || defined(TARGET_LPC11U35_501) || defined(TARGET_LPC1114) \
 	 || defined(TARGET_LPC812)   || defined(TARGET_KL25Z)         || defined(TARGET_KL05Z)        || defined(TARGET_STM32F100RB)  || defined(TARGET_STM32F051R8)
@@ -63,7 +63,7 @@
 //   <o>Scheduler (+ interrupts) stack size [bytes] <64-4096:8><#/4>
 #ifndef OS_SCHEDULERSTKSIZE
 #  if   defined(TARGET_LPC1768) || defined(TARGET_LPC2368)   || defined(TARGET_LPC4088) || defined(TARGET_LPC1347)  || defined(TARGET_K64F) \
-	 || defined(TARGET_KL46Z)   || defined(TARGET_STM32F407) || defined(TARGET_F407VG)  || defined(TARGET_STM32F303VC) || defined(TARGET_LPC1549) || defined(TARGET_LPC11U68)
+	 || defined(TARGET_KL46Z)   || defined(TARGET_STM32F407) || defined(TARGET_F407VG)  || defined(TARGET_STM32F303VC) || defined(TARGET_LPC1549) || defined(TARGET_LPC11U68) || defined(TARGET_NRF51822)
 #      define OS_SCHEDULERSTKSIZE    256
 #  elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401)  || defined(TARGET_LPC11U35_501) || defined(TARGET_LPC1114) \
 	 || defined(TARGET_LPC812)   || defined(TARGET_KL25Z)         || defined(TARGET_KL05Z)        || defined(TARGET_STM32F100RB)  || defined(TARGET_STM32F051R8)
@@ -130,6 +130,9 @@
 #  elif defined(TARGET_STM32F407) || defined(TARGET_F407VG)
 #    define OS_CLOCK       168000000
 
+#  elif defined(TARGET_NRF51822)
+#    define OS_CLOCK       16000000
+
 #  else
 #    error "no target defined"
 #  endif