Skip to content

Commit 744814f

Browse files
PataterPatater
authored
Merge pull request #14900 from 0xc0170/feature_CMSIS_5_13b9f72f2
Update CMSIS to 5.8.0
2 parents bad4aa6 + 049d1f1 commit 744814f

File tree

77 files changed

+6337
-5489
lines changed

Some content is hidden

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

77 files changed

+6337
-5489
lines changed

‎cmsis/CMSIS_5/CMSIS/RTOS2/Include/cmsis_os2.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013-2018 Arm Limited. All rights reserved.
2+
* Copyright (c) 2013-2020 Arm Limited. All rights reserved.
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*
@@ -17,7 +17,7 @@
1717
*
1818
* ----------------------------------------------------------------------
1919
*
20-
* $Date: 18. June 2018
20+
* $Date: 12. June 2020
2121
* $Revision: V2.1.3
2222
*
2323
* Project: CMSIS-RTOS2 API
@@ -86,7 +86,7 @@ typedef enum {
8686
osKernelLocked = 3, ///< Locked.
8787
osKernelSuspended = 4, ///< Suspended.
8888
osKernelError = -1, ///< Error.
89-
osKernelReserved = 0x7FFFFFFFU ///< Prevents enum down-size compiler optimization.
89+
osKernelReserved = 0x7FFFFFFF ///< Prevents enum down-size compiler optimization.
9090
} osKernelState_t;
9191

