Skip to content

Commit 0114b8f

Browse files
committed
Update new system kernel arch.
1 parent e67d6b6 commit 0114b8f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+55
-75
lines changed

.github/workflows/clang-format.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ jobs:
88
matrix:
99
path:
1010
- check: './include'
11-
exclude: './include/kernel/init.h' # Nothing to exclude
12-
- check: './kernel'
13-
exclude: '' # Nothing to exclude
14-
- check: './clock'
11+
exclude: './include/arch/arch32/' # Nothing to exclude
12+
exclude: './include/init.h' # Nothing to exclude
13+
- check: './source'
1514
exclude: '' # Nothing to exclude
1615
steps:
1716
- uses: actions/checkout@v3

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ target_sources(atos_kernel
1212
)
1313

1414
include(${CMAKE_CURRENT_LIST_DIR}/include/CMakeLists.txt)
15-
include(${CMAKE_CURRENT_LIST_DIR}/kernel/CMakeLists.txt)
16-
include(${CMAKE_CURRENT_LIST_DIR}/clock/CMakeLists.txt)
17-
include(${CMAKE_CURRENT_LIST_DIR}/port/CMakeLists.txt)
15+
include(${CMAKE_CURRENT_LIST_DIR}/source/CMakeLists.txt)
16+
include(${CMAKE_CURRENT_LIST_DIR}/source/clock/CMakeLists.txt)
17+
include(${CMAKE_CURRENT_LIST_DIR}/source/port/CMakeLists.txt)
1818

1919
if(NOT TARGET atos_config)
2020
message(FATAL_ERROR " atos_config target not specified. Please specify a cmake target that defines the include path for atos_configuration.h\n")

README.md

Lines changed: 0 additions & 20 deletions

build_version.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
extern "C" {
1313
#endif
1414

15-
#define ATOS_BUILD_TIME "2025-02-01,11:32"
16-
#define ATOS_COMMIT_HEAD_ID "ee4223b81fddf0ea5f2520f2adcfc2247091b865"
15+
#define ATOS_BUILD_TIME "2025-02-03,14:12"
16+
#define ATOS_COMMIT_HEAD_ID "e67d6b6d5955a438a676872675d7cbc0cbb5df19"
1717
#define ATOS_VERSION_MAJOR_NUMBER (2u)
1818
#define ATOS_VERSION_MINOR_NUMBER (0u)
19-
#define ATOS_VERSION_PATCH_NUMBER (10u)
19+
#define ATOS_VERSION_PATCH_NUMBER (11u)
2020

2121
#define ATOS_VERSION_MAJOR_NUMBER_MASK (0x03FFu)
2222
#define ATOS_VERSION_MAJOR_NUMBER_POS (22u)

include/CMakeLists.txt

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
add_library(kernel_include INTERFACE)
22

33
include_directories(${KERNEL_PATH}/include)
4-
include_directories(${KERNEL_PATH}/include/kernel)
4+
include_directories(${KERNEL_PATH}/include/arch)
5+
include_directories(${KERNEL_PATH}/include/clock)
6+
include_directories(${KERNEL_PATH}/include/port)
57

68
target_sources(kernel_include
79
PUBLIC
8-
${KERNEL_PATH}/include/arch.h
9-
10-
${KERNEL_PATH}/include/kernel/at_rtos.h
11-
${KERNEL_PATH}/include/kernel/compiler.h
12-
${KERNEL_PATH}/include/kernel/configuration.h
13-
${KERNEL_PATH}/include/kernel/kernel.h
14-
${KERNEL_PATH}/include/kernel/linker.h
15-
${KERNEL_PATH}/include/kernel/kstruct.h
16-
${KERNEL_PATH}/include/kernel/postcode.h
17-
${KERNEL_PATH}/include/kernel/timer.h
18-
${KERNEL_PATH}/include/kernel/trace.h
19-
${KERNEL_PATH}/include/kernel/type_def.h
20-
${KERNEL_PATH}/include/kernel/ktype.h
21-
${KERNEL_PATH}/include/kernel/init.h
10+
${KERNEL_PATH}/include/arch/arch.h
11+
${KERNEL_PATH}/include/clock/clock_tick.h
12+
${KERNEL_PATH}/include/port/port.h
13+
14+
${KERNEL_PATH}/include/at_rtos.h
15+
${KERNEL_PATH}/include/compiler.h
16+
${KERNEL_PATH}/include/configuration.h
17+
${KERNEL_PATH}/include/kernel.h
18+
${KERNEL_PATH}/include/linker.h
19+
${KERNEL_PATH}/include/kstruct.h
20+
${KERNEL_PATH}/include/postcode.h
21+
${KERNEL_PATH}/include/timer.h
22+
${KERNEL_PATH}/include/trace.h
23+
${KERNEL_PATH}/include/type_def.h
24+
${KERNEL_PATH}/include/ktype.h
25+
${KERNEL_PATH}/include/init.h
2226
)

include/arch.h renamed to include/arch/arch.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,25 +90,25 @@ typedef enum IRQn {
9090
#endif
9191

9292
#if defined(ARCH_ARM_CORTEX_CM0)
93-
#include "../arch/arch32/arm/cmsis/include/core_cm0.h"
93+
#include "./arch/arch32/arm/cmsis/include/core_cm0.h"
9494

9595
#elif defined(ARCH_ARM_CORTEX_CM0plus)
96-
#include "../arch/arch32/arm/cmsis/include/core_cm0plus.h"
96+
#include "./arch/arch32/arm/cmsis/include/core_cm0plus.h"
9797

9898
#elif defined(ARCH_ARM_CORTEX_CM3)
99-
#include "../arch/arch32/arm/cmsis/include/core_cm3.h"
99+
#include "./arch/arch32/arm/cmsis/include/core_cm3.h"
100100

101101
#elif defined(ARCH_ARM_CORTEX_CM4)
102-
#include "../arch/arch32/arm/cmsis/include/core_cm4.h"
102+
#include "./arch/arch32/arm/cmsis/include/core_cm4.h"
103103

104104
#elif defined(ARCH_ARM_CORTEX_CM23)
105-
#include "../arch/arch32/arm/cmsis/include/core_cm23.h"
105+
#include "./arch/arch32/arm/cmsis/include/core_cm23.h"
106106

107107
#elif defined(ARCH_ARM_CORTEX_CM33)
108-
#include "../arch/arch32/arm/cmsis/include/core_cm33.h"
108+
#include "./arch/arch32/arm/cmsis/include/core_cm33.h"
109109

110110
#elif defined ARCH_ARM_CORTEX_CM7
111-
#include "../arch/arch32/arm/cmsis/include/core_cm7.h"
111+
#include "./arch/arch32/arm/cmsis/include/core_cm7.h"
112112

113113
#elif defined ARCH_NATIVE_GCC
114114
// Nothing to do
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)