Skip to content

Commit 0114b8f

Browse files
At-ECAt-EC
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
)

‎arch/README.md renamed to ‎include/arch/README.md

‎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

‎arch/arch32/arm/cmsis/include/cachel1_armv7.h renamed to ‎include/arch/arch32/arm/cmsis/include/cachel1_armv7.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/cmsis_armcc.h renamed to ‎include/arch/arch32/arm/cmsis/include/cmsis_armcc.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/cmsis_armclang.h renamed to ‎include/arch/arch32/arm/cmsis/include/cmsis_armclang.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/cmsis_armclang_ltm.h renamed to ‎include/arch/arch32/arm/cmsis/include/cmsis_armclang_ltm.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/cmsis_compiler.h renamed to ‎include/arch/arch32/arm/cmsis/include/cmsis_compiler.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/cmsis_gcc.h renamed to ‎include/arch/arch32/arm/cmsis/include/cmsis_gcc.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/cmsis_iccarm.h renamed to ‎include/arch/arch32/arm/cmsis/include/cmsis_iccarm.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/cmsis_tiarmclang.h renamed to ‎include/arch/arch32/arm/cmsis/include/cmsis_tiarmclang.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/cmsis_version.h renamed to ‎include/arch/arch32/arm/cmsis/include/cmsis_version.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/core_armv81mml.h renamed to ‎include/arch/arch32/arm/cmsis/include/core_armv81mml.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/core_armv8mbl.h renamed to ‎include/arch/arch32/arm/cmsis/include/core_armv8mbl.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/core_armv8mml.h renamed to ‎include/arch/arch32/arm/cmsis/include/core_armv8mml.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/core_cm0.h renamed to ‎include/arch/arch32/arm/cmsis/include/core_cm0.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/core_cm0plus.h renamed to ‎include/arch/arch32/arm/cmsis/include/core_cm0plus.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/core_cm1.h renamed to ‎include/arch/arch32/arm/cmsis/include/core_cm1.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/core_cm23.h renamed to ‎include/arch/arch32/arm/cmsis/include/core_cm23.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/core_cm3.h renamed to ‎include/arch/arch32/arm/cmsis/include/core_cm3.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/core_cm33.h renamed to ‎include/arch/arch32/arm/cmsis/include/core_cm33.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/core_cm35p.h renamed to ‎include/arch/arch32/arm/cmsis/include/core_cm35p.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/core_cm4.h renamed to ‎include/arch/arch32/arm/cmsis/include/core_cm4.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/core_cm55.h renamed to ‎include/arch/arch32/arm/cmsis/include/core_cm55.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/core_cm7.h renamed to ‎include/arch/arch32/arm/cmsis/include/core_cm7.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/core_cm85.h renamed to ‎include/arch/arch32/arm/cmsis/include/core_cm85.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/core_sc000.h renamed to ‎include/arch/arch32/arm/cmsis/include/core_sc000.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/core_sc300.h renamed to ‎include/arch/arch32/arm/cmsis/include/core_sc300.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/core_starmc1.h renamed to ‎include/arch/arch32/arm/cmsis/include/core_starmc1.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/mpu_armv7.h renamed to ‎include/arch/arch32/arm/cmsis/include/mpu_armv7.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/mpu_armv8.h renamed to ‎include/arch/arch32/arm/cmsis/include/mpu_armv8.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/pac_armv81.h renamed to ‎include/arch/arch32/arm/cmsis/include/pac_armv81.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/pmu_armv8.h renamed to ‎include/arch/arch32/arm/cmsis/include/pmu_armv8.h

File renamed without changes.

‎arch/arch32/arm/cmsis/include/tz_context.h renamed to ‎include/arch/arch32/arm/cmsis/include/tz_context.h

File renamed without changes.

‎include/kernel/at_rtos.h renamed to ‎include/at_rtos.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
#ifndef _AT_RTOS_H_
88
#define _AT_RTOS_H_
99

10-
#define AT_RTOS_TYPE_API_DEFINE
11-
1210
#include "ktype.h"
1311
#include "kstruct.h"
1412
#include "configuration.h"

‎include/clock_tick.h renamed to ‎include/clock/clock_tick.h

File renamed without changes.

‎include/kernel/compiler.h renamed to ‎include/compiler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define _COMPILER_H_
1010

1111
#if !defined(ARCH_NATIVE_GCC)
12-
#include "../arch/arch32/arm/cmsis/include/cmsis_compiler.h"
12+
#include "./arch/arch32/arm/cmsis/include/cmsis_compiler.h"
1313
#endif
1414

1515
#endif /* _COMPILER_H_ */

‎include/kernel/configuration.h renamed to ‎include/configuration.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#define _CONFIGURATION_H_
99

1010
#include "atos_configuration.h"
11-
#include "build_version.h"
11+
#include "../build_version.h"
1212

1313
#ifndef THREAD_RUNTIME_NUMBER_SUPPORTED
1414
#define THREAD_RUNTIME_NUMBER_SUPPORTED (1u)

‎include/kernel/init.h renamed to ‎include/init.h

File renamed without changes.

‎include/kernel/kernel.h renamed to ‎include/kernel.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
#ifndef _KERNEL_H_
88
#define _KERNEL_H_
99

10+
#include "./arch/arch.h"
11+
#include "./port/port.h"
12+
#include "./clock/clock_tick.h"
1013
#include "kstruct.h"
11-
#include "arch.h"
1214
#include "ktype.h"
13-
#include "port.h"
1415

1516
#ifndef KERNEL_THREAD_STACK_SIZE
1617
#define KERNEL_SCHEDULE_THREAD_STACK_SIZE (1024u)

‎include/kernel/kstruct.h renamed to ‎include/kstruct.h

