Skip to content

Commit

Permalink
Release of X-CUBE-AZRTOS-L4 v1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
RKOUSTM committed Nov 8, 2021
1 parent 5b2b3af commit cef9784
Show file tree
Hide file tree
Showing 17 changed files with 835 additions and 64 deletions.
201 changes: 201 additions & 0 deletions Drivers/CMSIS/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http:https://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright {yyyy} {name of copyright owner}

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http:https://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
4 changes: 2 additions & 2 deletions Middlewares/ST/cmsis_rtos_threadx/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ The list of features supported by the current implementation are as below:
|-------------------------------|------------|------------------------------|
|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) |
|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) |
|Thread Flags | Y | It synchronize threads using flags. [More...](https://www.keil.com/pack/doc/cmsis/RTOS2/html/group__CMSIS__RTOS__ThreadFlagsMgmt.html) |
|Event Flags | N | It synchronize threads using event flags. [More...](https://www.keil.com/pack/doc/cmsis/RTOS2/html/group__CMSIS__RTOS__EventFlags.html) |
|Thread Flags | N | It synchronize threads using flags. [More...](https://www.keil.com/pack/doc/cmsis/RTOS2/html/group__CMSIS__RTOS__ThreadFlagsMgmt.html) |
|Event Flags | Y | It synchronize threads using event flags. [More...](https://www.keil.com/pack/doc/cmsis/RTOS2/html/group__CMSIS__RTOS__EventFlags.html) |
|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) |
|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) |
|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) |
Expand Down
17 changes: 17 additions & 0 deletions Middlewares/ST/cmsis_rtos_threadx/Release_Notes.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,23 @@ <h1 id="documentation">Documentation</h1>
</div>
<section id="update-history" class="col-sm-12 col-lg-8">
<h1>Update history</h1>
<div class="collapse">
<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>
<div>
<h2 id="main-changes">Main changes</h2>
<ul>
<li>Fix return values for the osMessageQueueGet API</li>
</ul>
<ul>
<li>Fix osThreadNew() API to support time-slice scheduling</li>
</ul>
<h2 id="dependencies">Dependencies:</h2>
<ul>
<li>Azure RTOS ThreadX V6.1.7 or higher</li>
</ul>
</div>
</div>

<div class="collapse">
<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>
<div>
Expand Down
26 changes: 18 additions & 8 deletions Middlewares/ST/cmsis_rtos_threadx/cmsis_os2.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@
#define RTOS2_BYTE_POOL_HEAP_SIZE 4 * 1024
#endif

/* Default time slice for the created threads */
#ifndef RTOS2_DEFAULT_TIME_SLICE
#define RTOS2_DEFAULT_TIME_SLICE 4
#endif

/* Default stack byte pool memory type */
#define RTOS2_BYTE_POOL_STACK_TYPE 1

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

/* Check if this API is called from Interrupt Service Routines, the thread_id
/* Check if this API is called from Interrupt Service Routines, the thread_id
is NULL or thread_id->tx_thread_id != TX_THREAD_ID */
if (IS_IRQ_MODE() || (thread_ptr == NULL) || (thread_ptr->tx_thread_id != TX_THREAD_ID))
{
Expand Down Expand Up @@ -3139,8 +3144,8 @@ osStatus_t osSemaphoreDelete(osSemaphoreId_t semaphore_id)
/*---------------------------------------------------------------------------*/

/**
* @brief The function osMessageQueueNew creates and initializes a message queue
* object. The function returns a message queue object identifier
* @brief The function osMessageQueueNew creates and initializes a message queue
* object. The function returns a message queue object identifier
* or NULL in case of an error.
* The function can be called after kernel initialization with osKernelInitialize.
* It is possible to create message queue objects before the RTOS kernel is
Expand Down Expand Up @@ -3721,13 +3726,18 @@ osStatus_t osMessageQueueGet(osMessageQueueId_t mq_id, void *msg_ptr, uint8_t *m
}
else if (tx_status == TX_QUEUE_EMPTY)
{
/* Return osErrorResource in case of error */
status = osErrorResource;
/* Return osErrorTimeout in case of error */
status = osErrorTimeout;
}
else if (tx_status == TX_WAIT_ERROR)
{
/* Return osErrorParameter when a non-zero timeout is used in ISR context */
status = osErrorParameter;
}
else
{
/* Return osErrorTimeout in case of error */
status = osErrorTimeout;
/* Return osErrorResource in case of error */
status = osErrorResource;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,14 @@ UINT MX_USBX_Host_Init(VOID *memory_ptr)

/* Allocate Memory for ux_app_MsgQueue */
if (tx_byte_allocate(byte_pool, (VOID **) &pointer,
APP_QUEUE_SIZE * sizeof(ux_app_devInfotypeDef), TX_NO_WAIT) != TX_SUCCESS)
APP_QUEUE_SIZE * sizeof(ULONG), TX_NO_WAIT) != TX_SUCCESS)
{
return TX_POOL_ERROR;
}

/* Create ux_app_MsgQueue */
if (tx_queue_create(&ux_app_MsgQueue, "Message Queue app", sizeof(ux_app_devInfotypeDef),
pointer, APP_QUEUE_SIZE * sizeof(ux_app_devInfotypeDef)) != TX_SUCCESS)
if (tx_queue_create(&ux_app_MsgQueue, "Message Queue app", TX_1_ULONG,
pointer, APP_QUEUE_SIZE * sizeof(ULONG)) != TX_SUCCESS)
{
return TX_QUEUE_ERROR;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ UINT ux_host_event_callback(ULONG event, UX_HOST_CLASS *p_host_class, VOID *p_i

/* Private defines -----------------------------------------------------------*/
/* USER CODE BEGIN PD */
#define APP_QUEUE_SIZE 5
#define APP_QUEUE_SIZE 1
#define USBX_APP_STACK_SIZE 1024
#define USBX_MEMORY_SIZE (64 * 1024)
#define NEW_RECEIVED_DATA 0x01
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

/* Private define ------------------------------------------------------------*/
/* USER CODE BEGIN PD */
#define APP_QUEUE_SIZE 5
#define APP_QUEUE_SIZE 1
#define USBX_APP_STACK_SIZE 1024
#define USBX_MEMORY_SIZE (64 * 1024)
/* USER CODE END PD */
Expand Down Expand Up @@ -145,14 +145,14 @@ UINT MX_USBX_Host_Init(VOID *memory_ptr)

/* Allocate Memory for the Queue */
if (tx_byte_allocate(byte_pool, (VOID **) &pointer,
APP_QUEUE_SIZE * sizeof(ux_app_devInfotypeDef), TX_NO_WAIT) != TX_SUCCESS)
APP_QUEUE_SIZE * sizeof(ULONG), TX_NO_WAIT) != TX_SUCCESS)
{
return TX_POOL_ERROR;
}

/* Create the MsgQueue */
if (tx_queue_create(&ux_app_MsgQueue, "Message Queue app", sizeof(ux_app_devInfotypeDef),
pointer, APP_QUEUE_SIZE * sizeof(ux_app_devInfotypeDef)) != TX_SUCCESS)
if (tx_queue_create(&ux_app_MsgQueue, "Message Queue app", TX_1_ULONG,
pointer, APP_QUEUE_SIZE * sizeof(ULONG)) != TX_SUCCESS)
{
return TX_QUEUE_ERROR;
}
Expand Down
Loading

0 comments on commit cef9784

Please sign in to comment.