LUO GANG / mbed-rtos-test

Official mbed Real Time Operating System based on the RTX implementation of the CMSIS-RTOS API open standard.

Fork of mbed-rtos by mbed official

Files at this revision

API Documentation at this revision

Revision 1:01158bb7600c, committed 2012-07-12

Comitter:
emilmont
Date:
Thu Jul 12 08:26:49 2012 +0000
Parent:
0:3cf1dd27c89c
Child:
2:4629f61a197e
Commit message:
Update mbed-rtos library to new implementation not requiring an additional static memory pool

Changed in this revision

RTX_Conf_CM.c Show annotated file Show diff for this revision Revisions of this file
rtos.lib Show annotated file Show diff for this revision Revisions of this file
rtx.lib Show annotated file Show diff for this revision Revisions of this file 
--- a/RTX_Conf_CM.c	Fri Jun 22 15:35:30 2012 +0000
+++ b/RTX_Conf_CM.c	Thu Jul 12 08:26:49 2012 +0000
@@ -34,9 +34,6 @@
 
 #include "cmsis_os.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 /*----------------------------------------------------------------------------
  *      RTX User configuration part BEGIN
@@ -46,6 +43,7 @@
 //
 // <h>Thread Configuration
 // =======================
+//
 //   <o>Number of concurrent running threads <0-250>
 //   <i> Defines max. number of threads that will run at the same time.
 //       counting "main", but not counting "osTimerThread"
@@ -80,13 +78,6 @@
   #define OS_MAINSTKSIZE     WORDS_STACK_SIZE
 #endif
 
-//   <o>Total stack size [bytes] for threads with user-provided stack size <0-4096:8><#/4>
-//   <i> Defines the combined stack size for threads with user-provided stack size.
-//   <i> Default: 0
-#ifndef OS_PRIVSTKSIZE
-  #define OS_PRIVSTKSIZE     (OS_PRIVCNT * WORDS_STACK_SIZE)
-#endif
-
 // <q>Check for stack overflow
 // ===========================
 // <i> Includes the stack checking code for stack overflow.
@@ -156,7 +147,8 @@
 
 //   <o>Timer Thread Priority
 //                        <1=> Low
-//     <2=> Below Normal  <3=> Normal
+//                        <2=> Below Normal
+//                        <3=> Normal
 //                        <4=> Above Normal
 //                        <5=> High
 //                        <6=> Realtime
@@ -209,6 +201,7 @@
 /*----------------------------------------------------------------------------
  *      RTX User configuration part END
  *---------------------------------------------------------------------------*/
+
 #define OS_TRV          ((uint32_t)(((double)OS_CLOCK*(double)OS_TICK)/1E6)-1)
 
 
@@ -249,13 +242,8 @@
  *      RTX Configuration Functions
  *---------------------------------------------------------------------------*/
 
-
 #include "RTX_CM_lib.h"
 
-#ifdef __cplusplus
-}
-#endif
-
 /*----------------------------------------------------------------------------
  * end of file
  *---------------------------------------------------------------------------*/

--- a/rtos.lib	Fri Jun 22 15:35:30 2012 +0000
+++ b/rtos.lib	Thu Jul 12 08:26:49 2012 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/mbed_official/code/rtos/#f065454bc33c
+http://mbed.org/users/mbed_official/code/rtos/#68e146c0e76b

--- a/rtx.lib	Fri Jun 22 15:35:30 2012 +0000
+++ b/rtx.lib	Thu Jul 12 08:26:49 2012 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/mbed_official/code/rtx/#c5034eca6017
+http://mbed.org/users/mbed_official/code/rtx/#5a95354ca0a2