Eric Patterson
Fork of official mbed Real Time Operating System based on the RTX implementation of the CMSIS-RTOS API open standard.
Dependents: Final_Coffee_Roaster
Fork of
mbed-rtos
by 
mbed official
Revision 11:db1fc233faa9, committed 2013-04-30
- Comitter:
- emilmont
- Date:
- Tue Apr 30 10:51:19 2013 +0000
- Parent:
- 10:fcb1f103f7a1
- Child:
- 12:58b30ac3f00e
- Commit message:
- In the Keil MDK toolchain "RTX_Config.h" is a special system library header file
Changed in this revision
--- a/rtx/HAL_CM.c Wed Apr 24 14:45:21 2013 +0000 +++ b/rtx/HAL_CM.c Tue Apr 30 10:51:19 2013 +0000 @@ -33,7 +33,7 @@ *---------------------------------------------------------------------------*/ #include "rt_TypeDef.h" -#include "RTX_Config.h" +#include "RTX_Conf.h" #include "rt_HAL_CM.h"
--- a/rtx/KL25Z/ARM/HAL_CM0.c Wed Apr 24 14:45:21 2013 +0000 +++ b/rtx/KL25Z/ARM/HAL_CM0.c Tue Apr 30 10:51:19 2013 +0000 @@ -33,7 +33,7 @@ *---------------------------------------------------------------------------*/ #include "rt_TypeDef.h" -#include "RTX_Config.h" +#include "RTX_Conf.h" #include "rt_System.h" #include "rt_HAL_CM.h" #include "rt_Task.h"
--- a/rtx/LPC11U24/uARM/HAL_CM0.c Wed Apr 24 14:45:21 2013 +0000 +++ b/rtx/LPC11U24/uARM/HAL_CM0.c Tue Apr 30 10:51:19 2013 +0000 @@ -33,7 +33,7 @@ *---------------------------------------------------------------------------*/ #include "rt_TypeDef.h" -#include "RTX_Config.h" +#include "RTX_Conf.h" #include "rt_System.h" #include "rt_HAL_CM.h" #include "rt_Task.h"
--- a/rtx/LPC1768/ARM/HAL_CM3.c Wed Apr 24 14:45:21 2013 +0000 +++ b/rtx/LPC1768/ARM/HAL_CM3.c Tue Apr 30 10:51:19 2013 +0000 @@ -33,7 +33,7 @@ *---------------------------------------------------------------------------*/ #include "rt_TypeDef.h" -#include "RTX_Config.h" +#include "RTX_Conf.h" #include "rt_System.h" #include "rt_HAL_CM.h" #include "rt_Task.h"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rtx/RTX_Conf.h Tue Apr 30 10:51:19 2013 +0000 @@ -0,0 +1,72 @@ +/*---------------------------------------------------------------------------- + * RL-ARM - RTX + *---------------------------------------------------------------------------- + * Name: RTX_CONFIG.H + * Purpose: Exported functions of RTX_Config.c + * Rev.: V4.60 + *---------------------------------------------------------------------------- + * + * Copyright (c) 1999-2009 KEIL, 2009-2012 ARM Germany GmbH + * All rights reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - Neither the name of ARM nor the names of its contributors may be used + * to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDERS AND CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + *---------------------------------------------------------------------------*/ + + +/* Error Codes */ +#define OS_ERR_STK_OVF 1 +#define OS_ERR_FIFO_OVF 2 +#define OS_ERR_MBX_OVF 3 + +/* Definitions */ +#define BOX_ALIGN_8 0x80000000 +#define _declare_box(pool,size,cnt) U32 pool[(((size)+3)/4)*(cnt) + 3] +#define _declare_box8(pool,size,cnt) U64 pool[(((size)+7)/8)*(cnt) + 2] +#define _init_box8(pool,size,bsize) _init_box (pool,size,(bsize) | BOX_ALIGN_8) + +/* Variables */ +extern U32 idle_task_stack[]; +extern U32 os_fifo[]; +extern void *os_active_TCB[]; + +/* Constants */ +extern U16 const os_maxtaskrun; +extern U32 const os_trv; +extern U8 const os_flags; +extern U32 const os_rrobin; +extern U32 const os_clockrate; +extern U32 const os_timernum; +extern U16 const idle_task_stack_size; + +extern U8 const os_fifo_size; + +/* Functions */ +extern void os_idle_demon (void); +extern int os_tick_init (void); +extern void os_tick_irqack (void); +extern void os_tmr_call (U16 info); +extern void os_error (U32 err_code); + +/*---------------------------------------------------------------------------- + * end of file + *---------------------------------------------------------------------------*/
--- a/rtx/RTX_Conf_CM.c Wed Apr 24 14:45:21 2013 +0000
+++ b/rtx/RTX_Conf_CM.c Tue Apr 30 10:51:19 2013 +0000
@@ -221,7 +221,7 @@
void os_error (uint32_t err_code) {
/* This function is called when a runtime error is detected. Parameter */
- /* 'err_code' holds the runtime error code (defined in RTX_Config.h). */
+ /* 'err_code' holds the runtime error code (defined in RTX_Conf.h). */
mbed_die();
}
--- a/rtx/RTX_Config.h Wed Apr 24 14:45:21 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -/*---------------------------------------------------------------------------- - * RL-ARM - RTX - *---------------------------------------------------------------------------- - * Name: RTX_CONFIG.H - * Purpose: Exported functions of RTX_Config.c - * Rev.: V4.60 - *---------------------------------------------------------------------------- - * - * Copyright (c) 1999-2009 KEIL, 2009-2012 ARM Germany GmbH - * All rights reserved. - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - Neither the name of ARM nor the names of its contributors may be used - * to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDERS AND CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - *---------------------------------------------------------------------------*/ - - -/* Error Codes */ -#define OS_ERR_STK_OVF 1 -#define OS_ERR_FIFO_OVF 2 -#define OS_ERR_MBX_OVF 3 - -/* Definitions */ -#define BOX_ALIGN_8 0x80000000 -#define _declare_box(pool,size,cnt) U32 pool[(((size)+3)/4)*(cnt) + 3] -#define _declare_box8(pool,size,cnt) U64 pool[(((size)+7)/8)*(cnt) + 2] -#define _init_box8(pool,size,bsize) _init_box (pool,size,(bsize) | BOX_ALIGN_8) - -/* Variables */ -extern U32 idle_task_stack[]; -extern U32 os_fifo[]; -extern void *os_active_TCB[]; - -/* Constants */ -extern U16 const os_maxtaskrun; -extern U32 const os_trv; -extern U8 const os_flags; -extern U32 const os_rrobin; -extern U32 const os_clockrate; -extern U32 const os_timernum; -extern U16 const idle_task_stack_size; - -extern U8 const os_fifo_size; - -/* Functions */ -extern void os_idle_demon (void); -extern int os_tick_init (void); -extern void os_tick_irqack (void); -extern void os_tmr_call (U16 info); -extern void os_error (U32 err_code); - -/*---------------------------------------------------------------------------- - * end of file - *---------------------------------------------------------------------------*/
--- a/rtx/rt_CMSIS.c Wed Apr 24 14:45:21 2013 +0000 +++ b/rtx/rt_CMSIS.c Tue Apr 30 10:51:19 2013 +0000 @@ -47,7 +47,7 @@ #endif #include "rt_TypeDef.h" -#include "RTX_Config.h" +#include "RTX_Conf.h" #include "rt_System.h" #include "rt_Task.h" #include "rt_Event.h"
--- a/rtx/rt_Event.c Wed Apr 24 14:45:21 2013 +0000 +++ b/rtx/rt_Event.c Tue Apr 30 10:51:19 2013 +0000 @@ -33,7 +33,7 @@ *---------------------------------------------------------------------------*/ #include "rt_TypeDef.h" -#include "RTX_Config.h" +#include "RTX_Conf.h" #include "rt_System.h" #include "rt_Event.h" #include "rt_List.h"
--- a/rtx/rt_List.c Wed Apr 24 14:45:21 2013 +0000 +++ b/rtx/rt_List.c Tue Apr 30 10:51:19 2013 +0000 @@ -33,7 +33,7 @@ *---------------------------------------------------------------------------*/ #include "rt_TypeDef.h" -#include "RTX_Config.h" +#include "RTX_Conf.h" #include "rt_System.h" #include "rt_List.h" #include "rt_Task.h"
--- a/rtx/rt_Mailbox.c Wed Apr 24 14:45:21 2013 +0000 +++ b/rtx/rt_Mailbox.c Tue Apr 30 10:51:19 2013 +0000 @@ -33,7 +33,7 @@ *---------------------------------------------------------------------------*/ #include "rt_TypeDef.h" -#include "RTX_Config.h" +#include "RTX_Conf.h" #include "rt_System.h" #include "rt_List.h" #include "rt_Mailbox.h"
--- a/rtx/rt_MemBox.c Wed Apr 24 14:45:21 2013 +0000 +++ b/rtx/rt_MemBox.c Tue Apr 30 10:51:19 2013 +0000 @@ -33,7 +33,7 @@ *---------------------------------------------------------------------------*/ #include "rt_TypeDef.h" -#include "RTX_Config.h" +#include "RTX_Conf.h" #include "rt_System.h" #include "rt_MemBox.h" #include "rt_HAL_CM.h"
--- a/rtx/rt_Mutex.c Wed Apr 24 14:45:21 2013 +0000 +++ b/rtx/rt_Mutex.c Tue Apr 30 10:51:19 2013 +0000 @@ -33,7 +33,7 @@ *---------------------------------------------------------------------------*/ #include "rt_TypeDef.h" -#include "RTX_Config.h" +#include "RTX_Conf.h" #include "rt_List.h" #include "rt_Task.h" #include "rt_Mutex.h"
--- a/rtx/rt_Robin.c Wed Apr 24 14:45:21 2013 +0000 +++ b/rtx/rt_Robin.c Tue Apr 30 10:51:19 2013 +0000 @@ -33,7 +33,7 @@ *---------------------------------------------------------------------------*/ #include "rt_TypeDef.h" -#include "RTX_Config.h" +#include "RTX_Conf.h" #include "rt_List.h" #include "rt_Task.h" #include "rt_Time.h"
--- a/rtx/rt_Semaphore.c Wed Apr 24 14:45:21 2013 +0000 +++ b/rtx/rt_Semaphore.c Tue Apr 30 10:51:19 2013 +0000 @@ -33,7 +33,7 @@ *---------------------------------------------------------------------------*/ #include "rt_TypeDef.h" -#include "RTX_Config.h" +#include "RTX_Conf.h" #include "rt_System.h" #include "rt_List.h" #include "rt_Task.h"
--- a/rtx/rt_System.c Wed Apr 24 14:45:21 2013 +0000 +++ b/rtx/rt_System.c Tue Apr 30 10:51:19 2013 +0000 @@ -33,7 +33,7 @@ *---------------------------------------------------------------------------*/ #include "rt_TypeDef.h" -#include "RTX_Config.h" +#include "RTX_Conf.h" #include "rt_Task.h" #include "rt_System.h" #include "rt_Event.h"
--- a/rtx/rt_Task.c Wed Apr 24 14:45:21 2013 +0000 +++ b/rtx/rt_Task.c Tue Apr 30 10:51:19 2013 +0000 @@ -33,7 +33,7 @@ *---------------------------------------------------------------------------*/ #include "rt_TypeDef.h" -#include "RTX_Config.h" +#include "RTX_Conf.h" #include "rt_System.h" #include "rt_Task.h" #include "rt_List.h"
--- a/rtx/rt_Time.c Wed Apr 24 14:45:21 2013 +0000 +++ b/rtx/rt_Time.c Tue Apr 30 10:51:19 2013 +0000 @@ -33,7 +33,7 @@ *---------------------------------------------------------------------------*/ #include "rt_TypeDef.h" -#include "RTX_Config.h" +#include "RTX_Conf.h" #include "rt_Task.h" #include "rt_Time.h"