From ff1b36acdc78609a835e3e20bf9897399c08806f Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 10 Aug 2013 14:56:07 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6125 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/ARMCM4-STM32F303-DISCOVERY/Makefile | 6 +- os/rt/kernel.dox | 173 --------------------------- os/rt/kernel.mk | 25 ---- os/rt/ports/ARMCMx/devices/STM32F30x/port.mk | 20 ++-- os/rt/rt.dox | 173 +++++++++++++++++++++++++++ os/rt/rt.mk | 25 ++++ 6 files changed, 211 insertions(+), 211 deletions(-) delete mode 100644 os/rt/kernel.dox delete mode 100644 os/rt/kernel.mk create mode 100644 os/rt/rt.dox create mode 100644 os/rt/rt.mk diff --git a/demos/ARMCM4-STM32F303-DISCOVERY/Makefile b/demos/ARMCM4-STM32F303-DISCOVERY/Makefile index 7f0e99a8e..087991465 100644 --- a/demos/ARMCM4-STM32F303-DISCOVERY/Makefile +++ b/demos/ARMCM4-STM32F303-DISCOVERY/Makefile @@ -69,8 +69,8 @@ include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/osal/chibios/osal.mk include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk -include $(CHIBIOS)/os/kernel/kernel.mk -include $(CHIBIOS)/os/kernel/ports/ARMCMx/devices/STM32F30x/port.mk +include $(CHIBIOS)/os/rt/rt.mk +include $(CHIBIOS)/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk include $(CHIBIOS)/test/test.mk # Define linker script file here @@ -222,4 +222,4 @@ ifeq ($(USE_FWLIB),yes) USE_OPT += -DUSE_STDPERIPH_DRIVER endif -include $(CHIBIOS)/os/kernel/ports/ARMCMx/compilers/GCC/rules.mk +include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/rules.mk diff --git a/os/rt/kernel.dox b/os/rt/kernel.dox deleted file mode 100644 index 05753a8f6..000000000 --- a/os/rt/kernel.dox +++ /dev/null @@ -1,173 +0,0 @@ -/* - ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010, - 2011,2012,2013 Giovanni Di Sirio. - - This file is part of ChibiOS/RT. - - ChibiOS/RT is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - ChibiOS/RT is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -/** - * @defgroup kernel Kernel - * @details The kernel is the portable part of ChibiOS/RT, this section - * documents the various kernel subsystems. - */ - -/** - * @defgroup kernel_info Version Numbers and Identification - * @ingroup kernel - */ - -/** - * @defgroup config Configuration - * @ingroup kernel - */ - -/** - * @defgroup types Types - * @details The system types are defined into the port layer, please refer to - * the core port implementation section. - * @ingroup kernel - */ - -/** - * @defgroup base Base Kernel Services - * @details Base kernel services, the base subsystems are always included in - * the OS builds. - * @ingroup kernel - */ - -/** - * @defgroup system System Management - * @ingroup base - */ - -/** - * @defgroup scheduler Scheduler - * @ingroup base - */ - -/** - * @defgroup threads Threads - * @ingroup base - */ - -/** - * @defgroup time Time and Virtual Timers - * @ingroup base - */ - -/** - * @defgroup synchronization Synchronization - * @details Synchronization services. - * @ingroup kernel - */ - -/** - * @defgroup semaphores Counting Semaphores - * @ingroup synchronization - */ - -/** - * @defgroup binary_semaphores Binary Semaphores - * @ingroup synchronization - */ - -/** - * @defgroup mutexes Mutexes - * @ingroup synchronization - */ - -/** - * @defgroup condvars Condition Variables - * @ingroup synchronization - */ - -/** - * @defgroup events Event Flags - * @ingroup synchronization - */ - -/** - * @defgroup messages Synchronous Messages - * @ingroup synchronization - */ - -/** - * @defgroup mailboxes Mailboxes - * @ingroup synchronization - */ - -/** - * @defgroup io_queues I/O Queues - * @ingroup synchronization - */ - -/** - * @defgroup memory Memory Management - * @details Memory Management services. - * @ingroup kernel - */ - -/** - * @defgroup memcore Core Memory Manager - * @ingroup memory - */ - -/** - * @defgroup heaps Heaps - * @ingroup memory - */ - -/** - * @defgroup pools Memory Pools - * @ingroup memory - */ - -/** - * @defgroup dynamic_threads Dynamic Threads - * @ingroup memory - */ - - /** - * @defgroup streams Streams and Files - * @details Stream and Files interfaces. - * @ingroup kernel - */ - -/** - * @defgroup data_streams Abstract Sequential Streams - * @ingroup streams - */ - -/** - * @defgroup data_files Abstract File Streams - * @ingroup streams - */ - -/** - * @defgroup registry Registry - * @ingroup kernel - */ - -/** - * @defgroup debug Debug - * @ingroup kernel - */ - -/** - * @defgroup internals Internals - * @ingroup kernel - */ - diff --git a/os/rt/kernel.mk b/os/rt/kernel.mk deleted file mode 100644 index 9e4d0c919..000000000 --- a/os/rt/kernel.mk +++ /dev/null @@ -1,25 +0,0 @@ -# List of all the ChibiOS/RT kernel files, there is no need to remove the files -# from this list, you can disable parts of the kernel by editing chconf.h. -KERNSRC = ${CHIBIOS}/os/rt/src/chsys.c \ - ${CHIBIOS}/os/rt/src/chdebug.c \ - ${CHIBIOS}/os/rt/src/chlists.c \ - ${CHIBIOS}/os/rt/src/chvt.c \ - ${CHIBIOS}/os/rt/src/chtm.c \ - ${CHIBIOS}/os/rt/src/chstats.c \ - ${CHIBIOS}/os/rt/src/chschd.c \ - ${CHIBIOS}/os/rt/src/chthreads.c \ - ${CHIBIOS}/os/rt/src/chdynamic.c \ - ${CHIBIOS}/os/rt/src/chregistry.c \ - ${CHIBIOS}/os/rt/src/chsem.c \ - ${CHIBIOS}/os/rt/src/chmtx.c \ - ${CHIBIOS}/os/rt/src/chcond.c \ - ${CHIBIOS}/os/rt/src/chevents.c \ - ${CHIBIOS}/os/rt/src/chmsg.c \ - ${CHIBIOS}/os/rt/src/chmboxes.c \ - ${CHIBIOS}/os/rt/src/chqueues.c \ - ${CHIBIOS}/os/rt/src/chmemcore.c \ - ${CHIBIOS}/os/rt/src/chheap.c \ - ${CHIBIOS}/os/rt/src/chmempools.c - -# Required include directories -KERNINC = ${CHIBIOS}/os/kernel/include diff --git a/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk b/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk index a11a1fa7b..673b97ee9 100644 --- a/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk +++ b/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk @@ -1,14 +1,14 @@ # List of the ChibiOS/RT Cortex-M4 STM32F30x port files. -PORTSRC = ${CHIBIOS}/os/kernel/ports/ARMCMx/chcore.c \ - ${CHIBIOS}/os/kernel/ports/ARMCMx/chcore_v7m.c \ - $(CHIBIOS)/os/kernel/ports/ARMCMx/compilers/GCC/crt0.c \ - $(CHIBIOS)/os/kernel/ports/ARMCMx/compilers/GCC/vectors.c \ +PORTSRC = ${CHIBIOS}/os/rt/ports/ARMCMx/chcore.c \ + ${CHIBIOS}/os/rt/ports/ARMCMx/chcore_v7m.c \ + $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/crt0.c \ + $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/vectors.c \ -PORTASM = $(CHIBIOS)/os/kernel/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s +PORTASM = $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s -PORTINC = ${CHIBIOS}/os/kernel/ports/ARMCMx \ - ${CHIBIOS}/os/kernel/ports/ARMCMx/CMSIS/include \ - ${CHIBIOS}/os/kernel/ports/ARMCMx/compilers/GCC \ - ${CHIBIOS}/os/kernel/ports/ARMCMx/devices/STM32F30x +PORTINC = ${CHIBIOS}/os/rt/ports/ARMCMx \ + ${CHIBIOS}/os/rt/ports/ARMCMx/CMSIS/include \ + ${CHIBIOS}/os/rt/ports/ARMCMx/compilers/GCC \ + ${CHIBIOS}/os/rt/ports/ARMCMx/devices/STM32F30x -PORTLD = ${CHIBIOS}/os/kernel/ports/ARMCMx/compilers/GCC/ld +PORTLD = ${CHIBIOS}/os/rt/ports/ARMCMx/compilers/GCC/ld diff --git a/os/rt/rt.dox b/os/rt/rt.dox new file mode 100644 index 000000000..05753a8f6 --- /dev/null +++ b/os/rt/rt.dox @@ -0,0 +1,173 @@ +/* + ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010, + 2011,2012,2013 Giovanni Di Sirio. + + This file is part of ChibiOS/RT. + + ChibiOS/RT is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + ChibiOS/RT is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +/** + * @defgroup kernel Kernel + * @details The kernel is the portable part of ChibiOS/RT, this section + * documents the various kernel subsystems. + */ + +/** + * @defgroup kernel_info Version Numbers and Identification + * @ingroup kernel + */ + +/** + * @defgroup config Configuration + * @ingroup kernel + */ + +/** + * @defgroup types Types + * @details The system types are defined into the port layer, please refer to + * the core port implementation section. + * @ingroup kernel + */ + +/** + * @defgroup base Base Kernel Services + * @details Base kernel services, the base subsystems are always included in + * the OS builds. + * @ingroup kernel + */ + +/** + * @defgroup system System Management + * @ingroup base + */ + +/** + * @defgroup scheduler Scheduler + * @ingroup base + */ + +/** + * @defgroup threads Threads + * @ingroup base + */ + +/** + * @defgroup time Time and Virtual Timers + * @ingroup base + */ + +/** + * @defgroup synchronization Synchronization + * @details Synchronization services. + * @ingroup kernel + */ + +/** + * @defgroup semaphores Counting Semaphores + * @ingroup synchronization + */ + +/** + * @defgroup binary_semaphores Binary Semaphores + * @ingroup synchronization + */ + +/** + * @defgroup mutexes Mutexes + * @ingroup synchronization + */ + +/** + * @defgroup condvars Condition Variables + * @ingroup synchronization + */ + +/** + * @defgroup events Event Flags + * @ingroup synchronization + */ + +/** + * @defgroup messages Synchronous Messages + * @ingroup synchronization + */ + +/** + * @defgroup mailboxes Mailboxes + * @ingroup synchronization + */ + +/** + * @defgroup io_queues I/O Queues + * @ingroup synchronization + */ + +/** + * @defgroup memory Memory Management + * @details Memory Management services. + * @ingroup kernel + */ + +/** + * @defgroup memcore Core Memory Manager + * @ingroup memory + */ + +/** + * @defgroup heaps Heaps + * @ingroup memory + */ + +/** + * @defgroup pools Memory Pools + * @ingroup memory + */ + +/** + * @defgroup dynamic_threads Dynamic Threads + * @ingroup memory + */ + + /** + * @defgroup streams Streams and Files + * @details Stream and Files interfaces. + * @ingroup kernel + */ + +/** + * @defgroup data_streams Abstract Sequential Streams + * @ingroup streams + */ + +/** + * @defgroup data_files Abstract File Streams + * @ingroup streams + */ + +/** + * @defgroup registry Registry + * @ingroup kernel + */ + +/** + * @defgroup debug Debug + * @ingroup kernel + */ + +/** + * @defgroup internals Internals + * @ingroup kernel + */ + diff --git a/os/rt/rt.mk b/os/rt/rt.mk new file mode 100644 index 000000000..b6dc526ec --- /dev/null +++ b/os/rt/rt.mk @@ -0,0 +1,25 @@ +# List of all the ChibiOS/RT kernel files, there is no need to remove the files +# from this list, you can disable parts of the kernel by editing chconf.h. +KERNSRC = ${CHIBIOS}/os/rt/src/chsys.c \ + ${CHIBIOS}/os/rt/src/chdebug.c \ + ${CHIBIOS}/os/rt/src/chlists.c \ + ${CHIBIOS}/os/rt/src/chvt.c \ + ${CHIBIOS}/os/rt/src/chtm.c \ + ${CHIBIOS}/os/rt/src/chstats.c \ + ${CHIBIOS}/os/rt/src/chschd.c \ + ${CHIBIOS}/os/rt/src/chthreads.c \ + ${CHIBIOS}/os/rt/src/chdynamic.c \ + ${CHIBIOS}/os/rt/src/chregistry.c \ + ${CHIBIOS}/os/rt/src/chsem.c \ + ${CHIBIOS}/os/rt/src/chmtx.c \ + ${CHIBIOS}/os/rt/src/chcond.c \ + ${CHIBIOS}/os/rt/src/chevents.c \ + ${CHIBIOS}/os/rt/src/chmsg.c \ + ${CHIBIOS}/os/rt/src/chmboxes.c \ + ${CHIBIOS}/os/rt/src/chqueues.c \ + ${CHIBIOS}/os/rt/src/chmemcore.c \ + ${CHIBIOS}/os/rt/src/chheap.c \ + ${CHIBIOS}/os/rt/src/chmempools.c + +# Required include directories +KERNINC = ${CHIBIOS}/os/rt/include -- cgit v1.2.3