Skip to content

Commit 865eee8

Browse files
Amanda Butlerbulislaw
authored andcommitted
Update cmsis-rtos.md
Copy edit, mostly for active voice, consistent tense and consistent code format.
1 parent 5e755c6 commit 865eee8

File tree

1 file changed

+41
-42
lines changed

1 file changed

+41
-42
lines changed

docs/advanced/cmsis-rtos.md

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,76 @@
1-
# CMSIS & RTX
1+
# CMSIS and RTX
22

3-
CMSIS/RTX code is imported from the original CMSIS repository which can be found: https://github.com/ARM-software/CMSIS_5/
3+
CMSIS/RTX code is imported from the original CMSIS repository, which you can find at: https://github.com/ARM-software/CMSIS_5/.
44

55
## Memory considerations
66

7-
Please note that mbed OS doesn't use any of the RTX memory models, which are based on static carveouts (memory pools). This approach is not ideal for generic system like mbed OS as calculating required numbers of RTOS objects is impossible. To avoid declaring arbitrary large buffers, carved out on compile time, limiting amount of available memory, mbed OS shifts the responsibility of supplying the backing memory to CMSIS-RTOS2 users.
7+
Please note that mbed OS doesn't use any of the RTX memory models, which are based on static carveouts (memory pools). This approach is not ideal for generic system, such as mbed O,S because calculating required numbers of RTOS objects is impossible. To avoid declaring arbitrary large buffers, carved out on compile time, limiting amount of available memory, mbed OS shifts the responsibility of supplying the backing memory to CMSIS-RTOS2 users.
88

9-
Therefore developers will need to use mbed OS RTOS C++ API or supply backing memory for RTX objects to `os*New` calls when using CMSIS-RTOS2 APIs directly (please consult CMSIS-RTOS2 documentation for API details). `mbed_rtos_storage.h` header provides handy wrappers that can be used to secure required memory without exposing the code to RTX implementation details.
9+
Therefore developers need to use the mbed OS RTOS C++ API or supply backing memory for RTX objects to `os*New` calls when using CMSIS-RTOS2 APIs directly. (Please consult CMSIS-RTOS2 documentation for API details.) `mbed_rtos_storage.h` header provides handy wrappers that you can use to secure required memory without exposing the code to RTX implementation details.
1010

1111
## Configuration
1212

13-
mbed OS changes to RTX configuration are all maintained in a single file: `mbed-os/rtos/rtx2/mbed_rtx_conf.h`
13+
mbed OS changes to RTX configuration all exist in a single file: `mbed-os/rtos/rtx2/mbed_rtx_conf.h`
1414

1515
Option | Value | Description |
1616
-------|-------|-------------|
17-
OS_STACK_SIZE | 4K or 2K | For normal target the thread stack size is set to 4K for constrained targets it's 2K |
18-
OS_TIMER_THREAD_STACK_SIZE | 768B | Timer thread stack set to 768B that's necessary to support our C++ wrappers (4 instances), but may require changing to support larger number of active timers |
19-
OS_IDLE_THREAD_STACK_SIZE | 256B | Required to handle mbed OS wrappers |
20-
OS_DYNAMIC_MEM_SIZE | 0 | RTX dynamic memory is disabled |
21-
OS_MUTEX_OBJ_MEM | 1 or 0 | For ARMC we use 1, for other toolchains it's 0. ARMC uses statically allocated mutexes internally. |
22-
OS_MUTEX_NUM | 6 or 0 | For ARMC we use 6, for other toolchains it's 0. ARMC uses statically allocated mutexes internally. |
23-
OS_STACK_WATERMARK | 0 or 1 | Watermarking enabled if MBED_STACK_STATS_ENABLED or MBED_STACK_STATS_ENABLED are set. |
24-
OS_PRIVILEGE_MODE | 0 or 1 | We set it for 0 if uVisor is enabled, 1 otherwise. |
25-
17+
`OS_STACK_SIZE` | 4K or 2K | For a normal target, the thread stack size is set to 4K; for constrained targets, it's 2K. |
18+
`OS_TIMER_THREAD_STACK_SIZE` | 768B | Timer thread stack set to 768B that's necessary to support the C++ wrappers (4 instances), but it may require changing to support larger number of active timers. |
19+
`OS_IDLE_THREAD_STACK_SIZE` | 256B | Required to handle mbed OS wrappers |
20+
`OS_DYNAMIC_MEM_SIZE` | 0 | RTX dynamic memory is disabled. |
21+
`OS_MUTEX_OBJ_MEM` | 1 or 0 | For ARMC, use 1; for other toolchains, it's 0. ARMC uses statically allocated mutexes internally. |
22+
`OS_MUTEX_NUM` | 6 or 0 | For ARMC, use 6; for other toolchains, it's 0. ARMC uses statically allocated mutexes internally. |
23+
`OS_STACK_WATERMARK` | 0 or 1 | Watermarking is enabled if `MBED_STACK_STATS_ENABLED` or `MBED_STACK_STATS_ENABLED` are set. |
24+
`OS_PRIVILEGE_MODE` | 0 or 1 | We set it for 0 if uVisor is enabled, 1 otherwise. |
2625

