diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index a281132..ad5dd17 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -8,15 +8,13 @@ jobs: matrix: path: - check: './include' - exclude: './include/kernel/init.h' # Nothing to exclude - - check: './kernel' - exclude: '' # Nothing to exclude - - check: './clock' - exclude: '' # Nothing to exclude + exclude: 'arch32|init' # Nothing to exclude + - check: './source' + exclude: './source/port' # Nothing to exclude steps: - uses: actions/checkout@v3 - name: Run clang-format style check for C programs. - uses: jidicula/clang-format-action@v4.11.0 + uses: jidicula/clang-format-action@v4.14.0 with: clang-format-version: '17' check-path: ${{ matrix.path['check'] }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b58cd2..0704a79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,9 +12,9 @@ target_sources(atos_kernel ) include(${CMAKE_CURRENT_LIST_DIR}/include/CMakeLists.txt) -include(${CMAKE_CURRENT_LIST_DIR}/kernel/CMakeLists.txt) -include(${CMAKE_CURRENT_LIST_DIR}/clock/CMakeLists.txt) -include(${CMAKE_CURRENT_LIST_DIR}/port/CMakeLists.txt) +include(${CMAKE_CURRENT_LIST_DIR}/source/CMakeLists.txt) +include(${CMAKE_CURRENT_LIST_DIR}/source/clock/CMakeLists.txt) +include(${CMAKE_CURRENT_LIST_DIR}/source/port/CMakeLists.txt) if(NOT TARGET atos_config) message(FATAL_ERROR " atos_config target not specified. Please specify a cmake target that defines the include path for atos_configuration.h\n") diff --git a/README.md b/README.md index 1f09237..45d8caf 100644 --- a/README.md +++ b/README.md @@ -203,26 +203,6 @@ int main(void) OS_THREAD_INIT(static_id, OS_PRIORITY_COOPERATION_SET(2), STACK_SIZE, entry_function); ``` -The following kernel H file path must be included in your project workshop. - -```shell -\ -\include\ -\include\kernel\ -``` -The following kernel C file should be placed in your project workshop based on your chip feature and compiler. - -```shell -\kernel\.c -\clock\clock_systick.c -\port\port_common.c -\port\.c -``` - -## Roadmap - -The At-EC road-map documentation is not ready. The At-RTOS is a beginning and basic component and will be an important member of the At-EC family. - ## Contribution The contributing documentation is not ready, You can check the open issue right now that we're developing. diff --git a/build_version.h b/build_version.h index e9c8416..c76fa0f 100644 --- a/build_version.h +++ b/build_version.h @@ -12,11 +12,11 @@ extern "C" { #endif -#define ATOS_BUILD_TIME "2025-02-01,11:32" -#define ATOS_COMMIT_HEAD_ID "ee4223b81fddf0ea5f2520f2adcfc2247091b865" +#define ATOS_BUILD_TIME "2025-02-03,14:12" +#define ATOS_COMMIT_HEAD_ID "e67d6b6d5955a438a676872675d7cbc0cbb5df19" #define ATOS_VERSION_MAJOR_NUMBER (2u) #define ATOS_VERSION_MINOR_NUMBER (0u) -#define ATOS_VERSION_PATCH_NUMBER (10u) +#define ATOS_VERSION_PATCH_NUMBER (11u) #define ATOS_VERSION_MAJOR_NUMBER_MASK (0x03FFu) #define ATOS_VERSION_MAJOR_NUMBER_POS (22u) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 7ef4cd1..cc74287 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1,22 +1,26 @@ add_library(kernel_include INTERFACE) include_directories(${KERNEL_PATH}/include) -include_directories(${KERNEL_PATH}/include/kernel) +include_directories(${KERNEL_PATH}/include/arch) +include_directories(${KERNEL_PATH}/include/clock) +include_directories(${KERNEL_PATH}/include/port) target_sources(kernel_include PUBLIC - ${KERNEL_PATH}/include/arch.h - - ${KERNEL_PATH}/include/kernel/at_rtos.h - ${KERNEL_PATH}/include/kernel/compiler.h - ${KERNEL_PATH}/include/kernel/configuration.h - ${KERNEL_PATH}/include/kernel/kernel.h - ${KERNEL_PATH}/include/kernel/linker.h - ${KERNEL_PATH}/include/kernel/kstruct.h - ${KERNEL_PATH}/include/kernel/postcode.h - ${KERNEL_PATH}/include/kernel/timer.h - ${KERNEL_PATH}/include/kernel/trace.h - ${KERNEL_PATH}/include/kernel/type_def.h - ${KERNEL_PATH}/include/kernel/ktype.h - ${KERNEL_PATH}/include/kernel/init.h + ${KERNEL_PATH}/include/arch/arch.h + ${KERNEL_PATH}/include/clock/clock_tick.h + ${KERNEL_PATH}/include/port/port.h + + ${KERNEL_PATH}/include/at_rtos.h + ${KERNEL_PATH}/include/compiler.h + ${KERNEL_PATH}/include/configuration.h + ${KERNEL_PATH}/include/kernel.h + ${KERNEL_PATH}/include/linker.h + ${KERNEL_PATH}/include/kstruct.h + ${KERNEL_PATH}/include/postcode.h + ${KERNEL_PATH}/include/timer.h + ${KERNEL_PATH}/include/trace.h + ${KERNEL_PATH}/include/type_def.h + ${KERNEL_PATH}/include/ktype.h + ${KERNEL_PATH}/include/init.h ) diff --git a/arch/README.md b/include/arch/README.md similarity index 100% rename from arch/README.md rename to include/arch/README.md diff --git a/include/arch.h b/include/arch/arch.h similarity index 88% rename from include/arch.h rename to include/arch/arch.h index 7486bc9..5403c1a 100644 --- a/include/arch.h +++ b/include/arch/arch.h @@ -90,25 +90,25 @@ typedef enum IRQn { #endif #if defined(ARCH_ARM_CORTEX_CM0) -#include "../arch/arch32/arm/cmsis/include/core_cm0.h" +#include "./arch/arch32/arm/cmsis/include/core_cm0.h" #elif defined(ARCH_ARM_CORTEX_CM0plus) -#include "../arch/arch32/arm/cmsis/include/core_cm0plus.h" +#include "./arch/arch32/arm/cmsis/include/core_cm0plus.h" #elif defined(ARCH_ARM_CORTEX_CM3) -#include "../arch/arch32/arm/cmsis/include/core_cm3.h" +#include "./arch/arch32/arm/cmsis/include/core_cm3.h" #elif defined(ARCH_ARM_CORTEX_CM4) -#include "../arch/arch32/arm/cmsis/include/core_cm4.h" +#include "./arch/arch32/arm/cmsis/include/core_cm4.h" #elif defined(ARCH_ARM_CORTEX_CM23) -#include "../arch/arch32/arm/cmsis/include/core_cm23.h" +#include "./arch/arch32/arm/cmsis/include/core_cm23.h" #elif defined(ARCH_ARM_CORTEX_CM33) -#include "../arch/arch32/arm/cmsis/include/core_cm33.h" +#include "./arch/arch32/arm/cmsis/include/core_cm33.h" #elif defined ARCH_ARM_CORTEX_CM7 -#include "../arch/arch32/arm/cmsis/include/core_cm7.h" +#include "./arch/arch32/arm/cmsis/include/core_cm7.h" #elif defined ARCH_NATIVE_GCC // Nothing to do diff --git a/arch/arch32/arm/cmsis/include/cachel1_armv7.h b/include/arch/arch32/arm/cmsis/include/cachel1_armv7.h similarity index 100% rename from arch/arch32/arm/cmsis/include/cachel1_armv7.h rename to include/arch/arch32/arm/cmsis/include/cachel1_armv7.h diff --git a/arch/arch32/arm/cmsis/include/cmsis_armcc.h b/include/arch/arch32/arm/cmsis/include/cmsis_armcc.h similarity index 100% rename from arch/arch32/arm/cmsis/include/cmsis_armcc.h rename to include/arch/arch32/arm/cmsis/include/cmsis_armcc.h diff --git a/arch/arch32/arm/cmsis/include/cmsis_armclang.h b/include/arch/arch32/arm/cmsis/include/cmsis_armclang.h similarity index 100% rename from arch/arch32/arm/cmsis/include/cmsis_armclang.h rename to include/arch/arch32/arm/cmsis/include/cmsis_armclang.h diff --git a/arch/arch32/arm/cmsis/include/cmsis_armclang_ltm.h b/include/arch/arch32/arm/cmsis/include/cmsis_armclang_ltm.h similarity index 100% rename from arch/arch32/arm/cmsis/include/cmsis_armclang_ltm.h rename to include/arch/arch32/arm/cmsis/include/cmsis_armclang_ltm.h diff --git a/arch/arch32/arm/cmsis/include/cmsis_compiler.h b/include/arch/arch32/arm/cmsis/include/cmsis_compiler.h similarity index 100% rename from arch/arch32/arm/cmsis/include/cmsis_compiler.h rename to include/arch/arch32/arm/cmsis/include/cmsis_compiler.h diff --git a/arch/arch32/arm/cmsis/include/cmsis_gcc.h b/include/arch/arch32/arm/cmsis/include/cmsis_gcc.h similarity index 100% rename from arch/arch32/arm/cmsis/include/cmsis_gcc.h rename to include/arch/arch32/arm/cmsis/include/cmsis_gcc.h diff --git a/arch/arch32/arm/cmsis/include/cmsis_iccarm.h b/include/arch/arch32/arm/cmsis/include/cmsis_iccarm.h similarity index 100% rename from arch/arch32/arm/cmsis/include/cmsis_iccarm.h rename to include/arch/arch32/arm/cmsis/include/cmsis_iccarm.h diff --git a/arch/arch32/arm/cmsis/include/cmsis_tiarmclang.h b/include/arch/arch32/arm/cmsis/include/cmsis_tiarmclang.h similarity index 100% rename from arch/arch32/arm/cmsis/include/cmsis_tiarmclang.h rename to include/arch/arch32/arm/cmsis/include/cmsis_tiarmclang.h diff --git a/arch/arch32/arm/cmsis/include/cmsis_version.h b/include/arch/arch32/arm/cmsis/include/cmsis_version.h similarity index 100% rename from arch/arch32/arm/cmsis/include/cmsis_version.h rename to include/arch/arch32/arm/cmsis/include/cmsis_version.h diff --git a/arch/arch32/arm/cmsis/include/core_armv81mml.h b/include/arch/arch32/arm/cmsis/include/core_armv81mml.h similarity index 100% rename from arch/arch32/arm/cmsis/include/core_armv81mml.h rename to include/arch/arch32/arm/cmsis/include/core_armv81mml.h diff --git a/arch/arch32/arm/cmsis/include/core_armv8mbl.h b/include/arch/arch32/arm/cmsis/include/core_armv8mbl.h similarity index 100% rename from arch/arch32/arm/cmsis/include/core_armv8mbl.h rename to include/arch/arch32/arm/cmsis/include/core_armv8mbl.h diff --git a/arch/arch32/arm/cmsis/include/core_armv8mml.h b/include/arch/arch32/arm/cmsis/include/core_armv8mml.h similarity index 100% rename from arch/arch32/arm/cmsis/include/core_armv8mml.h rename to include/arch/arch32/arm/cmsis/include/core_armv8mml.h diff --git a/arch/arch32/arm/cmsis/include/core_cm0.h b/include/arch/arch32/arm/cmsis/include/core_cm0.h similarity index 100% rename from arch/arch32/arm/cmsis/include/core_cm0.h rename to include/arch/arch32/arm/cmsis/include/core_cm0.h diff --git a/arch/arch32/arm/cmsis/include/core_cm0plus.h b/include/arch/arch32/arm/cmsis/include/core_cm0plus.h similarity index 100% rename from arch/arch32/arm/cmsis/include/core_cm0plus.h rename to include/arch/arch32/arm/cmsis/include/core_cm0plus.h diff --git a/arch/arch32/arm/cmsis/include/core_cm1.h b/include/arch/arch32/arm/cmsis/include/core_cm1.h similarity index 100% rename from arch/arch32/arm/cmsis/include/core_cm1.h rename to include/arch/arch32/arm/cmsis/include/core_cm1.h diff --git a/arch/arch32/arm/cmsis/include/core_cm23.h b/include/arch/arch32/arm/cmsis/include/core_cm23.h similarity index 100% rename from arch/arch32/arm/cmsis/include/core_cm23.h rename to include/arch/arch32/arm/cmsis/include/core_cm23.h diff --git a/arch/arch32/arm/cmsis/include/core_cm3.h b/include/arch/arch32/arm/cmsis/include/core_cm3.h similarity index 100% rename from arch/arch32/arm/cmsis/include/core_cm3.h rename to include/arch/arch32/arm/cmsis/include/core_cm3.h diff --git a/arch/arch32/arm/cmsis/include/core_cm33.h b/include/arch/arch32/arm/cmsis/include/core_cm33.h similarity index 100% rename from arch/arch32/arm/cmsis/include/core_cm33.h rename to include/arch/arch32/arm/cmsis/include/core_cm33.h diff --git a/arch/arch32/arm/cmsis/include/core_cm35p.h b/include/arch/arch32/arm/cmsis/include/core_cm35p.h similarity index 100% rename from arch/arch32/arm/cmsis/include/core_cm35p.h rename to include/arch/arch32/arm/cmsis/include/core_cm35p.h diff --git a/arch/arch32/arm/cmsis/include/core_cm4.h b/include/arch/arch32/arm/cmsis/include/core_cm4.h similarity index 100% rename from arch/arch32/arm/cmsis/include/core_cm4.h rename to include/arch/arch32/arm/cmsis/include/core_cm4.h diff --git a/arch/arch32/arm/cmsis/include/core_cm55.h b/include/arch/arch32/arm/cmsis/include/core_cm55.h similarity index 100% rename from arch/arch32/arm/cmsis/include/core_cm55.h rename to include/arch/arch32/arm/cmsis/include/core_cm55.h diff --git a/arch/arch32/arm/cmsis/include/core_cm7.h b/include/arch/arch32/arm/cmsis/include/core_cm7.h similarity index 100% rename from arch/arch32/arm/cmsis/include/core_cm7.h rename to include/arch/arch32/arm/cmsis/include/core_cm7.h diff --git a/arch/arch32/arm/cmsis/include/core_cm85.h b/include/arch/arch32/arm/cmsis/include/core_cm85.h similarity index 100% rename from arch/arch32/arm/cmsis/include/core_cm85.h rename to include/arch/arch32/arm/cmsis/include/core_cm85.h diff --git a/arch/arch32/arm/cmsis/include/core_sc000.h b/include/arch/arch32/arm/cmsis/include/core_sc000.h similarity index 100% rename from arch/arch32/arm/cmsis/include/core_sc000.h rename to include/arch/arch32/arm/cmsis/include/core_sc000.h diff --git a/arch/arch32/arm/cmsis/include/core_sc300.h b/include/arch/arch32/arm/cmsis/include/core_sc300.h similarity index 100% rename from arch/arch32/arm/cmsis/include/core_sc300.h rename to include/arch/arch32/arm/cmsis/include/core_sc300.h diff --git a/arch/arch32/arm/cmsis/include/core_starmc1.h b/include/arch/arch32/arm/cmsis/include/core_starmc1.h similarity index 100% rename from arch/arch32/arm/cmsis/include/core_starmc1.h rename to include/arch/arch32/arm/cmsis/include/core_starmc1.h diff --git a/arch/arch32/arm/cmsis/include/mpu_armv7.h b/include/arch/arch32/arm/cmsis/include/mpu_armv7.h similarity index 100% rename from arch/arch32/arm/cmsis/include/mpu_armv7.h rename to include/arch/arch32/arm/cmsis/include/mpu_armv7.h diff --git a/arch/arch32/arm/cmsis/include/mpu_armv8.h b/include/arch/arch32/arm/cmsis/include/mpu_armv8.h similarity index 100% rename from arch/arch32/arm/cmsis/include/mpu_armv8.h rename to include/arch/arch32/arm/cmsis/include/mpu_armv8.h diff --git a/arch/arch32/arm/cmsis/include/pac_armv81.h b/include/arch/arch32/arm/cmsis/include/pac_armv81.h similarity index 100% rename from arch/arch32/arm/cmsis/include/pac_armv81.h rename to include/arch/arch32/arm/cmsis/include/pac_armv81.h diff --git a/arch/arch32/arm/cmsis/include/pmu_armv8.h b/include/arch/arch32/arm/cmsis/include/pmu_armv8.h similarity index 100% rename from arch/arch32/arm/cmsis/include/pmu_armv8.h rename to include/arch/arch32/arm/cmsis/include/pmu_armv8.h diff --git a/arch/arch32/arm/cmsis/include/tz_context.h b/include/arch/arch32/arm/cmsis/include/tz_context.h similarity index 100% rename from arch/arch32/arm/cmsis/include/tz_context.h rename to include/arch/arch32/arm/cmsis/include/tz_context.h diff --git a/include/kernel/at_rtos.h b/include/at_rtos.h similarity index 99% rename from include/kernel/at_rtos.h rename to include/at_rtos.h index 3b5e3f4..58a5211 100644 --- a/include/kernel/at_rtos.h +++ b/include/at_rtos.h @@ -7,8 +7,6 @@ #ifndef _AT_RTOS_H_ #define _AT_RTOS_H_ -#define AT_RTOS_TYPE_API_DEFINE - #include "ktype.h" #include "kstruct.h" #include "configuration.h" diff --git a/include/clock_tick.h b/include/clock/clock_tick.h similarity index 100% rename from include/clock_tick.h rename to include/clock/clock_tick.h diff --git a/include/kernel/compiler.h b/include/compiler.h similarity index 83% rename from include/kernel/compiler.h rename to include/compiler.h index 67e0de4..8e6a57c 100644 --- a/include/kernel/compiler.h +++ b/include/compiler.h @@ -9,7 +9,7 @@ #define _COMPILER_H_ #if !defined(ARCH_NATIVE_GCC) -#include "../arch/arch32/arm/cmsis/include/cmsis_compiler.h" +#include "./arch/arch32/arm/cmsis/include/cmsis_compiler.h" #endif #endif /* _COMPILER_H_ */ diff --git a/include/kernel/configuration.h b/include/configuration.h similarity index 99% rename from include/kernel/configuration.h rename to include/configuration.h index 2eb00fd..80098d5 100644 --- a/include/kernel/configuration.h +++ b/include/configuration.h @@ -8,7 +8,7 @@ #define _CONFIGURATION_H_ #include "atos_configuration.h" -#include "build_version.h" +#include "../build_version.h" #ifndef THREAD_RUNTIME_NUMBER_SUPPORTED #define THREAD_RUNTIME_NUMBER_SUPPORTED (1u) diff --git a/include/kernel/init.h b/include/init.h similarity index 100% rename from include/kernel/init.h rename to include/init.h diff --git a/include/kernel/kernel.h b/include/kernel.h similarity index 96% rename from include/kernel/kernel.h rename to include/kernel.h index dd964d9..66f4a82 100644 --- a/include/kernel/kernel.h +++ b/include/kernel.h @@ -7,10 +7,11 @@ #ifndef _KERNEL_H_ #define _KERNEL_H_ +#include "./arch/arch.h" +#include "./port/port.h" +#include "./clock/clock_tick.h" #include "kstruct.h" -#include "arch.h" #include "ktype.h" -#include "port.h" #ifndef KERNEL_THREAD_STACK_SIZE #define KERNEL_SCHEDULE_THREAD_STACK_SIZE (1024u) diff --git a/include/kernel/kstruct.h b/include/kstruct.h similarity index 100% rename from include/kernel/kstruct.h rename to include/kstruct.h diff --git a/include/kernel/ktype.h b/include/ktype.h similarity index 100% rename from include/kernel/ktype.h rename to include/ktype.h diff --git a/include/kernel/linker.h b/include/linker.h similarity index 100% rename from include/kernel/linker.h rename to include/linker.h diff --git a/include/port.h b/include/port/port.h similarity index 99% rename from include/port.h rename to include/port/port.h index 0d22575..4f2dd32 100644 --- a/include/port.h +++ b/include/port/port.h @@ -8,7 +8,7 @@ #define _PORT_H_ #include "type_def.h" -#include "arch.h" +#include "./arch/arch.h" #define STACT_UNUSED_DATA (0xDEu) #define STACT_UNUSED_FRAME_MARK (0xDEDEDEDEu) diff --git a/include/kernel/postcode.h b/include/postcode.h similarity index 100% rename from include/kernel/postcode.h rename to include/postcode.h diff --git a/include/kernel/timer.h b/include/timer.h similarity index 100% rename from include/kernel/timer.h rename to include/timer.h diff --git a/include/kernel/trace.h b/include/trace.h similarity index 100% rename from include/kernel/trace.h rename to include/trace.h diff --git a/include/kernel/type_def.h b/include/type_def.h similarity index 100% rename from include/kernel/type_def.h rename to include/type_def.h diff --git a/package.json b/package.json index c5be977..93290ed 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "At-RTOS", "homepage": "https://github.com/At-EC/At-RTOS", - "version": "2.0.10", - "timestamp": "2025-02-01,11:32", - "commit_id": "63252f7f41b13855be4b71aaacb392da700d92cd" + "version": "2.0.11", + "timestamp": "2025-02-03,14:12", + "commit_id": "e67d6b6d5955a438a676872675d7cbc0cbb5df19" } diff --git a/kernel/CMakeLists.txt b/source/CMakeLists.txt similarity index 100% rename from kernel/CMakeLists.txt rename to source/CMakeLists.txt diff --git a/clock/CMakeLists.txt b/source/clock/CMakeLists.txt similarity index 82% rename from clock/CMakeLists.txt rename to source/clock/CMakeLists.txt index 0a9e298..6c11664 100644 --- a/clock/CMakeLists.txt +++ b/source/clock/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${KERNEL_PATH}/include) target_sources(atos_kernel PUBLIC - ${KERNEL_PATH}/include/clock_tick.h + ${KERNEL_PATH}/include/clock/clock_tick.h PRIVATE ${CMAKE_CURRENT_LIST_DIR}/clock_native_gcc.c diff --git a/clock/clock_native_gcc.c b/source/clock/clock_native_gcc.c similarity index 98% rename from clock/clock_native_gcc.c rename to source/clock/clock_native_gcc.c index 51d96dc..01d6087 100644 --- a/clock/clock_native_gcc.c +++ b/source/clock/clock_native_gcc.c @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. **/ -#include "clock_tick.h" +#include "./clock/clock_tick.h" #include "configuration.h" /** diff --git a/clock/clock_systick.c b/source/clock/clock_systick.c similarity index 98% rename from clock/clock_systick.c rename to source/clock/clock_systick.c index 9902aa6..53c7268 100644 --- a/clock/clock_systick.c +++ b/source/clock/clock_systick.c @@ -4,10 +4,10 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. **/ -#include "clock_tick.h" +#include "./arch/arch.h" +#include "./port/port.h" +#include "./clock/clock_tick.h" #include "configuration.h" -#include "arch.h" -#include "port.h" #include "ktype.h" /* Convert the microsecond to clock count */ diff --git a/kernel/event.c b/source/event.c similarity index 100% rename from kernel/event.c rename to source/event.c diff --git a/kernel/init.c b/source/init.c similarity index 100% rename from kernel/init.c rename to source/init.c diff --git a/kernel/kernel.c b/source/kernel.c similarity index 99% rename from kernel/kernel.c rename to source/kernel.c index 5be567e..d80742a 100644 --- a/kernel/kernel.c +++ b/source/kernel.c @@ -7,7 +7,6 @@ #include "kernel.h" #include "timer.h" #include "compiler.h" -#include "clock_tick.h" #include "ktype.h" #include "postcode.h" #include "trace.h" diff --git a/kernel/kthread.c b/source/kthread.c similarity index 100% rename from kernel/kthread.c rename to source/kthread.c diff --git a/kernel/linker.c b/source/linker.c similarity index 100% rename from kernel/linker.c rename to source/linker.c diff --git a/kernel/mutex.c b/source/mutex.c similarity index 100% rename from kernel/mutex.c rename to source/mutex.c diff --git a/kernel/pool.c b/source/pool.c similarity index 100% rename from kernel/pool.c rename to source/pool.c diff --git a/port/CMakeLists.txt b/source/port/CMakeLists.txt similarity index 85% rename from port/CMakeLists.txt rename to source/port/CMakeLists.txt index 1608012..9d03e4d 100644 --- a/port/CMakeLists.txt +++ b/source/port/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${KERNEL_PATH}/include) target_sources(atos_kernel PUBLIC - ${KERNEL_PATH}/include/port.h + ${KERNEL_PATH}/include/port/port.h PRIVATE ${CMAKE_CURRENT_LIST_DIR}/port_native_gcc.c diff --git a/port/port_common.c b/source/port/port_common.c similarity index 97% rename from port/port_common.c rename to source/port/port_common.c index 7a7c7ed..879b382 100644 --- a/port/port_common.c +++ b/source/port/port_common.c @@ -4,9 +4,9 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. **/ +#include "./port/port.h" +#include "./clock/clock_tick.h" #include "linker.h" -#include "clock_tick.h" -#include "port.h" /** * @brief ARM core systick interrupt handle function. @@ -98,9 +98,9 @@ _u32_t port_stack_frame_init(void (*pEntryFunction)(void), _u32_t *pAddress, _u3 psp_frame = STACK_ADDRESS_DOWN(psp_frame); - ((stack_snapshot_t *)psp_frame)->xPSR = B(24); /* xPSR */ + ((stack_snapshot_t *)psp_frame)->xPSR = B(24); /* xPSR */ ((stack_snapshot_t *)psp_frame)->R15_PC = (_u32_t)pEntryFunction; /* PC */ - ((stack_snapshot_t *)psp_frame)->R14_LR = 0xFFFFFFFDu; /* LR */ + ((stack_snapshot_t *)psp_frame)->R14_LR = 0xFFFFFFFDu; /* LR */ ((stack_snapshot_t *)psp_frame)->R12 = 0x12121212u; /* R12 */ ((stack_snapshot_t *)psp_frame)->R3 = 0x03030303u; /* R3 */ diff --git a/port/port_iar.s b/source/port/port_iar.s similarity index 100% rename from port/port_iar.s rename to source/port/port_iar.s diff --git a/port/port_keil_ac5.c b/source/port/port_keil_ac5.c similarity index 99% rename from port/port_keil_ac5.c rename to source/port/port_keil_ac5.c index 94f3fb1..4dd1659 100644 --- a/port/port_keil_ac5.c +++ b/source/port/port_keil_ac5.c @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. **/ -#include "port.h" +#include "./port/port.h" #if defined ( __FPU_PRESENT ) #define FPU_ENABLED __FPU_PRESENT diff --git a/port/port_keil_ac6.c b/source/port/port_keil_ac6.c similarity index 99% rename from port/port_keil_ac6.c rename to source/port/port_keil_ac6.c index eddac7a..c8c6157 100644 --- a/port/port_keil_ac6.c +++ b/source/port/port_keil_ac6.c @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. **/ -#include "port.h" +#include "./port/port.h" #if defined ( __FPU_PRESENT ) #define FPU_ENABLED __FPU_PRESENT diff --git a/port/port_native_gcc.c b/source/port/port_native_gcc.c similarity index 98% rename from port/port_native_gcc.c rename to source/port/port_native_gcc.c index 1dec715..b1943d0 100644 --- a/port/port_native_gcc.c +++ b/source/port/port_native_gcc.c @@ -4,8 +4,8 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. **/ +#include "./arch/arch.h" #include "type_def.h" -#include "arch.h" /** * @brief ARM core trigger the svc call interrupt. diff --git a/kernel/queue.c b/source/queue.c similarity index 100% rename from kernel/queue.c rename to source/queue.c diff --git a/kernel/semaphore.c b/source/semaphore.c similarity index 100% rename from kernel/semaphore.c rename to source/semaphore.c diff --git a/kernel/subscribe.c b/source/subscribe.c similarity index 100% rename from kernel/subscribe.c rename to source/subscribe.c diff --git a/kernel/thread.c b/source/thread.c similarity index 100% rename from kernel/thread.c rename to source/thread.c diff --git a/kernel/timer.c b/source/timer.c similarity index 99% rename from kernel/timer.c rename to source/timer.c index 1c0e597..70c728b 100644 --- a/kernel/timer.c +++ b/source/timer.c @@ -5,7 +5,6 @@ * LICENSE file in the root directory of this source tree. **/ #include "kernel.h" -#include "clock_tick.h" #include "timer.h" #include "postcode.h" #include "trace.h" diff --git a/kernel/trace.c b/source/trace.c similarity index 100% rename from kernel/trace.c rename to source/trace.c