9292
/// Thread state.
@@ -723,7 +723,7 @@ osStatus_t osMessageQueueGet (osMessageQueueId_t mq_id, void *msg_ptr, uint8_t *
723723
/// \return maximum number of messages.
724724
uint32_t osMessageQueueGetCapacity (osMessageQueueId_t mq_id);
725725

726-
/// Get maximum message size in a Memory Pool.
726+
/// Get maximum message size in a Message Queue.
727727
/// \param[in] mq_id message queue ID obtained by \ref osMessageQueueNew.
728728
/// \return maximum message size in bytes.
729729
uint32_t osMessageQueueGetMsgSize (osMessageQueueId_t mq_id);

‎cmsis/CMSIS_5/CMSIS/RTOS2/Include/os_tick.h‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/**************************************************************************//**
22
* @file os_tick.h
33
* @brief CMSIS OS Tick header file
4-
* @version V1.0.1
5-
* @date 24. November 2017
4+
* @version V1.0.2
5+
* @date 19. March 2021
66
******************************************************************************/
77
/*
8-
* Copyright (c) 2017-2017 ARM Limited. All rights reserved.
8+
* Copyright (c) 2017-2021 ARM Limited. All rights reserved.
99
*
1010
* SPDX-License-Identifier: Apache-2.0
1111
*
@@ -27,6 +27,11 @@
2727

2828
#include <stdint.h>
2929

30+
#ifdef __cplusplus
31+
extern "C"
32+
{
33+
#endif
34+
3035
/// IRQ Handler.
3136
#ifndef IRQHANDLER_T
3237
#define IRQHANDLER_T
@@ -68,4 +73,8 @@ uint32_t OS_Tick_GetCount (void);
6873
/// \return OS Tick overflow status (1 - overflow, 0 - no overflow).
6974
uint32_t OS_Tick_GetOverflow (void);
7075

76+
#ifdef __cplusplus
77+
}
78+
#endif
79+
7180
#endif /* OS_TICK_H */

‎cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Config/RTX_Config.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013-2018 Arm Limited. All rights reserved.
2+
* Copyright (c) 2013-2021 Arm Limited. All rights reserved.
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*
@@ -17,7 +17,7 @@
1717
*
1818
* -----------------------------------------------------------------------------
1919
*
20-
* $Revision: V5.1.0
20+
* $Revision: V5.1.1
2121
*
2222
* Project: CMSIS-RTOS RTX
2323
* Title: RTX Configuration
@@ -40,7 +40,7 @@ __WEAK uint32_t osRtxErrorNotify (uint32_t code, void *object_id) {
4040
(void)object_id;
4141

4242
switch (code) {
43-
case osRtxErrorStackUnderflow:
43+
case osRtxErrorStackOverflow:
4444
// Stack overflow detected for thread (thread_id=object_id)
4545
break;
4646
case osRtxErrorISRQueueOverflow:

‎cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Config/RTX_Config.h‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013-2020 Arm Limited. All rights reserved.
2+
* Copyright (c) 2013-2021 Arm Limited. All rights reserved.
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*
@@ -17,7 +17,7 @@
1717
*
1818
* -----------------------------------------------------------------------------
1919
*
20-
* $Revision: V5.5.1
20+
* $Revision: V5.5.2
2121
*
2222
* Project: CMSIS-RTOS RTX
2323
* Title: RTX Configuration definitions
@@ -69,7 +69,7 @@
6969

7070
// </e>
7171

72-
// <o>ISR FIFO Queue
72+
// <o>ISR FIFO Queue
7373
// <4=> 4 entries <8=> 8 entries <12=> 12 entries <16=> 16 entries
7474
// <24=> 24 entries <32=> 32 entries <48=> 48 entries <64=> 64 entries
7575
// <96=> 96 entries <128=> 128 entries <196=> 196 entries <256=> 256 entries
@@ -143,10 +143,10 @@
143143
#endif
144144

145145
// <q>Stack overrun checking
146-
// <i> Enables stack overrun check at thread switch.
146+
// <i> Enables stack overrun check at thread switch (requires RTX source variant).
147147
// <i> Enabling this option increases slightly the execution time of a thread switch.
148148
#ifndef OS_STACK_CHECK
149-
#define OS_STACK_CHECK 1
149+
#define OS_STACK_CHECK 0
150150
#endif
151151

152152
// <q>Stack usage watermark
@@ -156,8 +156,8 @@
156156
#define OS_STACK_WATERMARK 0
157157
#endif
158158

159-
// <o>Processor mode for Thread execution
160-
// <0=> Unprivileged mode
159+
// <o>Processor mode for Thread execution
160+
// <0=> Unprivileged mode
161161
// <1=> Privileged mode
162162
// <i> Default: Privileged mode
163163
#ifndef OS_PRIVILEGE_MODE
@@ -367,125 +367,125 @@
367367
// <i> Recording levels for RTX components.
368368
// <i> Only applicable if events for the respective component are generated.
369369

370-
// <h>Memory Management
370+
// <e.7>Memory Management
371371
// <i> Recording level for Memory Management events.
372372
// <o.0>Error events
373373
// <o.1>API function call events
374374
// <o.2>Operation events
375375
// <o.3>Detailed operation events
376-
// </h>
377-
#ifndef OS_EVR_MEMORY_LEVEL
378-
#define OS_EVR_MEMORY_LEVEL 0x01U
376+
// </e>
377+
#ifndef OS_EVR_MEMORY_LEVEL
378+
#define OS_EVR_MEMORY_LEVEL 0x81U
379379
#endif
380380

381-
// <h>Kernel
381+
// <e.7>Kernel
382382
// <i> Recording level for Kernel events.
383383
// <o.0>Error events
384384
// <o.1>API function call events
385385
// <o.2>Operation events
386386
// <o.3>Detailed operation events
387-
// </h>
388-
#ifndef OS_EVR_KERNEL_LEVEL
389-
#define OS_EVR_KERNEL_LEVEL 0x01U
387+
// </e>
388+
#ifndef OS_EVR_KERNEL_LEVEL
389+
#define OS_EVR_KERNEL_LEVEL 0x81U
390390
#endif
391391

392-
// <h>Thread
392+
// <e.7>Thread
393393
// <i> Recording level for Thread events.
394394
// <o.0>Error events
395395
// <o.1>API function call events
396396
// <o.2>Operation events
397397
// <o.3>Detailed operation events
398-
// </h>
399-
#ifndef OS_EVR_THREAD_LEVEL
400-
#define OS_EVR_THREAD_LEVEL 0x05U
398+
// </e>
399+
#ifndef OS_EVR_THREAD_LEVEL
400+
#define OS_EVR_THREAD_LEVEL 0x85U
401401
#endif
402402

403-
// <h>Generic Wait
403+
// <e.7>Generic Wait
404404
// <i> Recording level for Generic Wait events.
405405
// <o.0>Error events
406406
// <o.1>API function call events
407407
// <o.2>Operation events
408408
// <o.3>Detailed operation events
409-
// </h>
410-
#ifndef OS_EVR_WAIT_LEVEL
411-
#define OS_EVR_WAIT_LEVEL 0x01U
409+
// </e>
410+
#ifndef OS_EVR_WAIT_LEVEL
411+
#define OS_EVR_WAIT_LEVEL 0x81U
412412
#endif
413413

414-
// <h>Thread Flags
414+
// <e.7>Thread Flags
415415
// <i> Recording level for Thread Flags events.
416416
// <o.0>Error events
417417
// <o.1>API function call events
418418
// <o.2>Operation events
419419
// <o.3>Detailed operation events
420-
// </h>
421-
#ifndef OS_EVR_THFLAGS_LEVEL
422-
#define OS_EVR_THFLAGS_LEVEL 0x01U
420+
// </e>
421+
#ifndef OS_EVR_THFLAGS_LEVEL
422+
#define OS_EVR_THFLAGS_LEVEL 0x81U
423423
#endif
424424

425-
// <h>Event Flags
425+
// <e.7>Event Flags
426426
// <i> Recording level for Event Flags events.
427427
// <o.0>Error events
428428
// <o.1>API function call events
429429
// <o.2>Operation events
430430
// <o.3>Detailed operation events
431-
// </h>
432-
#ifndef OS_EVR_EVFLAGS_LEVEL
433-
#define OS_EVR_EVFLAGS_LEVEL 0x01U
431+
// </e>
432+
#ifndef OS_EVR_EVFLAGS_LEVEL
433+
#define OS_EVR_EVFLAGS_LEVEL 0x81U
434434
#endif
435435

436-
// <h>Timer
436+
// <e.7>Timer
437437
// <i> Recording level for Timer events.
438438
// <o.0>Error events
439439
// <o.1>API function call events
440440
// <o.2>Operation events
441441
// <o.3>Detailed operation events
442-
// </h>
443-
#ifndef OS_EVR_TIMER_LEVEL
444-
#define OS_EVR_TIMER_LEVEL 0x01U
442+
// </e>
443+
#ifndef OS_EVR_TIMER_LEVEL
444+
#define OS_EVR_TIMER_LEVEL 0x81U
445445
#endif
446446

447-
// <h>Mutex
447+
// <e.7>Mutex
448448
// <i> Recording level for Mutex events.
449449
// <o.0>Error events
450450
// <o.1>API function call events
451451
// <o.2>Operation events
452452
// <o.3>Detailed operation events
453-
// </h>
454-
#ifndef OS_EVR_MUTEX_LEVEL
455-
#define OS_EVR_MUTEX_LEVEL 0x01U
453+
// </e>
454+
#ifndef OS_EVR_MUTEX_LEVEL
455+
#define OS_EVR_MUTEX_LEVEL 0x81U
456456
#endif
457457

458-
// <h>Semaphore
458+
// <e.7>Semaphore
459459
// <i> Recording level for Semaphore events.
460460
// <o.0>Error events
461461
// <o.1>API function call events
462462
// <o.2>Operation events
463463
// <o.3>Detailed operation events
464-
// </h>
465-
#ifndef OS_EVR_SEMAPHORE_LEVEL
466-
#define OS_EVR_SEMAPHORE_LEVEL 0x01U
464+
// </e>
465+
#ifndef OS_EVR_SEMAPHORE_LEVEL
466+
#define OS_EVR_SEMAPHORE_LEVEL 0x81U
467467
#endif
468468

469-
// <h>Memory Pool
469+
// <e.7>Memory Pool
470470
// <i> Recording level for Memory Pool events.
471471
// <o.0>Error events
472472
// <o.1>API function call events
473473
// <o.2>Operation events
474474
// <o.3>Detailed operation events
475-
// </h>
476-
#ifndef OS_EVR_MEMPOOL_LEVEL
477-
#define OS_EVR_MEMPOOL_LEVEL 0x01U
475+
// </e>
476+
#ifndef OS_EVR_MEMPOOL_LEVEL
477+
#define OS_EVR_MEMPOOL_LEVEL 0x81U
478478
#endif
479479

480-
// <h>Message Queue
480+
// <e.7>Message Queue
481481
// <i> Recording level for Message Queue events.
482482
// <o.0>Error events
483483
// <o.1>API function call events
484484
// <o.2>Operation events
485485
// <o.3>Detailed operation events
486-
// </h>
487-
#ifndef OS_EVR_MSGQUEUE_LEVEL
488-
#define OS_EVR_MSGQUEUE_LEVEL 0x01U
486+
// </e>
487+
#ifndef OS_EVR_MSGQUEUE_LEVEL
488+
#define OS_EVR_MSGQUEUE_LEVEL 0x81U
489489
#endif
490490

491491
// </h>

‎cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Include/rtx_def.h‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/*
2+
* Copyright (c) 2021 Arm Limited. All rights reserved.
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the License); you may
7+
* not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
14+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*
18+
* -----------------------------------------------------------------------------
19+
*
20+
* Project: CMSIS-RTOS RTX
21+
* Title: RTX derived definitions
22+
*
23+
* -----------------------------------------------------------------------------
24+
*/
25+
26+
#ifndef RTX_DEF_H_
27+
#define RTX_DEF_H_
28+
29+
#ifdef _RTE_
30+
#include "RTE_Components.h"
31+
#endif
32+
#include "RTX_Config.h"
33+
34+
#if (defined(OS_OBJ_MEM_USAGE) && (OS_OBJ_MEM_USAGE != 0))
35+
#define RTX_OBJ_MEM_USAGE
36+
#endif
37+
38+
#if (defined(OS_STACK_CHECK) && (OS_STACK_CHECK != 0))
39+
#define RTX_STACK_CHECK
40+
#endif
41+
42+
#ifdef RTE_CMSIS_RTOS2_RTX5_ARMV8M_NS
43+
#define DOMAIN_NS 1
44+
#endif
45+
46+
#endif // RTX_DEF_H_

‎cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Include/rtx_evr.h‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013-2019 Arm Limited. All rights reserved.
2+
* Copyright (c) 2013-2021 Arm Limited. All rights reserved.
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*
@@ -26,8 +26,6 @@
2626
#ifndef RTX_EVR_H_
2727
#define RTX_EVR_H_
2828

29-
#include "cmsis_os2.h" // CMSIS RTOS API
30-
#include "RTX_Config.h" // RTX Configuration
3129
#include "rtx_os.h" // RTX OS definitions
3230

3331
// Initial Thread configuration covered also Thread Flags and Generic Wait
@@ -393,6 +391,17 @@ extern void EvrRtxKernelGetSysTimerFreq (uint32_t freq);
393391
#define EvrRtxKernelGetSysTimerFreq(freq)
394392
#endif
395393

394+
/**
395+
\brief Event on RTOS kernel system error (Error)
396+
\param[in] code error code.
397+
\param[in] object_id object that caused the error.
398+
*/
399+
#if (!defined(EVR_RTX_DISABLE) && (OS_EVR_KERNEL != 0) && !defined(EVR_RTX_KERNEL_ERROR_NOTIFY_DISABLE))
400+
extern void EvrRtxKernelErrorNotify (uint32_t code, void *object_id);
401+
#else
402+
#define EvrRtxKernelErrorNotify(code, object_id)
403+
#endif
404+
396405

397406
// ==== Thread Events ====
398407

0 commit comments

Comments
 (0)