2726
## Code structure
2827

29-
Due to differences in how mbed OS and CMSIS directory structures look like, we can't import the original code directly, some directory changes are necessary:
28+
Due to differences in how the mbed OS and CMSIS directory structures look, you can't import the original code directly. Some directory changes are necessary:
3029

3130
CMSIS5 | mbed OS | Explanation |
3231
-------|---------|-------------|
33-
CMSIS_5/CMSIS/Core/Include/core_*.h | mbed-os/cmsis/ | Core specific code |
34-
CMSIS_5/CMSIS/Core/Include/tz_context.h | mbed-os/cmsis/ | TrustZone code |
35-
CMSIS_5/CMSIS/Core/Include/cmsis_compiler.h | mbed-os/cmsis/ | Toolchain generic code |
36-
CMSIS_5/CMSIS/Core/Include/cmsis_{armcc,armclang,gcc}.h | mbed-os/cmsis/TOOLCHAIN_{ARM,GCC}/ | Toolchain specific code |
37-
CMSIS_5/CMSIS/RTOS2/Include/cmsis_os2.h | mbed-os/rtos/rtx2/TARGET_CORTEX_M/ | RTX main header |
38-
CMSIS_5/CMSIS/RTOS2/RTX/Config/ | mbed-os/rtos/rtx2/TARGET_CORTEX_M/ | RTX configuration files |
39-
CMSIS_5/CMSIS/RTOS2/RTX/Include1/ | mbed-os/rtos/rtx/ | RTOS1 compatibility layer |
40-
CMSIS_5/CMSIS/RTOS2/RTX/Include/ | mbed-os/rtos/rtx2/TARGET_CORTEX_M/ | RTX definitions |
41-
CMSIS_5/CMSIS/RTOS2/RTX/Source/rtx_* | mbed-os/rtos/rtx2/TARGET_CORTEX_M/ | RTX sources |
42-
CMSIS_5/CMSIS/RTOS2/RTX/Source/svc_user.c | mbed-os/rtos/rtx2/TARGET_CORTEX_M/ | RTX SVC user table |
43-
CMSIS_5/CMSIS/RTOS2/RTX/Source/{ARM,GCC,IAR}/| mbed-os/rtos/rtx2/TARGET_CORTEX_M/TARGET_{M0,M0P,M3,RTOS_M4_M7}/TOOLCHAIN_{ARM,GCC,IAR} | Toolchain and core specific exception handlers |
32+
`CMSIS_5/CMSIS/Core/Include/core_*.h` | `mbed-os/cmsis/` | Core specific code |
33+
`CMSIS_5/CMSIS/Core/Include/tz_context.h` | `mbed-os/cmsis/` | TrustZone code |
34+
`CMSIS_5/CMSIS/Core/Include/cmsis_compiler.h` | `mbed-os/cmsis/` | Toolchain generic code |
35+
`CMSIS_5/CMSIS/Core/Include/cmsis_{armcc,armclang,gcc}.h` | `mbed-os/cmsis/TOOLCHAIN_{ARM,GCC}/` | Toolchain specific code |
36+
`CMSIS_5/CMSIS/RTOS2/Include/cmsis_os2.h` | `mbed-os/rtos/rtx2/TARGET_CORTEX_M/` | RTX main header |
37+
`CMSIS_5/CMSIS/RTOS2/RTX/Config/` | `mbed-os/rtos/rtx2/TARGET_CORTEX_M/` | RTX configuration files |
38+
`CMSIS_5/CMSIS/RTOS2/RTX/Include1/` | `mbed-os/rtos/rtx/` | RTOS1 compatibility layer |
39+
`CMSIS_5/CMSIS/RTOS2/RTX/Include/` | `mbed-os/rtos/rtx2/TARGET_CORTEX_M/` | RTX definitions |
40+
`CMSIS_5/CMSIS/RTOS2/RTX/Source/rtx_*` | `mbed-os/rtos/rtx2/TARGET_CORTEX_M/` | RTX sources |
41+
`CMSIS_5/CMSIS/RTOS2/RTX/Source/svc_user.c` | `mbed-os/rtos/rtx2/TARGET_CORTEX_M/` | RTX SVC user table |
42+
`CMSIS_5/CMSIS/RTOS2/RTX/Source/{ARM,GCC,IAR}/` | `mbed-os/rtos/rtx2/TARGET_CORTEX_M/TARGET_{M0,M0P,M3,RTOS_M4_M7}/TOOLCHAIN_{ARM,GCC,IAR}` | Toolchain and core specific exception handlers |
4443