File renamed without changes.

‎include/kernel/ktype.h renamed to ‎include/ktype.h

File renamed without changes.

‎include/kernel/linker.h renamed to ‎include/linker.h

File renamed without changes.

‎include/port.h renamed to ‎include/port/port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#define _PORT_H_
99

1010
#include "type_def.h"
11-
#include "arch.h"
11+
#include "./arch/arch.h"
1212

1313
#define STACT_UNUSED_DATA (0xDEu)
1414
#define STACT_UNUSED_FRAME_MARK (0xDEDEDEDEu)

‎include/kernel/postcode.h renamed to ‎include/postcode.h

File renamed without changes.

‎include/kernel/timer.h renamed to ‎include/timer.h

File renamed without changes.

‎include/kernel/trace.h renamed to ‎include/trace.h

File renamed without changes.

‎include/kernel/type_def.h renamed to ‎include/type_def.h

File renamed without changes.

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "At-RTOS",
33
"homepage": "https://github.com/At-EC/At-RTOS",
4-
"version": "2.0.10",
5-
"timestamp": "2025-02-01,11:32",
6-
"commit_id": "63252f7f41b13855be4b71aaacb392da700d92cd"
4+
"version": "2.0.11",
5+
"timestamp": "2025-02-03,14:12",
6+
"commit_id": "e67d6b6d5955a438a676872675d7cbc0cbb5df19"
77
}

‎kernel/CMakeLists.txt renamed to ‎source/CMakeLists.txt

File renamed without changes.

‎clock/CMakeLists.txt renamed to ‎source/clock/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include_directories(${KERNEL_PATH}/include)
22

33
target_sources(atos_kernel
44
PUBLIC
5-
${KERNEL_PATH}/include/clock_tick.h
5+
${KERNEL_PATH}/include/clock/clock_tick.h
66

77
PRIVATE
88
${CMAKE_CURRENT_LIST_DIR}/clock_native_gcc.c

‎clock/clock_native_gcc.c renamed to ‎source/clock/clock_native_gcc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
**/
7-
#include "clock_tick.h"
7+
#include "./clock/clock_tick.h"
88
#include "configuration.h"
99

1010
/**

‎clock/clock_systick.c renamed to ‎source/clock/clock_systick.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
**/
7-
#include "clock_tick.h"
7+
#include "./arch/arch.h"
8+
#include "./port/port.h"
9+
#include "./clock/clock_tick.h"
810
#include "configuration.h"
9-
#include "arch.h"
10-
#include "port.h"
1111
#include "ktype.h"
1212

1313
/* Convert the microsecond to clock count */

‎kernel/event.c renamed to ‎source/event.c

File renamed without changes.

‎kernel/init.c renamed to ‎source/init.c

File renamed without changes.

‎kernel/kernel.c renamed to ‎source/kernel.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include "kernel.h"
88
#include "timer.h"
99
#include "compiler.h"
10-
#include "clock_tick.h"
1110
#include "ktype.h"
1211
#include "postcode.h"
1312
#include "trace.h"

‎kernel/kthread.c renamed to ‎source/kthread.c

File renamed without changes.

‎kernel/linker.c renamed to ‎source/linker.c

File renamed without changes.

‎kernel/mutex.c renamed to ‎source/mutex.c

File renamed without changes.

‎kernel/pool.c renamed to ‎source/pool.c

File renamed without changes.

‎port/CMakeLists.txt renamed to ‎source/port/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include_directories(${KERNEL_PATH}/include)
22

33
target_sources(atos_kernel
44
PUBLIC
5-
${KERNEL_PATH}/include/port.h
5+
${KERNEL_PATH}/include/port/port.h
66

77
PRIVATE
88
${CMAKE_CURRENT_LIST_DIR}/port_native_gcc.c

‎port/port_common.c renamed to ‎source/port/port_common.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
**/
7+
#include "./port/port.h"
8+
#include "./clock/clock_tick.h"
79
#include "linker.h"
8-
#include "clock_tick.h"
9-
#include "port.h"
1010

1111
/**
1212
* @brief ARM core systick interrupt handle function.

‎port/port_iar.s renamed to ‎source/port/port_iar.s

File renamed without changes.

‎port/port_keil_ac5.c renamed to ‎source/port/port_keil_ac5.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
**/
7-
#include "port.h"
7+
#include "./port/port.h"
88

99
#if defined ( __FPU_PRESENT )
1010
#define FPU_ENABLED __FPU_PRESENT

‎port/port_keil_ac6.c renamed to ‎source/port/port_keil_ac6.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
**/
7-
#include "port.h"
7+
#include "./port/port.h"
88

99
#if defined ( __FPU_PRESENT )
1010
#define FPU_ENABLED __FPU_PRESENT

‎port/port_native_gcc.c renamed to ‎source/port/port_native_gcc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
**/
7+
#include "./arch/arch.h"
78
#include "type_def.h"
8-
#include "arch.h"
99

1010
/**
1111
* @brief ARM core trigger the svc call interrupt.

‎kernel/queue.c renamed to ‎source/queue.c

File renamed without changes.

‎kernel/semaphore.c renamed to ‎source/semaphore.c

File renamed without changes.

‎kernel/subscribe.c renamed to ‎source/subscribe.c

File renamed without changes.

‎kernel/thread.c renamed to ‎source/thread.c

File renamed without changes.

‎kernel/timer.c renamed to ‎source/timer.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* LICENSE file in the root directory of this source tree.
66
**/
77
#include "kernel.h"
8-
#include "clock_tick.h"
98
#include "timer.h"
109
#include "postcode.h"
1110
#include "trace.h"

‎kernel/trace.c renamed to ‎source/trace.c

File renamed without changes.

0 commit comments

Comments
 (0)