Skip to content

Commit cef9784

Browse files
RKOUSTMRKOUSTM
committed
Release of X-CUBE-AZRTOS-L4 v1.0.1
1 parent 5b2b3af commit cef9784

File tree

17 files changed

+835
-64
lines changed

17 files changed

+835
-64
lines changed

‎Drivers/CMSIS/LICENSE.txt

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "{}"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright {yyyy} {name of copyright owner}
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

‎Middlewares/ST/cmsis_rtos_threadx/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ The list of features supported by the current implementation are as below:
1414
|-------------------------------|------------|------------------------------|
1515
|Kernel Information and Control | Y | It provide version/system information and starts/controls the RTOS Kernel. [More...](https://www.keil.com/pack/doc/cmsis/RTOS2/html/group__CMSIS__RTOS__KernelCtrl.html) |
1616
|Thread Management | Y | It define, create, and control thread functions.. [More...](https://www.keil.com/pack/doc/cmsis/RTOS2/html/group__CMSIS__RTOS__ThreadMgmt.html) |
17-
|Thread Flags | Y | It synchronize threads using flags. [More...](https://www.keil.com/pack/doc/cmsis/RTOS2/html/group__CMSIS__RTOS__ThreadFlagsMgmt.html) |
18-
|Event Flags | N | It synchronize threads using event flags. [More...](https://www.keil.com/pack/doc/cmsis/RTOS2/html/group__CMSIS__RTOS__EventFlags.html) |
17+
|Thread Flags | N | It synchronize threads using flags. [More...](https://www.keil.com/pack/doc/cmsis/RTOS2/html/group__CMSIS__RTOS__ThreadFlagsMgmt.html) |
18+
|Event Flags | Y | It synchronize threads using event flags. [More...](https://www.keil.com/pack/doc/cmsis/RTOS2/html/group__CMSIS__RTOS__EventFlags.html) |
1919
|Generic Wait Functions | Y | It wait for a certain period of time.. [More...](https://www.keil.com/pack/doc/cmsis/RTOS2/html/group__CMSIS__RTOS__Wait.html) |
2020
|Timer Management | Y | It create and control timer and timer callback functions. [More...](https://www.keil.com/pack/doc/cmsis/RTOS2/html/group__CMSIS__RTOS__TimerMgmt.html) |
2121
|Mutex Management | Y | It synchronize resource access using Mutual Exclusion (Mutex). [More...](https://www.keil.com/pack/doc/cmsis/RTOS2/html/group__CMSIS__RTOS__MutexMgmt.html) |

‎Middlewares/ST/cmsis_rtos_threadx/Release_Notes.html

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,23 @@ <h1 id="documentation">Documentation</h1>
4343
</div>
4444
<section id="update-history" class="col-sm-12 col-lg-8">
4545
<h1>Update history</h1>
46+
<div class="collapse">
47+
<input type="checkbox" id="collapse-section5" checked aria-hidden="true"> <label for="collapse-section5" aria-hidden="true"><strong>V1.0.4 / 08-November-2021</strong></label>
48+
<div>
49+
<h2 id="main-changes">Main changes</h2>
50+
<ul>
51+
<li>Fix return values for the osMessageQueueGet API</li>
52+
</ul>
53+
<ul>
54+
<li>Fix osThreadNew() API to support time-slice scheduling</li>
55+
</ul>
56+
<h2 id="dependencies">Dependencies:</h2>
57+
<ul>
58+
<li>Azure RTOS ThreadX V6.1.7 or higher</li>
59+
</ul>
60+
</div>
61+
</div>
62+
4663
<div class="collapse">
4764
<input type="checkbox" id="collapse-section4" checked aria-hidden="true"> <label for="collapse-section4" aria-hidden="true"><strong>V1.0.3 / 24-September-2021</strong></label>
4865
<div>

‎Middlewares/ST/cmsis_rtos_threadx/cmsis_os2.c

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@
103103
#define RTOS2_BYTE_POOL_HEAP_SIZE 4 * 1024
104104
#endif
105105

106+
/* Default time slice for the created threads */
107+
#ifndef RTOS2_DEFAULT_TIME_SLICE
108+
#define RTOS2_DEFAULT_TIME_SLICE 4
109+
#endif
110+
106111
/* Default stack byte pool memory type */
107112
#define RTOS2_BYTE_POOL_STACK_TYPE 1
108113

@@ -846,7 +851,7 @@ osThreadId_t osThreadNew(osThreadFunc_t func, void *argument, const osThreadAttr
846851
its value to the priority or deactivated using
847852
TX_DISABLE_PREEMPTION_THRESHOLD */
848853
if (tx_thread_create(thread_ptr, name_ptr, (void(*)(ULONG))func, entry_input, stack_start, stack_size, priority,
849-
priority, TX_NO_TIME_SLICE, TX_AUTO_START) != TX_SUCCESS)
854+
priority, RTOS2_DEFAULT_TIME_SLICE, TX_AUTO_START) != TX_SUCCESS)
850855
{
851856
/* Check if the memory for thread control block has been internally
852857
allocated */
@@ -1061,7 +1066,7 @@ uint32_t osThreadGetStackSize(osThreadId_t thread_id)
10611066
/* The specific thread stack size in bytes */
10621067
unsigned int stack_size;
10631068

1064-
/* Check if this API is called from Interrupt Service Routines, the thread_id
1069+
/* Check if this API is called from Interrupt Service Routines, the thread_id
10651070
is NULL or thread_id->tx_thread_id != TX_THREAD_ID */
10661071
if (IS_IRQ_MODE() || (thread_ptr == NULL) || (thread_ptr->tx_thread_id != TX_THREAD_ID))
10671072
{
@@ -3139,8 +3144,8 @@ osStatus_t osSemaphoreDelete(osSemaphoreId_t semaphore_id)
31393144
/*---------------------------------------------------------------------------*/
31403145

31413146
/**
3142-
* @brief The function osMessageQueueNew creates and initializes a message queue
3143-
* object. The function returns a message queue object identifier
3147+
* @brief The function osMessageQueueNew creates and initializes a message queue
3148+
* object. The function returns a message queue object identifier
31443149
* or NULL in case of an error.
31453150
* The function can be called after kernel initialization with osKernelInitialize.
31463151
* It is possible to create message queue objects before the RTOS kernel is
@@ -3721,13 +3726,18 @@ osStatus_t osMessageQueueGet(osMessageQueueId_t mq_id, void *msg_ptr, uint8_t *m
37213726
}
37223727
else if (tx_status == TX_QUEUE_EMPTY)
37233728
{
3724-
/* Return osErrorResource in case of error */
3725-
status = osErrorResource;
3729+
/* Return osErrorTimeout in case of error */
3730+
status = osErrorTimeout;
3731+
}
3732+
else if (tx_status == TX_WAIT_ERROR)
3733+
{
3734+
/* Return osErrorParameter when a non-zero timeout is used in ISR context */
3735+
status = osErrorParameter;
37263736
}
37273737
else
37283738
{
3729-
/* Return osErrorTimeout in case of error */
3730-
status = osErrorTimeout;
3739+
/* Return osErrorResource in case of error */
3740+
status = osErrorResource;
37313741
}
37323742
}
37333743

‎Projects/NUCLEO-L4R5ZI/Applications/USBX/Ux_Host_CDC_ACM/USBX/App/app_usbx_host.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,14 +149,14 @@ UINT MX_USBX_Host_Init(VOID *memory_ptr)
149149

150150
/* Allocate Memory for ux_app_MsgQueue */
151151
if (tx_byte_allocate(byte_pool, (VOID **) &pointer,
152-
APP_QUEUE_SIZE * sizeof(ux_app_devInfotypeDef), TX_NO_WAIT) != TX_SUCCESS)
152+
APP_QUEUE_SIZE * sizeof(ULONG), TX_NO_WAIT) != TX_SUCCESS)
153153
{
154154
return TX_POOL_ERROR;
155155
}
156156

157157
/* Create ux_app_MsgQueue */
158-
if (tx_queue_create(&ux_app_MsgQueue, "Message Queue app", sizeof(ux_app_devInfotypeDef),
159-
pointer, APP_QUEUE_SIZE * sizeof(ux_app_devInfotypeDef)) != TX_SUCCESS)
158+
if (tx_queue_create(&ux_app_MsgQueue, "Message Queue app", TX_1_ULONG,
159+
pointer, APP_QUEUE_SIZE * sizeof(ULONG)) != TX_SUCCESS)
160160
{
161161
return TX_QUEUE_ERROR;
162162
}

‎Projects/NUCLEO-L4R5ZI/Applications/USBX/Ux_Host_CDC_ACM/USBX/App/app_usbx_host.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ UINT ux_host_event_callback(ULONG event, UX_HOST_CLASS *p_host_class, VOID *p_i
7070

7171
/* Private defines -----------------------------------------------------------*/
7272
/* USER CODE BEGIN PD */
73-
#define APP_QUEUE_SIZE 5
73+
#define APP_QUEUE_SIZE 1
7474
#define USBX_APP_STACK_SIZE 1024
7575
#define USBX_MEMORY_SIZE (64 * 1024)
7676
#define NEW_RECEIVED_DATA 0x01

‎Projects/NUCLEO-L4R5ZI/Applications/USBX/Ux_Host_HID/USBX/App/app_usbx_host.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
/* Private define ------------------------------------------------------------*/
3535
/* USER CODE BEGIN PD */
36-
#define APP_QUEUE_SIZE 5
36+
#define APP_QUEUE_SIZE 1
3737
#define USBX_APP_STACK_SIZE 1024
3838
#define USBX_MEMORY_SIZE (64 * 1024)
3939
/* USER CODE END PD */
@@ -145,14 +145,14 @@ UINT MX_USBX_Host_Init(VOID *memory_ptr)
145145

146146
/* Allocate Memory for the Queue */
147147
if (tx_byte_allocate(byte_pool, (VOID **) &pointer,
148-
APP_QUEUE_SIZE * sizeof(ux_app_devInfotypeDef), TX_NO_WAIT) != TX_SUCCESS)
148+
APP_QUEUE_SIZE * sizeof(ULONG), TX_NO_WAIT) != TX_SUCCESS)
149149
{
150150
return TX_POOL_ERROR;
151151
}
152152

153153
/* Create the MsgQueue */
154-
if (tx_queue_create(&ux_app_MsgQueue, "Message Queue app", sizeof(ux_app_devInfotypeDef),
155-
pointer, APP_QUEUE_SIZE * sizeof(ux_app_devInfotypeDef)) != TX_SUCCESS)
154+
if (tx_queue_create(&ux_app_MsgQueue, "Message Queue app", TX_1_ULONG,
155+
pointer, APP_QUEUE_SIZE * sizeof(ULONG)) != TX_SUCCESS)
156156
{
157157
return TX_QUEUE_ERROR;
158158
}

0 commit comments

Comments
 (0)