4544
## Modification
4645

47-
Due to different use cases between mbed OS and CMSIS, we had to make some modifications to the source code. We've tried to upstream our changes to CMSIS repository, but in cases where they weren't compatible with CMSIS requirements we are forced to maintain small set of changes.
46+
Due to different use cases between mbed OS and CMSIS, we had to make some modifications to the source code. We've tried to upstream our changes to the CMSIS repository, but in cases where they aren't compatible with CMSIS requirements, we are forced to maintain a small set of changes.
4847

4948
### CMSIS
5049

5150

5251
Filename | Description |
5352
---------|-------------|
54-
cmsis_compiler.h | Added IAR missing __ALIGNED attribute for earlier (less than 7.8.4) versions |
53+
`cmsis_compiler.h` | Added IAR missing __ALIGNED attribute for earlier (less than 7.8.4) versions |
5554

5655

5756
### RTX
5857

5958
Filename | Description |
6059
---------|-------------|
61-
cmsis_os2.h | Doxygen added; added per-thread uVisor context |
62-
cmsis_os1.h | Change `osThreadDef` to accept 3 parameters, rather than 4, and be not static as expected by mbed OS |
63-
core_cm.h | Doxygen added; included headers changed to match mbed OS core selection; deferred priority setting of SVCall to uVisor, when uVisor is enabled |
64-
RTX_Config.h | Doxygen added, mbed OS RTX config included |
65-
rtx_evr.c | CMSIS component definition include removed |
66-
rtx_evr.h | Doxygen added |
67-
rtx_thread.c | Added per-thread uVisor context; notify uVisor of OS events |
68-
rtx_kernel.c | Added per-thread uVisor context; notify uVisor of OS events |
69-
rtx_lib.h | Doxygen added; added per-thread uVisor context |
70-
rtx_os.h | Doxygen added; added per-thread uVisor context |
71-
irq_cm4.s | For all toolchains: added case for Cortex M4 cores without VFP |
72-
svc_user.c | Removed as it's template file and should not be in our code base |
73-
rt_OsEventObserver.{c,h} | Added an interface for uVisor to get notified about certain events from privileged code |
60+
`cmsis_os2.h` | Doxygen added; added per-thread uVisor context |
61+
`cmsis_os1.h` | Change `osThreadDef` to accept 3 parameters rather than 4 and be not static as expected by mbed OS |
62+
`core_cm.h` | Doxygen added; included headers changed to match mbed OS core selection; deferred priority setting of SVCall to uVisor when uVisor is enabled |
63+
`RTX_Config.h` | Doxygen added; mbed OS RTX config included |
64+
`rtx_evr.c` | CMSIS component definition include removed |
65+
`rtx_evr.h` | Doxygen added |
66+
`rtx_thread.c` | Added per-thread uVisor context; notify uVisor of OS events |
67+
`rtx_kernel.c` | Added per-thread uVisor context; notify uVisor of OS events |
68+
`rtx_lib.h` | Doxygen added; added per-thread uVisor context |
69+
`rtx_os.h` | Doxygen added; added per-thread uVisor context |
70+
`irq_cm4.s` | For all toolchains: added case for Cortex M4 cores without VFP |
71+
`svc_user.c` | Removed as its template file and should not be in our code base |
72+
`rt_OsEventObserver.{c,h}` | Added an interface for uVisor to be notified about certain events from privileged code |
7473

7574
#### Other
7675

77-
* irq_cm0.s is used for both M0 and M0P cores in mbed OS for all toolchains
76+
* For all toolchains, mbed OS uses `irq_cm0.s` for both M0 and M0P cores.

0 commit comments

Comments
 (0)